sx/map
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

风机批量遥控接口修改

Browse Source
This commit is contained in:
huguanghan 2024-11-01 16:46:55 +08:00
parent 53c4025090
commit 2c278b537d
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
das/src/main/java/com/das/modules/page/controller/WindTurbinesPageController.java
View File

@ -2,8 +2,10 @@ package com.das.modules.page.controller;
import com.das.common.result.R; import com.das.common.result.R;
import com.das.modules.node.domain.dto.DeviceCommandDto; 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.domian.WindTurbinesPageVo;
import com.das.modules.page.service.WindTurbinesPageService; import com.das.modules.page.service.WindTurbinesPageService;
import jakarta.servlet.http.HttpServletRequest;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
@ -47,8 +49,8 @@ public class WindTurbinesPageController {
* @return 成功或者失败 * @return 成功或者失败
*/ */
@PostMapping ("/windTurbinesControl") @PostMapping ("/windTurbinesControl")
public R<Void> windTurbinesControl(@RequestBody List<DeviceCommandDto> controlList){ public R<Void> windTurbinesControl(HttpServletRequest request ,@RequestBody List<CommandInfoDto> controlList){
windTurbinesPageService.windTurbinesControl(controlList); windTurbinesPageService.windTurbinesControl(request,controlList);
return R.success(); return R.success();
} }
} }

9
das/src/main/java/com/das/modules/page/service/WindTurbinesPageService.java
View File

@ -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.domain.vo.SysEquipmentVo;
import com.das.modules.equipment.mapper.SysEquipmentMapper; import com.das.modules.equipment.mapper.SysEquipmentMapper;
import com.das.modules.node.domain.dto.DeviceCommandDto; 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.operation.service.OperationService;
import com.das.modules.page.domian.WindTurbinesPageVo; import com.das.modules.page.domian.WindTurbinesPageVo;
import jakarta.servlet.http.HttpServletRequest;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
@ -116,11 +118,10 @@ public class WindTurbinesPageService {
return windTurbinesPageVos; return windTurbinesPageVos;
} }
public void windTurbinesControl(List<DeviceCommandDto> controlList) { public void windTurbinesControl(HttpServletRequest request,List<CommandInfoDto> controlList) {
for (DeviceCommandDto item : controlList) { for (CommandInfoDto item : controlList) {
try { try {
//TODO: 待完善 控制代码修改 换到 OperationService中实现 optService.executeOperation(request,item);
//optService.executeOperation(item);
} catch (Exception e) { } catch (Exception e) {
log.error("下控失败", e); log.error("下控失败", e);
throw new ServiceException("下控失败" + e); throw new ServiceException("下控失败" + e);