From a2a2209f983a2bb736b59c9217790740930e7017 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期二, 06 八月 2024 15:13:45 +0800
Subject: [PATCH] Monitor结构更新
---
ycl-server/src/main/resources/mapper/zgyw/TMonitorMapper.xml | 277 ++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 180 insertions(+), 97 deletions(-)
diff --git a/ycl-server/src/main/resources/mapper/zgyw/TMonitorMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/TMonitorMapper.xml
index 38b6aad..be8a21a 100644
--- a/ycl-server/src/main/resources/mapper/zgyw/TMonitorMapper.xml
+++ b/ycl-server/src/main/resources/mapper/zgyw/TMonitorMapper.xml
@@ -1,98 +1,146 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+ "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ycl.platform.mapper.TMonitorMapper">
<resultMap type="com.ycl.platform.domain.entity.TMonitor" id="TMonitorResult">
- <result property="id" column="id" />
- <result property="serialNumber" column="serial_number" />
- <result property="name" column="name" />
- <result property="siteType" column="site_type" />
- <result property="macAddr" column="mac_addr" />
- <result property="ip" column="ip" />
- <result property="cameraFunType" column="camera_fun_type" />
- <result property="longitude" column="longitude" />
- <result property="latitude" column="latitude" />
- <result property="cameraCaptureArea" column="camera_capture_area" />
- <result property="onState" column="on_state" />
- <result property="civilCode" column="civil_code" />
- <result property="integratedDevice" column="integrated_device" />
- <result property="cameraBrand" column="camera_brand" />
- <result property="address" column="address" />
- <result property="netWorking" column="net_working" />
- <result property="publicSecurity" column="public_security" />
- <result property="installedTime" column="installed_time" />
- <result property="managementUnit" column="management_unit" />
- <result property="muContactInfo" column="mu_contact_info" />
- <result property="storageDays" column="storage_days" />
- <result property="monitorAzimuth" column="monitor_azimuth" />
- <result property="scenePhotoAddr" column="scene_photo_addr" />
- <result property="model" column="model" />
- <result property="siteVulgo" column="site_vulgo" />
- <result property="cameraType" column="camera_type" />
- <result property="cameraLightType" column="camera_light_type" />
- <result property="encodedFormat" column="encoded_format" />
- <result property="cameraDept" column="camera_dept" />
- <result property="hybm" column="hybm" />
- <result property="lxbm" column="lxbm" />
- <result property="reason" column="reason" />
- <result property="recovery" column="recovery" />
- <result property="recoveryTime" column="recovery_time" />
- <result property="deptId" column="dept_id" />
+ <result property="id" column="id"/>
+ <result property="serialNumber" column="serial_number"/>
+ <result property="name" column="name"/>
+ <result property="siteType" column="site_type"/>
+ <result property="macAddr" column="mac_addr"/>
+ <result property="ip" column="ip"/>
+ <result property="cameraFunType" column="camera_fun_type"/>
+ <result property="longitude" column="longitude"/>
+ <result property="latitude" column="latitude"/>
+ <result property="cameraCaptureArea" column="camera_capture_area"/>
+ <result property="onState" column="on_state"/>
+ <result property="civilCode" column="civil_code"/>
+ <result property="integratedDevice" column="integrated_device"/>
+ <result property="cameraBrand" column="camera_brand"/>
+ <result property="address" column="address"/>
+ <result property="netWorking" column="net_working"/>
+ <result property="publicSecurity" column="public_security"/>
+ <result property="installedTime" column="installed_time"/>
+ <result property="managementUnit" column="management_unit"/>
+ <result property="muContactInfo" column="mu_contact_info"/>
+ <result property="storageDays" column="storage_days"/>
+ <result property="monitorAzimuth" column="monitor_azimuth"/>
+ <result property="scenePhotoAddr" column="scene_photo_addr"/>
+ <result property="model" column="model"/>
+ <result property="siteVulgo" column="site_vulgo"/>
+ <result property="cameraType" column="camera_type"/>
+ <result property="cameraLightType" column="camera_light_type"/>
+ <result property="encodedFormat" column="encoded_format"/>
+ <result property="cameraDept" column="camera_dept"/>
+ <result property="hybm" column="hybm"/>
+ <result property="lxbm" column="lxbm"/>
</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 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="selectListByIds" 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
+ where m.serial_number in
+ <foreach collection="list" separator="," item="id" open="(" close=")">
+ #{id}
+ </foreach>
+ </select>
<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_name from t_monitor m
+ 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
<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>
- <if test="siteType != null "> and site_type = #{siteType}</if>
- <if test="macAddr != null and macAddr != ''"> and mac_addr = #{macAddr}</if>
- <if test="ip != null and ip != ''"> and ip = #{ip}</if>
- <if test="cameraFunType != null and cameraFunType != ''"> and camera_fun_type like concat('%', #{cameraFunType}, '%')</if>
- <if test="longitude != null and longitude != ''"> and longitude = #{longitude}</if>
- <if test="latitude != null and latitude != ''"> and latitude = #{latitude}</if>
- <if test="cameraCaptureArea != null and cameraCaptureArea != ''"> and camera_capture_area = #{cameraCaptureArea}</if>
- <if test="onState != null "> and on_state = #{onState}</if>
- <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="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>
- <if test="managementUnit != null and managementUnit != ''"> and management_unit = #{managementUnit}</if>
- <if test="muContactInfo != null and muContactInfo != ''"> and mu_contact_info = #{muContactInfo}</if>
- <if test="storageDays != null "> and storage_days = #{storageDays}</if>
- <if test="monitorAzimuth != null "> and monitor_azimuth = #{monitorAzimuth}</if>
- <if test="scenePhotoAddr != null and scenePhotoAddr != ''"> and scene_photo_addr = #{scenePhotoAddr}</if>
- <if test="model != null and model != ''"> and model = #{model}</if>
- <if test="siteVulgo != null and siteVulgo != ''"> and site_vulgo = #{siteVulgo}</if>
- <if test="cameraType != null "> and camera_type = #{cameraType}</if>
- <if test="cameraLightType != null "> and camera_light_type = #{cameraLightType}</if>
- <if test="encodedFormat != null "> and encoded_format = #{encodedFormat}</if>
- <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="recovery != null "> and p.recovery = #{recovery}</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>
+ <if test="ip != null and ip != ''">and ip = #{ip}</if>
+ <if test="cameraFunType != null and cameraFunType != ''">and camera_fun_type like concat('%',
+ #{cameraFunType}, '%')
+ </if>
+ <if test="longitude != null and longitude != ''">and longitude = #{longitude}</if>
+ <if test="latitude != null and latitude != ''">and latitude = #{latitude}</if>
+ <if test="cameraCaptureArea != null and cameraCaptureArea != ''">and camera_capture_area =
+ #{cameraCaptureArea}
+ </if>
+ <if test="onState != null ">and on_state = #{onState}</if>
+ <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="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>
+ <if test="managementUnit != null and managementUnit != ''">and management_unit = #{managementUnit}</if>
+ <if test="muContactInfo != null and muContactInfo != ''">and mu_contact_info = #{muContactInfo}</if>
+ <if test="storageDays != null ">and storage_days = #{storageDays}</if>
+ <if test="monitorAzimuth != null ">and monitor_azimuth = #{monitorAzimuth}</if>
+ <if test="scenePhotoAddr != null and scenePhotoAddr != ''">and scene_photo_addr = #{scenePhotoAddr}</if>
+ <if test="model != null and model != ''">and model = #{model}</if>
+ <if test="siteVulgo != null and siteVulgo != ''">and site_vulgo = #{siteVulgo}</if>
+ <if test="cameraType != null ">and camera_type = #{cameraType}</if>
+ <if test="cameraLightType != null ">and camera_light_type = #{cameraLightType}</if>
+ <if test="encodedFormat != null ">and encoded_format = #{encodedFormat}</if>
+ <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="recovery != null ">and p.recovery = #{recovery}</if>
</where>
${params.dataScope}
</select>
- <select id="selectTMonitorById" parameterType="Long" resultMap="TMonitorResult">
+ <select id="selectTMonitorById" parameterType="Long" resultType="com.ycl.platform.domain.vo.TMonitorVO">
<include refid="selectTMonitorVo"/>
where id = #{id}
</select>
- <insert id="insertTMonitor" parameterType="com.ycl.platform.domain.entity.TMonitor" useGeneratedKeys="true" keyProperty="id">
+ <insert id="insertTMonitor" parameterType="com.ycl.platform.domain.entity.TMonitor" useGeneratedKeys="true"
+ keyProperty="id">
insert into t_monitor
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="serialNumber != null and serialNumber != ''">serial_number,</if>
@@ -125,7 +173,7 @@
<if test="cameraDept != null">camera_dept,</if>
<if test="hybm != null">hybm,</if>
<if test="lxbm != null">lxbm,</if>
- </trim>
+ </trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="serialNumber != null and serialNumber != ''">#{serialNumber},</if>
<if test="name != null and name != ''">#{name},</if>
@@ -157,7 +205,7 @@
<if test="cameraDept != null">#{cameraDept},</if>
<if test="hybm != null">#{hybm},</if>
<if test="lxbm != null">#{lxbm},</if>
- </trim>
+ </trim>
</insert>
<update id="updateTMonitor" parameterType="com.ycl.platform.domain.entity.TMonitor">
@@ -171,7 +219,9 @@
<if test="cameraFunType != null and cameraFunType != ''">camera_fun_type = #{cameraFunType},</if>
<if test="longitude != null and longitude != ''">longitude = #{longitude},</if>
<if test="latitude != null and latitude != ''">latitude = #{latitude},</if>
- <if test="cameraCaptureArea != null and cameraCaptureArea != ''">camera_capture_area = #{cameraCaptureArea},</if>
+ <if test="cameraCaptureArea != null and cameraCaptureArea != ''">camera_capture_area =
+ #{cameraCaptureArea},
+ </if>
<if test="onState != null">on_state = #{onState},</if>
<if test="civilCode != null and civilCode != ''">civil_code = #{civilCode},</if>
<if test="integratedDevice != null">integrated_device = #{integratedDevice},</if>
@@ -198,7 +248,9 @@
</update>
<delete id="deleteTMonitorById" parameterType="Long">
- delete from t_monitor where id = #{id}
+ delete
+ from t_monitor
+ where id = #{id}
</delete>
<delete id="deleteTMonitorByIds" parameterType="String">
@@ -209,13 +261,13 @@
</delete>
<select id="getVideoCount" 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(ROUND(SUM(IF(on_state = 1, 1, 0)) / count(*) * 100, 2), 0) as viewsPercentage
+ 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(ROUND(SUM(IF(on_state = 1, 1, 0)) / count(*) * 100, 2), 0) as viewsPercentage
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
+ 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>
@@ -229,35 +281,66 @@
IFNULL(SUM(IF(on_state = 2, 1, 0)), 0) AS postsPercentage,
IFNULL(ROUND(SUM(IF(on_state = 1, 1, 0)) / count(*) * 100, 2), 0) as viewsPercentage
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}
+ 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
+ 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
+ LEFT JOIN t_yw_point p ON t.serial_number = p.serial_number
WHERE TIMESTAMPDIFF(DAY, p.recovery_time, NOW()) <= #{time}
]]>
</select>
<select id="home" resultType="java.util.Map">
SELECT
- u.unit_name AS name,
- CONCAT(MONTH(w.create_time), '鏈�') AS months,
- COUNT(w.id) AS num1,
- COUNT(m.id) - COUNT(w.id) AS num2
+ u.unit_name AS name,
+ CONCAT(MONTH(w.create_time), '鏈�') AS months,
+ COUNT(w.id) AS num1,
+ COUNT(m.id) - COUNT(w.id) AS num2
FROM
- t_monitor m
- LEFT JOIN t_yw_point p ON m.serial_number = p.serial_number
- LEFT JOIN t_yw_unit u ON p.unit_id = u.id
- LEFT JOIN t_work_order w ON p.id = w.point_id
+ t_monitor m
+ LEFT JOIN t_yw_point p ON m.serial_number = p.serial_number
+ LEFT JOIN t_yw_unit u ON p.unit_id = u.id
+ LEFT JOIN t_work_order w ON p.id = w.point_id
WHERE u.id = #{unitId} AND MONTH(w.create_time) IS NOT NULL
- <if test="dateRange != null and dateRange.size > 0">
+ <if test="dateRange != null and dateRange.size > 0">
AND DATE_FORMAT(w.create_time, '%Y-%m') BETWEEN #{dateRange[0]} AND #{dateRange[1]}
- </if>
+ </if>
GROUP BY months
ORDER BY months
</select>
--
Gitblit v1.8.0