From 9b95b7f8e17325b3b97e407c503bc37baf9bbd94 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E5=85=B4=E7=90=B3?= <1911390090@qq.com>
Date: Thu, 10 Oct 2024 14:27:16 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=AA=E9=98=B3=E8=83=BD=E6=9D=BF=E8=AE=BE?=
 =?UTF-8?q?=E5=A4=87=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/DcDeviceController.java        | 27 ++++++++++++-------
 1 file changed, 17 insertions(+), 10 deletions(-)

diff --git a/zc-business/src/main/java/com/zc/business/controller/DcDeviceController.java b/zc-business/src/main/java/com/zc/business/controller/DcDeviceController.java
index 44db9039..f4a52ba9 100644
--- a/zc-business/src/main/java/com/zc/business/controller/DcDeviceController.java
+++ b/zc-business/src/main/java/com/zc/business/controller/DcDeviceController.java
@@ -13,6 +13,7 @@ import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.utils.spring.SpringUtils;
 import com.ruoyi.system.service.ISysConfigService;
 import com.zc.business.constant.DeviceTypeConstants;
 import com.zc.business.domain.DcDevice;
@@ -33,6 +34,7 @@ import okhttp3.Request;
 import okhttp3.Response;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
 import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.*;
 
@@ -52,6 +54,7 @@ import java.util.stream.Collectors;
  *
  * @author zhaoxianglong
  */
+@Component()
 @Api(tags = {"设备"})
 @RestController
 @RequestMapping("/business/device")
@@ -315,7 +318,7 @@ public class DcDeviceController extends BaseController {
     /**
      * 根据物联设备id获取最新属性数据
      *
-     * @param deviceId 物联设备id
+     * @param deviceId 物联设备id SolarPanelTimingTask
      * @return 获取属性数据操作结果
      */
     @ApiOperation("获取设备最新属性数据")
@@ -471,7 +474,7 @@ public class DcDeviceController extends BaseController {
      //   parameters.put("deviceState", "1");
 
      //   List<String> propertyIds = Arrays.asList("visibility", "wetSlipperyCoefficient", "waterFilmIceSnowValue");
-
+//generatingPower 发电功率 //"cumulativeElectricityConsumptionInTheYear", //当年累计用电量
         List<String> propertyIds = Arrays.asList("cumulativeElectricityConsumptionInTheYear", //当年累计用电量
          "cumulativeElectricityConsumptionOnTheDay",//当日累计用电量
          "theAccumulatedChargeOfTheYear",//当年累计充电量
@@ -514,8 +517,10 @@ public class DcDeviceController extends BaseController {
         double formattedStandardCoal = Double.parseDouble(decimalFormat.format(standardCoal));
 
         attributeMap.put("standardCoal", formattedStandardCoal);
+/*
         attributeMap.forEach((key, value) -> System.out.println(String.format("属性：%s，格式值：%s", key, value)));
         System.out.println(carbonEmissionReduction);
+*/
 
         return AjaxResult.success(attributeMap);
     }
@@ -1380,6 +1385,8 @@ public class DcDeviceController extends BaseController {
     public AjaxResult ConfluenceAreaEarlyWarningDeviceBatteryLowWarning() throws HttpException, IOException, InterruptedException {
         DcDevice dcDevice = new DcDevice();
         dcDevice.setDeviceType(UniversalEnum.FIFTEEN.getValue());
+        IDcDeviceService dcDeviceService = SpringUtils.getBean(IDcDeviceService.class);
+
         List<DcDevice> dcDeviceList = dcDeviceService.listDevice(dcDevice);
         ArrayList devices = new ArrayList<>();
 
@@ -1394,17 +1401,17 @@ public class DcDeviceController extends BaseController {
             }
         }
         ArrayList functions = new ArrayList();
-//        for (int i = UniversalEnum.ZERO.getNumber(); i < UniversalEnum.SIX.getNumber(); i++) {
-//            JSONObject function = new JSONObject();
-//            function.put("functionId", UniversalEnum.A.getValue() + (i + UniversalEnum.ONE.getNumber()));
-//            function.put("params", new JSONObject());
-//            functions.add(function);
-//        }
+        for (int i = UniversalEnum.ZERO.getNumber(); i < UniversalEnum.SIX.getNumber(); i++) {
+            JSONObject function = new JSONObject();
+            function.put("functionId", UniversalEnum.A.getValue() + (i + UniversalEnum.ONE.getNumber()));
+            function.put("params", new JSONObject());
+            functions.add(function);
+        }
 
-        JSONObject function = new JSONObject();
+/*        JSONObject function = new JSONObject();
         function.put("functionId", UniversalEnum.A_ONE.getValue());
         function.put("params", new JSONObject());
-        functions.add(function);
+        functions.add(function);*/
         JSONObject jsonObject = new JSONObject();
         jsonObject.put("devices", devices);
         jsonObject.put("functions", functions);