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

@@ -27,7 +27,7 @@
 		order by rs.id desc
 		<choose>
 	     <when test="pageSize==-1"></when>
-	     <when test="pageSize!=-1">limit #{offset},#{pageSize}</when>  
+	     <when test="pageSize!=-1">limit #{offset},#{pageSize}</when>
 	    </choose>
 	</select>
 
@@ -172,7 +172,7 @@
 		GROUP BY
 		    ff1.risk_source_id;
 	</select>
-	
+
 	 <resultMap id="riskSourceMap" type="com.yeejoin.amos.fas.core.common.response.RiskSourceTreeResponse">
        <result property="id" column="id" />
        <result property="parentId" column="parent_id" />
@@ -191,7 +191,7 @@
        <result property="omission" column="omission" />
        <result property="unplan" column="unplan" />
     </resultMap>
-    
+
     <select id="getRiskSources" resultMap="riskSourceMap">
 			SELECT
 				rs.id,
@@ -213,9 +213,9 @@
 			where rs.org_code = #{compCode}
 			ORDER BY rs.sort_num,rs.id  ASC
 	</select>
-	
+
 	<select id="getRiskSourcesEquipment" resultMap="riskSourceMap">
-	
+
 		SELECT
 			sum(a.cc) ccount,
 			a.`name`,
@@ -240,10 +240,10 @@
 			a.`name`,
 			a.position3d,
 			a.parent_id,
-			a.id	
+			a.id
 	</select>
-	
-		
+
+
 	<select id="getCheckPointRiskSource" resultMap="riskSourceMap">
 		SELECT
 			sum(a.cc) ccount,
@@ -280,9 +280,9 @@
 			a.parent_id,
 			a.id
 	</select>
-	
 
-	
+
+
 	<select  id="getRiskSourcesFireEquipmentByType" resultMap="riskSourceMap">
 		SELECT
 			sum(a.cc) ccount,
@@ -338,13 +338,13 @@
 		FROM
 			`f_risk_source_point_inputitem` rspi
 		LEFT JOIN p_point pp ON pp.id = rspi.point_id
-		LEFT JOIN p_input_item pii ON pii.id = rspi.point_inputitem_id 
+		LEFT JOIN p_input_item pii ON pii.id = rspi.point_inputitem_id
 		WHERE  pii.`name` is not NULL
 		 AND rspi.risk_source_id = #{riskSourceId}
 		GROUP BY riskId,pointId,pointNo,pointName,depName,username,telephone
 		<choose>
 	     <when test="pageSize==-1"></when>
-	     <when test="pageSize!=-1">limit #{offset},#{pageSize}</when>  
+	     <when test="pageSize!=-1">limit #{offset},#{pageSize}</when>
 	    </choose>
 	</select>
 
@@ -540,7 +540,7 @@
 	</select>
 
 	<select id="queryForUnqualified" resultType="map">
