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<>();
     }