From 9d5878687df1a39293c171a93b8f57f2fb4559a5 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期五, 09 八月 2024 09:16:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-server/src/main/resources/mapper/zgyw/YwPointMapper.xml | 50 +++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 45 insertions(+), 5 deletions(-)
diff --git a/ycl-server/src/main/resources/mapper/zgyw/YwPointMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/YwPointMapper.xml
index d10f643..878f8d0 100644
--- a/ycl-server/src/main/resources/mapper/zgyw/YwPointMapper.xml
+++ b/ycl-server/src/main/resources/mapper/zgyw/YwPointMapper.xml
@@ -16,8 +16,8 @@
<result column="remark" property="remark" />
<result column="create_time" property="createTime" />
<result column="update_time" property="updateTime" />
- <result column="category" property="category" />
- <result column="point_tag" property="pointTagString" />
+ <result column="province_tag" property="provinceTag" />
+ <result column="important_tag" property="importantTag" />
</resultMap>
<select id="selectData" resultType="com.ycl.platform.base.BaseSelect">
@@ -28,7 +28,6 @@
SELECT
typ.id,
typ.point_name,
- typ.point_tag,
typ.start_time,
typ.end_time,
typ.unit_id,
@@ -39,8 +38,8 @@
typ.remark,
typ.create_time,
typ.update_time,
- typ.point_tag,
- typ.category
+ typ.important_tag,
+ typ.province_tag
FROM
t_yw_point typ
LEFT JOIN t_yw_unit tyu ON typ.unit_id = tyu.id AND tyu.deleted = 0
@@ -52,4 +51,45 @@
</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
+ 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
+ ]]>
+ </select>
+
+ <select id="selectByTag" resultType="com.ycl.platform.domain.entity.YwPoint">
+ select * from t_yw_point
+ <where>
+ <if test="important!=null and important!= '' ">
+ and important_tag = #{important}
+ </if>
+ <if test="province!=null and province!= '' ">
+ and province_tag = #{province}
+ </if>
+ </where>
+ </select>
+
+ <select id="export" resultType="com.ycl.platform.domain.excel.PointExport">
+ SELECT
+ m.name as pointName,
+ m.serial_number,
+ m.ip,
+ yu.unit_name,
+ yp.start_time,
+ yp.end_time
+ FROM
+ t_yw_point yp
+ INNER JOIN t_monitor m ON yp.serial_number = m.serial_number
+ INNER JOIN t_yw_unit yu ON yu.id = yp.unit_id
+ <where>
+ <if test="query.pointName != null and query.pointName != ''">
+ AND m.name like concat('%', #{query.pointName} ,'%')
+ </if>
+ </where>
+ </select>
</mapper>
--
Gitblit v1.8.0