From 2c278b537d190f63edad029765fbd317df9ab177 Mon Sep 17 00:00:00 2001
From: huguanghan <ghhul@isoftstone.com>
Date: Fri, 1 Nov 2024 16:46:55 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A3=8E=E6=9C=BA=E6=89=B9=E9=87=8F=E9=81=A5?=
 =?UTF-8?q?=E6=8E=A7=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../page/controller/WindTurbinesPageController.java      | 6 ++++--
 .../modules/page/service/WindTurbinesPageService.java    | 9 +++++----
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/das/src/main/java/com/das/modules/page/controller/WindTurbinesPageController.java b/das/src/main/java/com/das/modules/page/controller/WindTurbinesPageController.java
index 814ca167..79d079fc 100644
--- a/das/src/main/java/com/das/modules/page/controller/WindTurbinesPageController.java
+++ b/das/src/main/java/com/das/modules/page/controller/WindTurbinesPageController.java
@@ -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();
     }
 }
diff --git a/das/src/main/java/com/das/modules/page/service/WindTurbinesPageService.java b/das/src/main/java/com/das/modules/page/service/WindTurbinesPageService.java
index a9423601..4dd971f7 100644
--- a/das/src/main/java/com/das/modules/page/service/WindTurbinesPageService.java
+++ b/das/src/main/java/com/das/modules/page/service/WindTurbinesPageService.java
@@ -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);