From 66544379029bdc7ecce13e6b3a32b59be1527495 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期四, 01 八月 2024 18:23:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-server/src/main/resources/mapper/zgyw/TMonitorMapper.xml | 60 ++++++++++++++++++++++++------------------------------------
1 files changed, 24 insertions(+), 36 deletions(-)
diff --git a/ycl-server/src/main/resources/mapper/zgyw/TMonitorMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/TMonitorMapper.xml
index 460ec85..687d7f7 100644
--- a/ycl-server/src/main/resources/mapper/zgyw/TMonitorMapper.xml
+++ b/ycl-server/src/main/resources/mapper/zgyw/TMonitorMapper.xml
@@ -37,22 +37,22 @@
<result property="hybm" column="hybm" />
<result property="lxbm" column="lxbm" />
<result property="reason" column="reason" />
- <result property="defaultOrder" column="default_order" />
<result property="recovery" column="recovery" />
<result property="recoveryTime" column="recovery_time" />
<result property="deptId" column="dept_id" />
</resultMap>
<sql id="selectTMonitorVo">
- select id, 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, reason, default_order,recovery,recovery_time,dept_id from t_monitor
+ select id, 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 from t_monitor
</sql>
<select id="selectTMonitorList" resultType="com.ycl.platform.domain.vo.TMonitorVO">
- select id, 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, reason, default_order,recovery,recovery_time,d.dept_name from t_monitor m
- left join sys_dept d on m.dept_id = d.dept_id
+ 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_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
<where>
- <if test="serialNumber != null and serialNumber != ''"> and serial_number = #{serialNumber}</if>
+ <if test="serialNumber != null and serialNumber != ''"> and m.serial_number = #{serialNumber}</if>
<if test="name != null and name != ''"> and name like concat('%', #{name}, '%')</if>
<if test="siteType != null "> and site_type = #{siteType}</if>
<if test="macAddr != null and macAddr != ''"> and mac_addr = #{macAddr}</if>
@@ -82,11 +82,7 @@
<if test="cameraDept != null and cameraDept != ''"> and camera_dept = #{cameraDept}</if>
<if test="hybm != null and hybm != ''"> and hybm = #{hybm}</if>
<if test="lxbm != null "> and lxbm = #{lxbm}</if>
- <if test="reason != null and reason != ''"> and reason = #{reason}</if>
- <if test="defaultOrder != null "> and default_order = #{defaultOrder}</if>
- <if test="recovery != null "> and recovery = #{recovery}</if>
- <if test="recoveryTime != null "> and recovery_time = #{recoveryTime}</if>
- <if test="deptId != null "> and m.dept_id = #{deptId}</if>
+ <if test="recovery != null "> and p.recovery = #{recovery}</if>
</where>
${params.dataScope}
</select>
@@ -129,11 +125,6 @@
<if test="cameraDept != null">camera_dept,</if>
<if test="hybm != null">hybm,</if>
<if test="lxbm != null">lxbm,</if>
- <if test="reason != null">reason,</if>
- <if test="defaultOrder != null">default_order,</if>
- <if test="recovery != null">recovery,</if>
- <if test="recoveryTime != null">recovery_time,</if>
- <if test="deptId != null">dept_id,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="serialNumber != null and serialNumber != ''">#{serialNumber},</if>
@@ -166,11 +157,6 @@
<if test="cameraDept != null">#{cameraDept},</if>
<if test="hybm != null">#{hybm},</if>
<if test="lxbm != null">#{lxbm},</if>
- <if test="reason != null">#{reason},</if>
- <if test="defaultOrder != null">#{defaultOrder},</if>
- <if test="recovery != null">#{recovery},</if>
- <if test="recoveryTime != null">#{recoveryTime},</if>
- <if test="deptId != null">#{deptId},</if>
</trim>
</insert>
@@ -207,11 +193,6 @@
<if test="cameraDept != null">camera_dept = #{cameraDept},</if>
<if test="hybm != null">hybm = #{hybm},</if>
<if test="lxbm != null">lxbm = #{lxbm},</if>
- <if test="reason != null">reason = #{reason},</if>
- <if test="defaultOrder != null">default_order = #{defaultOrder},</if>
- <if test="recovery != null">recovery = #{defaultOrder},</if>
- <if test="recoveryTime != null">recovery_time = #{recoveryTime},</if>
- <if test="deptId != null">dept_id = #{deptId},</if>
</trim>
where id = #{id}
</update>
@@ -231,14 +212,10 @@
SELECT count(*) AS totalPosts,
IFNULL(SUM(IF(on_state = 1, 1, 0)), 0) AS totalMembers,
IFNULL(SUM(IF(on_state = 2, 1, 0)), 0) AS postsPercentage,
- IFNULL(SUM(IF(default_order = 1, 1, 0)), 0) AS totalViews,
- -1 as noStore,
- -1 as partStore,
- IFNULL(ROUND(SUM(IF(on_state = 1, 1, 0)) / count(*) * 100, 2), 0) as viewsPercentage,
- -1 as totalFace,
- -1 as totalCar
+ IFNULL(ROUND(SUM(IF(on_state = 1, 1, 0)) / count(*) * 100, 2), 0) as viewsPercentage
FROM t_monitor m
- left join sys_dept d on m.dept_id = d.dept_id
+ 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
<where>
camera_fun_type like concat('%', #{cameraFunType}, '%')
</where>
@@ -246,13 +223,24 @@
</select>
<select id="recoveryException" resultType="java.util.Map">
+ <![CDATA[
SELECT count(*) AS totalPosts,
IFNULL(SUM(IF(on_state = 1, 1, 0)), 0) AS totalMembers,
IFNULL(SUM(IF(on_state = 2, 1, 0)), 0) AS postsPercentage,
- IFNULL(SUM(IF(default_order = 1, 1, 0)), 0) AS totalViews,
IFNULL(ROUND(SUM(IF(on_state = 1, 1, 0)) / count(*) * 100, 2), 0) as viewsPercentage
- FROM t_monitor
- WHERE recovery = 1
+ FROM t_monitor t
+ LEFT JOIN t_yw_point p ON t.serial_number = p.serial_number
+ WHERE p.recovery = 1 OR TIMESTAMPDIFF(DAY, p.recovery_time, NOW()) <= #{time}
+ ]]>
+ </select>
+
+ <select id="selectRecoveryMonitor" resultType="com.ycl.platform.domain.vo.TMonitorVO">
+ <![CDATA[
+ SELECT t.id, p.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
+ FROM t_monitor t
+ LEFT JOIN t_yw_point p ON t.serial_number = p.serial_number
+ WHERE TIMESTAMPDIFF(DAY, p.recovery_time, NOW()) <= #{time}
+ ]]>
</select>
</mapper>
--
Gitblit v1.8.0