From 6707cf22587cba66f79a29145cc735a7c029dd05 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期一, 09 九月 2024 13:35:02 +0800
Subject: [PATCH] 设置新设备bug
---
ycl-server/src/main/resources/mapper/zgyw/YwPointMapper.xml | 149 +++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 148 insertions(+), 1 deletions(-)
diff --git a/ycl-server/src/main/resources/mapper/zgyw/YwPointMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/YwPointMapper.xml
index 70e0166..34b5f19 100644
--- a/ycl-server/src/main/resources/mapper/zgyw/YwPointMapper.xml
+++ b/ycl-server/src/main/resources/mapper/zgyw/YwPointMapper.xml
@@ -55,6 +55,90 @@
</where>
</select>
+ <select id="dataCenterPage">
+ SELECT
+ m.*
+ FROM
+ t_yw_point p INNER JOIN t_monitor m ON p.serial_number = m.serial_number
+ <where>
+ AND p.create_time between #{query.startTime} and #{query.endTime}
+ <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>
+ <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>
+ <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
@@ -90,7 +174,7 @@
SELECT
m.name as pointName,
m.serial_number,
- m.ip,
+ m.ip as pointIp,
yu.unit_name,
yp.start_time,
yp.end_time,
@@ -163,4 +247,67 @@
LIMIT 1
</select>
+ <select id="getDeptPointGB" resultType="string">
+ SELECT
+ DISTINCT serial_number
+ FROM
+ t_yw_point
+ WHERE
+ <if test="tagType == 0">
+ dept_tag = 1
+ </if>
+ <if test="tagType == 1">
+ important_tag = 1
+ </if>
+ <if test="tagType == 2">
+ important_command_image_tag = 1
+ </if>
+ AND deleted = 0
+ </select>
+
+ <select id="select" resultType="com.ycl.platform.domain.entity.YwPoint">
+ SELECT
+ *
+ FROM
+ t_yw_point
+ <where>
+ <if test="keyword != null and keyword != ''">
+ AND (serial_number like concat('%', #{keyword}, '%') or point_name like concat('%', #{keyword}, '%'))
+ </if>
+ <if test="unitId != null">
+ AND unit_id = #{unitId}
+ </if>
+ AND deleted = 0
+ </where>
+
+ </select>
+
+ <select id="getReportResult" resultType="com.ycl.platform.domain.vo.ReportAuditingRecordVO">
+ SELECT
+ ar.result, r.begin_create_time, r.end_create_time
+ FROM
+ t_report r
+ INNER JOIN t_report_auditing_record ar ON r.id = ar.report_id
+ AND ar.deleted = 0
+ AND r.report_type = #{reportType}
+ AND r.deleted = 0
+ AND r.serial_number = #{serialNumber}
+ 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
+ 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
+ </select>
+
+
</mapper>
--
Gitblit v1.8.0