修改设备点位，设备表相关sql

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

@@ -2,8 +2,9 @@
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.yeejoin.amos.fas.business.dao.mapper.PlanVisual3dMapper">
-	<!--查询-->
+	<!--查询 0-设备类；1-耗材类;2-视频监控;3-灭火器材'-->
 	<select id="getResourceListByType" resultType="java.util.HashMap">
+	
 		SELECT
 		 rs.id as `key` ,
 		 rs.id AS `value`,

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

@@ -4,7 +4,7 @@
 <mapper namespace="com.yeejoin.amos.fas.business.dao.mapper.AlarmMapper">
 	<!---->
 	<select id="countPageData" resultType="long">
-		SELECT
+		<!-- SELECT
 		count(a.id) AS total_num
 		FROM `f_alarm` a 
 		inner join 
@@ -22,7 +22,7 @@
 		<trim prefix="WHERE" prefixOverrides="AND ">
 			<if test="beginDate!=null"> and a.alarm_time >= #{beginDate} </if>
 			<if test="endDate!=null"> and a.alarm_time <![CDATA[<=]]> #{endDate} </if>
-	    </trim>
+	    </trim> -->
 	</select>
 
 	<select id="countAlarmData" resultType="long">
@@ -32,7 +32,7 @@
 	</select>
 	<!--分页查询 -->
 	<select id="getAlarmMapperPage" resultType="java.util.HashMap">
-		SELECT
+		<!-- SELECT
 			a.id, 
 			sa.code,
 			sa.equip_code as equipCode,
@@ -67,7 +67,7 @@
 		<choose>
 	     <when test="pageSize==-1"></when>
 	     <when test="pageSize!=-1">limit #{offset},#{pageSize}</when>  
-	    </choose>
+	    </choose> -->
 	</select>
 
 

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

@@ -115,7 +115,7 @@
 
 
     <select id="queryForFireEquipmentHistoryCount" resultType="long">
