光伏辐照录入修改

web/runeconomy-xk/src/main/java/com/gyee/runeconomy/controller/Irradiationinput/IrradiationinputController.java

@@ -19,6 +19,8 @@ public class IrradiationinputController {
     @Resource
     private IrradiationinputService irradiationinputService;
 
+    //单独部署该定时打开，同时注释其它定时
+
 //    @Scheduled(cron = "0 */1 * * * ?")
     @GetMapping("/input")
     @ResponseBody

web/runeconomy-xk/src/main/java/com/gyee/runeconomy/service/Irradiationinput/IrradiationinputService.java

@@ -30,22 +30,21 @@ public class IrradiationinputService {
         Date currentDate = DateUtils.getCurrentDate();
         List<String> wpPoints = new ArrayList<>();
         List<PointData> thls = new ArrayList<>();
+        List<PointData> realData = new ArrayList<>(); // 创建realData列表
 
-        if (!qwtList.isEmpty() || qwtList.size()>1) {
+        if (!qwtList.isEmpty() || qwtList.size() >= 1) {
             for (ProEconIrradiationInput lr : qwtList) {
                 Map<String, Map<String, ProBasicPowerstationPoint>> wppointmap = CacheContext.wppointmap;
-                Map<String, ProBasicPowerstationPoint> pointMap = wppointmap.get(lr.getWindpowerstationId()); //添加场站为需要被录入值的场站
-
-                if (pointMap.size() > 1 || !pointMap.isEmpty()) {
-
+                Map<String, ProBasicPowerstationPoint> pointMap = wppointmap.get(lr.getWindpowerstationId());
+                if (pointMap.size() >= 1 || !pointMap.isEmpty()) {
                     wpPoints.add(pointMap.get(ContantXk.GZYC).getNemCode());
-                    List<PointData> realData = edosUtil.getHistMatrix(wpPoints, currentDate.getTime() / 1000);
-
-                    for (PointData data : realData){
-                        data.setEdnaId(lr.getNemCode()); //替换测点为被录入的测点
-                        thls.add(data); //将测点及值放入list
+                    realData.addAll(edosUtil.getHistMatrix(wpPoints, currentDate.getTime() / 1000));
+                    for (PointData data : realData) {
+                        data.setEdnaId(lr.getNemCode());
+                        thls.add(data);
                     }
-
+                    realData.clear(); // 清空realData
+                    wpPoints.clear(); // 清空wpPoints,为下一次循环准备
                 }
             }
             edosUtil.sendMultiPoint(thls);

web/runeconomy-xk/src/main/java/com/gyee/runeconomy/service/monitor/ComprehensiveService.java

@@ -36,11 +36,11 @@ public class ComprehensiveService {
     public List<ProEconTestingPoint> targets(String type) {
         QueryWrapper<ProEconTestingPoint> qw = new QueryWrapper<>();
         if (type.equals("-1")) {
-            qw.select(" DISTINCT uniform_code,name ").lambda().eq(ProEconTestingPoint::getTypeId, "fcc").ne(ProEconTestingPoint::getUniformCode, "ZYCGL");
+            qw.select(" DISTINCT uniform_code,name,value_unit ").lambda().eq(ProEconTestingPoint::getTypeId, "fcc").ne(ProEconTestingPoint::getUniformCode, "ZYCGL");
         } else if (type.equals("-2")) {
-            qw.select(" DISTINCT uniform_code,name ").lambda().eq(ProEconTestingPoint::getTypeId, "gcc").ne(ProEconTestingPoint::getUniformCode, "ZYCGL");
+            qw.select(" DISTINCT uniform_code,name,value_unit ").lambda().eq(ProEconTestingPoint::getTypeId, "gcc").ne(ProEconTestingPoint::getUniformCode, "ZYCGL");
         } else {
-            qw.select(" DISTINCT uniform_code,name ").lambda().in(ProEconTestingPoint::getTypeId, "gcc", "fcc").ne(ProEconTestingPoint::getUniformCode, "ZYCGL");
+            qw.select(" DISTINCT uniform_code,name,value_unit ").lambda().in(ProEconTestingPoint::getTypeId, "gcc", "fcc").ne(ProEconTestingPoint::getUniformCode, "ZYCGL");
         }
         qw.lambda().eq(ProEconTestingPoint::getSpare3,"1");
         List<ProEconTestingPoint> list = proEconTestingPointService.list(qw);
@@ -49,7 +49,7 @@ public class ComprehensiveService {
 
     public List<ProEconTestingPoint> wttargets(String type, String part) {
         QueryWrapper<ProEconTestingPoint> qw = new QueryWrapper<>();
-        qw.select(" DISTINCT uniform_code,name ").lambda().like(ProEconTestingPoint::getUniformCode, "AI");
+        qw.select(" DISTINCT uniform_code,name,value_unit ").lambda().like(ProEconTestingPoint::getUniformCode, "AI");
         if (type.equals("-1")) {
             qw.lambda().eq(ProEconTestingPoint::getTypeId, "F");
         } else if (type.equals("-2")) {
@@ -88,6 +88,7 @@ public class ComprehensiveService {
             vo.setCapacity(wp.getJrCapacity() + wp.getJrwindCapacity());
             List<String> targetList = new ArrayList<>();
             List<String> glList = new ArrayList<>();
+            List<String> dlList = new ArrayList<>();
             Map<String, ProBasicPowerstationPoint> powerstationPointMap = wppointmap.get(wp.getId());
             Arrays.stream(targetArray).forEach(t -> {
                 if (powerstationPointMap.containsKey(t)) {
@@ -95,6 +96,9 @@ public class ComprehensiveService {
                     if (powerstationPointMap.get(t).getName().contains("功率")) {
                         glList.add(powerstationPointMap.get(t).getNemCode());
                     }
+                    if (powerstationPointMap.get(t).getName().contains("电量")) {
+                        dlList.add(powerstationPointMap.get(t).getNemCode());
+                    }
                 }
             });
             List<PointData> pointDataList = null;
@@ -107,6 +111,11 @@ public class ComprehensiveService {
                             a.setPointValueInDouble(a.getPointValueInDouble() / 1000);
                         }
                     }
+                    for (String c : dlList) {
+                        if (a.getPointName().equals(c)) {
+                            a.setPointValueInDouble(a.getPointValueInDouble() / 10000);
+                        }
+                    }
                 }
 
             } catch (Exception e) {

web/runeconomy-xk/src/main/java/com/gyee/runeconomy/util/realtimesource/EdosUtil.java

@@ -1562,12 +1562,17 @@ public class EdosUtil implements IEdosUtil {
         }
 
         List<JSONObject> writeList = new ArrayList<>();
+        List<JSONObject> jsonObjects = new ArrayList<>();
 
         for (PointData entity : pointls) {
             writeList.add(convertPointData(entity));
         }
         try {
-            String result = restTemplate.postForObject(url, writeList, String.class);
+            for (JSONObject wtt : writeList) {
+                jsonObjects = new ArrayList<>();
+                jsonObjects.add(wtt);
+                String result = restTemplate.postForObject(url, jsonObjects, String.class);
+            }
         } catch (HttpClientErrorException exception) {
             if (exception.getStatusCode() == HttpStatus.NOT_FOUND) {
                 System.out.println("404请求错误");