From 25163bd6852fdc8ace11fd5c3f60260b7e25798e Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期五, 13 九月 2024 16:43:34 +0800
Subject: [PATCH] 异常恢复监控

---
 ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java |    2 ++
 ycl-server/src/main/resources/mapper/zgyw/TMonitorMapper.xml                     |   22 ++++++++++++++--------
 ycl-server/src/main/java/com/ycl/platform/service/impl/TMonitorServiceImpl.java  |   23 ++++++++++-------------
 3 files changed, 26 insertions(+), 21 deletions(-)

diff --git a/ycl-server/src/main/java/com/ycl/platform/service/impl/TMonitorServiceImpl.java b/ycl-server/src/main/java/com/ycl/platform/service/impl/TMonitorServiceImpl.java
index 771bfc1..03aae29 100644
--- a/ycl-server/src/main/java/com/ycl/platform/service/impl/TMonitorServiceImpl.java
+++ b/ycl-server/src/main/java/com/ycl/platform/service/impl/TMonitorServiceImpl.java
@@ -28,10 +28,8 @@
 import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.stereotype.Service;
 
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
+import java.time.LocalDate;
+import java.util.*;
 
 /**
  * 璁惧璧勪骇Service涓氬姟灞傚鐞�
@@ -70,22 +68,21 @@
     @Override
     @DataScope(deptAlias = "d",userAlias = "u")
     public List<TMonitorVO> selectTMonitorList(TMonitorVO tMonitor) {
-        List<TMonitorVO> monitors = tMonitorMapper.selectTMonitorList(tMonitor);
-        // 寮傚父璁惧
+        // 寮傚父鎭㈠鐩戞帶
         if (Objects.equals(tMonitor.getRecovery(), 1L)) {
             String time = configService.selectConfigByKey("abnormal.equipment.continuous.attention.time");
             if (StringUtils.isBlank(time)) {
                 throw new RuntimeException("璇烽厤缃紓甯歌澶囪繛缁叧娉ㄦ椂闂�");
             }
-            List<TMonitorVO> recoveryMonitors = tMonitorMapper.selectRecoveryMonitor(time);
-            monitors.addAll(recoveryMonitors);
+            tMonitor.setTime(time);
         }
+        List<TMonitorVO> monitors = tMonitorMapper.selectTMonitorList(tMonitor);
         // 瑙嗛鐩戞帶璁惧
         if (Objects.equals(tMonitor.getCameraFunType(), "1")) {
             monitors.forEach(monitor -> {
                 Query query = new Query();
                 query.addCriteria(Criteria.where("deviceId").is(monitor.getSerialNumber())
-                        // .and("mongoCreateTime").is(LocalDate.now())
+                         .and("mongoCreateTime").is(LocalDate.now())
                 );
                 VideoOnlineResult one = mongoTemplate.findOne(query, VideoOnlineResult.class);
                 if (one != null) {
@@ -101,7 +98,7 @@
             monitors.forEach(monitor -> {
                 Query query = new Query();
                 query.addCriteria(Criteria.where("externalIndexCode").is(monitor.getSerialNumber())
-                        // .and("mongoCreateTime").is(LocalDate.now())
+                         .and("mongoCreateTime").is(LocalDate.now())
                 );
                 VehicleDeviceInspectionResult one = mongoTemplate.findOne(query, VehicleDeviceInspectionResult.class);
                 VehicleDeviceSamplingResult two = mongoTemplate.findOne(query, VehicleDeviceSamplingResult.class);
@@ -123,7 +120,7 @@
             monitors.forEach(monitor -> {
                 Query query = new Query();
                 query.addCriteria(Criteria.where("externalIndexCode").is(monitor.getSerialNumber())
-                        // .and("mongoCreateTime").is(LocalDate.now())
+                         .and("mongoCreateTime").is(LocalDate.now())
                 );
                 FaceDeviceInspectionResult one = mongoTemplate.findOne(query, FaceDeviceInspectionResult.class);
                 FaceDeviceSamplingResult two = mongoTemplate.findOne(query, FaceDeviceSamplingResult.class);
@@ -199,8 +196,8 @@
     @Override
     @DataScope(deptAlias = "d",userAlias = "u")
     public Map<String, String> recoveryException(TMonitorVO monitor) {
-        String time = configService.selectConfigByKey("abnormal.equipment.continuous.attention.time");
-        monitor.setTime(time);
+//        String time = configService.selectConfigByKey("abnormal.equipment.continuous.attention.time");
+//        monitor.setTime(time);
         return tMonitorMapper.recoveryException(monitor);
     }
 
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java b/ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java
index a946f0c..2a8ac76 100644
--- a/ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java
+++ b/ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java
@@ -685,6 +685,8 @@
                 FFmpegFrameGrabber grabber = null;
                 try {
                     grabber = FFmpegFrameGrabber.createDefault(rtspUrl);
+                    //璁剧疆10s瓒呮椂
+                    grabber.setTimeout(10000);
                     grabber.start();
                     Frame frame = grabber.grabImage(); // 鐩存帴鎹曡幏涓�甯�
                     if (frame != null) {
diff --git a/ycl-server/src/main/resources/mapper/zgyw/TMonitorMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/TMonitorMapper.xml
index f5a4c39..1d17737 100644
--- a/ycl-server/src/main/resources/mapper/zgyw/TMonitorMapper.xml
+++ b/ycl-server/src/main/resources/mapper/zgyw/TMonitorMapper.xml
@@ -99,18 +99,23 @@
     <select id="selectTMonitorList" resultType="com.ycl.platform.domain.vo.TMonitorVO">
         select m.id, m.serial_number, name, site_type, mac_addr, ip, camera_fun_type, longitude, latitude,
         camera_capture_area, p.online as onState, civil_code, d.dept_id, d.dept_name, d.area, p.province_tag,
-        IF(COUNT(w.id) OVER() > 0, '鏄�', '鍚�') AS error, u.unit_name from t_monitor m
+        IF(COUNT(w.id) OVER() > 0, '鏄�', '鍚�') AS error, u.unit_name, p.recovery_time,p.reason  from t_monitor m
         left join t_yw_point p on m.serial_number = p.serial_number and p.deleted = 0
         left join sys_dept d on p.dept_id = d.dept_id and d.del_flag = 0
-        left join t_work_order w on m.serial_number = w.serial_number and w.deleted = 0
+        left join (
+        WITH cte AS (
+        SELECT *,row_number() OVER(PARTITION BY serial_number ORDER BY create_time DESC) rn FROM t_work_order
+        WHERE deleted = 0
+        ) SELECT * FROM cte WHERE rn=1
+        ) w on m.serial_number = w.serial_number and w.deleted = 0
         left join t_yw_unit u on p.unit_id = u.id and u.deleted = 0
         <where>
-
             <if test="serialNumber != null  and serialNumber != ''">and m.serial_number = #{serialNumber}</if>
             <if test="name != null  and name != ''">
-            and (name like concat('%', #{name}, '%')
-            or m.serial_number like concat('%', #{name}, '%')
-            or u.unit_name like concat('%', #{name}, '%')) </if>
+                and (name like concat('%', #{name}, '%')
+                or m.serial_number like concat('%', #{name}, '%')
+                or u.unit_name like concat('%', #{name}, '%'))
+            </if>
             <if test="provinceTag != null ">and p.province_tag = #{provinceTag}</if>
             <if test="siteType != null ">and site_type = #{siteType}</if>
             <if test="macAddr != null  and macAddr != ''">and mac_addr = #{macAddr}</if>
@@ -123,6 +128,7 @@
             <if test="cameraCaptureArea != null  and cameraCaptureArea != ''">and camera_capture_area =
                 #{cameraCaptureArea}
             </if>
+            <if test="time !=null and time !=''">and TIMESTAMPDIFF(DAY, p.recovery_time, NOW()) <![CDATA[<=]]> #{time}</if>
             <if test="onState != null ">and p.online = #{onState}</if>
             <if test="civilCode != null  and civilCode != ''">and civil_code = #{civilCode}</if>
             <if test="integratedDevice != null ">and integrated_device = #{integratedDevice}</if>
@@ -144,7 +150,7 @@
             <if test="cameraDept != null  and cameraDept != ''">and camera_dept = #{cameraDept}</if>
             <if test="hybm != null  and hybm != ''">and hybm = #{hybm}</if>
             <if test="lxbm != null ">and lxbm = #{lxbm}</if>
-            <if test="recovery != null ">and p.recovery = #{recovery}</if>
+<!--            <if test="recovery != null ">and p.recovery = #{recovery}</if>-->
             ${params.dataScope}
         </where>
     </select>
@@ -335,7 +341,7 @@
         LEFT JOIN t_yw_point p ON t.serial_number = p.serial_number
         left join sys_dept d on p.dept_id = d.dept_id and d.del_flag = 0
         <where>
-            (p.recovery = 1 OR TIMESTAMPDIFF(DAY, p.recovery_time, NOW()) <![CDATA[<=]]> #{time})
+<!--             (p.recovery = 1 OR TIMESTAMPDIFF(DAY, p.recovery_time, NOW()) <![CDATA[<=]]> #{time}) -->
              <if test="provinceTag!=null">
                 and p.province_tag = #{provinceTag}
              </if>

--
Gitblit v1.8.0