Merge branch 'developer' of http://39.98.45.134:8090/moa/amos-boot-biz into developer

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/resources/mapper/cluster/IdxBizFanWarningRecordMapper.xml

@@ -50,7 +50,7 @@
             AND a.GATEWAY_ID = #{stationId}
         </if>
     </where>
-    order by REC_DATE DESC
+    order by recDate DESC
     limit #{current}, #{size}
 </select>
 

amos-boot-system-jxiop/amos-boot-module-jxiop-monitor-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/controller/MonitorFanIdxController.java

@@ -440,7 +440,13 @@ public class MonitorFanIdxController extends BaseController {
 
         return CommonResponseUtil.success();
     }
-
+    @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
+    @ApiOperation(value = "统一获取集电线与风机状态")
+    @GetMapping("/fanLineList")
+    public void getFanLineList() {
+        getStatusJDX();
+        getListByFJ();
+    }
 
     @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
     @ApiOperation(value = "获取升压站信息 通过排序等")

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

@@ -226,7 +226,7 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator {
         });
         Collator instance = Collator.getInstance(Locale.CHINA);
         if (needDisplayDisplayNameSystemType.contains(systemType) && needDisplayDisplayNameFrontModule.contains(frontModule)) {
-           result.sort(Comparator.comparing(ESEquipments::getTraceId,Comparator.comparingInt(Integer::parseInt)));
+            result.sort(Comparator.comparing(ESEquipments::getTraceId, Comparator.comparingInt(Integer::parseInt)));
         } else {
             Collections.sort(result, (e1, e2) -> {
                 return instance.compare(e1.getEquipmentIndexName(), e2.getEquipmentIndexName());
@@ -855,12 +855,12 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator {
                     data = listDatum.getDisplayName();
                 }
             }
-            statusMap.put("addres",listDatum.getAddress());
+            statusMap.put("addres", listDatum.getAddress());
             statusMap.put("data", data);
             statusMap.put("state", listDatum.getValue().equals("false") ? 0 : 1);
             statusMap.put("status", listDatum.getValue().equals("false") ? 0 : 1);
             statusMap.put("title", listDatum.getValue().equals("false") ? "断" : "通");
-            if(systemType.equals("网络")){
+            if (systemType.equals("网络")) {
                 statusMap.put("state", listDatum.getValue().equals("false") ? 1 : 0);
             }
             statusMaps.add(statusMap);
@@ -897,7 +897,6 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator {
         });
 
 
-
         return statusMaps;
     }
 
@@ -966,11 +965,12 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator {
         HashMap<String, String> fanstatutsHashMap = new HashMap<>();
         StationBasic stationBasic = stationBasicMapper.selectById(stationId);
         Map<String, List<String>> queryCondtion = new HashMap<>();
-        queryCondtion.put(CommonConstans.QueryStringEquipmentIndexName, Arrays.asList("瞬时风速"));
+        queryCondtion.put(CommonConstans.QueryStringEquipmentIndexName, Arrays.asList("瞬时风速", "有功功率"));
         queryCondtion.put(CommonConstans.QueryStringGateWayId, Arrays.asList(gatewayId));
-        List<ESEquipments> listData = commonServiceImpl.getListDataByCondtions(queryCondtion, null, ESEquipments.class);
-        queryCondtion.put(CommonConstans.QueryStringEquipmentIndexName, Arrays.asList("有功功率"));
-        List<ESEquipments> listData1 = commonServiceImpl.getListDataByCondtions(queryCondtion, null, ESEquipments.class);
+        List<ESEquipments> listDataAll = commonServiceImpl.getListDataByCondtions(queryCondtion, null, ESEquipments.class);
+        Map<String, Object> listDataWindSpeed = listDataAll.stream().filter(esEquipments -> esEquipments.getEquipmentIndexName().equals("瞬时风速")).collect(Collectors.toMap(ESEquipments::getEquipmentNumber, ESEquipments::getValueF));
+//        queryCondtion.put(CommonConstans.QueryStringEquipmentIndexName, Arrays.asList("有功功率"));
+        Map<String, Object> listDataActivePower = listDataAll.stream().filter(esEquipments -> esEquipments.getEquipmentIndexName().equals("有功功率")).collect(Collectors.toMap(ESEquipments::getEquipmentNumber, ESEquipments::getValueF));
         TpriDmpDatabook tpriDmpDatabook = tpriDmpDatabookServiceImpl.getTpriDmpDatabookByDataName("风机");
         List<Map<String, Object>> dataMaps = sjglZsjZsbtzServiceImpl.sjglZsjZsbtzMapper.getStationInfoMapByStationWerks(werks, tpriDmpDatabook.getDataid().toString());
         //获取风机列表
@@ -983,30 +983,28 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator {
         for (Map<String, Object> dataMap : dataMaps) {
             List<String> numList = Arrays.asList(dataMap.get("equipNum").toString().split(","));
             List<Map<String, Object>> statusMaps = new ArrayList<>();
-            for (ESEquipments listDatum : listData) {
-                if (null == listDatum.getValueF()) {
-                    listDatum.setValueF(0F);
-                }
-                for (ESEquipments indicatorsDto : listData1) {
-                    if (listDatum.getEquipmentNumber().equals(indicatorsDto.getEquipmentNumber())) {
-                        listDatum.setValueLabel(String.valueOf(indicatorsDto.getValueF() == null ? 0 : indicatorsDto.getValueF()));
-                    }
-                }
-
-                for (String num : numList) {
-                    if (Integer.parseInt(num) == Integer.parseInt(listDatum.getEquipmentNumber())) {
-                        Map<String, Object> map = new HashMap<>();
-                        map.put("title", prefix + listDatum.getEquipmentNumber());
-                        //用于参数传递
-                        map.put("title1", listDatum.getEquipmentNumber());
-                        map.put("windSpeed", listDatum.getValueF());
-                        map.put("power", listDatum.getValueLabel());
-                        //获取风机状态如果获取到的状态为空-则默认为正常运行状态
-                        String fantStatus = ObjectUtils.isEmpty(fanstatutsHashMap.get(listDatum.getEquipmentNumber())) ? "通讯中断" : fanstatutsHashMap.get(listDatum.getEquipmentNumber());
-                        map.put("url", fanStatusImagePathPrefix + File.separator + "风机-" + fantStatus + ".gif");
-                        statusMaps.add(map);
-                    }
-                }
+//            for (ESEquipments listDatum : listData) {
+//                if (null == listDatum.getValueF()) {
+//                    listDatum.setValueF(0F);
+//                }
+//                for (ESEquipments indicatorsDto : listData1) {
+//                    if (listDatum.getEquipmentNumber().equals(indicatorsDto.getEquipmentNumber())) {
+//                        listDatum.setValueLabel(String.valueOf(indicatorsDto.getValueF() == null ? 0 : indicatorsDto.getValueF()));
+//                    }
+//                }
+
+            for (String num : numList) {
+                Map<String, Object> map = new HashMap<>();
+                String equipmentNumber = String.format("%02d", Integer.parseInt(num));
+                map.put("title", prefix + equipmentNumber);
+                //用于参数传递
+                map.put("title1", equipmentNumber);
+                map.put("windSpeed", listDataWindSpeed.get(equipmentNumber));
+                map.put("power", listDataActivePower.get(equipmentNumber));
+                //获取风机状态如果获取到的状态为空-则默认为正常运行状态
+                String fantStatus = ObjectUtils.isEmpty(fanstatutsHashMap.get(equipmentNumber)) ? "通讯中断" : fanstatutsHashMap.get(equipmentNumber);
+                map.put("url", fanStatusImagePathPrefix + File.separator + "风机-" + fantStatus + ".gif");
+                statusMaps.add(map);
             }
             IPage<Map<String, Object>> result = new Page<>();
             result.setRecords(statusMaps);
@@ -1330,7 +1328,7 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator {
                 stringStringHashMap.put("value1", "0.0");
                 stringStringHashMap.put("value2", "0.0");
                 stringStringHashMap.put("value3", "0.0");
-                if(!map.get("boosterName").toString().equals("35kVⅠ母PT")){
+                if (!map.get("boosterName").toString().equals("35kVⅠ母PT")) {
                     listData.forEach(item -> {
 
                         if (item.getDisplayName().equals("Ia")) {
@@ -1343,7 +1341,7 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator {
                             stringStringHashMap.put("value3", item.getValueF() == null ? "0" : keepTwoDecimalPlaces(item.getValueF().toString()));
                         }
                     });
-                }else{
+                } else {
                     stringStringHashMap.put("value1", "");
                     stringStringHashMap.put("value2", "");
                     stringStringHashMap.put("value3", "");
@@ -2147,16 +2145,16 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator {
 
 
     public ResultsData getDeaviAtionRate(String gatewayId, String zz, String nbq, String hlx) {
-		ArrayList<Map<String, Object>> resultList = new ArrayList<>();
-		Map<String, List<String>> queryConditon = new HashMap<>();
-		queryConditon.put(CommonConstans.QueryStringGateWayId, Arrays.asList(gatewayId));
-		Map<String, String> likeMap = new HashMap<>();
-		likeMap.put(CommonConstans.QueryStringEquipmentIndexNameNotKeyword, "路电流");
-		//hlx=hlx.replace("#0", "#");
-		//likeMap.put(CommonConstans.QueryStringEquipmentSpecificNameNotKeyword, hlx);
-		String nhlx =zz+"/"+nbq+"/"+ hlx.replace("#0", "#");
-		List<ESEquipments> list = commonServiceImpl.getListDataByCondtionsAndLike(queryConditon, null,
-				ESEquipments.class, likeMap);
+        ArrayList<Map<String, Object>> resultList = new ArrayList<>();
+        Map<String, List<String>> queryConditon = new HashMap<>();
+        queryConditon.put(CommonConstans.QueryStringGateWayId, Arrays.asList(gatewayId));
+        Map<String, String> likeMap = new HashMap<>();
+        likeMap.put(CommonConstans.QueryStringEquipmentIndexNameNotKeyword, "路电流");
+        //hlx=hlx.replace("#0", "#");
+        //likeMap.put(CommonConstans.QueryStringEquipmentSpecificNameNotKeyword, hlx);
+        String nhlx = zz + "/" + nbq + "/" + hlx.replace("#0", "#");
+        List<ESEquipments> list = commonServiceImpl.getListDataByCondtionsAndLike(queryConditon, null,
+                ESEquipments.class, likeMap);
 
 //		Map<String, List<String>> queryConditon1 = new HashMap<>();
 //		queryConditon1.put(CommonConstans.QueryStringGateWayId, Arrays.asList(gatewayId));
@@ -2165,40 +2163,40 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator {
 //		List<ESEquipments> list1 = commonServiceImpl.getListDataByCondtionsAndLike(queryConditon, null,
 //				ESEquipments.class, likeMap1);
 
-		if (!ValidationUtil.isEmpty(list)) {
-		    list=list.stream().filter(i->i.getEquipmentSpecificName().contains(nhlx)).collect(Collectors.toList());
-			
-			Double avageValue = 0.0;
-			avageValue = list.stream().filter(e -> !ObjectUtils.isEmpty(e.getValueF()))
-					.mapToDouble(l -> Double.parseDouble(l.getValueF().toString())).average().getAsDouble();
-			avageValue = Double.valueOf(String.format(CommonConstans.Twodecimalplaces, avageValue));
-			for (ESEquipments s : list) {
-				HashMap<String, Object> resultMap = new HashMap<>();
-				resultMap.put("hlx", s.getEquipmentIndexName());
-				double now = Double.valueOf(String.format(CommonConstans.Twodecimalplaces, s.getValueF()));
-				resultMap.put("now", now);
-				resultMap.put("avg", avageValue);
-				double c = now - avageValue;
-				if (c < 0) {
-					c = -c;
-				}
-				double lsv = c / avageValue;
-				lsv = Double.valueOf(String.format(CommonConstans.Twodecimalplaces, lsv));
-				resultMap.put("lsv", lsv);
-				resultList.add(resultMap);
-			}
-		}
-		// 构建平台数据
-		DataGridMock DataGridMock = new DataGridMock(0, resultList.size(), false, 0, resultList);
-		ColModel colModelEventMovement = new ColModel("hlx", "hlx", "汇流箱", "汇流箱", "dataGrid", "hlx");
-		ColModel colModelStationName = new ColModel("now", "now", "当前值", "当前值", "dataGrid", "now");
-		ColModel colModelEventDesc = new ColModel("avg", "avg", "平均值", "平均值", "dataGrid", "avg");
-		ColModel colModelAlarmGroupName = new ColModel("pcv", "pcv", "偏差率", "偏差率", "dataGrid", "pcv");
-		List<ColModel> listColModel = Arrays.asList(colModelEventMovement, colModelStationName, colModelEventDesc,
-				colModelAlarmGroupName);
-		ResultsData resultsData = new ResultsData(DataGridMock, listColModel);
-		return resultsData;
-	}
+        if (!ValidationUtil.isEmpty(list)) {
+            list = list.stream().filter(i -> i.getEquipmentSpecificName().contains(nhlx)).collect(Collectors.toList());
+
+            Double avageValue = 0.0;
+            avageValue = list.stream().filter(e -> !ObjectUtils.isEmpty(e.getValueF()))
+                    .mapToDouble(l -> Double.parseDouble(l.getValueF().toString())).average().getAsDouble();
+            avageValue = Double.valueOf(String.format(CommonConstans.Twodecimalplaces, avageValue));
+            for (ESEquipments s : list) {
+                HashMap<String, Object> resultMap = new HashMap<>();
+                resultMap.put("hlx", s.getEquipmentIndexName());
+                double now = Double.valueOf(String.format(CommonConstans.Twodecimalplaces, s.getValueF()));
+                resultMap.put("now", now);
+                resultMap.put("avg", avageValue);
+                double c = now - avageValue;
+                if (c < 0) {
+                    c = -c;
+                }
+                double lsv = c / avageValue;
+                lsv = Double.valueOf(String.format(CommonConstans.Twodecimalplaces, lsv));
+                resultMap.put("lsv", lsv);
+                resultList.add(resultMap);
+            }
+        }
+        // 构建平台数据
+        DataGridMock DataGridMock = new DataGridMock(0, resultList.size(), false, 0, resultList);
+        ColModel colModelEventMovement = new ColModel("hlx", "hlx", "汇流箱", "汇流箱", "dataGrid", "hlx");
+        ColModel colModelStationName = new ColModel("now", "now", "当前值", "当前值", "dataGrid", "now");
+        ColModel colModelEventDesc = new ColModel("avg", "avg", "平均值", "平均值", "dataGrid", "avg");
+        ColModel colModelAlarmGroupName = new ColModel("pcv", "pcv", "偏差率", "偏差率", "dataGrid", "pcv");
+        List<ColModel> listColModel = Arrays.asList(colModelEventMovement, colModelStationName, colModelEventDesc,
+                colModelAlarmGroupName);
+        ResultsData resultsData = new ResultsData(DataGridMock, listColModel);
+        return resultsData;
+    }
 
 //    @Scheduled(cron = "0 */10 * * * ?")
 //	//@Scheduled(cron = "0/1 * * * * ?")