From 083ac7646ef2ab4a2614678b158a3dce1482e75c Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期四, 05 十二月 2024 02:32:13 +0800
Subject: [PATCH] 省厅标签拆分
---
ycl-server/src/main/resources/mapper/zgyw/YwPointMapper.xml | 43 ++++++++++++++++++++++++++++---------------
1 files changed, 28 insertions(+), 15 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..00c45db 100644
--- a/ycl-server/src/main/resources/mapper/zgyw/YwPointMapper.xml
+++ b/ycl-server/src/main/resources/mapper/zgyw/YwPointMapper.xml
@@ -1,7 +1,7 @@
<?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">
<mapper namespace="com.ycl.platform.mapper.YwPointMapper">
-
+ <!-- TODO -->
<!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
<resultMap id="BaseResultMap" type="com.ycl.platform.domain.vo.YwPointVO">
<result column="id" property="id"/>
@@ -36,7 +36,9 @@
<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 +52,7 @@
<result column="label_value" property="labelValue"/>
<result column="column_value" property="columnValue"/>
</resultMap>
-
+ <!-- TODO -->
<select id="page" resultMap="pageMap">
SELECT
typ.id,
@@ -66,7 +68,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,
@@ -98,7 +102,7 @@
<!-- and dcv.column_value like concat('%', #{pointName}, '%')-->
<!-- </if>-->
</select>
-
+ <!-- TODO -->
<select id="dataCenterPage" resultType="com.ycl.platform.domain.vo.PointDetailVO">
SELECT
m.*
@@ -145,7 +149,7 @@
</choose>
</where>
</select>
-
+ <!-- TODO -->
<select id="distinctCount" resultType="integer">
SELECT
count(DISTINCT m.serial_number)
@@ -201,7 +205,7 @@
ORDER BY end_time limit 50
]]>
</select>
-
+ <!-- TODO -->
<select id="selectByTag" resultType="com.ycl.platform.domain.entity.YwPoint">
select * from t_yw_point
<where>
@@ -230,7 +234,9 @@
yp.start_time,
yp.end_time,
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,7 +271,9 @@
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}
WHERE serial_number = #{point.serialNumber}
@@ -344,19 +352,18 @@
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_videogetTagsByGB, important_tag, important_command_image_tag, dept_tag
</select>
-
+ <!-- TODO -->
<select id="selectToCount" resultType="com.ycl.platform.domain.vo.YwPointVO">
select p.* from t_yw_point p
left join t_monitor m on p.serial_number = m.serial_number
@@ -382,8 +389,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},
--
Gitblit v1.8.0