From 9490c47566a0f253f35a1019fd1b1e1473630d67 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期一, 20 一月 2025 09:48:53 +0800
Subject: [PATCH] Merge branch 'dev'
---
ycl-server/src/main/resources/mapper/zgyw/YwPointMapper.xml | 192 ++++++++++++-----------------------------------
1 files changed, 50 insertions(+), 142 deletions(-)
diff --git a/ycl-server/src/main/resources/mapper/zgyw/YwPointMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/YwPointMapper.xml
index 0b266b3..74a5004 100644
--- a/ycl-server/src/main/resources/mapper/zgyw/YwPointMapper.xml
+++ b/ycl-server/src/main/resources/mapper/zgyw/YwPointMapper.xml
@@ -2,26 +2,6 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ycl.platform.mapper.YwPointMapper">
- <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
- <resultMap id="BaseResultMap" type="com.ycl.platform.domain.vo.YwPointVO">
- <result column="id" property="id"/>
- <result column="point_name" property="pointName"/>
- <result column="start_time" property="startTime"/>
- <result column="end_time" property="endTime"/>
- <result column="unit_id" property="unitId"/>
- <result column="unit_name" property="unitName"/>
- <result column="status" property="status"/>
- <result column="dept_id" property="deptId"/>
- <result column="dept_name" property="deptName"/>
- <result column="remark" property="remark"/>
- <result column="create_time" property="createTime"/>
- <result column="update_time" property="updateTime"/>
- <result column="province_tag" property="provinceTag"/>
- <result column="important_tag" property="importantTag"/>
- <result column="important_command_image_tag" property="importantCommandImageTag"/>
- <result column="dept_tag" property="deptTag"/>
- </resultMap>
-
<!-- 鍒嗛〉鏄犲皠缁撴灉 -->
<resultMap id="pageMap" type="com.ycl.platform.domain.vo.YwPointVO">
<result column="id" property="id"/>
@@ -33,10 +13,14 @@
<result column="status" property="status"/>
<result column="dept_id" property="deptId"/>
<result column="dept_name" property="deptName"/>
+ <result column="username" property="username"/>
+ <result column="password" property="password"/>
<result column="remark" property="remark"/>
<result column="create_time" property="createTime"/>
<result column="update_time" property="updateTime"/>
- <result column="province_tag" property="provinceTag"/>
+ <result column="province_tag_video" property="provinceTagVideo"/>
+ <result column="province_tag_car" property="provinceTagCar"/>
+ <result column="province_tag_face" property="provinceTagFace"/>
<result column="important_tag" property="importantTag"/>
<result column="important_command_image_tag" property="importantCommandImageTag"/>
<result column="dept_tag" property="deptTag"/>
@@ -50,7 +34,6 @@
<result column="label_value" property="labelValue"/>
<result column="column_value" property="columnValue"/>
</resultMap>
-
<select id="page" resultMap="pageMap">
SELECT
typ.id,
@@ -66,7 +49,9 @@
typ.create_time,
typ.update_time,
typ.important_tag,
- typ.province_tag,
+ typ.province_tag_video,
+ typ.province_tag_car,
+ typ.province_tag_face,
typ.important_command_image_tag,
typ.dept_tag,
't_yw_point' as tableName,
@@ -99,125 +84,17 @@
<!-- </if>-->
</select>
- <select id="dataCenterPage" resultType="com.ycl.platform.domain.vo.PointDetailVO">
- SELECT
- m.*
- FROM
- t_yw_point p INNER JOIN t_monitor m ON p.serial_number = m.serial_number
- <where>
- <if test="query.keyword != null and query.keyword != ''">
- AND (m.name like concat('%', #{query.keyword}, '%') OR m.serial_number like concat('%',
- #{query.keyword}, '%'))
- </if>
- <if test="query.dataType == 1">
- AND p.province_tag = 1
- </if>
- <if test="query.dataType == 2">
- AND p.dept_tag = 1
- </if>
- <choose>
- <when test="query.deptTag == 1">
- AND p.dept_tag = 1
- </when>
- <when test="query.deptTag == 2">
- AND p.province_tag = 1
- </when>
- <when test="query.deptTag == 3">
- AND p.important_tag = 1
- </when>
- <when test="query.deptTag == 4">
- AND p.important_command_image_tag = 1
- </when>
- <when test="query.deptTag == 5">
- AND p.new_device = 1
- </when>
- </choose>
- <choose>
- <when test="query.deviceType == 1">
- AND m.camera_fun_type like '%1%'
- </when>
- <when test="query.deviceType == 2">
- AND m.camera_fun_type like '%2%'
- </when>
- <when test="query.deviceType == 3">
- AND m.camera_fun_type like '%3%'
- </when>
- </choose>
- </where>
- </select>
-
- <select id="distinctCount" resultType="integer">
- SELECT
- count(DISTINCT m.serial_number)
- FROM
- t_yw_point p INNER JOIN t_monitor m ON p.serial_number = m.serial_number
- <where>
- <if test="query.dataType == 1">
- AND p.province_tag = 1
- </if>
- <if test="query.dataType == 2">
- AND p.dept_tag = 1
- </if>
- <choose>
- <when test="query.deptTag == 1">
- AND dept_tag = 1
- </when>
- <when test="query.deptTag == 2">
- AND province_tag = 1
- </when>
- <when test="query.deptTag == 3">
- AND important_tag = 1
- </when>
- <when test="query.deptTag == 4">
- AND important_command_image_tag = 1
- </when>
- <when test="query.deptTag == 5">
- AND new_device = 1
- </when>
- </choose>
- <choose>
- <when test="query.deviceType == 1">
- AND m.camera_fun_type like '%1%'
- </when>
- <when test="query.deviceType == 2">
- AND m.camera_fun_type like '%2%'
- </when>
- <when test="query.deviceType == 3">
- AND m.camera_fun_type like '%3%'
- </when>
- </choose>
- </where>
- </select>
-
<select id="home" resultType="com.ycl.platform.domain.entity.YwPoint">
<![CDATA[
SELECT t_yw_point.id, point_name, start_time, end_time, status, unit_name AS remark
FROM t_yw_point
LEFT JOIN t_yw_unit ON t_yw_unit.id = t_yw_point.unit_id AND t_yw_point.deleted = 0
- WHERE t_yw_point.deleted = 0
+ WHERE t_yw_point.deleted = 0 AND t_yw_point.examine_status = 1
AND TIMESTAMPDIFF(MONTH, NOW(), end_time) <= (SELECT config_value
FROM sys_config
WHERE config_key = 'operation.and.maintenance.expiration.warning.time')
ORDER BY end_time limit 50
]]>
- </select>
-
- <select id="selectByTag" resultType="com.ycl.platform.domain.entity.YwPoint">
- select * from t_yw_point
- <where>
- <if test="important!=null and important == true ">
- and important_tag = #{important}
- </if>
- <if test="province!=null and province == true ">
- and province_tag = #{province}
- </if>
- <if test="commandImage!=null and commandImage == true ">
- and important_command_image_tag = #{commandImage}
- </if>
- <if test="deptTag !=null and deptTag == true ">
- and dept_tag = #{deptTag}
- </if>
- </where>
</select>
<select id="export" resultType ="com.ycl.platform.domain.excel.PointExport">
@@ -229,8 +106,12 @@
yu.unit_name,
yp.start_time,
yp.end_time,
+ yp.username,
+ yp.password,
d.area,
- CASE WHEN yp.province_tag = 0 THEN '鍚�' ELSE '鏄�' END AS provinceTagString,
+ CASE WHEN yp.province_tag_video = 0 THEN '鍚�' ELSE '鏄�' END AS provinceTagVideoString,
+ CASE WHEN yp.province_tag_car = 0 THEN '鍚�' ELSE '鏄�' END AS provinceTagCarString,
+ CASE WHEN yp.province_tag_face = 0 THEN '鍚�' ELSE '鏄�' END AS provinceTagFaceString,
CASE WHEN yp.important_tag = 0 THEN '鍚�' ELSE '鏄�' END AS importantTagString,
CASE WHEN yp.important_command_image_tag = 0 THEN '鍚�' ELSE '鏄�' END AS importantCommandImageTagString,
CASE WHEN yp.dept_tag = 0 THEN '鍚�' ELSE '鏄�' END AS deptTagString
@@ -265,9 +146,13 @@
start_time = #{point.startTime},
end_time = #{point.endTime},
</if>
- province_tag = #{point.provinceTag},
+ province_tag_video = #{point.provinceTagVideo},
+ province_tag_car = #{point.provinceTagCar},
+ province_tag_face = #{point.provinceTagFace},
important_command_image_tag = #{point.importantCommandImageTag},
- dept_tag = #{point.deptTag}
+ dept_tag = #{point.deptTag},
+ username = #{point.username},
+ password = #{point.password}
WHERE serial_number = #{point.serialNumber}
</foreach>
</update>
@@ -344,17 +229,16 @@
AND ar.result = 1
ORDER BY ar.create_time DESC limit 1
</select>
-
<select id="getTagsByGB" resultType="com.ycl.platform.domain.vo.CheckTagVO">
SELECT
- serial_number as no, province_tag, important_tag, important_command_image_tag, dept_tag
+ serial_number as no, province_tag_face,province_tag_car,province_tag_video, important_tag, important_command_image_tag, dept_tag
FROM
t_yw_point
WHERE
deleted = 0 AND serial_number in
<foreach collection="gbList" open="(" separator="," close=")" item="no">#{no}</foreach>
GROUP BY
- serial_number, province_tag, important_tag, important_command_image_tag, dept_tag
+ serial_number, province_tag_face,province_tag_car,province_tag_video, important_tag, important_command_image_tag, dept_tag
</select>
<select id="selectToCount" resultType="com.ycl.platform.domain.vo.YwPointVO">
@@ -362,8 +246,14 @@
left join t_monitor m on p.serial_number = m.serial_number
<where>
p.examine_status = 1 and m.camera_fun_type like concat('%',#{examineCategory},'%')
- <if test="examineTag == 0">
- and p.province_tag = 1
+ <if test="examineTag == 0 and examineCategory ==1" >
+ and p.province_tag_video = 1
+ </if>
+ <if test="examineTag == 0 and examineCategory ==2" >
+ and p.province_tag_car = 1
+ </if>
+ <if test="examineTag == 0 and examineCategory ==3" >
+ and p.province_tag_face = 1
</if>
<if test="examineTag == 2">
and p.dept_tag = 1
@@ -382,8 +272,14 @@
<if test="deptId !=null">
dept_id = #{deptId},
</if>
- <if test="provinceTag !=null">
- province_tag = #{provinceTag},
+ <if test="provinceTagVideo !=null">
+ province_tag_video = #{provinceTagVideo},
+ </if>
+ <if test="provinceTagCar !=null">
+ province_tag_car = #{provinceTagCar},
+ </if>
+ <if test="provinceTagFace !=null">
+ province_tag_face = #{provinceTagFace},
</if>
<if test="importantTag !=null">
important_tag = #{importantTag},
@@ -394,6 +290,12 @@
<if test="deptTag !=null">
dept_tag = #{deptTag},
</if>
+ <if test="username !=null and username!=''">
+ username = #{username},
+ </if>
+ <if test="password !=null and password !=''">
+ password = #{password},
+ </if>
unit_id = #{unitId},
start_time = #{startTime},
end_time = #{endTime},
@@ -401,4 +303,10 @@
</set>
where id =#{id}
</update>
+
+ <!-- 娓呯悊涓�鏈轰竴妗� -->
+ <delete id="clearMonitor">
+ delete from t_yw_point p
+ where p.examine_status != 1
+ </delete>
</mapper>
--
Gitblit v1.8.0