From 636833dfe5ce1d27b30cec1e73badff884cfa1b9 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期六, 07 十二月 2024 18:25:07 +0800
Subject: [PATCH] 新增白名单故障类型
---
ycl-server/src/main/resources/mapper/zgyw/TMonitorMapper.xml | 100 +++++++-------------------------------------------
1 files changed, 14 insertions(+), 86 deletions(-)
diff --git a/ycl-server/src/main/resources/mapper/zgyw/TMonitorMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/TMonitorMapper.xml
index 42bcced..3fd35dc 100644
--- a/ycl-server/src/main/resources/mapper/zgyw/TMonitorMapper.xml
+++ b/ycl-server/src/main/resources/mapper/zgyw/TMonitorMapper.xml
@@ -38,28 +38,6 @@
<result property="lxbm" column="lxbm"/>
<result property="deviceType" column="device_type"/>
</resultMap>
- <!-- TODO -->
- <resultMap id="monitorMap" type="com.ycl.platform.domain.result.SYS.TMonitorResult">
- <result column="m.id" property="id"/>
- <result column="no" property="no"/>
- <result column="m.name" property="name"/>
- <result column="monitorType" property="monitorType"/>
- <result column="d.dept_id" property="deptId"/>
- <result column="p.province_tag" property="provinceTag"/>
- <result column="p.important_tag" property="importantTag"/>
- <result column="p.important_command_image_tag" property="importantCommandImageTag"/>
- <result column="p.dept_tag" property="deptTag"/>
- <result column="p.online" property="online"/>
- <collection property="dynamicColumnList" select="getDyColumns"
- column="{pid=pid,tableName=tableName}"
- ofType="com.ycl.platform.domain.vo.DynamicColumnVO"/>
- </resultMap>
-
- <resultMap id="dynamicColumnMap" type="com.ycl.platform.domain.vo.DynamicColumnVO">
- <result column="prop_name" property="propName"/>
- <result column="label_value" property="labelValue"/>
- <result column="column_value" property="columnValue"/>
- </resultMap>
<sql id="selectTMonitorVo">
select id,
@@ -117,7 +95,7 @@
#{number}
</foreach>
</select>
- <!-- TODO -->
+
<select id="selectTMonitorList" resultType="com.ycl.platform.domain.vo.TMonitorVO">
select m.id, m.serial_number, name, site_type, mac_addr, ip, camera_fun_type, longitude, latitude,
camera_capture_area, p.online as onState, civil_code, d.dept_id, d.dept_name, d.area, p.province_tag_video,p.province_tag_car,p.province_tag_face,p.dept_tag,
@@ -183,10 +161,10 @@
${params.dataScope}
</where>
</select>
- <!-- TODO -->
+
<select id="exportTMonitorList" resultType="com.ycl.platform.domain.excel.TMonitorExp">
select m.id, m.serial_number, name, ip, camera_fun_type,p.online as onState,
- d.dept_name, p.id as pointId,p.province_tag,p.dept_tag,p.important_tag,p.important_command_image_tag,u.unit_name as managementUnit
+ d.dept_name, p.id as pointId,p.province_tag_video,p.province_tag_car,p.province_tag_face,p.dept_tag,p.important_tag,p.important_command_image_tag,u.unit_name as managementUnit
from t_monitor m
left join t_yw_point p on m.serial_number = p.serial_number and p.deleted = 0
left join sys_dept d on p.dept_id = d.dept_id and d.del_flag = 0
@@ -200,7 +178,9 @@
or m.serial_number like concat('%', #{name}, '%')
or u.unit_name like concat('%', #{name}, '%'))
</if>
- <if test="provinceTag != null ">and p.province_tag = #{provinceTag}</if>
+ <if test="provinceTag != null and cameraFunType==1">and p.province_tag_video = #{provinceTag}</if>
+ <if test="provinceTag != null and cameraFunType==2">and p.province_tag_car = #{provinceTag}</if>
+ <if test="provinceTag != null and cameraFunType==3">and p.province_tag_face = #{provinceTag}</if>
<if test="deptTag != null ">and p.dept_tag = #{deptTag}</if>
<if test="cameraFunType != null and cameraFunType != ''">and camera_fun_type like concat('%',
#{cameraFunType}, '%')
@@ -209,20 +189,23 @@
<if test="civilCode != null and civilCode != ''">and civil_code = #{civilCode}</if>
</where>
</select>
- <!-- TODO -->
<select id="selectMonitorVOList" resultType="com.ycl.platform.domain.vo.TMonitorVO">
select m.id, m.serial_number, name, site_type, mac_addr, ip, camera_fun_type, longitude, latitude,
camera_capture_area, on_state, civil_code, integrated_device, camera_brand, address, net_working,
public_security, installed_time, management_unit, mu_contact_info, storage_days
, monitor_azimuth, scene_photo_addr, model, site_vulgo, camera_type, camera_light_type, encoded_format,
- camera_dept, hybm, lxbm,d.dept_id, d.dept_name,p.province_tag,p.dept_tag from t_monitor m
+ camera_dept, hybm, lxbm,d.dept_id, d.dept_name,
+ CASE
+ WHEN p.provnce_tag_video = 1 OR p.provnce_tag_car = 1 OR p.provnce_tag_face = 1 THEN 1
+ ELSE 0
+ END AS province_tag,p.dept_tag
+ from t_monitor m
left join t_yw_point p on m.serial_number = p.serial_number
left join sys_dept d on p.dept_id = d.dept_id
</select>
- <!-- TODO -->
<select id="selectMonitorResult" resultType = "com.ycl.platform.domain.result.SYS.TMonitorResult">
select m.id, m.serial_number as no,m.name,m.camera_fun_type as monitorType,
- d.dept_id,p.province_tag,p.important_tag,p.important_command_image_tag,p.dept_tag,p.online,p.id as pointId
+ d.dept_id,p.province_tag_video as provinceTag,p.important_tag,p.important_command_image_tag,p.dept_tag,p.online,p.id as pointId
from t_monitor m
left join t_yw_point p on m.serial_number = p.serial_number
left join sys_dept d on p.dept_id = d.dept_id
@@ -238,7 +221,7 @@
</foreach>
</if>
<if test="provinceTag!=null">
- and p.province_tag = #{provinceTag}
+ and p.province_tag_video = #{provinceTag}
</if>
<if test="importantTag!=null">
and p.important_tag = #{importantTag}
@@ -533,7 +516,6 @@
LEFT JOIN t_yw_point p3 ON t_monitor.serial_number = p3.serial_number AND p3.examine_status = 1 AND p3.online = 1 AND p1.id = p3.id<if test="dataScope == 1"> AND p3.province_tag_face = 1 </if><if test="dataScope == 3"> AND p3.dept_tag = 1 </if><if test="deptId != null"> AND p3.dept_id = #{deptId} </if>
WHERE INSTR(camera_fun_type, 3)
</select>
- <!-- TODO -->
<select id="monitorRate" resultType="com.ycl.platform.domain.vo.screen.MonitorRateVO">
SELECT
*
@@ -645,60 +627,6 @@
</if>
</where>
</select>
-
-<!-- <select id="getDyColumns" resultMap="dynamicColumnMap">-->
-<!-- SELECT-->
-<!-- *-->
-<!-- FROM-->
-<!-- t_dynamic_column_value dcv-->
-<!-- LEFT JOIN t_dynamic_column dc ON dc.id = dcv.dynamic_column_id AND dc.table_name = #{tableName}-->
-<!-- WHERE-->
-<!-- dcv.ref_id = #{id}-->
-<!-- <if test="keyword != null and keyword != ''">-->
-<!-- and dcv.column_value like concat('%', #{keyword}, '%')-->
-<!-- </if>-->
-<!-- </select>-->
-
-<!-- <resultMap id="dyMap" type="com.ycl.platform.domain.vo.TMonitorVO">-->
-<!-- <id column="id" property="id"/>-->
-<!-- <result column="serial_number" property="serialNumber"/>-->
-<!-- <result column="name" property="name"/>-->
-<!-- <result column="site_type" property="siteType"/>-->
-<!-- <result column="mac_addr" property="macAddr"/>-->
-<!-- <result column="ip" property="ip"/>-->
-<!-- <result column="longitude" property="longitude"/>-->
-<!-- <result column="latitude" property="latitude"/>-->
-<!-- <result column="camera_capture_area" property="cameraCaptureArea"/>-->
-<!-- <result column="camera_fun_type" property="cameraFunType"/>-->
-<!-- <result column="on_state" property="onState"/>-->
-<!-- <result column="civil_code" property="civilCode"/>-->
-<!-- <result column="integrated_device" property="integratedDevice"/>-->
-<!-- <result column="camera_brand" property="cameraBrand"/>-->
-<!-- <result column="address" property="address"/>-->
-<!-- <result column="public_security" property="publicSecurity"/>-->
-<!-- <result column="installed_time" property="installedTime"/>-->
-<!-- <result column="management_unit" property="managementUnit"/>-->
-<!-- <result column="mu_contact_info" property="muContactInfo"/>-->
-<!-- <result column="storage_days" property="storageDays"/>-->
-<!-- <result column="monitor_azimuth" property="monitorAzimuth"/>-->
-<!-- <result column="scene_photo_addr" property="scenePhotoAddr"/>-->
-<!-- <result column="model" property="model"/>-->
-<!-- <result column="site_vulgo" property="siteVulgo"/>-->
-<!-- <result column="camera_type" property="cameraType"/>-->
-<!-- <result column="camera_light_type" property="cameraLightType"/>-->
-<!-- <result column="encoded_format" property="encodedFormat"/>-->
-<!-- <result column="camera_dept" property="cameraDept"/>-->
-<!-- <result column="hybm" property="hybm"/>-->
-<!-- <result column="lxbm" property="lxbm"/>-->
-<!-- <collection property="dynamicColumnList" select="getDyColumns" column="{id=id,tableName=tableName,keyword=keyword}" ofType="com.ycl.platform.domain.vo.DynamicColumnVO"/>-->
-<!-- </resultMap>-->
-
-<!-- <resultMap id="dynamicColumnMap" type="com.ycl.platform.domain.vo.DynamicColumnVO">-->
-<!-- <result column="prop_name" property="propName"/>-->
-<!-- <result column="label_value" property="labelValue"/>-->
-<!-- <result column="column_value" property="columnValue"/>-->
-<!-- </resultMap>-->
-
<delete id="deleteAll">
delete from t_monitor
--
Gitblit v1.8.0