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

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

@@ -361,10 +361,10 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator {
         StationBasic stationBasic = getOneByStationNumber(stationId);
         Map<String, List<String>> queryCondtion = new HashMap<>();
         queryCondtion.put(CommonConstans.QueryStringGateWayId, Arrays.asList(stationBasic.getFanGatewayId()));
-        queryCondtion.put("equipmentNumber", Arrays.asList(equipNum));
-        Map<String, String> shouldQueryCondtion = new HashMap<>();
-        shouldQueryCondtion.put("frontModule", frontModule);
-        List<ESEquipments> result = commonServiceImpl.getListDataByCondtions(queryCondtion, shouldQueryCondtion, ESEquipments.class);
+        queryCondtion.put(CommonConstans.QueryStringEquipmentNumberKeyword, Arrays.asList(equipNum));
+        Map<String, String> likeMap = new HashMap<>();
+        likeMap.put(CommonConstans.QueryStringFrontMoudleNotKeyWord, frontModule);
+        List<ESEquipments> result = commonServiceImpl.getListDataByCondtionsAndLike(queryCondtion, null, ESEquipments.class, likeMap);
         List<String> xList = new ArrayList<>();
         List<String> yList = new ArrayList<>();
         for (int i = 0; i < result.size(); i++) {
@@ -390,15 +390,15 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator {
 
     public String getFanDataByType(String stationId, String equipNum, String frontModule, String typeName) {
         StationBasic stationBasic = getOneByStationNumber(stationId);
-        Map<String, String> queryCondtion = new HashMap<>();
-        queryCondtion.put(CommonConstans.QueryStringFrontMoudle, frontModule);
-        Map<String, List<String>> queryCondtion1 = new HashMap<>();
-        queryCondtion1.put(CommonConstans.QueryStringEquipmentIndexName, Arrays.asList(typeName));
-        queryCondtion1.put(CommonConstans.QueryStringGateWayId, Arrays.asList(stationBasic.getFanGatewayId()));
-        queryCondtion1.put(CommonConstans.QueryStringEquipmentNumber, Arrays.asList(equipNum));
-        List<ESEquipments> equipNumList = commonServiceImpl.getListDataByCondtions(queryCondtion1, queryCondtion, ESEquipments.class);
-        if (CollectionUtils.isNotEmpty(equipNumList) && StringUtils.isNotEmpty(equipNumList.get(0).getValue())) {
-            return equipNumList.get(0).getValue();
+        Map<String, String> likeMap = new HashMap<>();
+        likeMap.put(CommonConstans.QueryStringFrontMoudleNotKeyWord, frontModule);
+        Map<String, List<String>> queryCondtion = new HashMap<>();
+        queryCondtion.put(CommonConstans.QueryStringEquipmentIndexName, Arrays.asList(typeName));
+        queryCondtion.put(CommonConstans.QueryStringGateWayId, Arrays.asList(stationBasic.getFanGatewayId()));
+        queryCondtion.put(CommonConstans.QueryStringEquipmentNumberKeyword, Arrays.asList(equipNum));
+        List<ESEquipments> equipNumList = commonServiceImpl.getListDataByCondtionsAndLike(queryCondtion, null, ESEquipments.class, likeMap);
+        if (CollectionUtils.isNotEmpty(equipNumList) && StringUtils.isNotEmpty(equipNumList.get(0).getValueDouble().toString())) {
+            return equipNumList.get(0).getValueDouble().toString();
         } else {
             return "0";
         }