Merge remote-tracking branch 'origin/develop_dl_plan6' into develop_dl_plan6

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/resources/mapper/OrgUsrMapper.xml

@@ -1121,7 +1121,7 @@ LEFT JOIN (
         ( CASE WHEN cfp.post_qualification IS NULL THEN 0 ELSE 1 END ) AS is_certificate,
         IF
         (
-        ( SELECT field_value FROM cb_dynamic_form_instance dfi WHERE dfi.field_code = 'peopleType' AND dfi.instance_id = u.sequence_nbr ) = 2,
+        ( SELECT field_value FROM cb_dynamic_form_instance dfi WHERE dfi.field_code = 'peopleType' AND dfi.instance_id = u.sequence_nbr ) = 1601,
         1,
         0
         ) AS is_firefighters,

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/SupervisionConfigureController.java

@@ -330,7 +330,7 @@ public class SupervisionConfigureController extends AbstractBaseController {
             long nowDateTime = new Date().getTime();//当前时间戳
             Map<String, String> stateMap = fireFightingSystemMapper.queryPressureNowStateBySpecificId((Long) item.get("id"));
             ids.add((Long) item.get("id"));
-            boolean time = false;
+            boolean time = true;
             if (!ObjectUtils.isEmpty(stateMap) && stateMap.containsKey("update_date") && stateMap.containsKey("equipment_index_name")) {
                 item.put("update_time", String.valueOf(stateMap.get("update_date")).replaceAll("T", " "));
                 if (!ObjectUtils.isEmpty(stateMap.get("value"))) {
@@ -347,13 +347,13 @@ public class SupervisionConfigureController extends AbstractBaseController {
                     }
                     long res = nowDateTime - update_time;
                     long diffMinute = res / 1000 / 60;
-                    if (diffMinute <= 5) {
-                        time = true;
+                    if (diffMinute > 5) {
+                        time = false;
                     }
                     item.put("upTime", diffMinute);
                 }
             }
-            item.put("stateDesc", Integer.parseInt(String.valueOf(item.get("isAlarm"))) == 0 || time ? "正常" : "异常");
+            item.put("stateDesc", Integer.parseInt(String.valueOf(item.get("isAlarm"))) == 0 && time ? "正常" : "异常");
             return item;
         }).collect(Collectors.toList());
         List<Map<String, Object>> stateMap = fireFightingSystemMapper.queryStartAndStopBySpecificId(ids);

amos-boot-system-equip/src/main/resources/mapper/FireFightingSystemMapper.xml

@@ -4885,7 +4885,7 @@
                     </if>
                 GROUP BY
                     es.id
-            ) a
+            ) a ORDER BY FIELD(status,'压力低','正常','--')
     </select>
 
     <select id="getInfluentFlowBySuper" resultType="java.util.Map">

amos-boot-utils/amos-boot-utils-message/src/main/java/com/yeejoin/amos/message/kafka/KafkaConsumerService.java

@@ -28,7 +28,7 @@ public class KafkaConsumerService {
      * 消费单条消息,topics 可以监听多个topic，如：topics = {"topic1", "topic2"}
      * @param message 消息
      */
-    @KafkaListener(id = "consumerSingle", topics = "#{'${kafka.topics}'.split(',')}", errorHandler = "consumerAwareListenerErrorHandler")
+    @KafkaListener(id = "consumerSingle", topics = "#{'${kafka.topics}'.split(',')}", concurrency = "2")
     public void consumerSingle(String message,Acknowledgment ack) {
         JSONObject messageObj = JSONObject.fromObject(message);
         String topic = messageObj.getString("topic");