修改获取离散率

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

@@ -1680,6 +1680,7 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator {
                 url = pictureUrl + urls[0];
             } else {
                 url = pictureUrl + urls[1];
+                ;
             }
             photoUrls.put(datass.getDisplayName().split("_")[0] + "jddwz", url);
         }
@@ -1725,14 +1726,14 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator {
 
     }
 
+
     public HashMap<String, Object> getyw(String gatewayId) {
         HashMap<String, Object> resultMap = new HashMap<>();
         Map<String, List<String>> queryCondtion = new HashMap<>();
         queryCondtion.put(CommonConstans.QueryStringGateWayId, Arrays.asList(gatewayId));
-        queryCondtion.put(CommonConstans.QueryStringSystemTypeKeyword, Arrays.asList("模拟量"));
-        Map<String,String> likeMap = new HashMap<>();
-        likeMap.put(CommonConstans.QueryStringFrontMoudle,"1主变");
-        List<ESEquipments> esEquipmentsList = commonServiceImpl.getListDataByCondtions(queryCondtion, null, ESEquipments.class,likeMap);
+        queryCondtion.put(CommonConstans.QueryStringFrontMoudle, Arrays.asList("1主变"));
+        queryCondtion.put(CommonConstans.QueryStringSystemType, Arrays.asList("模拟量"));
+        List<ESEquipments> esEquipmentsList = commonServiceImpl.getListDataByCondtions(queryCondtion, null, ESEquipments.class);
         // TODO: 2023/7/14 数据未整理  --->  油面温1   油面温2   绕组温度
         resultMap.put("value1", "0.0");
         resultMap.put("value2", "0.0");
@@ -1740,13 +1741,13 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator {
         resultMap.put("value4", "0.0");
         esEquipmentsList.forEach(item -> {
             if ("档位".equals(item.getDisplayName())) {
-                resultMap.put("value4", String.format("%.0f",item.getValueF()));
+                resultMap.put("value4", item.getValue());
             } else if ("油面温1".equals(item.getDisplayName())) {
-                resultMap.put("value1", String.format("%.1f",item.getValueF()));
+                resultMap.put("value1", item.getValue());
             } else if ("油面温2".equals(item.getDisplayName())) {
-                resultMap.put("value2", String.format("%.1f",item.getValueF()));
+                resultMap.put("value2", item.getValue());
             } else if ("绕组温度".equals(item.getDisplayName())) {
-                resultMap.put("value3", String.format("%.1f",item.getValueF()));
+                resultMap.put("value3", item.getValue());
             }
         });
         return resultMap;
@@ -1954,6 +1955,23 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator {
 
     public ResultsData collectingBox(String gatewayId, int current, int size) {
 
+        ArrayList<Map<String, Object>> resultList = getLSV(gatewayId);
+       
+        //构建平台数据
+        DataGridMock DataGridMock = new DataGridMock(current, resultList.size(), false, current, resultList);
+        ColModel colModelEventMovement = new ColModel("zz", "zz", "子阵", "子阵", "dataGrid", "zz");
+        ColModel colModelStationName = new ColModel("nbq", "nbq", "逆变器", "逆变器", "dataGrid", "nvq");
+        ColModel colModelEventDesc = new ColModel("hlx", "hlx", "汇流箱", "汇流箱", "dataGrid", "hlx");
+        ColModel colModelAlarmGroupName = new ColModel("avg", "avg", "支路电流平均值", "支路电流平均值", "dataGrid", "avg");
+        ColModel colModelEventTime = new ColModel("lsv", "lsv", "支路电流离散率", "支路电流离散率", "dataGrid", "lsv");
+        List<ColModel> listColModel = Arrays.asList(colModelEventMovement, colModelStationName, colModelEventDesc, colModelAlarmGroupName, colModelEventTime);
+        ResultsData resultsData = new ResultsData(DataGridMock, listColModel);
+        return resultsData;
+    }
+    
+    public ArrayList<Map<String, Object>> getLSV(String gatewayId)
+    {
+    	
     	ArrayList<Map<String, Object>> resultList = new ArrayList<>();
     	 Map<String, List<String>> queryConditon = new HashMap<>();
          queryConditon.put(CommonConstans.QueryStringGateWayId, Arrays.asList(gatewayId));
@@ -1995,16 +2013,8 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator {
                  resultList.add(resultMap);
              }
          }
-        //构建平台数据
-        DataGridMock DataGridMock = new DataGridMock(current, resultList.size(), false, current, resultList);
-        ColModel colModelEventMovement = new ColModel("zz", "zz", "子阵", "子阵", "dataGrid", "zz");
-        ColModel colModelStationName = new ColModel("nbq", "nbq", "逆变器", "逆变器", "dataGrid", "nvq");
-        ColModel colModelEventDesc = new ColModel("hlx", "hlx", "汇流箱", "汇流箱", "dataGrid", "hlx");
-        ColModel colModelAlarmGroupName = new ColModel("avg", "avg", "支路电流平均值", "支路电流平均值", "dataGrid", "avg");
-        ColModel colModelEventTime = new ColModel("lsl", "lsv", "支路电流离散率", "支路电流离散率", "dataGrid", "lsv");
-        List<ColModel> listColModel = Arrays.asList(colModelEventMovement, colModelStationName, colModelEventDesc, colModelAlarmGroupName, colModelEventTime);
-        ResultsData resultsData = new ResultsData(DataGridMock, listColModel);
-        return resultsData;
+         
+         return resultList;
     }