公共方法添加

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

@@ -85,6 +85,7 @@ public class CommonConstans {
     public static final String QueryStringSystemType = "systemType";
     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";

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

@@ -461,8 +461,51 @@ public class CommonServiceImpl {
         }
         if (!ObjectUtils.isEmpty(shouldQuerCondtion)) {
             for (String key : shouldQuerCondtion.keySet()) {
-//                queryBuilder.should(QueryBuilders.wildcardQuery(key, shouldQuerCondtion.get(key)));
-                queryBuilder.must(QueryBuilders.matchQuery(key,shouldQuerCondtion.get(key)));
+                queryBuilder.should(QueryBuilders.wildcardQuery(key, shouldQuerCondtion.get(key)));
+            }
+        }
+
+        Query query = new NativeSearchQueryBuilder()
+                .withQuery(queryBuilder)
+                .build();
+        query.setTrackTotalHits(true);
+        SearchHits search = elasticsearchTemplate.search(query, tClass);
+        if (search.hasSearchHits()) {
+            List<SearchHit<T>> searchHitList = search.getSearchHits();
+            List<T> list = searchHitList.stream().map(hit -> hit.getContent()).collect(Collectors.toList());
+            return list;
+        }
+        return null;
+    }
+
+
+    /**
+     * 根据查询条件获取列表信息
+     *
+     * @param mustQuerCondtion
+     * @param shouldQuerCondtion
+     * @param tClass
+     * @param <T>
+     * @param likeMap 模糊字段查询
+     * @return
+     */
+    public <T> List<T> getListDataByCondtionsAndLike(Map<String, List<String>> mustQuerCondtion, Map<String, String> shouldQuerCondtion, Class<T> tClass, Map<String, String> likeMap) {
+        BoolQueryBuilder queryBuilder = QueryBuilders.boolQuery();
+        if (!ObjectUtils.isEmpty(mustQuerCondtion)) {
+            for (String key : mustQuerCondtion.keySet()) {
+                List<String> va = mustQuerCondtion.get(key);
+                queryBuilder.must(QueryBuilders.termsQuery(key, va));
+            }
+        }
+        if (!ObjectUtils.isEmpty(shouldQuerCondtion)) {
+            for (String key : shouldQuerCondtion.keySet()) {
+                queryBuilder.should(QueryBuilders.wildcardQuery(key, shouldQuerCondtion.get(key)));
+            }
+        }
+        if (!ObjectUtils.isEmpty(likeMap)) {
+            for (String key : likeMap.keySet()) {
+                MatchPhraseQueryBuilder queryBuilder1 = QueryBuilders.matchPhraseQuery(key, "*" + likeMap.get(key) + "*");
+                queryBuilder.must(queryBuilder1);
             }
         }
 
@@ -478,6 +521,9 @@ public class CommonServiceImpl {
         }
         return null;
     }
