From b0cac5f13a8af64e9c50f2e0d73a6626bec92252 Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期五, 21 七月 2023 14:15:25 +0800
Subject: [PATCH] 增加app一键报警业务 优化全局报警包名
---
ard-work/src/main/java/com/ruoyi/alarm/global/service/impl/GlobalAlarmServiceImpl.java | 81 +++++++++++++++++++++++++++++++---------
1 files changed, 62 insertions(+), 19 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/alarm/globalAlarm/service/impl/GlobalAlarmServiceImpl.java b/ard-work/src/main/java/com/ruoyi/alarm/global/service/impl/GlobalAlarmServiceImpl.java
similarity index 91%
rename from ard-work/src/main/java/com/ruoyi/alarm/globalAlarm/service/impl/GlobalAlarmServiceImpl.java
rename to ard-work/src/main/java/com/ruoyi/alarm/global/service/impl/GlobalAlarmServiceImpl.java
index 0cb90b3..64818b7 100644
--- a/ard-work/src/main/java/com/ruoyi/alarm/globalAlarm/service/impl/GlobalAlarmServiceImpl.java
+++ b/ard-work/src/main/java/com/ruoyi/alarm/global/service/impl/GlobalAlarmServiceImpl.java
@@ -1,24 +1,26 @@
-package com.ruoyi.alarm.globalAlarm.service.impl;
+package com.ruoyi.alarm.global.service.impl;
import com.alibaba.fastjson2.JSONObject;
-import com.ruoyi.alarm.accessAlarm.domain.ArdAlarmAccess;
-import com.ruoyi.alarm.accessAlarm.mapper.ArdAlarmAccessMapper;
-import com.ruoyi.alarm.cameraAlarm.domain.ArdAlarmCamera;
-import com.ruoyi.alarm.cameraAlarm.mapper.ArdAlarmCameraMapper;
-import com.ruoyi.alarm.externalAlarm.domain.ArdAlarmExternal;
-import com.ruoyi.alarm.externalAlarm.mapper.ArdAlarmExternalMapper;
-import com.ruoyi.alarm.globalAlarm.domain.GlobalAlarmCondition;
-import com.ruoyi.alarm.globalAlarm.domain.GlobalAlarmData;
-import com.ruoyi.alarm.globalAlarm.domain.GuidePriorityQueue;
-import com.ruoyi.alarm.globalAlarm.domain.GuideTask;
-import com.ruoyi.alarm.globalAlarm.service.IGlobalAlarmService;
-import com.ruoyi.alarm.radarAlarm.domain.ArdAlarmRadar;
-import com.ruoyi.alarm.radarAlarm.domain.RadarAlarmData;
-import com.ruoyi.alarm.radarAlarm.mapper.ArdAlarmRadarMapper;
-import com.ruoyi.alarm.stealAlarm.domain.ArdAlarmStealelec;
-import com.ruoyi.alarm.stealAlarm.mapper.ArdAlarmStealelecMapper;
-import com.ruoyi.alarm.tubeAlarm.domain.ArdAlarmTube;
-import com.ruoyi.alarm.tubeAlarm.mapper.ArdAlarmTubeMapper;
+import com.ruoyi.alarm.access.domain.ArdAlarmAccess;
+import com.ruoyi.alarm.access.mapper.ArdAlarmAccessMapper;
+import com.ruoyi.alarm.apponekey.domain.ArdAlarmApponekey;
+import com.ruoyi.alarm.apponekey.mapper.ArdAlarmApponekeyMapper;
+import com.ruoyi.alarm.camera.domain.ArdAlarmCamera;
+import com.ruoyi.alarm.camera.mapper.ArdAlarmCameraMapper;
+import com.ruoyi.alarm.external.domain.ArdAlarmExternal;
+import com.ruoyi.alarm.external.mapper.ArdAlarmExternalMapper;
+import com.ruoyi.alarm.global.domain.GlobalAlarmCondition;
+import com.ruoyi.alarm.global.domain.GlobalAlarmData;
+import com.ruoyi.alarm.global.domain.GuidePriorityQueue;
+import com.ruoyi.alarm.global.domain.GuideTask;
+import com.ruoyi.alarm.global.service.IGlobalAlarmService;
+import com.ruoyi.alarm.radar.domain.ArdAlarmRadar;
+import com.ruoyi.alarm.radar.domain.RadarAlarmData;
+import com.ruoyi.alarm.radar.mapper.ArdAlarmRadarMapper;
+import com.ruoyi.alarm.steal.domain.ArdAlarmStealelec;
+import com.ruoyi.alarm.steal.mapper.ArdAlarmStealelecMapper;
+import com.ruoyi.alarm.tube.domain.ArdAlarmTube;
+import com.ruoyi.alarm.tube.mapper.ArdAlarmTubeMapper;
import com.ruoyi.alarmpoints.tube.domain.ArdTubes;
import com.ruoyi.alarmpoints.tube.domain.ArdTubesDetails;
import com.ruoyi.alarmpoints.tube.mapper.ArdTubesDetailsMapper;
@@ -63,6 +65,8 @@
@Slf4j(topic = "mqtt")
public class GlobalAlarmServiceImpl implements IGlobalAlarmService {
//region 渚濊禆娉ㄥ叆
+ @Resource
+ private ArdAlarmApponekeyMapper ardAlarmApponekeyMapper;
@Resource
private ArdEquipExternalMapper ardEquipExternalMapper;
@Resource
@@ -120,6 +124,8 @@
countMap.put("1005", count1005);
int count1006 = ardAlarmAccessMapper.selectCountByAlarmTime(refreshTime);
countMap.put("1006", count1006);
+ int count1009 = ardAlarmApponekeyMapper.selectCountByAlarmTime(refreshTime);
+ countMap.put("1009", count1009);
int count1014 = ardAlarmTubeMapper.selectCountByAlarmTime(refreshTime);
countMap.put("1014", count1014);
map.put("20000", countMap);
@@ -237,6 +243,20 @@
.setTotal(ardAlarmRadar.getTotal());
return globalAlarmData;
}).collect(Collectors.toList());
+ case 1009:
+ List<ArdAlarmApponekey> ardAlarmApponekeys = ardAlarmApponekeyMapper.selectListAllByCommand(refreshTime);
+ return ardAlarmApponekeys.stream()
+ .map(ardAlarmApponekey -> {
+ GlobalAlarmData globalAlarmData = new GlobalAlarmData()
+ .setId(ardAlarmApponekey.getId())
+ .setName(ardAlarmApponekey.getName())
+ .setAlarmTime(ardAlarmApponekey.getCreateTime())
+ .setLongitude(ardAlarmApponekey.getLongitude())
+ .setLatitude(ardAlarmApponekey.getLatitude())
+ .setCount(ardAlarmApponekey.getCount())
+ .setTotal(ardAlarmApponekey.getTotal());
+ return globalAlarmData;
+ }).collect(Collectors.toList());
case 1014:
List<ArdAlarmTube> ardAlarmTubes = ardAlarmTubeMapper.selectListAllByCommand(refreshTime);
return ardAlarmTubes.stream()
@@ -318,6 +338,12 @@
aaa.setPageSize(pageSize);
aaa.setAlarmType("闃插尯鎶ヨ");
return ardAlarmAccessMapper.selectArdAlarmAccessList(aaa);
+ case 1009:
+ ArdAlarmApponekey aaak = new ArdAlarmApponekey();
+ aaak.setParams(params);
+ aaak.setPageNum(pageNum);
+ aaak.setPageSize(pageSize);
+ return ardAlarmApponekeyMapper.selectArdAlarmApponekeyList(aaak);
case 1014:
ArdAlarmTube aat = new ArdAlarmTube();
aat.setParams(params);
@@ -383,6 +409,14 @@
String alarmTime = fmt.format(ardAlarmAccess.getAlarmTime());
ardAlarmAccessMapper.updateViewTimeByAcsId(acsId, alarmTime, DateUtils.getTime());
return ardAlarmAccess;
+ }
+ case 1009:
+ ArdAlarmApponekey ardAlarmApponekey = ardAlarmApponekeyMapper.selectArdAlarmApponekeyById(condition.getId());
+ if (StringUtils.isNotNull(ardAlarmApponekey)) {
+ String userId = ardAlarmApponekey.getUserId();
+ String alarmTime = fmt.format(ardAlarmApponekey.getCreateTime());
+ ardAlarmApponekeyMapper.updateViewTimeByUserId(userId, alarmTime, DateUtils.getTime());
+ return ardAlarmApponekey;
}
case 1014:
ArdAlarmTube ardAlarmTube = ardAlarmTubeMapper.selectArdAlarmTubeById(condition.getId());
@@ -622,6 +656,15 @@
}
//endregion
break;
+ case "apponekey":
+ //region app涓�閿姤璀�
+ ArdAlarmApponekey ardAlarmApponekey = JSONObject.parseObject(message, ArdAlarmApponekey.class);
+ int aaak = ardAlarmApponekeyMapper.insertArdAlarmApponekey(ardAlarmApponekey);
+ if (aaak > 0) {
+ log.debug("apponekey鍏ュ簱鎴愬姛锛�" + ardAlarmApponekey);
+ }
+ //endregion
+ break;
}
} catch (Exception ex) {
log.error("鎺ユ敹鎶ヨ寮傚父:" + ex.getMessage());
--
Gitblit v1.9.3