From 6d1540258545a41fcbaa50c43b3480a22896d03e Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期一, 30 九月 2024 18:23:20 +0800
Subject: [PATCH] 点位在线定时任务卡死修复
---
ycl-server/src/main/resources/mapper/zgyw/CheckIndexCarMapper.xml | 33 ++++++++++++++++++++++++++-------
1 files changed, 26 insertions(+), 7 deletions(-)
diff --git a/ycl-server/src/main/resources/mapper/zgyw/CheckIndexCarMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/CheckIndexCarMapper.xml
index fe35b61..e8c64e5 100644
--- a/ycl-server/src/main/resources/mapper/zgyw/CheckIndexCarMapper.xml
+++ b/ycl-server/src/main/resources/mapper/zgyw/CheckIndexCarMapper.xml
@@ -10,6 +10,7 @@
<result property="examineTag" column="examine_tag" />
<result property="createTime" column="create_time" />
<result property="score" column="score" />
+ <result property="num" column="num" />
<result property="viewConnectStability" column="view_connect_stability" />
<result property="siteOnline" column="site_online" />
<result property="deviceDirectoryConsistent" column="device_directory_consistent" />
@@ -27,13 +28,16 @@
</sql>
<select id="selectCheckIndexCarList" resultMap="CheckIndexCarResult">
- select tcic.*,sd.dept_name,tcs.score
+ select tcic.*,sd.dept_name,tcs.score,count(m.serial_number) as num
from t_check_index_car tcic left join sys_dept sd on tcic.dept_id = sd.dept_id
left join t_check_score tcs on tcic.id = tcs.index_id
+ left join t_yw_point p on p.dept_id = tcic.dept_id
+ left join t_monitor m on p.serial_number = m.serial_number
<where>
- tcs.examine_category = 2
+ tcs.examine_category = 2 and m.camera_fun_type like concat('%',2,'%')
<if test="deptId != null "> and tcic.dept_id = #{deptId}</if>
<if test="examineTag != null "> and tcic.examine_tag = #{examineTag}</if>
+ <if test="examineTagQuery != null "> and p.province_tag = #{examineTagQuery}</if>
<if test="date != null "> and date_format(tcic.create_time,'%Y-%m') = #{date}</if>
<if test="day != null "> and date(tcic.create_time) = #{day}</if>
<if test="params.publish != null and params.publish != ''">and tcic.publish = #{params.publish}</if>
@@ -42,15 +46,24 @@
#{deptId}
</foreach>
</if>
- <if test="examineTags != null and examineTags.size()>0">and tcic.examine_tag in
- <foreach collection="examineTags" separator="," open="(" close=")" item="examineTag">
- #{examineTag}
+ </where>
+ group by tcic.id
+ order by tcic.examine_tag desc,sd.area_code,tcic.create_time
+ </select>
+
+ <select id="getCheckIndexCarList" resultMap="CheckIndexCarResult">
+ select tcic.*,sd.dept_name
+ from t_check_index_car tcic left join sys_dept sd on tcic.dept_id = sd.dept_id
+ <where>
+ <if test="examineTag != null "> and tcic.examine_tag = #{examineTag}</if>
+ <if test="day != null "> and date(tcic.create_time) = #{day}</if>
+ <if test="deptIds != null and deptIds.size()>0">and tcic.dept_id in
+ <foreach collection="deptIds" separator="," open="(" close=")" item="deptId">
+ #{deptId}
</foreach>
</if>
</where>
- order by tcic.examine_tag desc,tcic.create_time,tcs.score desc
</select>
-
<select id="selectCheckIndexCarById" resultMap="CheckIndexCarResult">
<include refid="selectCheckIndexCarVo"/>
where id = #{id}
@@ -144,8 +157,14 @@
AND dept_id = #{deptId}
</if>
<if test="dataScope == 1">
+ AND examine_tag = 0
+ </if>
+ <if test="dataScope == 2">
AND examine_tag = 1
</if>
+ <if test="dataScope == 3">
+ AND examine_tag = 2
+ </if>
</where>
ORDER BY
create_time DESC
--
Gitblit v1.8.0