Merge branch 'dev_upgrade' of 172.16.10.76:station/YeeAmosFireAutoSysRoot into upgrade

YeeAmosFireAutoSysStart/src/main/resources/db/changelog/fas-2.0.1.xml

@@ -554,18 +554,37 @@
             ALTER TABLE `f_station_info` ADD COLUMN `safety_user_phone_num` varchar(20) NULL COMMENT '安全负责人联系方式';
         </sql>
     </changeSet>
-    <changeSet author="zjw" id="16062323232111">
+    <changeSet author="keyong" id="1608279637-1">
         <preConditions onFail="MARK_RAN">
             <not>
-                <columnExists tableName="f_station_info" columnName="safety_user_phone_num" />
+                <columnExists tableName="f_station_info" columnName="fire_captain_name" />
             </not>
         </preConditions>
         <comment>修改f_station_info表结构</comment>
         <sql>
             ALTER TABLE `f_station_info` ADD COLUMN `fire_captain_name` varchar(20) NULL COMMENT '驻站消防队队长姓名';
+        </sql>
+    </changeSet>
+    <changeSet author="keyong" id="1608279637-2">
+        <preConditions onFail="MARK_RAN">
+            <not>
+                <columnExists tableName="f_station_info" columnName="fire_captain_phone_num" />
+            </not>
+        </preConditions>
+        <comment>修改f_station_info表结构</comment>
+        <sql>
             ALTER TABLE `f_station_info` ADD COLUMN `fire_captain_phone_num` varchar(20) NULL COMMENT '驻站消防队队长电话';
+        </sql>
+    </changeSet>
+    <changeSet author="keyong" id="1608279637-3">
+        <preConditions onFail="MARK_RAN">
+            <not>
+                <columnExists tableName="f_station_info" columnName="fire_captain_user_id" />
+            </not>
+        </preConditions>
+        <comment>修改f_station_info表结构</comment>
+        <sql>
             ALTER TABLE `f_station_info` ADD COLUMN `fire_captain_user_id` varchar(20) NULL COMMENT '驻站消防队队长';
         </sql>
     </changeSet>
-    
 </databaseChangeLog>
\ No newline at end of file

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

@@ -136,6 +136,7 @@
         wl_equipment_specific_index ind
         left join wl_equipment_specific as spe on spe.id = ind.equipment_specific_id
         left join wl_equipment_detail as det on spe.equipment_detail_id = det.id
+        WHERE 1=1 AND ind.value IS NOT NULL
         ) d
         WHERE
         1 = 1

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

@@ -647,7 +647,7 @@
 
 
 	<select id="queryContingencyWater"  resultType="java.util.HashMap">
-		<!-- SELECT
+	<!--SELECT
 			wr.alarm_level,
 			wr.max_level,
 			wr.area,
@@ -664,7 +664,31 @@
 			wr.alarm_level,
 			wr.max_level,
 			wr.area,
-			wr.`name` -->
+			wr.`name`-->
+		SELECT
+		*
+		FROM
+		(
+		SELECT
+		building.height AS alarm_level,
+		building.warn_height AS max_level,
+		building.area_measure AS area,
+		building.CODE AS CODE,
+		building.NAME AS NAME,
+		3.6 AS
+		VALUE
+
+		FROM
+		wl_building building
+		LEFT JOIN wl_equipment_category category ON building.equipment_code = category.id
+		WHERE
+		category.CODE = 93020000
+		) wr
+		GROUP BY
+		wr.alarm_level,
+		wr.max_level,
+		wr.area,
+		wr.`name`
 	</select>