From a56cbc8a929232b039f137fc51b5af27f40b2822 Mon Sep 17 00:00:00 2001
From: 龚焕茏 <2842157468@qq.com>
Date: 星期四, 01 八月 2024 15:33:25 +0800
Subject: [PATCH] feat：异常恢复监控
---
ycl-server/src/main/java/com/ycl/platform/service/ITMonitorService.java | 2
ycl-server/src/main/java/com/ycl/platform/mapper/TMonitorMapper.java | 10 ++
ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java | 40 ++++--------
ycl-server/src/main/resources/mapper/zgyw/TMonitorMapper.xml | 52 ++++++++---------
ycl-server/src/main/java/com/ycl/platform/service/impl/TMonitorServiceImpl.java | 19 +++++
5 files changed, 64 insertions(+), 59 deletions(-)
diff --git a/ycl-server/src/main/java/com/ycl/platform/mapper/TMonitorMapper.java b/ycl-server/src/main/java/com/ycl/platform/mapper/TMonitorMapper.java
index 0132e86..552305c 100644
--- a/ycl-server/src/main/java/com/ycl/platform/mapper/TMonitorMapper.java
+++ b/ycl-server/src/main/java/com/ycl/platform/mapper/TMonitorMapper.java
@@ -65,10 +65,16 @@
/**
* 鑾峰彇瑙嗛缁熻
- * @param cameraFunType 绫诲瀷
+ * @param tMonitor 鏉′欢
* @return 缁熻鏁�
*/
Map<String, String> getVideoCount(TMonitor tMonitor);
- Map<String, String> recoveryException();
+ Map<String, String> recoveryException(String time);
+
+ /**
+ * 鑾峰彇鎭㈠寮傚父鎸佺画鍏虫敞璁惧
+ * @return 璁惧
+ */
+ List<TMonitorVO> selectRecoveryMonitor(String time);
}
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/ITMonitorService.java b/ycl-server/src/main/java/com/ycl/platform/service/ITMonitorService.java
index 38de510..5cfb83e 100644
--- a/ycl-server/src/main/java/com/ycl/platform/service/ITMonitorService.java
+++ b/ycl-server/src/main/java/com/ycl/platform/service/ITMonitorService.java
@@ -66,7 +66,7 @@
/**
* 鑾峰彇鎸囧畾鎽勫儚澶村姛鑳界被鍨嬩笅鐨勮棰戞暟閲忋��
*
- * @param cameraFunType 鎽勫儚澶村姛鑳界被鍨嬶紝鐢ㄤ簬绛涢�夎棰戙��
+ * @param tMonitor 鏉′欢
* @return 杩斿洖涓�涓寘鍚棰戞暟閲忕殑Map瀵硅薄锛屽叾涓璳ey涓虹粺璁℃寚鏍囷紝value涓哄搴斿姛鑳界被鍨嬩笅鐨勭粺璁℃暟閲忋��
*/
Map<String, String> getVideoCount(TMonitor tMonitor);
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 57e65f8..4a241b1 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
@@ -6,11 +6,14 @@
import com.ycl.platform.domain.vo.TMonitorVO;
import com.ycl.platform.mapper.TMonitorMapper;
import com.ycl.platform.service.ITMonitorService;
+import com.ycl.system.service.ISysConfigService;
+import com.ycl.utils.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
import java.util.Map;
+import java.util.Objects;
/**
* 璁惧璧勪骇Service涓氬姟灞傚鐞�
@@ -23,6 +26,8 @@
{
@Autowired
private TMonitorMapper tMonitorMapper;
+ @Autowired
+ private ISysConfigService configService;
/**
* 鏌ヨ璁惧璧勪骇
@@ -46,7 +51,16 @@
@DataScope(deptAlias = "d",userAlias = "u")
public List<TMonitorVO> selectTMonitorList(TMonitor tMonitor)
{
- return tMonitorMapper.selectTMonitorList(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);
+ }
+ return monitors;
}
/**
@@ -105,6 +119,7 @@
@Override
public Map<String, String> recoveryException() {
- return tMonitorMapper.recoveryException();
+ String time = configService.selectConfigByKey("abnormal.equipment.continuous.attention.time");
+ return tMonitorMapper.recoveryException(time);
}
}
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 8485cc6..6a4f2a8 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
@@ -24,16 +24,16 @@
import com.ycl.utils.SecurityUtils;
import com.ycl.utils.redis.RedisCache;
import com.ycl.utils.uuid.IdUtils;
-import constant.PointConfigConstants;
-import enumeration.general.*;
+import enumeration.general.NotifyTypeEnum;
+import enumeration.general.UrgentLevelEnum;
+import enumeration.general.WorkOrderDistributeWayEnum;
+import enumeration.general.WorkOrderStatusEnum;
import lombok.RequiredArgsConstructor;
-import org.apache.commons.lang3.ArrayUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.Assert;
-import org.springframework.util.CollectionUtils;
import org.springframework.util.StringUtils;
import java.time.LocalDateTime;
@@ -41,7 +41,6 @@
import java.util.ArrayList;
import java.util.List;
import java.util.Objects;
-import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors;
/**
@@ -272,44 +271,37 @@
public Result distributeFast(DistributeWorkOrderVO data) {
// 鑾峰彇褰撳墠鏃堕棿
LocalDateTime now = LocalDateTime.now(ZoneId.systemDefault());
+ data.setEnd(now);
switch (data.getFastWay()) {
case LAST_HALF_HOUR:
data.setStart(now.minusMinutes(30));
- data.setEnd(now);
break;
case LAST_HOUR:
data.setStart(now.minusHours(1));
- data.setEnd(now);
break;
case LAST_TWO_HOUR:
data.setStart(now.minusHours(2));
- data.setEnd(now);
break;
case LAST_DAY:
data.setStart(now.minusDays(1));
- data.setEnd(now);
break;
}
// 鏌ヨ绗﹀悎鏉′欢鐨勫伐鍗�
- List<Integer> ids = new LambdaQueryChainWrapper<>(baseMapper)
+ List<WorkOrder> list = new LambdaQueryChainWrapper<>(baseMapper)
+ .select(WorkOrder::getId, WorkOrder::getPointId)
.eq(WorkOrder::getStatus, WorkOrderStatusEnum.WAIT_DISTRIBUTE)
.eq(Objects.nonNull(data.getUnitId()), WorkOrder::getUnitId, data.getUnitId())
.eq(WorkOrder::getErrorType, data.getErrorType())
.between(WorkOrder::getCreateTime, data.getStart(), data.getEnd())
.orderByDesc(WorkOrder::getCreateTime)
.last("limit " + data.getFastNumLimit())
- .list()
- .stream()
- .map(WorkOrder::getId)
- .toList();
+ .list();
+ List<Integer> ids = list.stream().map(WorkOrder::getId).toList();
+ List<Integer> pointIds = list.stream().map(WorkOrder::getPointId).toList();
- if (ids.isEmpty()) {
- return Result.error("娌℃湁绗﹀悎鏉′欢鐨勫伐鍗�");
- }
- if (!getDistributeLock()) {
- return Result.error("姝ゅ埢鏈変汉涓嬪彂涓紝涓洪伩鍏嶅啿绐侊紝璇风◢鍚庨噸璇�");
- }
+ if (ids.isEmpty()) { return Result.error("娌℃湁绗﹀悎鏉′欢鐨勫伐鍗�"); }
+ if (!getDistributeLock()) { return Result.error("姝ゅ埢鏈変汉涓嬪彂涓紝涓洪伩鍏嶅啿绐侊紝璇风◢鍚庨噸璇�"); }
try {
new LambdaUpdateChainWrapper<>(baseMapper)
.set(WorkOrder::getStatus, WorkOrderStatusEnum.DISTRIBUTED)
@@ -327,9 +319,7 @@
@Override
public Result selectedIdsDistribute(DistributeWorkOrderQuery query) {
WorkOrderDistributeWayEnum distributeWayEnum = WorkOrderDistributeWayEnum.SELECTED_DISTRIBUTE;
- if (!getDistributeLock()) {
- return Result.error("姝ゅ埢鏈変汉涓嬪彂涓紝涓洪伩鍏嶅啿绐侊紝璇风◢鍚庨噸璇�");
- }
+ if (!getDistributeLock()) { return Result.error("姝ゅ埢鏈変汉涓嬪彂涓紝涓洪伩鍏嶅啿绐侊紝璇风◢鍚庨噸璇�"); }
try {
if (query.getIds().isEmpty()) {
query.setIds(new LambdaQueryChainWrapper<>(baseMapper)
@@ -342,9 +332,7 @@
.collect(Collectors.toList()));
distributeWayEnum = WorkOrderDistributeWayEnum.ALL_DISTRIBUTE;
}
- if (query.getIds().isEmpty()) {
- return Result.error("娌℃湁宸ュ崟寰呬笅鍙�");
- }
+ if (query.getIds().isEmpty()) { return Result.error("娌℃湁宸ュ崟寰呬笅鍙�"); }
new LambdaUpdateChainWrapper<>(baseMapper)
.set(WorkOrder::getStatus, WorkOrderStatusEnum.DISTRIBUTED)
.in(WorkOrder::getId, query.getIds())
diff --git a/ycl-server/src/main/resources/mapper/zgyw/TMonitorMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/TMonitorMapper.xml
index 8faab75..687d7f7 100644
--- a/ycl-server/src/main/resources/mapper/zgyw/TMonitorMapper.xml
+++ b/ycl-server/src/main/resources/mapper/zgyw/TMonitorMapper.xml
@@ -43,15 +43,16 @@
</resultMap>
<sql id="selectTMonitorVo">
- select id, serial_number, name, site_type, mac_addr, ip, camera_fun_type, longitude, latitude, camera_capture_area, on_state, civil_code, integrated_device, camera_brand, address, net_working, public_security, installed_time, management_unit, mu_contact_info, storage_days, monitor_azimuth, scene_photo_addr, model, site_vulgo, camera_type, camera_light_type, encoded_format, camera_dept, hybm, lxbm, reason, recovery,recovery_time,dept_id from t_monitor
+ select id, serial_number, name, site_type, mac_addr, ip, camera_fun_type, longitude, latitude, camera_capture_area, on_state, civil_code, integrated_device, camera_brand, address, net_working, public_security, installed_time, management_unit, mu_contact_info, storage_days, monitor_azimuth, scene_photo_addr, model, site_vulgo, camera_type, camera_light_type, encoded_format, camera_dept, hybm, lxbm from t_monitor
</sql>
<select id="selectTMonitorList" resultType="com.ycl.platform.domain.vo.TMonitorVO">
- select id, serial_number, name, site_type, mac_addr, ip, camera_fun_type, longitude, latitude, camera_capture_area, on_state, civil_code, integrated_device, camera_brand, address, net_working, public_security, installed_time, management_unit, mu_contact_info, storage_days
- , monitor_azimuth, scene_photo_addr, model, site_vulgo, camera_type, camera_light_type, encoded_format, camera_dept, hybm, lxbm, reason, recovery,recovery_time,d.dept_name from t_monitor m
- left join sys_dept d on m.dept_id = d.dept_id
+ select m.id, m.serial_number, name, site_type, mac_addr, ip, camera_fun_type, longitude, latitude, camera_capture_area, on_state, civil_code, integrated_device, camera_brand, address, net_working, public_security, installed_time, management_unit, mu_contact_info, storage_days
+ , monitor_azimuth, scene_photo_addr, model, site_vulgo, camera_type, camera_light_type, encoded_format, camera_dept, hybm, lxbm, d.dept_name from t_monitor m
+ left join t_yw_point p on m.serial_number = p.serial_number
+ left join sys_dept d on p.dept_id = d.dept_id
<where>
- <if test="serialNumber != null and serialNumber != ''"> and serial_number = #{serialNumber}</if>
+ <if test="serialNumber != null and serialNumber != ''"> and m.serial_number = #{serialNumber}</if>
<if test="name != null and name != ''"> and name like concat('%', #{name}, '%')</if>
<if test="siteType != null "> and site_type = #{siteType}</if>
<if test="macAddr != null and macAddr != ''"> and mac_addr = #{macAddr}</if>
@@ -81,10 +82,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="reason != null and reason != ''"> and reason = #{reason}</if>
- <if test="recovery != null "> and recovery = #{recovery}</if>
- <if test="recoveryTime != null "> and recovery_time = #{recoveryTime}</if>
- <if test="deptId != null "> and m.dept_id = #{deptId}</if>
+ <if test="recovery != null "> and p.recovery = #{recovery}</if>
</where>
${params.dataScope}
</select>
@@ -127,10 +125,6 @@
<if test="cameraDept != null">camera_dept,</if>
<if test="hybm != null">hybm,</if>
<if test="lxbm != null">lxbm,</if>
- <if test="reason != null">reason,</if>
- <if test="recovery != null">recovery,</if>
- <if test="recoveryTime != null">recovery_time,</if>
- <if test="deptId != null">dept_id,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="serialNumber != null and serialNumber != ''">#{serialNumber},</if>
@@ -163,10 +157,6 @@
<if test="cameraDept != null">#{cameraDept},</if>
<if test="hybm != null">#{hybm},</if>
<if test="lxbm != null">#{lxbm},</if>
- <if test="reason != null">#{reason},</if>
- <if test="recovery != null">#{recovery},</if>
- <if test="recoveryTime != null">#{recoveryTime},</if>
- <if test="deptId != null">#{deptId},</if>
</trim>
</insert>
@@ -203,9 +193,6 @@
<if test="cameraDept != null">camera_dept = #{cameraDept},</if>
<if test="hybm != null">hybm = #{hybm},</if>
<if test="lxbm != null">lxbm = #{lxbm},</if>
- <if test="reason != null">reason = #{reason},</if>
- <if test="recoveryTime != null">recovery_time = #{recoveryTime},</if>
- <if test="deptId != null">dept_id = #{deptId},</if>
</trim>
where id = #{id}
</update>
@@ -225,13 +212,10 @@
SELECT count(*) AS totalPosts,
IFNULL(SUM(IF(on_state = 1, 1, 0)), 0) AS totalMembers,
IFNULL(SUM(IF(on_state = 2, 1, 0)), 0) AS postsPercentage,
- -1 as noStore,
- -1 as partStore,
- IFNULL(ROUND(SUM(IF(on_state = 1, 1, 0)) / count(*) * 100, 2), 0) as viewsPercentage,
- -1 as totalFace,
- -1 as totalCar
+ IFNULL(ROUND(SUM(IF(on_state = 1, 1, 0)) / count(*) * 100, 2), 0) as viewsPercentage
FROM t_monitor m
- left join sys_dept d on m.dept_id = d.dept_id
+ left join t_yw_point p on m.serial_number = p.serial_number
+ left join sys_dept d on p.dept_id = d.dept_id
<where>
camera_fun_type like concat('%', #{cameraFunType}, '%')
</where>
@@ -239,12 +223,24 @@
</select>
<select id="recoveryException" resultType="java.util.Map">
+ <![CDATA[
SELECT count(*) AS totalPosts,
IFNULL(SUM(IF(on_state = 1, 1, 0)), 0) AS totalMembers,
IFNULL(SUM(IF(on_state = 2, 1, 0)), 0) AS postsPercentage,
IFNULL(ROUND(SUM(IF(on_state = 1, 1, 0)) / count(*) * 100, 2), 0) as viewsPercentage
- FROM t_monitor
- WHERE recovery = 1
+ FROM t_monitor t
+ LEFT JOIN t_yw_point p ON t.serial_number = p.serial_number
+ WHERE p.recovery = 1 OR TIMESTAMPDIFF(DAY, p.recovery_time, NOW()) <= #{time}
+ ]]>
+ </select>
+
+ <select id="selectRecoveryMonitor" resultType="com.ycl.platform.domain.vo.TMonitorVO">
+ <![CDATA[
+ SELECT t.id, p.serial_number, name, site_type, mac_addr, ip, camera_fun_type, longitude, latitude, camera_capture_area, on_state, civil_code, integrated_device, camera_brand, address, net_working, public_security, installed_time, management_unit, mu_contact_info, storage_days, monitor_azimuth, scene_photo_addr, model, site_vulgo, camera_type, camera_light_type, encoded_format, camera_dept, hybm, lxbm
+ FROM t_monitor t
+ LEFT JOIN t_yw_point p ON t.serial_number = p.serial_number
+ WHERE TIMESTAMPDIFF(DAY, p.recovery_time, NOW()) <= #{time}
+ ]]>
</select>
</mapper>
--
Gitblit v1.8.0