From a604e310ccd6257165526a3fc01c03e063687652 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期四, 01 八月 2024 15:32:37 +0800
Subject: [PATCH] 一机一档 TODO：解析区域
---
ycl-server/src/main/resources/mapper/zgyw/TMonitorMapper.xml | 26 ++++++++++++--------------
1 files changed, 12 insertions(+), 14 deletions(-)
diff --git a/ycl-server/src/main/resources/mapper/zgyw/TMonitorMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/TMonitorMapper.xml
index e75c2f6..8faab75 100644
--- a/ycl-server/src/main/resources/mapper/zgyw/TMonitorMapper.xml
+++ b/ycl-server/src/main/resources/mapper/zgyw/TMonitorMapper.xml
@@ -37,20 +37,19 @@
<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, reason, recovery,recovery_time,dept_id 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,sd.dept_name from t_monitor m
- left join sys_dept sd on m.dept_id = sd.dept_id
+ , monitor_azimuth, scene_photo_addr, model, site_vulgo, camera_type, camera_light_type, encoded_format, camera_dept, hybm, lxbm, reason, recovery,recovery_time,d.dept_name from t_monitor m
+ left join sys_dept d on m.dept_id = d.dept_id
<where>
<if test="serialNumber != null and serialNumber != ''"> and serial_number = #{serialNumber}</if>
<if test="name != null and name != ''"> and name like concat('%', #{name}, '%')</if>
@@ -83,11 +82,11 @@
<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 dept_id = #{deptId}</if>
+ <if test="deptId != null "> and m.dept_id = #{deptId}</if>
</where>
+ ${params.dataScope}
</select>
<select id="selectTMonitorById" parameterType="Long" resultMap="TMonitorResult">
@@ -129,7 +128,6 @@
<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>
@@ -166,7 +164,6 @@
<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>
@@ -207,8 +204,6 @@
<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>
@@ -230,23 +225,26 @@
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
- FROM t_monitor
- WHERE camera_fun_type like concat('%', #{cameraFunType}, '%')
+ FROM t_monitor m
+ left join sys_dept d on m.dept_id = d.dept_id
+ <where>
+ camera_fun_type like concat('%', #{cameraFunType}, '%')
+ </where>
+ ${params.dataScope}
</select>
<select id="recoveryException" resultType="java.util.Map">
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
</select>
+
</mapper>
--
Gitblit v1.8.0