公共方法添加

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

@@ -91,4 +91,5 @@ public class CommonConstans {
     public static final String QueryStringIsAlarm = "isAlarm";
     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/service/impl/CommonServiceImpl.java

@@ -486,7 +486,7 @@ public class CommonServiceImpl {
      * @param shouldQuerCondtion
      * @param tClass
      * @param <T>
-     * @param likeMap 模糊字段查询
+     * @param likeMap 模糊字段查询 key：不能带.keyWords
      * @return
      */
     public <T> List<T> getListDataByCondtionsAndLike(Map<String, List<String>> mustQuerCondtion, Map<String, String> shouldQuerCondtion, Class<T> tClass, Map<String, String> likeMap) {

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

@@ -786,18 +786,18 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator {
     public void getStatusJDX(String gatewayId, String stationId, String frontModule) {
         Map<String, List<String>> queryCondtion = new HashMap<>();
         queryCondtion.put(CommonConstans.QueryStringGateWayId, Arrays.asList(gatewayId));
-        Map<String, String> shouldCodtion = new HashMap<>();
-        shouldCodtion.put("frontModule", frontModule);
-        shouldCodtion.put(CommonConstans.QueryStringDisplayName, "合位");
-        List<ESEquipments> listData = commonServiceImpl.getListDataByCondtions(queryCondtion, shouldCodtion, ESEquipments.class);
+        Map<String, String> likeMap = new HashMap<>();
+        likeMap.put(CommonConstans.QueryStringFrontMoudleNotKeyWord, frontModule);
+        likeMap.put(CommonConstans.QueryStringDisplayName, "合位");
+        List<ESEquipments> listData = commonServiceImpl.getListDataByCondtionsAndLike(queryCondtion, null, ESEquipments.class, likeMap);
         List<Map<String, Object>> statusMaps = new ArrayList<>();
         Map<String, List<ESEquipments>> collect = listData.stream().collect(Collectors.groupingBy(ESEquipments::getFrontModule, LinkedHashMap::new, Collectors.toList()));
         for (String s : collect.keySet()) {
             Map<String, Object> statusMap = new HashMap<>();
             if (frontModule.equals("前光")) {
-                shouldCodtion.remove(CommonConstans.QueryStringDisplayName);
-                shouldCodtion.put(CommonConstans.QueryStringSystemType, "模拟量");
-                List<ESEquipments> value = commonServiceImpl.getListDataByCondtions(queryCondtion, shouldCodtion, ESEquipments.class);
+                likeMap.remove(CommonConstans.QueryStringDisplayName);
+                likeMap.put(CommonConstans.QueryStringSystemType, "模拟量");
+                List<ESEquipments> value = commonServiceImpl.getListDataByCondtionsAndLike(queryCondtion, null, ESEquipments.class, likeMap);
                 for (ESEquipments indicatorsDto : value) {
                     Double aDouble = Double.valueOf(indicatorsDto.getValue());
                     statusMap.put(indicatorsDto.getDisplayName() + "Value", String.format(CommonConstans.Twodecimalplaces, aDouble));