-	
+
 		SELECT
 			(
 				SELECT
@@ -564,11 +564,11 @@
 		LEFT JOIN f_fmea fm ON fm.id = pi.fmea_id
 		WHERE
 			pi.`state` = 1
-		AND fm.risk_source_id = #{riskSourceId};	
+		AND fm.risk_source_id = #{riskSourceId};
 	</select>
-	
+
 	<select id="queryForFmeaEquipAlarm" resultType="map">
-	
+
 		SELECT
 			ed.`name` as 'fireEquipmentName',
 			ei.`name` as 'name'
@@ -584,15 +584,15 @@
 		AND fm.risk_source_id = #{riskSourceId}
 		GROUP BY fireEquipmentName,name
 	</select>
-	
+
 	<select id="queryRiskAreaRpn"  resultType="java.util.HashMap">
 		SELECT
             rs.id,
-            rs.name, 
-            rs.rpn, 
-            rs.rpni, 
+            rs.name,
+            rs.rpn,
+            rs.rpni,
             rs.risk_level_id as riskLevelId,
-            rl.`name` as riskLevelName, 
+            rl.`name` as riskLevelName,
             rl.level,
             rl.color
         FROM
@@ -601,20 +601,20 @@
         WHERE rs.parent_id &gt; 0
         order by rs.sort_num,rs.id
 	</select>
-	
+
 	<select id="queryRiskSourceSecondLevel"  resultType="java.util.HashMap">
 		SELECT
 			rs.id,
-            rs.name, 
-            rs.rpn, 
-            rs.rpni, 
+            rs.name,
+            rs.rpn,
+            rs.rpni,
             rs.risk_level_id as riskLevelId,
-            rl.`name` as riskLevelName, 
+            rl.`name` as riskLevelName,
             rl.level,
             rl.color
 		FROM
 			`f_risk_source` rs
-		LEFT JOIN f_risk_level rl ON rl.id = rs.risk_level_id 
+		LEFT JOIN f_risk_level rl ON rl.id = rs.risk_level_id
 		WHERE
 			rs.parent_id = (
 				SELECT
@@ -642,12 +642,12 @@
 					rf.id = ${factorId}
 			)
 	</select>
-	
-	
-	
-	
+
+
+
+
 	<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>
 
 
@@ -728,7 +752,7 @@
 		</set>
 		where id = #{id}
 	</update>
-	
+
 	<select id="getRegionList" parameterType="string" resultType="com.yeejoin.amos.fas.core.common.response.RegionTreeResponse">
 		select
 			rs.id,rs.name,rs.code,rs.parent_id,rs.ue4_location,rs.ue4_rotation,rs.ue4_extent,
@@ -737,7 +761,7 @@
 					IF(ISNULL(rs.route_path) || LENGTH(trim(rs.route_path)) <![CDATA[ <]]> 1,0,1) as is_bind,
 				</when>
 				<otherwise>
-					IF(ISNULL(IF(replace(trim(rs.ue4_rotation),'[]','')='',NULL,rs.ue4_rotation)) 
+					IF(ISNULL(IF(replace(trim(rs.ue4_rotation),'[]','')='',NULL,rs.ue4_rotation))
 					AND ISNULL(IF(replace(trim(rs.ue4_location),'[]','')='',NULL,rs.ue4_location)),0,1) as is_bind,
 				</otherwise>
 			</choose>
@@ -750,7 +774,7 @@
 		left join f_risk_level rl ON rs.risk_level_id = rl.id
 		where is_region = 'TRUE' AND (rs.org_code = #{orgCode} OR rs.org_code like CONCAT(#{orgCode},'-%'))
 	</select>
-	 
+
 	<select id="findRegionById" resultType="java.util.HashMap">
 		select
 			id,name,code,parent_id as parentId,ue4_location as ue4Location,ue4_rotation as ue4Rotation,ue4_extent as ue4Extent,route_path as routePath,
@@ -759,7 +783,7 @@
 					IF(ISNULL(route_path) || LENGTH(trim(route_path)) <![CDATA[ <]]> 1,0,1) as isBind,
 				</when>
 				<otherwise>
-					IF(ISNULL(IF(replace(trim(ue4_rotation),'[]','')='',NULL,ue4_rotation)) 
+					IF(ISNULL(IF(replace(trim(ue4_rotation),'[]','')='',NULL,ue4_rotation))
 					AND ISNULL(IF(replace(trim(ue4_location),'[]','')='',NULL,ue4_location)),0,1) as isBind,
 				</otherwise>
 			</choose>
@@ -768,7 +792,7 @@
 		from f_risk_source r
 		where id=#{id} AND (org_code = #{orgCode} OR org_code like CONCAT(#{orgCode},'-%'))
 	</select>
-	
+
 	<update id="batchSaveRegionUe4" parameterType="java.util.List">
 		<foreach collection="list" item="item" index="index" open="" close="" separator=";">
             update f_risk_source