From 728576cac67b5da2534ba576febab744ff6af64a Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期三, 28 八月 2024 10:36:12 +0800
Subject: [PATCH] 取消python任务
---
ycl-server/src/main/resources/mapper/zgyw/TMonitorMapper.xml | 91 ++++++++++++++++++++++++++++-----------------
1 files changed, 57 insertions(+), 34 deletions(-)
diff --git a/ycl-server/src/main/resources/mapper/zgyw/TMonitorMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/TMonitorMapper.xml
index f984a0a..b97bffc 100644
--- a/ycl-server/src/main/resources/mapper/zgyw/TMonitorMapper.xml
+++ b/ycl-server/src/main/resources/mapper/zgyw/TMonitorMapper.xml
@@ -36,6 +36,7 @@
<result property="cameraDept" column="camera_dept"/>
<result property="hybm" column="hybm"/>
<result property="lxbm" column="lxbm"/>
+ <result property="deviceType" column="device_type"/>
</resultMap>
<sql id="selectTMonitorVo">
@@ -69,7 +70,8 @@
encoded_format,
camera_dept,
hybm,
- lxbm
+ lxbm,
+ device_type
from t_monitor
</sql>
@@ -89,12 +91,12 @@
<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, 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 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
+ camera_capture_area, on_state, civil_code, d.dept_id, d.dept_name, d.area, p.province_tag,
+ IF(COUNT(w.id) OVER() > 0, '鏄�', '鍚�') AS error, u.unit_name 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
+ left join t_work_order w on m.serial_number = w.serial_number and w.deleted = 0
+ left join t_yw_unit u on p.unit_id = u.id and u.deleted = 0
<where>
<if test="serialNumber != null and serialNumber != ''">and m.serial_number = #{serialNumber}</if>
<if test="name != null and name != ''">and name like concat('%', #{name}, '%')</if>
@@ -113,7 +115,7 @@
<if test="civilCode != null and civilCode != ''">and civil_code = #{civilCode}</if>
<if test="integratedDevice != null ">and integrated_device = #{integratedDevice}</if>
<if test="cameraBrand != null ">and camera_brand = #{cameraBrand}</if>
- <if test="address != null and address != ''">and address like concat('%',#{address},'%')</if>
+ <if test="address != null and address != ''">and d.dept_id = #{address}</if>
<if test="netWorking != null ">and net_working = #{netWorking}</if>
<if test="publicSecurity != null and publicSecurity != ''">and public_security = #{publicSecurity}</if>
<if test="installedTime != null ">and installed_time = #{installedTime}</if>
@@ -184,6 +186,7 @@
<if test="cameraDept != null">camera_dept,</if>
<if test="hybm != null">hybm,</if>
<if test="lxbm != null">lxbm,</if>
+ <if test="deviceType != null">device_type,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="serialNumber != null and serialNumber != ''">#{serialNumber},</if>
@@ -216,8 +219,19 @@
<if test="cameraDept != null">#{cameraDept},</if>
<if test="hybm != null">#{hybm},</if>
<if test="lxbm != null">#{lxbm},</if>
+ <if test="deviceType != null">#{deviceType},</if>
</trim>
</insert>
+
+ <update id="batchUpdateDeviceType">
+ <foreach collection="list" separator=";" item="item">
+ UPDATE t_monitor
+ SET
+ update_time = #{item.updateTime},
+ device_type = #{item.deviceType}
+ WHERE id = #{item.id}
+ </foreach>
+ </update>
<update id="updateTMonitor" parameterType="com.ycl.platform.domain.entity.TMonitor">
update t_monitor
@@ -254,6 +268,7 @@
<if test="cameraDept != null">camera_dept = #{cameraDept},</if>
<if test="hybm != null">hybm = #{hybm},</if>
<if test="lxbm != null">lxbm = #{lxbm},</if>
+ <if test="deviceType != null">device_type = #{deviceType},</if>
</trim>
where id = #{id}
</update>
@@ -354,7 +369,7 @@
LEFT JOIN t_work_order w ON w.serial_number = p.serial_number
WHERE u.id = #{unitId} AND MONTH(w.create_time) IS NOT NULL
<if test="dateRange != null and dateRange.size > 0">
- AND DATE_FORMAT(w.create_time, '%Y-%m') BETWEEN #{dateRange[0]} AND #{dateRange[1]}
+ AND DATE_FORMAT(w.create_time, '%Y-%m') BETWEEN DATE_FORMAT(#{dateRange[0]}, '%Y-%m') AND DATE_FORMAT(#{dateRange[1]}, '%Y-%m')
</if>
GROUP BY months
ORDER BY months
@@ -367,10 +382,9 @@
COUNT(p2.id) AS errorNum,
COUNT(p1.id) - COUNT(p2.id) AS normalNum
FROM t_monitor
- LEFT JOIN t_yw_point p1 ON t_monitor.serial_number = p1.serial_number <if test="dataScope == 1"> AND p1.province_tag = 'province' </if>
- LEFT JOIN t_yw_point p2 ON t_monitor.serial_number = p2.serial_number AND p2.recovery = 1 <if test="dataScope == 1"> AND p2.province_tag = 'province' </if>
+ LEFT JOIN t_yw_point p1 ON t_monitor.serial_number = p1.serial_number <if test="dataScope == 1"> AND p1.province_tag = 1 </if><if test="dataScope == 3"> AND p1.important_tag = 1 </if><if test="deptId != null"> AND p1.dept_id = #{deptId} </if>
+ LEFT JOIN t_yw_point p2 ON t_monitor.serial_number = p2.serial_number AND p2.recovery = 1 AND p1.id = p2.id <if test="dataScope == 1"> AND p2.province_tag = 1 </if><if test="dataScope == 3"> AND p2.important_tag = 1 </if><if test="deptId != null"> AND p2.dept_id = #{deptId} </if>
WHERE INSTR(camera_fun_type, 1)
- <if test="deptId != null"> AND p1.dept_id = #{deptId} AND p2.dept_id = #{deptId} </if>
UNION ALL
SELECT
'杞﹁締' as type,
@@ -378,10 +392,9 @@
COUNT(p2.id) AS errorNum,
COUNT(p1.id) - COUNT(p2.id) AS normalNum
FROM t_monitor
- LEFT JOIN t_yw_point p1 ON t_monitor.serial_number = p1.serial_number <if test="dataScope == 1"> AND p1.province_tag = 'province' </if>
- LEFT JOIN t_yw_point p2 ON t_monitor.serial_number = p2.serial_number AND p2.recovery = 1 <if test="dataScope == 1"> AND p2.province_tag = 'province' </if>
+ LEFT JOIN t_yw_point p1 ON t_monitor.serial_number = p1.serial_number <if test="dataScope == 1"> AND p1.province_tag = 1 </if><if test="dataScope == 3"> AND p1.important_tag = 1 </if><if test="deptId != null"> AND p1.dept_id = #{deptId} </if>
+ LEFT JOIN t_yw_point p2 ON t_monitor.serial_number = p2.serial_number AND p2.recovery = 1 AND p1.id = p2.id <if test="dataScope == 1"> AND p2.province_tag = '1' </if><if test="dataScope == 3"> AND p2.important_tag = 1 </if><if test="deptId != null"> AND p2.dept_id = #{deptId} </if>
WHERE INSTR(camera_fun_type, 2)
- <if test="deptId != null"> AND p1.dept_id = #{deptId} AND p2.dept_id = #{deptId} </if>
UNION ALL
SELECT
'浜鸿劯' as type,
@@ -389,10 +402,9 @@
COUNT(p2.id) AS errorNum,
COUNT(p1.id) - COUNT(p2.id) AS normalNum
FROM t_monitor
- LEFT JOIN t_yw_point p1 ON t_monitor.serial_number = p1.serial_number <if test="dataScope == 1"> AND p1.province_tag = 'province' </if>
- LEFT JOIN t_yw_point p2 ON t_monitor.serial_number = p2.serial_number AND p2.recovery = 1 <if test="dataScope == 1"> AND p2.province_tag = 'province' </if>
+ LEFT JOIN t_yw_point p1 ON t_monitor.serial_number = p1.serial_number <if test="dataScope == 1"> AND p1.province_tag = 1 </if><if test="dataScope == 3"> AND p1.important_tag = 1 </if><if test="deptId != null"> AND p1.dept_id = #{deptId} </if>
+ LEFT JOIN t_yw_point p2 ON t_monitor.serial_number = p2.serial_number AND p2.recovery = 1 AND p1.id = p2.id <if test="dataScope == 1"> AND p2.province_tag = 1 </if><if test="dataScope == 3"> AND p2.important_tag = 1 </if><if test="deptId != null"> AND p2.dept_id = #{deptId} </if>
WHERE INSTR(camera_fun_type, 3)
- <if test="deptId != null"> AND p1.dept_id = #{deptId} AND p2.dept_id = #{deptId} </if>
</select>
<select id="monitorRate" resultType="com.ycl.platform.domain.vo.screen.MonitorRateVO">
@@ -408,8 +420,8 @@
COUNT(m2.id) AS faceErrorNum
FROM
sys_dept d
- LEFT JOIN t_yw_point p ON p.dept_id = d.dept_id AND p.deleted = 0 <if test="dataScope == 1"> AND p.province_tag = 'province' </if>
- LEFT JOIN t_yw_point p2 ON p2.dept_id = d.dept_id AND p2.deleted = 0 AND p2.recovery = 1 <if test="dataScope == 1"> AND p2.province_tag = 'province' </if>
+ LEFT JOIN t_yw_point p ON p.dept_id = d.dept_id AND p.deleted = 0 <if test="dataScope == 1"> AND p.province_tag = 1 </if><if test="dataScope == 3"> AND p.important_tag = 1 </if>
+ LEFT JOIN t_yw_point p2 ON p2.dept_id = d.dept_id AND p2.deleted = 0 AND p2.recovery = 1 AND p.id = p2.id <if test="dataScope == 1"> AND p2.province_tag = 1 </if><if test="dataScope == 3"> AND p2.important_tag = 1 </if>
LEFT JOIN t_monitor m ON m.serial_number = p.serial_number AND INSTR(m.camera_fun_type, 1)
LEFT JOIN t_monitor m2 ON m2.serial_number = p2.serial_number AND INSTR(m2.camera_fun_type, 1)
WHERE d.del_flag = 0 AND d.area IS NOT NULL
@@ -426,8 +438,8 @@
COUNT(m2.id) AS carErrorNum
FROM
sys_dept d
- LEFT JOIN t_yw_point p ON p.dept_id = d.dept_id AND p.deleted = 0 <if test="dataScope == 1"> AND p.province_tag = 'province' </if>
- LEFT JOIN t_yw_point p2 ON p2.dept_id = d.dept_id AND p2.deleted = 0 AND p2.recovery = 1 <if test="dataScope == 1"> AND p2.province_tag = 'province' </if>
+ LEFT JOIN t_yw_point p ON p.dept_id = d.dept_id AND p.deleted = 0 <if test="dataScope == 1"> AND p.province_tag = 1 </if><if test="dataScope == 3"> AND p.important_tag = 1 </if>
+ LEFT JOIN t_yw_point p2 ON p2.dept_id = d.dept_id AND p2.deleted = 0 AND p2.recovery = 1 AND p.id = p2.id <if test="dataScope == 1"> AND p2.province_tag = 1 </if><if test="dataScope == 3"> AND p2.important_tag = 1 </if>
LEFT JOIN t_monitor m ON m.serial_number = p.serial_number AND INSTR(m.camera_fun_type, 2)
LEFT JOIN t_monitor m2 ON m2.serial_number = p2.serial_number AND INSTR(m2.camera_fun_type, 2)
WHERE d.del_flag = 0 AND d.area IS NOT NULL
@@ -444,8 +456,8 @@
COUNT(m2.id) AS videoErrorNum
FROM
sys_dept d
- LEFT JOIN t_yw_point p ON p.dept_id = d.dept_id AND p.deleted = 0 <if test="dataScope == 1"> AND p.province_tag = 'province' </if>
- LEFT JOIN t_yw_point p2 ON p2.dept_id = d.dept_id AND p2.deleted = 0 AND p2.recovery = 1 <if test="dataScope == 1"> AND p2.province_tag = 'province' </if>
+ LEFT JOIN t_yw_point p ON p.dept_id = d.dept_id AND p.deleted = 0 <if test="dataScope == 1"> AND p.province_tag = 1 </if><if test="dataScope == 3"> AND p.important_tag = 1 </if>
+ LEFT JOIN t_yw_point p2 ON p2.dept_id = d.dept_id AND p2.deleted = 0 AND p2.recovery = 1 AND p.id = p2.id <if test="dataScope == 1"> AND p2.province_tag = 1 </if><if test="dataScope == 3"> AND p2.important_tag = 1 </if>
LEFT JOIN t_monitor m ON m.serial_number = p.serial_number AND INSTR(m.camera_fun_type, 3)
LEFT JOIN t_monitor m2 ON m2.serial_number = p2.serial_number AND INSTR(m2.camera_fun_type, 3)
WHERE d.del_flag = 0 AND d.area IS NOT NULL
@@ -488,22 +500,29 @@
tm.camera_dept,
tm.hybm,
tm.lxbm,
- dc.prop_name,
- dc.label_value,
- dc.field_value
+ 't_monitor' as tableName,
+ #{query.keyword} as keyword
FROM
t_monitor tm
- LEFT JOIN t_dynamic_column dc ON tm.id = dc.ref_id
<where>
<if test="query.keyword != null and query.keyword != ''">
- AND (tm.name like concat('%', #{query.keyword}, '%') OR dc.field_value like concat('%', #{query.keyword}, '%'))
+ AND tm.name like concat('%', #{query.keyword}, '%')
</if>
</where>
</select>
- <delete id="deleteAll">
- delete from t_monitor
- </delete>
+ <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"/>
@@ -536,13 +555,17 @@
<result column="camera_dept" property="cameraDept"/>
<result column="hybm" property="hybm"/>
<result column="lxbm" property="lxbm"/>
- <collection property="dynamicColumnList" ofType="com.ycl.platform.domain.vo.DynamicColumnVO" resultMap="dynamicColumnMap"/>
+ <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="field_value" property="fieldValue"/>
+ <result column="column_value" property="columnValue"/>
</resultMap>
+
+ <delete id="deleteAll">
+ delete from t_monitor
+ </delete>
</mapper>
--
Gitblit v1.8.0