水池接口调整

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/vo/FormInstanceVo.java

@@ -22,4 +22,5 @@ public class FormInstanceVo {
     private String area;
     private String volume;
     private String iotCode;
+    private String percentValue;
 }
\ No newline at end of file

YeeAmosFireAutoSysStart/src/main/resources/application-dev.properties

@@ -61,7 +61,7 @@ rocketmq.producer.isOnOff=on
 # 发送同一类消息设置为同一个group，保证唯一默认不需要设置，rocketmq会使用ip@pid（pid代表jvm名字）作为唯一标识
 rocketmq.producer.groupName=${spring.application.name}
 # mq的nameserver地址
-rocketmq.producer.namesrvAddr=172.16.3.51:9876
+rocketmq.producer.namesrvAddr=172.16.3.135:9876
 # 消息最大长度 默认 1024 * 4 (4M)
 rocketmq.producer.maxMessageSize = 4096
 # 发送消息超时时间，默认 3000

YeeAmosFireAutoSysStart/src/main/resources/db/mapper/dbTemplate_risk_source.xml

@@ -641,9 +641,44 @@
 					rf.id = ${factorId}
 			)
 	</select>
+<!--	<select id="queryContingencyWater"  resultType="com.yeejoin.amos.fas.business.vo.FormInstanceVo">-->
+<!--		SELECT-->
+<!--			*-->
+<!--		FROM-->
+<!--			(-->
+<!--			SELECT-->
+<!--				MAX( CASE WHEN a.field_name = 'name' THEN a.field_value END ) AS `name`,-->
+<!--				MAX( CASE WHEN a.field_name = 'code' THEN a.field_value END ) AS `code`,-->
+<!--				MAX( CASE WHEN a.field_name = 'height' THEN a.field_value END ) AS maxLevel,-->
+<!--				MAX( CASE WHEN a.field_name = 'lowWaterHeight' THEN a.field_value END ) AS alarmLevel,-->
+<!--				MAX( CASE WHEN a.field_name = 'bottomArea' THEN a.field_value END ) AS area,-->
+<!--				MAX( CASE WHEN a.field_name = 'volume' THEN a.field_value END ) AS volume,-->
+<!--				es.iot_code-->
+<!--			FROM-->
+<!--				`wl_form_instance` a-->
+<!--				LEFT JOIN wl_equipment_specific es ON a.instance_id = es.warehouse_structure_id-->
+<!--			WHERE-->
+<!--				a.group_code IN ( 'pool', 'r_pool' )-->
+<!--			GROUP BY-->
+<!--				a.instance_id-->
+<!--			) s-->
+<!--		GROUP BY-->
+<!--			s.alarmLevel,-->
+<!--			s.maxLevel,-->
+<!--			s.area,-->
+<!--			s.`name`-->
+<!--	</select>-->
+
 	<select id="queryContingencyWater"  resultType="com.yeejoin.amos.fas.business.vo.FormInstanceVo">
 		SELECT
-			*
+		m.`name`,
+		m.`code`,
+		m.`alarmLevel`,
+		m.`area`,
+		m.`volume`,
+		IFNULL(( MAX( CASE WHEN esi.equipment_index_key = 'FHS_FirePoolDevice_WaterLevel' THEN esi.`value` END )), m.maxLevel ) AS maxLevel,
+		IFNULL(( MAX( CASE WHEN esi.equipment_index_key = 'FHS_FirePoolDeviceLiquidLevelPercentage' THEN esi.`value` END )), 0 ) AS percentValue,
+		es.iot_code
 		FROM
 		(
 		SELECT
@@ -653,20 +688,25 @@
 		MAX( CASE WHEN a.field_name = 'lowWaterHeight' THEN a.field_value END ) AS alarmLevel,
 		MAX( CASE WHEN a.field_name = 'bottomArea' THEN a.field_value END ) AS area,
 		MAX( CASE WHEN a.field_name = 'volume' THEN a.field_value END ) AS volume,
-				es.iot_code
+		a.instance_id
 		FROM
 		`wl_form_instance` a
-				LEFT JOIN wl_equipment_specific es ON a.instance_id = es.warehouse_structure_id
 		WHERE
 		a.group_code IN ( 'pool', 'r_pool' )
 		GROUP BY
 		a.instance_id
-			) s
+		) m
+		LEFT JOIN (
+		SELECT
+		*
+		FROM
+		wl_equipment_specific W1
+		WHERE
+		NOT EXISTS ( SELECT 1 FROM wl_equipment_specific W2 WHERE W2.warehouse_structure_id = W1.warehouse_structure_id AND W1.id &lt; W2.id )
+		) es ON m.instance_id = es.warehouse_structure_id
+		LEFT JOIN wl_equipment_specific_index esi ON es.id = esi.equipment_specific_id
 		GROUP BY
-			s.alarmLevel,
-			s.maxLevel,
-			s.area,
-			s.`name`
+		m.instance_id
 	</select>
 	<select id="queryFmeaByPointId" resultType="java.util.HashMap">
 		SELECT