+
+
+
     public <T> List<T> getListDataByCondtions(Map<String, List<String>> mustQuerCondtion, Map<String, String> shouldQuerCondtion, Map<String, String> notMustQuerCondtion, Class<T> tClass) {
         BoolQueryBuilder queryBuilder = QueryBuilders.boolQuery();
         if (!ObjectUtils.isEmpty(mustQuerCondtion)) {

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

@@ -787,7 +787,7 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator {
         Map<String, List<String>> queryCondtion = new HashMap<>();
         queryCondtion.put(CommonConstans.QueryStringGateWayId, Arrays.asList(gatewayId));
         Map<String, String> shouldCodtion = new HashMap<>();
-        shouldCodtion.put(CommonConstans.QueryStringFrontMoudle, frontModule);
+        shouldCodtion.put("frontModule", frontModule);
         shouldCodtion.put(CommonConstans.QueryStringDisplayName, "合位");
         List<ESEquipments> listData = commonServiceImpl.getListDataByCondtions(queryCondtion, shouldCodtion, ESEquipments.class);
         List<Map<String, Object>> statusMaps = new ArrayList<>();
@@ -1697,21 +1697,21 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator {
         queryConditon.put(CommonConstans.QueryStringEquipmentIndexName, Arrays.asList("总直流功率"));
         queryConditon.put(CommonConstans.QueryStringGateWayId, Arrays.asList(gatewayId));
         Map<String, String> shouldConditon = new HashMap<>();
-        shouldConditon.put(CommonConstans.QueryStringEquipmentIndexName, "逆变器");
+        shouldConditon.put(CommonConstans.QueryStringFrontMoudle, "逆变器");
         List<ESEquipments> listData = commonServiceImpl.getListDataByCondtions(queryConditon, shouldConditon, ESEquipments.class);
 
         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.QueryStringEquipmentIndexName, "逆变器");
-        List<ESEquipments> listData1 = commonServiceImpl.getListDataByCondtions(queryConditon, shouldConditon, ESEquipments.class);
+        shouldConditon1.put(CommonConstans.QueryStringFrontMoudle, "逆变器");
+        List<ESEquipments> listData1 = commonServiceImpl.getListDataByCondtions(queryConditon1, shouldConditon1, ESEquipments.class);
 
         // 将两组数据合并成一个集合中 将总直流功率数据 放入 另一个集合的valueLable中
         for (ESEquipments listDatum : listData) {
             for (ESEquipments esEquipments : listData1) {
                 if (esEquipments.getEquipmentNumber().equals(listDatum.getEquipmentNumber())) {
-                    esEquipments.setValueLabel(listDatum.getValue());
+                    esEquipments.setValueLabel(listDatum.getValueDouble().toString());
                 }
             }
         }
@@ -1726,7 +1726,7 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator {
             String number = equipNum.substring(equipNum.length() - 1);
             map.put("titie", String.valueOf(num));
             map.put("titie" + number, equipNum);
-            map.put("value" + number, String.format(CommonConstans.Twodecimalplaces, Double.parseDouble(esEquipments.getValue())));
+            map.put("value" + number, String.format(CommonConstans.Twodecimalplaces, Double.parseDouble(esEquipments.getValueDouble().toString())));
             map.put("valueLabel" + number, String.format(CommonConstans.Twodecimalplaces, Double.parseDouble(esEquipments.getValueLabel())));
             map.put("state" + number, equipStatesMap.get(esEquipments.getEquipmentNumber()));
             maps.add(map);
@@ -2045,8 +2045,9 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator {
         List<ESEquipments> totalEquipmentList = commonServiceImpl.getListDataByCondtions(queryCondition, shouldCondition, ESEquipments.class);
         totalEquipmentList.forEach(indicatorsDto -> result.put(indicatorsDto.getEquipmentNumber(), "正常运行"));
         Map<String, List<String>> queryCondition1 = new HashMap<>();
-        queryCondition.put(CommonConstans.QueryStringEquipmentIndexName, Arrays.asList("运行", "待机", "故障停机", "告警运行", "限额运行", "停机", "通讯故障", "'降额运行'"));
-        queryCondition.put(CommonConstans.QueryStringGateWayId, Arrays.asList(gatewayId));
+        queryCondition1.put(CommonConstans.QueryStringEquipmentIndexName, Arrays.asList("运行", "待机", "故障停机", "告警运行", "限额运行", "停机", "通讯故障", "'降额运行'"));
+        queryCondition1.put(CommonConstans.QueryStringValueKeyword, Arrays.asList("true"));
+        queryCondition1.put(CommonConstans.QueryStringGateWayId, Arrays.asList(gatewayId));
         List<ESEquipments> indicatorsDtoList = commonServiceImpl.getListDataByCondtions(queryCondition1, shouldCondition, ESEquipments.class);
         indicatorsDtoList.forEach(esEquipments -> {
             if (!"运行".equals(esEquipments.getEquipmentIndexName())) {