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

amos-boot-system-jxiop/amos-boot-module-jxiop-api/src/main/java/com/yeejoin/amos/boot/module/jxiop/api/dto/TreeDto.java

@@ -34,6 +34,11 @@ public class TreeDto {
     private Integer isOnClick;
 
     /**
+     * 风机首页-配置页面场景ID
+     */
+    private String sceneId;
+
+    /**
      * 子节点
      */
     private List<TreeDto> children;

amos-boot-system-jxiop/amos-boot-module-jxiop-api/src/main/resources/mapper/StationBasicMapper.xml

@@ -160,7 +160,8 @@
             sequence_nbr as code,
             station_type as parentCode,
             sequence_nbr as id,
-            '1' as isOnclick
+            '1' as isOnclick,
+            scene_id as sceneId
         from station_basic
         <where>
             <if test="regionCode != null and regionCode != ''">

amos-boot-system-jxiop/amos-boot-module-jxiop-monitor-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/constants/CommonConstans.java

@@ -79,16 +79,20 @@ public class CommonConstans {
     };
     //es EquipIndexName 查绚关键字
     public static final String QueryStringEquipmentIndexName = "equipmentIndexName.keyword";
+    //es EquipIndexName 查绚关键字
+    public static final String QueryStringEquipmentIndexNameNotKeyword = "equipmentIndexName";
     //es gatewayId 查绚关键字
     public static final String QueryStringGateWayId = "gatewayId.keyword";
     public static final String QueryStringFrontMoudle = "frontModule.keyword";
     public static final String QueryStringSystemType = "systemType";
+    public static final String QueryStringSystemTypeKeyword = "systemType.keyword";
     public static final String QueryStringEquipmentNumber = "equipmentNumber";
     public static final String QueryStringValue = "value";
     public static final String QueryStringValueKeyword = "value.keyword";
     public static final String QueryStringDataType = "dataType";
     public static final String QueryStringDisplayName = "displayName";
     public static final String QueryStringIsAlarm = "isAlarm";
+    public static final String QueryStringIsAlarmKeyword = "isAlarm.keyword";
     public static final String  Twodecimalplaces= "%.2f";
     public static final String Fourdecimalplaces = "%.4f";
     public static final String QueryStringFrontMoudleNotKeyWord = "frontModule";

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

@@ -763,6 +763,7 @@ public class MonitorFanIdxController extends BaseController {
 
         List<Map<String, Object>> statusMonitoring = monitorFanIndicator.solarPowerOperation(gatewayId);
         List<Map<String, Object>> collect = statusMonitoring.stream()
+                .sorted(Comparator.comparing(t -> Integer.parseInt(t.get("sort").toString())))
                 .skip((long) (current - 1) * size)
                 .limit(size)
                 .collect(Collectors.toList());

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

@@ -519,7 +519,7 @@ public class CommonServiceImpl {
             List<T> list = searchHitList.stream().map(hit -> hit.getContent()).collect(Collectors.toList());
             return list;
         }
-        return null;
+        return new ArrayList<>();
     }
 
 

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

@@ -124,15 +124,17 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator {
         String table = gateway;
         Map<String,List<String>> queryCodntion = new HashMap<>();
         queryCodntion.put(CommonConstans.QueryStringGateWayId,Arrays.asList(gateway));
-        queryCodntion.put(CommonConstans.QueryStringIsAlarm,Arrays.asList("1"));
-        List<ESEquipments> alldata = commonServiceImpl.getListDataByCondtions(queryCodntion,null,ESEquipments.class);
+        queryCodntion.put(CommonConstans.QueryStringIsAlarmKeyword,Arrays.asList("1"));
+        List<ESEquipments> alldata = commonServiceImpl.getListDataByCondtionsAndLike(queryCodntion,null,ESEquipments.class, null);
         List<ESEquipments> waringData = alldata.stream().filter(esEquipments -> !esEquipments.getValue().equals("0.0")&&!esEquipments.getValue().equals(esEquipments.getValueLabel())).collect(Collectors.toList());
         if (StringUtils.isNotEmpty(equipmentNumber)) {
             waringData= waringData.stream().filter(esEquipments -> esEquipments.getEquipmentNumber().equals(equipmentNumber)).collect(Collectors.toList());
         }
-        List<ESEquipments> lisSort=waringData.stream().sorted(Comparator.comparing(ESEquipments::getCreatedTime).reversed()).collect(Collectors.toList()).subList(((current - 1) * size),(current*size));
+        if (CollectionUtils.isNotEmpty(waringData)) {
+             waringData=waringData.stream().sorted(Comparator.comparing(ESEquipments::getCreatedTime).reversed()).collect(Collectors.toList()).subList(((current - 1) * size),(current*size));
+        }
         //对于查询到的告警信息进行按照时间顺序进行排序
-        DataGridMock DataGridMock = new DataGridMock(current, !waringData.isEmpty() ? waringData.size() : 0, false, current, lisSort);
+        DataGridMock DataGridMock = new DataGridMock(current, !waringData.isEmpty() ? waringData.size() : 0, false, current, waringData);
         ColModel colModelequipmentNumber = new ColModel("equipmentNumber", "equipmentNumber", "设备", "设备", "dataGrid", "equipmentNumber");
         ColModel colModelvalueLabel = new ColModel("valueLabel", "valueLabel", "事件描述", "事件描述", "dataGrid", "valueLabel");
         ColModel colModelcreatedTime = new ColModel("createdTime", "createdTime", "发生时间", "发生时间", "dataGrid", "createdTime");
@@ -222,6 +224,7 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator {
         treeDto.setId(String.valueOf(region.getSequenceNbr()));
         treeDto.setParentCode("0");
         treeDto.setIsOnClick(0);
+        treeDto.setSceneId("987654321");
         List<TreeDto> stationListByRegionCode = stationBasicMapper.getStationListByRegionCode(String.valueOf(region.getRegionCode()));
 
 
@@ -230,6 +233,7 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator {
         fdzTreeDto.setCode("FDZ");
         fdzTreeDto.setParentCode(String.valueOf(region.getRegionCode()));
         fdzTreeDto.setIsOnClick(0);
+        fdzTreeDto.setSceneId("12345678910");
         List<TreeDto> fdz = stationListByRegionCode.stream().filter(t -> t.getParentCode().contains("FDZ") && t.getParentCode().length() < 4).collect(Collectors.toList());
         fdzTreeDto.setChildren(fdz);
 
@@ -238,6 +242,7 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator {
         gfzTreeDto.setCode("GFZ");
         gfzTreeDto.setParentCode(String.valueOf(region.getRegionCode()));
         gfzTreeDto.setIsOnClick(0);
+        gfzTreeDto.setSceneId("1234567891011");
         List<TreeDto> gfz = stationListByRegionCode.stream().filter(t -> t.getParentCode().contains("GFDZ")).collect(Collectors.toList());
         gfzTreeDto.setChildren(gfz);
         List<TreeDto> treeDtos = Arrays.asList(fdzTreeDto, gfzTreeDto);
@@ -996,9 +1001,9 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator {
         Map<String, List<String>> queryCondtion = new HashMap<>();
         queryCondtion.put(CommonConstans.QueryStringGateWayId, Arrays.asList(gatewayId));
 //        queryCondtion.put(CommonConstans.QueryStringFrontMoudle, Arrays.asList("电量表计"));
-        Map<String, String> shouldCondition = new HashMap<>();
-        shouldCondition.put( null != stationType ? "frontModule" : CommonConstans.QueryStringFrontMoudle, "电量表计");
-        List<ESEquipments> esEquipmentsList = commonServiceImpl.getListDataByCondtions(queryCondtion, shouldCondition, ESEquipments.class);
+        Map<String, String> likeMap = new HashMap<>();
+        likeMap.put(CommonConstans.QueryStringFrontMoudleNotKeyWord, "电量表计");
+        List<ESEquipments> esEquipmentsList = commonServiceImpl.getListDataByCondtionsAndLike(queryCondtion, null, ESEquipments.class, likeMap);
         List<ESEquipments> windSqlList = esEquipmentsList.stream().filter(esEquipments -> !esEquipments.getDisplayName().equals("") && !esEquipments.getDisplayName().equals("检修状态")).collect(Collectors.toList());
         Map<String, List<ESEquipments>> maps = windSqlList.stream().collect(Collectors.groupingBy(ESEquipments::getSystemType));
         ArrayList<Map<String, String>> resultList = new ArrayList<>();
@@ -1109,15 +1114,15 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator {
         if (StringUtils.isNotEmpty(gatewayId)) {
             Map<String, List<String>> queryCondition = new HashMap<>();
             queryCondition.put(CommonConstans.QueryStringGateWayId, Arrays.asList(gatewayId));
-            queryCondition.put(CommonConstans.QueryStringSystemType, Arrays.asList("模拟量"));
+            queryCondition.put(CommonConstans.QueryStringSystemTypeKeyword, Arrays.asList("模拟量"));
             List<ESEquipments> esEquipmentsList = commonServiceImpl.getListDataByCondtions(queryCondition, null, ESEquipments.class);
             List<ESEquipments> xianData = esEquipmentsList.stream().filter(esEquipments -> esEquipments.getFrontModule().equals("220kVⅠ母PT") || esEquipments.getFrontModule().equals("35kVⅠ母PT")).collect(Collectors.toList());
             HashMap<String, Object> resultMap = new HashMap<>();
             xianData.forEach(item -> {
                 if ("220kVⅠ母PT".equals(item.getFrontModule())) {
-                    resultMap.put("220" + item.getDisplayName(), keepTwoDecimalPlaces(item.getValue()));
+                    resultMap.put("220" + item.getDisplayName(), keepTwoDecimalPlaces(item.getValueDouble().toString()));
                 } else if ("35kVⅠ母PT".equals(item.getFrontModule())) {
-                    resultMap.put("35" + item.getDisplayName(), keepTwoDecimalPlaces(item.getValue()));
+                    resultMap.put("35" + item.getDisplayName(), keepTwoDecimalPlaces(item.getValueDouble().toString()));
                 }
             });
             List<String> xyxDisplayNameList = Arrays.asList("Ia", "P", "Q", "Ux");
@@ -1127,9 +1132,9 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator {
             // 正向总有功正向总无功需要计算
             dlbjSqlData.forEach(item -> {
                 if ("正向总有功".equals(item.getDisplayName())) {
-                    resultMap.put("2000S1", keepTwoDecimalPlaces(String.valueOf((Double.parseDouble(item.getValue()) / 1000))));
+                    resultMap.put("2000S1", keepTwoDecimalPlaces(String.valueOf((Double.parseDouble(item.getValueDouble().toString()) / 1000))));
                 } else if ("正向总无功".equals(item.getDisplayName())) {
-                    resultMap.put("2000S2", keepTwoDecimalPlaces(String.valueOf((Double.parseDouble(item.getValue()) / 1000))));
+                    resultMap.put("2000S2", keepTwoDecimalPlaces(String.valueOf((Double.parseDouble(item.getValueDouble().toString()) / 1000))));
                 }
             });
 
@@ -1141,13 +1146,13 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator {
             resultMap.put("value4", "0.0");
             zb1SqlData.forEach(item -> {
                 if ("档位".equals(item.getDisplayName())) {
-                    resultMap.put("value4", ObjectUtils.isEmpty(item.getValue()) ? "0" : String.format("%.0f", Double.parseDouble(item.getValue())));
+                    resultMap.put("value4", ObjectUtils.isEmpty(item.getValueDouble().toString()) ? "0" : String.format("%.0f", Double.parseDouble(item.getValueDouble().toString())));
                 } else if ("油面温1".equals(item.getDisplayName())) {
-                    resultMap.put("value1", ObjectUtils.isEmpty(item.getValue()) ? "0.0" : String.format("%.1f", Double.parseDouble(item.getValue())));
+                    resultMap.put("value1", ObjectUtils.isEmpty(item.getValueDouble().toString()) ? "0.0" : String.format("%.1f", Double.parseDouble(item.getValueDouble().toString())));
                 } else if ("油面温2".equals(item.getDisplayName())) {
-                    resultMap.put("value2", ObjectUtils.isEmpty(item.getValue()) ? "0.0" : String.format("%.1f", Double.parseDouble(item.getValue())));
+                    resultMap.put("value2", ObjectUtils.isEmpty(item.getValueDouble().toString()) ? "0.0" : String.format("%.1f", Double.parseDouble(item.getValueDouble().toString())));
                 } else if ("绕组温度".equals(item.getDisplayName())) {
-                    resultMap.put("value3", ObjectUtils.isEmpty(item.getValue()) ? "0.0" : String.format("%.1f", Double.parseDouble(item.getValue())));
+                    resultMap.put("value3", ObjectUtils.isEmpty(item.getValueDouble().toString()) ? "0.0" : String.format("%.1f", Double.parseDouble(item.getValueDouble().toString())));
                 }
             });
 
@@ -1183,13 +1188,13 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator {
                 stringStringHashMap.put("value3", "0.0");
                 listData.forEach(item -> {
                     if (item.getDisplayName().equals("Ia")) {
-                        stringStringHashMap.put("value1", keepTwoDecimalPlaces(item.getValue()));
+                        stringStringHashMap.put("value1", keepTwoDecimalPlaces(item.getValueDouble().toString()));
                     }
                     if (item.getDisplayName().equals("P")) {
-                        stringStringHashMap.put("value2", keepTwoDecimalPlaces(item.getValue()));
+                        stringStringHashMap.put("value2", keepTwoDecimalPlaces(item.getValueDouble().toString()));
                     }
                     if (item.getDisplayName().equals("Q")) {
-                        stringStringHashMap.put("value3", keepTwoDecimalPlaces(item.getValue()));
+                        stringStringHashMap.put("value3", keepTwoDecimalPlaces(item.getValueDouble().toString()));
                     }
                 });
                 resultList.add(stringStringHashMap);
@@ -1223,16 +1228,16 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator {
         if (StringUtils.isNotEmpty(gatewayId)) {
             Map<String, List<String>> queryCondition = new HashMap<>();
             queryCondition.put(CommonConstans.QueryStringGateWayId, Arrays.asList(gatewayId));
-            queryCondition.put(CommonConstans.QueryStringSystemType, Arrays.asList("模拟量"));
+            queryCondition.put(CommonConstans.QueryStringSystemTypeKeyword, Arrays.asList("模拟量"));
             List<ESEquipments> esEquipmentsList = commonServiceImpl.getListDataByCondtions(queryCondition, null, ESEquipments.class);
             // 10kVⅡ段母线数据
-            List<ESEquipments> xianData = esEquipmentsList.stream().filter(esEquipments -> esEquipments.getFrontModule().equals("35kVⅠ母PT")).collect(Collectors.toList());
+            List<ESEquipments> xianData = esEquipmentsList.stream().filter(esEquipments -> esEquipments.getFrontModule().contains("35kVⅠ母PT")).collect(Collectors.toList());
             HashMap<String, Object> resultMap = new HashMap<>();
-            xianData.forEach(item -> resultMap.put(item.getDisplayName(), keepTwoDecimalPlaces(item.getValue())));
+            xianData.forEach(item -> resultMap.put(item.getDisplayName(), keepTwoDecimalPlaces(item.getValueDouble().toString())));
 
             List<String> xyxDisplayNameList = Arrays.asList("Ia", "P", "Q");
             List<ESEquipments> xyxSqlData = esEquipmentsList.stream().filter(esEquipments -> esEquipments.getFrontModule().equals("35kV前万线") && xyxDisplayNameList.contains(esEquipments.getDisplayName())).collect(Collectors.toList());
-            xyxSqlData.forEach(item -> resultMap.put("35qwx" + item.getDisplayName(), keepTwoDecimalPlaces(item.getValue())));
+            xyxSqlData.forEach(item -> resultMap.put("35qwx" + item.getDisplayName(), keepTwoDecimalPlaces(item.getValueDouble().toString())));
 
             // 主线路图上各个路线名称
             resultMap.put("35qwx", "35kV前万线");
@@ -1251,6 +1256,9 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator {
             List<Map<String, String>> boosterStationInfo = monitorFanIndicatorregionMapper.getMajorBoosterStationInfo(gatewayId, "ASC", 5);
             ArrayList<Map<String, String>> resultList = new ArrayList<>();
             for (Map<String, String> map : boosterStationInfo) {
+                if (map.get("boosterName").equals("35kVⅠ母PT")) {
+                    continue;
+                }
                 List<ESEquipments> listData = esEquipmentsList.stream().filter(esEquipments -> esEquipments.getFrontModule().contains(map.get("boosterName")) && xyxDisplayNameList.contains(esEquipments.getDisplayName())).collect(Collectors.toList());
                 HashMap<String, String> stringStringHashMap = new HashMap<>();
                 stringStringHashMap.put("value1", "0.0");
@@ -1258,13 +1266,13 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator {
                 stringStringHashMap.put("value3", "0.0");
                 listData.forEach(item -> {
                     if (item.getDisplayName().equals("Ia")) {
-                        stringStringHashMap.put("value1", keepTwoDecimalPlaces(item.getValue()));
+                        stringStringHashMap.put("value1", keepTwoDecimalPlaces(item.getValueDouble().toString()));
                     }
                     if (item.getDisplayName().equals("P")) {
-                        stringStringHashMap.put("value2", keepTwoDecimalPlaces(item.getValue()));
+                        stringStringHashMap.put("value2", keepTwoDecimalPlaces(item.getValueDouble().toString()));
                     }
                     if (item.getDisplayName().equals("Q")) {
-                        stringStringHashMap.put("value3", keepTwoDecimalPlaces(item.getValue()));
+                        stringStringHashMap.put("value3", keepTwoDecimalPlaces(item.getValueDouble().toString()));
                     }
                 });
                 resultList.add(stringStringHashMap);
@@ -1318,9 +1326,9 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator {
     public Map<String, Object> getSwitchUrl(String gatewayId, String equipName) {
         Map<String, List<String>> queryCondtion = new HashMap<>();
         queryCondtion.put(CommonConstans.QueryStringGateWayId, Arrays.asList(gatewayId));
-        Map<String, String> shouldQueryCondtion = new HashMap<>();
-        shouldQueryCondtion.put(CommonConstans.QueryStringSystemType, "开关");
-        List<ESEquipments> esEquipmentsList = commonServiceImpl.getListDataByCondtions(queryCondtion, shouldQueryCondtion, ESEquipments.class);
+        Map<String, String> likeMap = new HashMap<>();
+        likeMap.put(CommonConstans.QueryStringSystemTypeKeyword, "开关");
+        List<ESEquipments> esEquipmentsList = commonServiceImpl.getListDataByCondtions(queryCondtion, null, ESEquipments.class, likeMap);
         List<ESEquipments> listData = esEquipmentsList.stream().filter(esEquipments -> esEquipments.getDisplayName().contains("合位")).collect(Collectors.toList());
         List<ESEquipments> listDatas = esEquipmentsList.stream().filter(esEquipments -> esEquipments.getDisplayName().contains("远方就地开关")).collect(Collectors.toList());
         List<ESEquipments> listDatass = esEquipmentsList.stream().filter(esEquipments -> esEquipments.getDisplayName().contains("接地刀位置")).collect(Collectors.toList());
@@ -1564,15 +1572,15 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator {
         ArrayList<Map<String, Object>> resultList = new ArrayList<>();
         Map<String, List<String>> queryConditon = new HashMap<>();
         queryConditon.put(CommonConstans.QueryStringGateWayId, Arrays.asList(gatewayId));
-        Map<String, String> shouldConditon = new HashMap<>();
-        shouldConditon.put(CommonConstans.QueryStringEquipmentIndexName, "路电流");
-        List<ESEquipments> list = commonServiceImpl.getListDataByCondtions(queryConditon, shouldConditon, ESEquipments.class);
+        Map<String, String> likeMap = new HashMap<>();
+        likeMap.put(CommonConstans.QueryStringEquipmentIndexNameNotKeyword, "路电流");
+        List<ESEquipments> list = commonServiceImpl.getListDataByCondtionsAndLike(queryConditon, null, ESEquipments.class, likeMap);
 
         Map<String, List<String>> queryConditon1 = new HashMap<>();
         queryConditon1.put(CommonConstans.QueryStringGateWayId, Arrays.asList(gatewayId));
-        Map<String, String> shouldConditon1 = new HashMap<>();
-        shouldConditon1.put(CommonConstans.QueryStringEquipmentIndexName, "平均电流");
-        List<ESEquipments> list1 = commonServiceImpl.getListDataByCondtions(queryConditon, shouldConditon, ESEquipments.class);
+        Map<String, String> likeMap1 = new HashMap<>();
+        likeMap1.put(CommonConstans.QueryStringEquipmentIndexNameNotKeyword, "平均电流");
+        List<ESEquipments> list1 = commonServiceImpl.getListDataByCondtionsAndLike(queryConditon, null, ESEquipments.class, likeMap1);
 
         if (!ValidationUtil.isEmpty(list)) {
             Map<String, List<ESEquipments>> collect = list.stream().collect(Collectors.groupingBy(ESEquipments::getEquipmentNumber));
@@ -1580,7 +1588,7 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator {
                 List<ESEquipments> indicatorsDtos = collect.get(s);
                 HashMap<String, Object> resultMap = new HashMap<>();
                 Double avageValue = 0.0;
-                avageValue = indicatorsDtos.stream().filter(e -> !ObjectUtils.isEmpty(e.getValue())).mapToDouble(l -> Double.parseDouble((String) l.getValue())).average().getAsDouble();
+                avageValue = indicatorsDtos.stream().filter(e -> !ObjectUtils.isEmpty(e.getValueDouble())).mapToDouble(l -> Double.parseDouble(l.getValueDouble().toString())).average().getAsDouble();
                 avageValue = Double.valueOf(String.format(CommonConstans.Twodecimalplaces, avageValue));
                 resultMap.put("avg", avageValue);
                 String[] name = s.split("-");
@@ -1628,6 +1636,7 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator {
             List<ESEquipments> indicatorsDtos = collects.get(s);
             Map<String, Object> map = new HashMap<>();
             map.put("name", s);
+            map.put("sort", s.split("-")[0]);
             map.put("type", "兆能");//此处暂时未提供数据 待定 暂写死值
             map.put("status", "1");//此处暂时未提供数据 待定 暂写死值
             indicatorsDtos.forEach(e -> {
@@ -1701,16 +1710,16 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator {
         Map<String, List<String>> queryConditon = new HashMap<>();
         queryConditon.put(CommonConstans.QueryStringEquipmentIndexName, Arrays.asList("总直流功率"));
         queryConditon.put(CommonConstans.QueryStringGateWayId, Arrays.asList(gatewayId));
-        Map<String, String> shouldConditon = new HashMap<>();
-        shouldConditon.put(CommonConstans.QueryStringFrontMoudle, "逆变器");
-        List<ESEquipments> listData = commonServiceImpl.getListDataByCondtions(queryConditon, shouldConditon, ESEquipments.class);
+        Map<String, String> likeMap = new HashMap<>();
+        likeMap.put(CommonConstans.QueryStringFrontMoudleNotKeyWord, "逆变器");
+        List<ESEquipments> listData = commonServiceImpl.getListDataByCondtionsAndLike(queryConditon, null, ESEquipments.class, likeMap);
 
         Map<String, List<String>> queryConditon1 = new HashMap<>();
         queryConditon1.put(CommonConstans.QueryStringEquipmentIndexName, Arrays.asList("有功功率"));
         queryConditon1.put(CommonConstans.QueryStringGateWayId, Arrays.asList(gatewayId));
-        Map<String, String> shouldConditon1 = new HashMap<>();
-        shouldConditon1.put(CommonConstans.QueryStringFrontMoudle, "逆变器");
-        List<ESEquipments> listData1 = commonServiceImpl.getListDataByCondtions(queryConditon1, shouldConditon1, ESEquipments.class);
+        Map<String, String> likeMap1 = new HashMap<>();
+        likeMap1.put(CommonConstans.QueryStringFrontMoudleNotKeyWord, "逆变器");
+        List<ESEquipments> listData1 = commonServiceImpl.getListDataByCondtionsAndLike(queryConditon1, null, ESEquipments.class, likeMap1);
 
         // 将两组数据合并成一个集合中 将总直流功率数据 放入 另一个集合的valueLable中
         for (ESEquipments listDatum : listData) {