风机批量遥控接口修改
This commit is contained in:
parent
53c4025090
commit
2c278b537d
@ -2,8 +2,10 @@ package com.das.modules.page.controller;
|
||||
|
||||
import com.das.common.result.R;
|
||||
import com.das.modules.node.domain.dto.DeviceCommandDto;
|
||||
import com.das.modules.operation.domain.dto.CommandInfoDto;
|
||||
import com.das.modules.page.domian.WindTurbinesPageVo;
|
||||
import com.das.modules.page.service.WindTurbinesPageService;
|
||||
import jakarta.servlet.http.HttpServletRequest;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
@ -47,8 +49,8 @@ public class WindTurbinesPageController {
|
||||
* @return 成功或者失败
|
||||
*/
|
||||
@PostMapping ("/windTurbinesControl")
|
||||
public R<Void> windTurbinesControl(@RequestBody List<DeviceCommandDto> controlList){
|
||||
windTurbinesPageService.windTurbinesControl(controlList);
|
||||
public R<Void> windTurbinesControl(HttpServletRequest request ,@RequestBody List<CommandInfoDto> controlList){
|
||||
windTurbinesPageService.windTurbinesControl(request,controlList);
|
||||
return R.success();
|
||||
}
|
||||
}
|
||||
|
@ -8,8 +8,10 @@ import com.das.modules.equipment.domain.dto.SysEquipmentDto;
|
||||
import com.das.modules.equipment.domain.vo.SysEquipmentVo;
|
||||
import com.das.modules.equipment.mapper.SysEquipmentMapper;
|
||||
import com.das.modules.node.domain.dto.DeviceCommandDto;
|
||||
import com.das.modules.operation.domain.dto.CommandInfoDto;
|
||||
import com.das.modules.operation.service.OperationService;
|
||||
import com.das.modules.page.domian.WindTurbinesPageVo;
|
||||
import jakarta.servlet.http.HttpServletRequest;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Service;
|
||||
@ -116,11 +118,10 @@ public class WindTurbinesPageService {
|
||||
return windTurbinesPageVos;
|
||||
}
|
||||
|
||||
public void windTurbinesControl(List<DeviceCommandDto> controlList) {
|
||||
for (DeviceCommandDto item : controlList) {
|
||||
public void windTurbinesControl(HttpServletRequest request,List<CommandInfoDto> controlList) {
|
||||
for (CommandInfoDto item : controlList) {
|
||||
try {
|
||||
//TODO: 待完善 控制代码修改 换到 OperationService中实现
|
||||
//optService.executeOperation(item);
|
||||
optService.executeOperation(request,item);
|
||||
} catch (Exception e) {
|
||||
log.error("下控失败", e);
|
||||
throw new ServiceException("下控失败" + e);
|
||||
|
Loading…
Reference in New Issue
Block a user