From 9b55891e6dd57bc244e6c5654434b32e05c83496 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期三, 25 九月 2024 15:10:25 +0800
Subject: [PATCH] 异常监控排除已经审核过的工单作为状态
---
ycl-server/src/main/resources/mapper/zgyw/CheckIndexFaceMapper.xml | 59 +++++++++++++++++++++++++++++++++++++++++------------------
1 files changed, 41 insertions(+), 18 deletions(-)
diff --git a/ycl-server/src/main/resources/mapper/zgyw/CheckIndexFaceMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/CheckIndexFaceMapper.xml
index d38a48a..66f5c54 100644
--- a/ycl-server/src/main/resources/mapper/zgyw/CheckIndexFaceMapper.xml
+++ b/ycl-server/src/main/resources/mapper/zgyw/CheckIndexFaceMapper.xml
@@ -8,6 +8,8 @@
<result property="id" column="id" />
<result property="deptId" column="dept_id" />
<result property="examineTag" column="examine_tag" />
+ <result property="num" column="num" />
+ <result property="score" column="score" />
<result property="createTime" column="create_time" />
<result property="viewConnectStability" column="view_connect_stability" />
<result property="siteOnline" column="site_online" />
@@ -24,21 +26,36 @@
</sql>
<select id="selectCheckIndexFaceList" resultMap="CheckIndexFaceResult">
+ select tcif.*,sd.dept_name,tcs.score,count(m.serial_number) as num
+ from t_check_index_face tcif left join sys_dept sd on tcif.dept_id = sd.dept_id
+ left join t_check_score tcs on tcif.id = tcs.index_id
+ left join t_yw_point p on p.dept_id = tcif.dept_id
+ left join t_monitor m on p.serial_number = m.serial_number
+ <where>
+ tcs.examine_category = 3 and m.camera_fun_type like concat('%',3,'%')
+ <if test="deptId != null "> and tcif.dept_id = #{deptId}</if>
+ <if test="examineTag != null "> and tcif.examine_tag = #{examineTag}</if>
+ <if test="examineTagQuery != null "> and p.province_tag = #{examineTagQuery}</if>
+ <if test="date != null "> and date_format(tcif.create_time,'%Y-%m') = #{date}</if>
+ <if test="day != null "> and date(tcif.create_time) = #{day}</if>
+ <if test="params.publish != null and params.publish != ''">and tcif.publish = #{params.publish}</if>
+ <if test="deptIds != null ">and tcif.dept_id in
+ <foreach collection="deptIds" separator="," open="(" close=")" item="deptId">
+ #{deptId}
+ </foreach>
+ </if>
+ </where>
+ group by tcif.id
+ order by tcif.examine_tag desc,sd.area_code,tcif.create_time
+ </select>
+
+ <select id="getCheckIndexFaceList" resultMap="CheckIndexFaceResult">
select tcif.*,sd.dept_name
from t_check_index_face tcif left join sys_dept sd on tcif.dept_id = sd.dept_id
<where>
- <if test="deptId != null "> and tcif.dept_id = #{deptId}</if>
- <if test="examineTag != null "> and examine_tag = #{examineTag}</if>
+ <if test="examineTag != null "> and tcif.examine_tag = #{examineTag}</if>
<if test="date != null "> and date_format(tcif.create_time,'%Y-%m') = #{date}</if>
<if test="day != null "> and date(tcif.create_time) = #{day}</if>
- <if test="viewConnectStability != null "> and view_connect_stability = #{viewConnectStability}</if>
- <if test="siteOnline != null "> and site_online = #{siteOnline}</if>
- <if test="deviceDirectoryConsistent != null "> and device_directory_consistent = #{deviceDirectoryConsistent}</if>
- <if test="faceInformationCollectionAccuracy != null "> and face_information_collection_accuracy = #{faceInformationCollectionAccuracy}</if>
- <if test="facePictureQualification != null "> and face_picture_qualification = #{facePictureQualification}</if>
- <if test="faceTimingAccuracy != null "> and face_timing_accuracy = #{faceTimingAccuracy}</if>
- <if test="faceUploadTimeliness != null "> and face_upload_timeliness = #{faceUploadTimeliness}</if>
- <if test="facePictureAvailability != null "> and face_picture_availability = #{facePictureAvailability}</if>
<if test="deptIds != null ">and tcif.dept_id in
<foreach collection="deptIds" separator="," open="(" close=")" item="deptId">
#{deptId}
@@ -117,14 +134,14 @@
<select id="dashboard" resultType="com.ycl.platform.domain.entity.CheckIndexFace">
SELECT
- IFNULL(ROUND(AVG(view_connect_stability * 100), 2), 0) AS view_connect_stability,
- IFNULL(ROUND(AVG(site_online * 100), 2), 0) AS site_online,
- IFNULL(ROUND(AVG(device_directory_consistent * 100), 2), 0) AS device_directory_consistent,
- IFNULL(ROUND(AVG(face_information_collection_accuracy * 100), 2), 0) AS face_information_collection_accuracy,
- IFNULL(ROUND(AVG(face_picture_qualification * 100), 2), 0) AS face_picture_qualification,
- IFNULL(ROUND(AVG(face_timing_accuracy * 100), 2), 0) AS face_timing_accuracy,
- IFNULL(ROUND(AVG(face_upload_timeliness * 100), 2), 0) AS face_upload_timeliness,
- IFNULL(ROUND(AVG(face_picture_availability * 100), 2), 0) AS face_picture_availability
+ IFNULL(ROUND(AVG(view_connect_stability * 100), 0), 0) AS view_connect_stability,
+ IFNULL(ROUND(AVG(site_online * 100), 0), 0) AS site_online,
+ IFNULL(ROUND(AVG(device_directory_consistent * 100), 0), 0) AS device_directory_consistent,
+ IFNULL(ROUND(AVG(face_information_collection_accuracy * 100), 0), 0) AS face_information_collection_accuracy,
+ IFNULL(ROUND(AVG(face_picture_qualification * 100), 0), 0) AS face_picture_qualification,
+ IFNULL(ROUND(AVG(face_timing_accuracy * 100), 0), 0) AS face_timing_accuracy,
+ IFNULL(ROUND(AVG(face_upload_timeliness * 100), 0), 0) AS face_upload_timeliness,
+ IFNULL(ROUND(AVG(face_picture_availability * 100), 0), 0) AS face_picture_availability
FROM
t_check_index_face
<where>
@@ -132,8 +149,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