From cae71f98572da0f6809ce888ef9a2ecacead34b2 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期六, 10 八月 2024 11:11:17 +0800
Subject: [PATCH] 重点指挥图像在线率
---
ycl-server/src/main/resources/mapper/zgyw/YwPointMapper.xml | 99 ++++++++++++++++++++++++++-----------------------
1 files changed, 52 insertions(+), 47 deletions(-)
diff --git a/ycl-server/src/main/resources/mapper/zgyw/YwPointMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/YwPointMapper.xml
index 28f53bf..ed1861a 100644
--- a/ycl-server/src/main/resources/mapper/zgyw/YwPointMapper.xml
+++ b/ycl-server/src/main/resources/mapper/zgyw/YwPointMapper.xml
@@ -4,21 +4,21 @@
<!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
<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="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"/>
</resultMap>
<select id="selectData" resultType="com.ycl.platform.base.BaseSelect">
@@ -27,25 +27,25 @@
<select id="page" resultMap="BaseResultMap">
SELECT
- typ.id,
- typ.point_name,
- typ.start_time,
- typ.end_time,
- typ.unit_id,
- tyu.unit_name,
- typ.status,
- typ.dept_id,
- sd.dept_name,
- typ.remark,
- typ.create_time,
- typ.update_time,
- typ.important_tag,
- typ.province_tag,
- typ.important_command_image_tag
+ typ.id,
+ typ.point_name,
+ typ.start_time,
+ typ.end_time,
+ typ.unit_id,
+ tyu.unit_name,
+ typ.status,
+ typ.dept_id,
+ sd.dept_name,
+ typ.remark,
+ typ.create_time,
+ typ.update_time,
+ typ.important_tag,
+ typ.province_tag,
+ typ.important_command_image_tag
FROM
- t_yw_point typ
- LEFT JOIN t_yw_unit tyu ON typ.unit_id = tyu.id AND tyu.deleted = 0
- LEFT JOIN sys_dept sd ON typ.dept_id = sd.dept_id AND sd.del_flag = 0
+ t_yw_point typ
+ LEFT JOIN t_yw_unit tyu ON typ.unit_id = tyu.id AND tyu.deleted = 0
+ LEFT JOIN sys_dept sd ON typ.dept_id = sd.dept_id AND sd.del_flag = 0
<where>
<if test="query.pointName != null and query.pointName != ''">
AND typ.point_name like concat('%', #{query.pointName}, '%')
@@ -57,9 +57,11 @@
<![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
+ 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')
+ 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>
@@ -73,24 +75,27 @@
<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>
</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,
- yp.province_tag,
- yp.important_tag,
- yp.important_command_image_tag
+ m.name as pointName,
+ m.serial_number,
+ m.ip,
+ yu.unit_name,
+ yp.start_time,
+ yp.end_time,
+ yp.province_tag,
+ yp.important_tag,
+ yp.important_command_image_tag
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
+ 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} ,'%')
--
Gitblit v1.8.0