监盘首页-有功功率显示错误、夏造风电运行列表乱序

amos-boot-system-jxiop/amos-boot-module-jxiop-monitor-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/service/impl/MonitorFanIndicatorImpl.java

@@ -974,6 +974,7 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator {
         queryCondtion.put(CommonConstans.QueryStringEquipmentIndexName, Arrays.asList("风向角", "有功功率", "瞬时风速", "日发电量"));
         List<ESEquipments> allList = commonServiceImpl.getListDataByCondtions(queryCondtion, null, ESEquipments.class);
         List<ESEquipments> windSqlList = new ArrayList<>();
+        List<ESEquipments> windSqlSortList = new ArrayList<>();
         List<ESEquipments> powerSqlList = new ArrayList<>();
         List<ESEquipments> windSpeedSqlList = new ArrayList<>();
         List<ESEquipments> electricitySqlList = new ArrayList<>();
@@ -996,18 +997,19 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator {
         });
         Map<String, String> powerSqlMap = powerSqlList.stream().collect(Collectors.toMap(ESEquipments::getEquipmentNumber, ESEquipments::getValue));
         Map<String, String> windSpeedSqlMap = windSpeedSqlList.stream().collect(Collectors.toMap(ESEquipments::getEquipmentNumber, ESEquipments::getValue));
+        windSqlSortList = windSqlList.stream().sorted(Comparator.comparing(ESEquipments::getEquipmentNumber,Comparator.comparing(Integer::parseInt))).collect(Collectors.toList());
         Map<String, String> electricitySqlMap = electricitySqlList.stream().collect(Collectors.toMap(ESEquipments::getEquipmentNumber, ESEquipments::getValue));
         ArrayList<Map<String, String>> resultList = new ArrayList<>();
-        windSqlList.forEach(item -> {
+        for (int i = 0; i < windSqlSortList.size(); i++) {
+            ESEquipments esEquipments = windSqlSortList.get(i);
             HashMap<String, String> stringStringHashMap = new HashMap<>();
-            stringStringHashMap.put("equipmentNumber", item.getEquipmentNumber());
-            stringStringHashMap.put("wind", ObjectUtils.isEmpty(item.getValue()) ? "0.0" : item.getValue());
-            stringStringHashMap.put("power", powerSqlMap.get(item.getEquipmentNumber()));
-            stringStringHashMap.put("windSpeed", windSpeedSqlMap.get(item.getEquipmentNumber()));
-            stringStringHashMap.put("electricity", String.format(CommonConstans.Fourdecimalplaces, ObjectUtils.isEmpty(electricitySqlMap.get(item.getEquipmentNumber())) ? 0.0000 : Double.valueOf(electricitySqlMap.get(item.getEquipmentNumber()))));
-
+            stringStringHashMap.put("equipmentNumber", esEquipments.getEquipmentNumber());
+            stringStringHashMap.put("wind", ObjectUtils.isEmpty(esEquipments.getValue()) ? "0.0" : esEquipments.getValue());
+            stringStringHashMap.put("power", powerSqlMap.get(esEquipments.getEquipmentNumber()));
+            stringStringHashMap.put("windSpeed", windSpeedSqlMap.get(esEquipments.getEquipmentNumber()));
+            stringStringHashMap.put("electricity", String.format(CommonConstans.Fourdecimalplaces, ObjectUtils.isEmpty(electricitySqlMap.get(esEquipments.getEquipmentNumber())) ? 0.0000 : Double.valueOf(electricitySqlMap.get(esEquipments.getEquipmentNumber()))));
             resultList.add(stringStringHashMap);
-        });
+        }
         //构建平台数据
         DataGridMock DataGridMock = new DataGridMock(current, resultList.size(), false, current, resultList);
         ColModel colModelEquipmentNumber = new ColModel("equipmentNumber", "equipmentNumber", "风机编码", "风机编码", "dataGrid", "equipmentNumber");

amos-boot-system-jxiop/amos-boot-module-jxiop-monitor-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/service/impl/MonitoringServiceImpl.java

@@ -1314,15 +1314,11 @@ public class MonitoringServiceImpl {
                 queryCondtion1.put(CommonConstans.QueryStringGateWayId, Arrays.asList(stationBasic.getBoosterGatewayId()));
                 queryCondtion1.put(CommonConstans.QueryStringEquipmentIndexName, Arrays.asList("南瑞光差保护_313P"));
                 List<ESEquipments> esEquipmentsList = commonServiceImpl.getListDataByCondtions(queryCondtion1, null, ESEquipments.class);
-                total.updateAndGet(v -> v + commonServiceImpl.getSumByEquipmentIndxName(esEquipmentsList, "南瑞光差保护_313P"));
+                total.updateAndGet(v -> v + commonServiceImpl.getSumByEquipmentIndxName(esEquipmentsList, "南瑞光差保护_313P")*CommonConstans.kwToMv);
             }
-
-
         });
-
-
         //有功功率换算
-        hashMap.put("title", String.format(CommonConstans.Twodecimalplaces, total.get() / 1000));
+        hashMap.put("title", String.format(CommonConstans.Twodecimalplaces, total.get()));
         return hashMap;
     }