修改监控屏数据查询

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

@@ -697,7 +697,7 @@
 			'riskSource' as type
 		from f_risk_source rs
 		left join f_risk_level rl ON rs.risk_level_id = rl.id
-		where is_region = 'TRUE' AND rs.org_code like CONCAT(#{orgCode},'%')
+		where is_region = 'TRUE' AND rs.org_code = #{orgCode}
 	</select>
 	 
 	<select id="findRegionById" resultType="java.util.HashMap">
@@ -715,7 +715,7 @@
 			IF(is_region = 'TRUE',1,0) as isRegion,
 			(select name from f_risk_level where level = r.risk_level_id) as riskLevel
 		from f_risk_source r
-		where id=#{id} AND org_code like CONCAT(#{orgCode},'%')
+		where id=#{id} AND org_code = #{orgCode}
 	</select>
 	
 	<update id="batchSaveRegionUe4" parameterType="java.util.List">

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

@@ -150,7 +150,7 @@
 			</when>
 		</choose>
 		<if test="orgCode != null">
-			AND R.org_code like CONCAT(#{orgCode},'%')
+			AND R.org_code = #{orgCode}
 		</if>
 	</select>
 	
@@ -169,7 +169,7 @@
 					AND rs.id = #{pointId}
 				</if>
 				<if test="orgCode != null">
-					AND rs.org_code like CONCAT(#{orgCode},'%')
+					AND rs.org_code = #{orgCode}
 				</if>
 			</when>
 			<when	test="type == 'patrol'">
@@ -200,7 +200,7 @@
 					AND id = #{pointId}
 				</if>
 				<if test="orgCode != null">
-					AND org_code like CONCAT(#{orgCode},'%')
+					AND org_code = #{orgCode}
 				</if>
 			</when>
 			<when	test="type == 'impEquipment'">
@@ -215,7 +215,7 @@
 					AND id = #{pointId}
 				</if>
 				<if test="orgCode != null">
-					AND org_code like CONCAT(#{orgCode},'%')
+					AND org_code = #{orgCode}
 				</if>
 			</when>
 			<when	test="type == 'monitorEquipment'">
@@ -230,7 +230,7 @@
 					AND id = #{pointId}
 				</if>
 				<if test="orgCode != null">
-					AND org_code like CONCAT(#{orgCode},'%')
+					AND org_code = #{orgCode}
 				</if>
 			</when>
 			<when	test="type == 'video'">
@@ -245,7 +245,7 @@
 					AND id = #{pointId}
 				</if>
 				<if test="orgCode != null">
-					AND org_code like CONCAT(#{orgCode},'%')
+					AND org_code = #{orgCode}
 				</if>
 			</when>
 			<when	test="type == 'hydrant'">
@@ -260,7 +260,7 @@
 					AND id = #{pointId}
 				</if>
 				<if test="orgCode != null">
-					AND org_code like CONCAT(#{orgCode},'%')
+					AND org_code = #{orgCode}
 				</if>
 			</when>
 			<when	test="type == 'pool'">
@@ -275,7 +275,7 @@
 					AND id = #{pointId}
 				</if>
 				<if test="orgCode != null">
-					AND org_code like CONCAT(#{orgCode},'%')
+					AND org_code = #{orgCode}
 				</if>
 			</when>
 			<when	test="type == 'fireCar'">
@@ -290,7 +290,7 @@
 					AND id = #{pointId}
 				</if>
 				<if test="orgCode != null">
-					AND org_code like CONCAT(#{orgCode},'%')
+					AND org_code = #{orgCode}
 				</if>
 			</when>
 			<when	test="type == 'fireEquipment'">
@@ -305,7 +305,7 @@
 					AND id = #{pointId}
 				</if>
 				<if test="orgCode != null">
-					AND org_code like CONCAT(#{orgCode},'%')
+					AND org_code = #{orgCode}
 				</if>
 			</when>
 			<when	test="type == 'fireChamber'">
@@ -320,7 +320,7 @@
 					AND id = #{pointId}
 				</if>
 				<if test="orgCode != null">
-					AND org_code like CONCAT(#{orgCode},'%')
+					AND org_code like = #{orgCode}
 				</if>
 			</when>
 			<when	test="type == 'fireFoamRoom'">
@@ -335,7 +335,7 @@
 					AND id = #{pointId}
 				</if>
 				<if test="orgCode != null">
-					AND org_code like CONCAT(#{orgCode},'%')
+					AND org_code  = #{orgCode}
 				</if>
 			</when>
 		</choose>
@@ -386,7 +386,7 @@
 			where
 			a.task_no = b.id
 			and a.`status` in ('2','3')
-			and (b.org_code = #{orgCode} or b.org_code like CONCAT(#{orgCode},'-','%'))
+			and b.org_code = #{orgCode}
 		) pt
 		where #{date} BETWEEN pt.begin_date and pt.end_date
 	</select>
@@ -466,7 +466,7 @@
 		left JOIN p_plan_task t on t.id=d.task_no
 		WHERE
 		DATEDIFF(t.begin_time,CURRENT_DATE) <= 0 AND DATEDIFF(t.end_time,CURRENT_DATE) >= 0
-		AND (t.org_code = #{org_code} or t.org_code like CONCAT(#{orgCode},'-','%'))
+		AND t.org_code = #{org_code}
 		GROUP BY d.status
 		]]>
 	</select>
@@ -476,7 +476,7 @@
 		FROM f_rpn_change_log n
 		LEFT JOIN f_risk_source r ON r.id = n.risk_source_id
 		WHERE n.type = 1
-		AND (r.org_code = #{org_code} or r.org_code like CONCAT(#{orgCode},'-','%'))
+		AND r.org_code = #{org_code}
 		ORDER BY n.create_date desc
 		limit 0,5
 	</select>
@@ -489,7 +489,7 @@
 		left join p_point I ON I.id = p.point_id
 		where p.is_ok IN ('2', '3')
 			AND I.is_delete = 0
-			AND p.org_code = #{orgCode} or p.org_code like CONCAT(#{orgCode},'-','%')
+			AND p.org_code = #{orgCode}
 		ORDER BY p.check_time desc
 		limit 0,5
 	</select>
@@ -606,7 +606,7 @@
 			FROM f_fire_equipment fe 
 			WHERE fe.id IN (
 				select fire_equipment_id from f_equipment_fire_equipment
-			) AND org_code like CONCAT(#{orgCode},'%')
+			) AND org_code = #{orgCode}
 		UNION ALL
 		SELECT e.id,e.name,e.code,e.ue4_location,e.ue4_rotation,'impEquipment' as type,'impEquipment' as level,
 			TMP.relationKeys,
@@ -635,7 +635,7 @@
 			LEFT JOIN 
 				(select GROUP_CONCAT(fire_equipment_id)  as relationKeys,equipment_id from f_equipment_fire_equipment GROUP BY equipment_id) tmp
 				ON TMP.equipment_id = e.id
-			WHERE e.org_code like CONCAT(#{orgCode},'%')
+			WHERE e.org_code = #{orgCode}
 		UNION ALL
 		SELECT id,name,code,ue4_location,ue4_rotation,
 			case type 
@@ -672,7 +672,7 @@
 					when 2 then concat('pool-',id)
 				end as `key`
 			FROM f_water_resource
-			WHERE org_code like CONCAT(#{orgCode},'%')
+			WHERE org_code = #{orgCode}
 		UNION ALL
 		SELECT id,name,code,ue4_location,ue4_rotation,'fireChamber' as type,'fireChamber' as level,
 			null as relationKeys,
@@ -698,7 +698,7 @@
 				END position,
 				concat('fireChamber-',id) as `key`
 			FROM f_fire_station
-			WHERE type = 1 AND org_code like CONCAT(#{orgCode},'%')
+			WHERE type = 1 AND org_code = #{orgCode}
 		UNION ALL
 		SELECT id,name,car_num as code,ue4_location,ue4_rotation,'fireCar' as type,'fireCar' as level,
 			null as relationKeys,
@@ -724,7 +724,7 @@
 				END position,
 				concat('fireCar-',id) as `key`
 			FROM f_fire_car 
-			WHERE org_code like CONCAT(#{orgCode},'%')
+			WHERE org_code = #{orgCode}
 	</select>
 	
 	<select id="initViewErrorNode" resultType="com.yeejoin.amos.fas.business.vo.View3dNodeVo">
@@ -743,7 +743,7 @@
 				r.is_region <![CDATA[<>]]> 'TRUE'
 				AND R.status = 'ANOMALY'
 				AND rl.id = r.risk_level_id
-				AND R.org_code like CONCAT(#{orgCode},'%')
+				AND R.org_code = #{orgCode}
 			UNION ALL
 			select
 					p.id,p.name,p.point_no as code,p.ue4_location,p.ue4_rotation,
@@ -768,7 +768,7 @@
 		            end as title
 				from p_point p
 				where status in ('0','2','3')
-				AND p.org_code like CONCAT(#{orgCode},'%')
+				AND p.org_code = #{orgCode}
 			UNION ALL
 			select 
 				distinct e.id,e.name,e.code,e.ue4_location,e.ue4_rotation,
@@ -784,7 +784,7 @@
 				left join f_equipment_fire_equipment efe ON e.id = efe.equipment_id
 				left join f_fire_equipment fe ON efe.fire_equipment_id = fe.id
 				where fe.equip_status = 1
-				AND e.org_code like CONCAT(#{orgCode},'%')
+				AND e.org_code = #{orgCode}
 			) tmp 
 			where 1=1
 			<if test="riskSourceId != null">
@@ -949,7 +949,7 @@
 					AND temp.type = #{type}
 				</if>
 				<if test="orgCode != null">
-					AND temp.orgCode like CONCAT(#{orgCode},'%')
+					AND temp.orgCode = #{orgCode}
 				</if>
 	</select>