1.防火阀、应急广播数量统计放到火爆系统

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/FireFightingSystemServiceImpl.java

@@ -161,8 +161,8 @@ public class FireFightingSystemServiceImpl extends ServiceImpl<FireFightingSyste
         }
         List<DynamicFormInstance> formInstance = vo.getFormInstances();
         // 验证必填项 BUG 2725 by kongfm 2021-09-09
-        formInstance.stream().forEach(item -> {
-            if (item.getNotNull() == true && StringUtils.isEmpty(item.getFieldValue())) {
+        formInstance.forEach(item -> {
+            if (item.getNotNull() && StringUtils.isEmpty(item.getFieldValue())) {
                 throw new BadRequest(item.getFieldLabel() + "为必填项，请确认");
             }
         });

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/SyncDataServiceImpl.java

@@ -446,7 +446,7 @@ public class SyncDataServiceImpl implements ISyncDataService {
 
     private void sendMessage(SyncDataMessage message) {
         try {
-            emqKeeper.getMqttClient().publish(message.getType().getMqTopic(), message.message2Bytes(), 1, false);
+            emqKeeper.getMqttClient().publish(message.getType().getMqTopic(), message.message2Bytes(), 2, false);
         } catch (MqttException e) {
             e.printStackTrace();
         }

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

@@ -768,7 +768,7 @@
         fs.`name` AS aliasname,
         fs.`code`,
         fg.group_name AS systemtype,
-        fs.install_date AS installdate,
+        IFNULL(fs.install_date, CURRENT_TIMESTAMP) AS installdate,
         IFNULL(p.`name`,'') AS chargeperson,
         IFNULL(fs.charge_person_phone,'') AS chargepersonphone,
         IFNULL(mi.`name`,'') AS constructionunit,
@@ -777,7 +777,7 @@
         fs.maintenance_frequency AS maintenancefrequency,
         fs.maintenance_phone AS maintenancephone,
         fs.rec_date AS createdate,
-        NOW( ) AS updatedate,
+        NOW() AS updatedate,
         fs.`code` AS mrid,
         fs.remark AS description
         FROM
@@ -963,7 +963,15 @@
 	        from
 	        `wl_equipment_specific_index` si
 	        where
-	        si.equipment_index_key = 'FAS_UltravioletLight_FireAlarm') as zwhynum
+	        si.equipment_index_key = 'FAS_UltravioletLight_FireAlarm') as zwhynum,
+	        (
+                SELECT
+                    count(1)
+                FROM
+                    `wl_equipment_specific_index` si
+                WHERE
+                    si.equipment_index_key = 'SCS_FireDamper_FireAlarm'
+		    ) AS fhznum
 	    </select>
 	    <select id="fireAlarmSysIndexNumber" resultType="java.util.Map">
 	        SELECT
@@ -1187,14 +1195,6 @@
 			SELECT
 				count(1)
 			FROM
-				`wl_equipment_specific_index` si
-			WHERE
-				si.equipment_index_key = 'SCS_FireDamper_FireAlarm'
-		) AS fhznum,
-		(
-			SELECT
-				count(1)
-			FROM
 				`wl_equipment_specific_index` s
 			WHERE
 				s.equipment_index_key = 'SCS_FireDamper_Shield'
@@ -1222,14 +1222,6 @@
 			SELECT
 				count(1)
 			FROM
-				`wl_equipment_specific_index` si
-			WHERE
-				si.equipment_index_key = 'FES_FireBroadcast_Start'
-		) AS yjgbnum,
-		(
-			SELECT
-				count(1)
-			FROM
 				`wl_equipment_specific_index` s
 			WHERE
 				s.equipment_index_key = 'FES_FireBroadcast_Shield'
@@ -1252,7 +1244,15 @@
 			WHERE
 				s.equipment_index_key = 'FES_FireBroadcast_Start'
 			AND s.`value` = 'true'
-		) AS yjgbqd
+		) AS yjgbqd,
+		(
+			SELECT
+				count(1)
+			FROM
+				`wl_equipment_specific_index` si
+			WHERE
+				si.equipment_index_key = 'FES_FireBroadcast_Start'
+		) AS yjgbnum
     </select>
     <select id="fireWaterSysHydrant" resultType="java.util.Map">
         SELECT