-        SELECT
+       <!--  SELECT
         count(1)
         FROM
         (
@@ -159,12 +159,12 @@
         </if>
         <if test="startTime!=null">
             AND d.create_date BETWEEN '${startTime}' AND '${endTime}'
-        </if>
+        </if> -->
     </select>
 
 
     <select id="queryForFireEquipmentHistory" resultType="map">
-        SELECT
+        <!-- SELECT
         d.*
         FROM
         (
@@ -220,7 +220,7 @@
         </if>
         ORDER BY d.create_date desc
         LIMIT ${start},${length}
-
+ -->
 
     </select>
 
@@ -326,7 +326,7 @@
     </select>
 
     <select id="findAllEquipPointInfo" resultType="com.yeejoin.amos.fas.business.vo.EquipCommunicationData">
-	   SELECT
+	   <!-- SELECT
 			p.`code` pointCode,
 			p.`name` pointName,
 			f.`name` equimentName,
@@ -342,11 +342,11 @@
 		LEFT JOIN f_fire_equipment e ON e.id = p.fire_equipment_id
 		LEFT JOIN f_equipment_fire_equipment fe ON fe.fire_equipment_id = e.id
 		LEFT JOIN f_equipment f ON f.id = fe.equipment_id
-		LEFT JOIN f_dict d on d.id = p.alarm_type
+		LEFT JOIN f_dict d on d.id = p.alarm_type -->
 	</select>
 
     <select id="findOneByPointCode" resultType="com.yeejoin.amos.fas.business.vo.EquipCommunicationData">
-	   SELECT
+	   <!-- SELECT
 			p.`code` pointCode,
 			p.`name` pointName,
 			e.id fireEquipmentId,
@@ -359,7 +359,7 @@
 			f_fire_equipment_point p
 		LEFT JOIN f_fire_equipment e ON e.id = p.fire_equipment_id
 		LEFT JOIN f_dict d on d.id = p.alarm_type
-		where p.`code` = #{code}
+		where p.`code` = #{code} -->
 	</select>
 
     <select id="listByCodes" resultType="com.yeejoin.amos.fas.business.entity.mybatis.FireEquipmentEntity">
@@ -393,7 +393,7 @@
     <insert id="saveBatch" keyColumn="id" keyProperty="id"
             parameterType="com.yeejoin.amos.fas.business.param.FireEquipmentParam"
             useGeneratedKeys="true">
-        insert into f_fire_equipment
+       <!--  insert into f_fire_equipment
         (
             org_code,
             code,
@@ -432,7 +432,7 @@
             #{item.weight},
             #{item.riskSourceId}
         )
-        </foreach>
+        </foreach> -->
     </insert>
 
     <update id="updateBatch">
@@ -517,7 +517,7 @@
         count(1)
         FROM
         f_equipment_fire_equipment efe
-        JOIN f_fire_equipment fe ON efe.fire_equipment_id = fe.id
+        JOIN wl_equipment_specific fe ON efe.fire_equipment_id = fe.id
         WHERE
         efe.equipment_id = ${equipmentId}
         <if test="fname != null">
@@ -531,7 +531,7 @@
     
      <select id="removeIfmeaPointByFireEquipIdAndEquipId" resultType="long">
         DELETE fmep FROM `f_fmea_equipment_point` fmep
-			LEFT JOIN f_fire_equipment_point fep ON fep.id = fmep.equipment_point_id
-			WHERE fep.fire_equipment_id = #{fireEquipmentId} AND fmep.important_equipment_id = #{importantEquipmentId}
+			LEFT JOIN wl_equipment_specific_index esi ON esi.id = fmep.equipment_point_id
+			WHERE esi.equipment_specific_id = #{fireEquipmentId} AND fmep.important_equipment_id = #{importantEquipmentId}
     </select>
 </mapper>
\ No newline at end of file

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

@@ -6,30 +6,30 @@
 
 	<select id="queryOne" resultType="java.util.Map">
 
-		select * from f_fire_equipment_point where id = ${id}
+		<!-- select * from f_fire_equipment_point where id = ${id} -->
 	</select>
 
 	<select id="queryCountForPage" resultType="long">
 
-		select count(1) from f_fire_equipment_point
+		<!-- select count(1) from f_fire_equipment_point
 		where fire_equipment_id = ${fireEqumntId}
 		<if test="name!=null">
 			and fp.name like '%${name}%'
-		</if>
+		</if> -->
 	</select>
 	<select id="queryForPage" resultType="java.util.Map">
 
-		select * from f_fire_equipment_point fp
+		<!-- select * from f_fire_equipment_point fp
 		where fp.fire_equipment_id = ${fireEqumntId}
 		<if test="name!=null">
 			and fp.name like '%${name}%'
 		</if>
-		 LIMIT ${start},${length} ;
+		 LIMIT ${start},${length} ; -->
 	</select>
 
 
 	<select id="queryForEqueAndPointName" resultType="map">
-		SELECT
+		<!-- SELECT
 			ep.`name`,
 			(
 				SELECT
@@ -52,12 +52,12 @@
 				AND se.risk_source_id = ${riskSourceId}
 			)
 		AND ep.type = 'SWITCH'
-		AND ep.`value` = 1
+		AND ep.`value` = 1 -->
 	</select>
 
 
 	<select id="queryStopCountByEuipmentIdAndAlarmType" resultType="int">
-	SELECT
+	<!-- SELECT
 		count(1)
 	FROM
 		f_equipment e,
@@ -70,11 +70,11 @@
 	and d.id = ep.alarm_type
 	AND d.dict_value = #{alarmType}
 	AND e.id = #{equimentId}
-	AND ep.`value` = #{value}
+	AND ep.`value` = #{value} -->
 	</select>
 
 	<select id="queryCountByEuipmentIdAndAlarmType" resultType="int">
-	SELECT
+	<!--  SELECT
 		count(1)
 	FROM
 		f_equipment e,
@@ -86,17 +86,17 @@
 	AND fe.fire_equipment_id = ep.fire_equipment_id
 	and d.id = ep.alarm_type
 	AND d.dict_value = #{alarmType}
-	AND e.id = #{equimentId}
+	AND e.id = #{equimentId}-->
 	</select>
 
 	<update id="updateValue">
-		update f_fire_equipment_point set value = #{state},create_date = NOW() where id = #{id}
+		<!-- update f_fire_equipment_point set value = #{state},create_date = NOW() where id = #{id} -->
 	</update>
 
 	<insert id="saveBatch" keyColumn="id" keyProperty="id"
 			parameterType="com.yeejoin.amos.fas.business.param.FireEquipmentPointParam"
 			useGeneratedKeys="true">
-		insert into f_fire_equipment_point
+		<!--  insert into f_fire_equipment_point
 		(
 			name,
 			code,
@@ -119,11 +119,11 @@
 			#{item.orgCode},
 			#{item.createBy}
 		)
-		</foreach>
+		</foreach>-->
 	</insert>
 
 	<select id="listByMap" resultType="com.yeejoin.amos.fas.business.entity.mybatis.FireEquipmentPointEntity">
-		select
+		<!-- select
 			a.id,
 			a.name,
 			a.code,
@@ -159,11 +159,11 @@
 		order by a.create_date desc
 		<if test="pageSize!=null and pageSize!=-1 and offset!=null">
 			limit #{offset},#{pageSize}
-		</if>
+		</if> -->
 	</select>
 
 	<select id="countByMap" resultType="long">
-		select
+		<!-- select
 			count(1)
 		from
 			f_fire_equipment_point as a
@@ -178,11 +178,11 @@
 			<if test="type!=null and type.trim() != ''">
 				and a.type = #{type}
 			</if>
-		</where>
+		</where> -->
 	</select>
 
 	<select id="getByCode" resultType="com.yeejoin.amos.fas.business.entity.mybatis.FireEquipmentPointEntity">
-		select
+		<!-- select
 			id,
 			name,
 			code,
@@ -199,11 +199,11 @@
 			f_fire_equipment_point
 		where
 			code = #{code}
-		limit 1
+		limit 1 -->
 	</select>
 
     <update id="updateBatch">
-        <foreach collection="list" item="item" index="index" separator=";">
+       <!--  <foreach collection="list" item="item" index="index" separator=";">
             update f_fire_equipment_point
             <set>
                 <if test="item.name != null">
@@ -241,11 +241,11 @@
                 </if>
             </set>
             where id = #{item.id}
-        </foreach>
+        </foreach> -->
     </update>
 
     <select id="listByCodes" resultType="com.yeejoin.amos.fas.business.entity.mybatis.FireEquipmentPointEntity">
-		select
+		<!-- select
 			id,
 			name,
 			code,
@@ -264,11 +264,11 @@
 			code in
             <foreach collection="codes" item="item" index="index" open="(" separator="," close=")">
                 #{item}
-            </foreach>
+            </foreach> -->
 	</select>
 
 	<select id="getById" resultType="com.yeejoin.amos.fas.business.entity.mybatis.FireEquipmentPointEntity">
-		select
+		<!-- select
 			id,
 			name,
 			code,
@@ -285,11 +285,11 @@
 			f_fire_equipment_point
 		where
 			id = #{id}
-		limit 1
+		limit 1 -->
 	</select>
 
 	<select id="countBindByIds" resultType="java.lang.Long">
-		select
+		<!-- select
 			count(1)
 		from
 			f_fire_equipment_point
@@ -299,23 +299,23 @@
 				#{item}
 			</foreach>
 		and
-			fire_equipment_id > 0
+			fire_equipment_id > 0 -->
 	</select>
 
 	<update id="updatefireEquipmentIdByIds">
-		update
+		<!-- update
 			f_fire_equipment_point
 		set
 			fire_equipment_id = #{fireEquipmentId}
 		where id in
 		<foreach collection="ids" item="item" index="index" open="(" separator="," close=")">
 			#{item}
-		</foreach>
+		</foreach> -->
 	</update>
 
 	<insert id="save" keyColumn="id" keyProperty="id" parameterType="com.yeejoin.amos.fas.business.entity.mybatis.FireEquipmentPointEntity"
 			useGeneratedKeys="true">
-		insert into f_fire_equipment_point
+		<!-- insert into f_fire_equipment_point
 		<trim prefix="(" suffix=")" suffixOverrides=",">
 			<if test="name != null">
 				name,
@@ -385,11 +385,11 @@
 			<if test="alarmType != null">
 				#{alarmType},
 			</if>
-		</trim>
+		</trim> -->
 	</insert>
 
 	<update id="update" parameterType="com.yeejoin.amos.fas.business.entity.mybatis.FireEquipmentPointEntity">
-		update f_fire_equipment_point
+		<!-- update f_fire_equipment_point
 		<set>
 			<if test="name != null">
 				name = #{name},
@@ -425,25 +425,25 @@
 				alarm_type = #{alarmType},
 			</if>
 		</set>
-		where id = #{id}
+		where id = #{id} -->
 	</update>
 
 	<delete id="deleteBatchByIds">
-		delete from f_fire_equipment_point
+		<!-- delete from f_fire_equipment_point
 		where
 			id in
 			<foreach collection="list" item="item" index="index" open="(" separator="," close=")">
 				#{item}
-			</foreach>
+			</foreach> -->
 	</delete>
 
 	<select id="getPointsByEquipmentIdAndType" resultType="Map">
-		SELECT p.* from 
+		<!-- SELECT p.* from 
 		f_fire_equipment_point p
 		LEFT JOIN f_fire_equipment fe on p.fire_equipment_id = fe.id
 		LEFT JOIN f_equipment_fire_equipment e on fe.id = e.fire_equipment_id
 		where e.equipment_id = #{id}
-		and p.type = #{type}
+		and p.type = #{type} -->
 	</select>
 
 </mapper>
\ No newline at end of file

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

@@ -50,14 +50,14 @@
             select
                 c.fmea_id as fmeaId
             from
-                f_fire_equipment as a
+                wl_equipment_specific as a
             left join
-                f_fire_equipment_point as b on b.fire_equipment_id = a.id
+                wl_equipment_specific_index as b on b.equipment_specific_id = a.id
             left join
                 f_fmea_equipment_point as c on c.equipment_point_id = b.id
             where
                 c.fmea_id = #{fmeaId}
-            group by b.fire_equipment_id
+            group by b.equipment_specific_id
         ) as d
     </select>
 
@@ -65,21 +65,25 @@
         select
             c.fmea_id as fmeaId,
             a.id as equipmentId,
-            group_concat(concat( b.NAME, '##', c.state ) SEPARATOR <![CDATA[ '\n' ]]> ) as equipmentPointNames,
-            a.name as equipmentName,
+            group_concat(concat( ei.name, '##', c.state ) SEPARATOR <![CDATA[ '\n' ]]> ) as equipmentPointNames,
+            ed.name as equipmentName,
             a.code as equipmentCode,
             d.name AS importantEquipName,
             d.id AS importantEquipId
         from
-            f_fire_equipment as a
+            wl_equipment_specific as a
         left join
-            f_fire_equipment_point as b on b.fire_equipment_id = a.id
+            wl_equipment_detail as ed on ed.id = a.equipment_detail_id
+        left join
+            wl_equipment_specific_index as b on b.equipment_specific_id = a.id
+        left join
+        	wl_equipment_index as ei on b.equipment_index_id = ei.id
         left join
             f_fmea_equipment_point as c on c.equipment_point_id = b.id
         LEFT JOIN f_equipment AS d ON d.id = c.important_equipment_id
         where
             c.fmea_id = #{fmeaId}
-        group by b.fire_equipment_id,c.important_equipment_id
+        group by b.equipment_specific_id,c.important_equipment_id
         limit #{offset},#{limit}
     </select>
 
@@ -87,13 +91,13 @@
         select
             count(1)
         from
-            f_fire_equipment_point as a
+            wl_equipment_specific_index as a
         where
-            a.fire_equipment_id = #{equipmentId}
+            a.equipment_specific_id = #{equipmentId}
     </select>
 
     <select id="listEquipmentPointIdsByEquipmentId" resultType="java.lang.Long">
-        select id from f_fire_equipment_point where fire_equipment_id = #{equipmentId}
+        select id from wl_equipment_specific_index where equipment_specific_id = #{equipmentId}
     </select>
 
     <select id="listByEquipmentPointId" resultType="com.yeejoin.amos.fas.dao.entity.FmeaEquipmentPoint">
@@ -108,8 +112,8 @@
     <select id="listEquipmentPoint" resultType="java.util.Map">
         select
             a.id,
-            a.name,
-            a.code,
+            ei.name,
+            ei.name_key as code,
             (
 				select
 					case when count(1) > 0 then 'bound' else 'noBound' end
@@ -123,15 +127,15 @@
                     d.important_equipment_id = #{importantEquipId}
 			) isBound
         from
-            f_fire_equipment_point as a
-            left join f_dict fd on fd.id = a.alarm_type
+            wl_equipment_specific_index as a
+            left join wl_equipment_index ei on ei.id = a.equipment_index_id
         <where>
-        	fd.dict_value = 'alarm_type_trouble'
+        	ei.type_code = 'BREAKDOWN'
             <if test="equipmentId!=null">
-                and a.fire_equipment_id = #{equipmentId}
+                and a.equipment_specific_id = #{equipmentId}
             </if>
             <if test="equipmentPointName!=null and equipmentPointName!=''">
-                and a.name like concat("%",#{equipmentPointName},"%")
+                and ei.name like concat("%",#{equipmentPointName},"%")
             </if>
         </where>
     </select>

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

@@ -149,12 +149,11 @@
 		SELECT
 			1 
 		FROM
-			f_fire_equipment_point ep
-			LEFT JOIN f_fire_equipment e ON e.id = ep.fire_equipment_id
+			wl_equipment_specific_index ep
+			LEFT JOIN wl_equipment_specific e ON e.id = ep.equipment_specific_id
 			LEFT JOIN f_equipment_fire_equipment fe ON fe.fire_equipment_id = e.id
-			LEFT JOIN f_dict d on ep.alarm_type = d.id
-			where d.dict_code = 'fire_equipment_switch'
-			and d.dict_value = 'alarm_type_fire'
+			LEFT JOIN wl_equipment_index ei on ei.id = ep.equipment_index_id
+			where ei.type_code = 'FIREALARM'
 			and fe.equipment_id = #{equipmentId}
 			and ep.id = #{pointId}
 	</select>

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

@@ -570,12 +570,14 @@
 	<select id="queryForFmeaEquipAlarm" resultType="map">
 	
 		SELECT
-			fe.`name` as 'fireEquipmentName',
-			fep.`name` as 'name'
+			ed.`name` as 'fireEquipmentName',
+			ei.`name` as 'name'
 		FROM
 			`f_fmea_equipment_point` AS fmep
-		LEFT JOIN f_fire_equipment_point fep ON fep.id = fmep.equipment_point_id
-		LEFT JOIN f_fire_equipment fe ON fe.id = fep.fire_equipment_id
+		LEFT JOIN wl_equipment_specific_index fep ON fep.id = fmep.equipment_point_id
+		LEFT JOIN wl_equipment_index ei ON ei.id = fep.equipment_index_id
+		LEFT JOIN wl_equipment_specific fe ON fe.id = fep.equipment_specific_id
+		LEFT JOIN wl_equipment_detail ed ON ed.id = fe.equipment_detail_id
 		LEFT JOIN f_fmea fm ON fm.id = fmep.fmea_id
 		WHERE
 			fmep.state = 1
@@ -637,7 +639,7 @@
 	
 	
 	<select id="queryContingencyWater"  resultType="java.util.HashMap">
-		SELECT
+		<!-- SELECT
 			wr.alarm_level,
 			wr.max_level,
 			wr.area,
@@ -654,7 +656,7 @@
 			wr.alarm_level,
 			wr.max_level,
 			wr.area,
-			wr.`name`
+			wr.`name` -->
 	</select>