光字牌通用接口调整

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

@@ -344,7 +344,7 @@ public class MonitorFanIdxController extends BaseController {
         if (null != stationType) {
             gatewayId = stationBasic.getFanGatewayId();
         }
-        List<Map<String, Object>> statusMonitoring = monitorFanIndicator.getStatusGzp(gatewayId, systemType, frontModule, equipNum);
+        List<Map<String, Object>> statusMonitoring = monitorFanIndicator.getStatusGzp(gatewayId, systemType, frontModule, equipNum,stationBasic.getStationType());
         IPage<Map<String, Object>> result = new Page<>();
         result.setRecords(statusMonitoring);
         result.setCurrent(1);
@@ -368,7 +368,7 @@ public class MonitorFanIdxController extends BaseController {
         stringStringHashMap.put("agzp", "A套保护光字牌");
         stringStringHashMap.put("bgzp", "B套保护光字牌");
         for (Map.Entry<String, String> stringStringEntry : stringStringHashMap.entrySet()) {
-            List<Map<String, Object>> statusMonitoring = monitorFanIndicator.getStatusGzp(gatewayId, stringStringEntry.getValue(), name, null);
+            List<Map<String, Object>> statusMonitoring = monitorFanIndicator.getStatusGzp(gatewayId, stringStringEntry.getValue(), name, null,stationBasic.getStationType());
             IPage<Map<String, Object>> result = new Page<>();
             result.setRecords(statusMonitoring);
             result.setCurrent(1);
@@ -577,7 +577,7 @@ public class MonitorFanIdxController extends BaseController {
 //        String sql = " SELECT * FROM indicators_" + gatewayId + " WHERE (equipmentIndexName ='待机' or equipmentIndexName ='故障停机' or equipmentIndexName ='告警运行' or equipmentIndexName ='限额运行' or equipmentIndexName ='停机 or 'equipmentIndexName ='停机' or equipmentIndexName ='停机') and value = 'true'";
 
         Map<String, Object> switchUrl = monitorFanIndicatorImpl.getSwitchUrl(gatewayId, name);
-        List<Map<String, Object>> statusMonitoring = monitorFanIndicator.getStatusGzp(gatewayId, "网络", name, null);
+        List<Map<String, Object>> statusMonitoring = monitorFanIndicator.getStatusGzp(gatewayId, "网络", name, null,stationBasic.getStationType());
         IPage<Map<String, Object>> result = new Page<>();
         switchUrl.put("records", statusMonitoring);
         switchUrl.put("current", 1);

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

@@ -567,7 +567,7 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator {
         List<String> windSpeeds = new ArrayList<>();
         List<String> activePowers = new ArrayList<>();
         List<String> axisData = new ArrayList<>();
-        Integer size = indicatorDataListWindSpeed.size()>indicatorDataListActivePower.size() ? indicatorDataListActivePower.size():indicatorDataListWindSpeed.size();
+        Integer size = indicatorDataListWindSpeed.size() > indicatorDataListActivePower.size() ? indicatorDataListActivePower.size() : indicatorDataListWindSpeed.size();
         for (int i = 0; i < size; i++) {
             windSpeeds.add(indicatorDataListWindSpeed.get(i).getValue());
             activePowers.add(indicatorDataListActivePower.get(i).getValue());
@@ -831,23 +831,27 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator {
     }
 
 
-    public List<Map<String, Object>> getStatusGzp(String gatewayId, String systemType, String frontModule, String equipNum) {
+    public List<Map<String, Object>> getStatusGzp(String gatewayId, String systemType, String frontModule, String equipNum, String stationType) {
         Map<String, List<String>> queryCondtion = new HashMap<>();
         queryCondtion.put(CommonConstans.QueryStringGateWayId, Arrays.asList(gatewayId));
-        queryCondtion.put(CommonConstans.QueryStringSystemTypeKeyword, Arrays.asList(systemType));
         if (null != equipNum) {
             queryCondtion.put(CommonConstans.QueryStringEquipmentNumberKeyword, Arrays.asList(equipNum));
         }
 
         Map<String, String> likeMap = new HashMap<>();
-        likeMap.put(CommonConstans.QueryStringFrontMoudleNotKeyWord, frontModule);
-        List<ESEquipments> indicatorsDtoList = commonServiceImpl.getListDataByCondtionsAndLike(queryCondtion, null, ESEquipments.class, likeMap);
+        likeMap.put(CommonConstans.QueryStringFrontMoudle, frontModule);
+        if (stationType.equals("FDZ")) {
+            queryCondtion.put(CommonConstans.QueryStringSystemTypeKeyword, Arrays.asList(systemType));
+        } else {
+            likeMap.put(CommonConstans.QueryStringSystemTypeKeyword, systemType);
+        }
+        List<ESEquipments> indicatorsDtoList = commonServiceImpl.getListDataByCondtions(queryCondtion, null, ESEquipments.class, likeMap);
 
         List<Map<String, Object>> statusMaps = new ArrayList<>();
         for (ESEquipments listDatum : indicatorsDtoList) {
             Map<String, Object> statusMap = new HashMap<>();
             String data = listDatum.getDisplayName();
-            if (StringUtils.isEmpty(data)||(!ObjectUtils.isEmpty(listDatum.getEquipmentNumber())&&data.equals(listDatum.getEquipmentNumber()))) {
+            if (StringUtils.isEmpty(data) || (!ObjectUtils.isEmpty(listDatum.getEquipmentNumber()) && data.equals(listDatum.getEquipmentNumber()))) {
                 data = listDatum.getEquipmentIndexName();
             }
             statusMap.put("addres", listDatum.getAddress());
@@ -1876,7 +1880,7 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator {
         List<Map<String, Object>> seriesData = new ArrayList<>();
         for (String s : data.keySet()) {
             Map<String, Object> map = new HashMap<>();
-            List<String> value = data.get(s).stream().map(indicatorData-> String.format(CommonConstans.Twodecimalplaces, Double.valueOf(indicatorData.getValue()))).collect(Collectors.toList());
+            List<String> value = data.get(s).stream().map(indicatorData -> String.format(CommonConstans.Twodecimalplaces, Double.valueOf(indicatorData.getValue()))).collect(Collectors.toList());
             axisData = data.get(s).stream().map(indicatorData -> DateUtil.format(indicatorData.getCreatedTime(), "HH:mm")).collect(Collectors.toList());
             map.put("data", value);
             seriesData.add(map);
@@ -1978,7 +1982,7 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator {
         queryCondtion.put(CommonConstans.QueryStringEquipmentNumber, Arrays.asList(equipNum));
         Map<String, String> shouldCondtion = new HashMap<>();
         shouldCondtion.put(CommonConstans.QueryStringEquipmentIndexName, "实时故障");
-        List<ESEquipments> indicatorsDtoList = commonServiceImpl.getListDataByCondtions(queryCondtion, null, ESEquipments.class,shouldCondtion);
+        List<ESEquipments> indicatorsDtoList = commonServiceImpl.getListDataByCondtions(queryCondtion, null, ESEquipments.class, shouldCondtion);
         //获取风机型号
         String type = indicatorsDtoList.get(0).getEquipmentSpecificName().substring(0, 5);
         List<String> sytemNames = Arrays.asList("发电机系统", "机舱与塔筒系统", "变流与主控系统", "偏航与液压系统", "叶轮系统");