From 1aad56563c6861e13f3a837eb7ef410723cc2358 Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期日, 25 六月 2023 11:00:04 +0800
Subject: [PATCH] 报警点位数量推送增加一层map 增加通用光电报警数量推送
---
ard-work/src/main/java/com/ruoyi/alarm/cameraAlarm/mapper/ArdAlarmCameraMapper.java | 2 ++
ard-work/src/main/java/com/ruoyi/alarm/globalAlarm/service/impl/GlobalAlarmServiceImpl.java | 31 ++++++++++++++++++++++++++++---
ard-work/src/main/java/com/ruoyi/alarm/globalAlarm/service/IGlobalAlarmService.java | 2 +-
ard-work/src/main/java/com/ruoyi/alarm/tubeAlarm/mapper/ArdAlarmTubeMapper.java | 2 +-
ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/AlarmTask.java | 2 +-
ard-work/src/main/resources/mapper/alarm/ArdAlarmTubeMapper.xml | 2 +-
ard-work/src/main/java/com/ruoyi/alarm/globalAlarm/controller/GlobalAlarmController.java | 2 +-
ard-work/src/main/resources/mapper/alarm/ArdAlarmCameraMapper.xml | 5 +++++
8 files changed, 40 insertions(+), 8 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/alarm/cameraAlarm/mapper/ArdAlarmCameraMapper.java b/ard-work/src/main/java/com/ruoyi/alarm/cameraAlarm/mapper/ArdAlarmCameraMapper.java
index 3fadd7e..646843d 100644
--- a/ard-work/src/main/java/com/ruoyi/alarm/cameraAlarm/mapper/ArdAlarmCameraMapper.java
+++ b/ard-work/src/main/java/com/ruoyi/alarm/cameraAlarm/mapper/ArdAlarmCameraMapper.java
@@ -63,4 +63,6 @@
public int deleteArdAlarmCameraByIds(String[] ids);
public List<ArdAlarmCamera> selectListAllByCommand(@Param("refreshTime")String refreshTime);
+
+ int selectCountByAlarmTime(@Param("refreshTime")String refreshTime);
}
diff --git a/ard-work/src/main/java/com/ruoyi/alarm/globalAlarm/controller/GlobalAlarmController.java b/ard-work/src/main/java/com/ruoyi/alarm/globalAlarm/controller/GlobalAlarmController.java
index 55c2b35..e62c2dd 100644
--- a/ard-work/src/main/java/com/ruoyi/alarm/globalAlarm/controller/GlobalAlarmController.java
+++ b/ard-work/src/main/java/com/ruoyi/alarm/globalAlarm/controller/GlobalAlarmController.java
@@ -53,7 +53,7 @@
@ApiOperation(value = "鏌ョ湅鎶ヨ鐐规暟閲�",notes = "鏌ヨ鍒锋柊鏃堕棿鍐呮姤璀︾殑鐐逛綅鏁伴噺")
@ApiOperationSupport(order = 2)
public AjaxResult countAlarmLog() {
- Map<String, Integer> stringIntegerMap = globalAlarmService.selectAlarmLogsCount();
+ Map<String, Object> stringIntegerMap = globalAlarmService.selectAlarmLogsCount();
return AjaxResult.success(stringIntegerMap);
}
@GetMapping("/List")
diff --git a/ard-work/src/main/java/com/ruoyi/alarm/globalAlarm/service/IGlobalAlarmService.java b/ard-work/src/main/java/com/ruoyi/alarm/globalAlarm/service/IGlobalAlarmService.java
index edc5628..c74748d 100644
--- a/ard-work/src/main/java/com/ruoyi/alarm/globalAlarm/service/IGlobalAlarmService.java
+++ b/ard-work/src/main/java/com/ruoyi/alarm/globalAlarm/service/IGlobalAlarmService.java
@@ -18,6 +18,6 @@
public List<GlobalAlarmData> selectAlarmLogs(GlobalAlarmCondition condition);
Object updateAlarmViewTime(GlobalAlarmCondition condition);
public void receiveAlarm(String topic,String message);
- public Map<String,Integer> selectAlarmLogsCount();
+ public Map<String,Object> selectAlarmLogsCount();
Object selectAlarmList(Integer command, String beginTime, String endTime,Integer pageNum,Integer pageSize);
}
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/globalAlarm/service/impl/GlobalAlarmServiceImpl.java
index 175017b..8bb6f21 100644
--- a/ard-work/src/main/java/com/ruoyi/alarm/globalAlarm/service/impl/GlobalAlarmServiceImpl.java
+++ b/ard-work/src/main/java/com/ruoyi/alarm/globalAlarm/service/impl/GlobalAlarmServiceImpl.java
@@ -358,14 +358,18 @@
* @淇敼浜哄拰鍏跺畠淇℃伅
*/
@Override
- public Map<String, Integer> selectAlarmLogsCount() {
+ public Map<String, Object> selectAlarmLogsCount() {
+ Map<String,Object> map=new HashMap<>();
Map<String, Integer> countMap = new HashMap<>();
String refreshTime = configService.selectConfigByKey("refreshTime");
int count1001 = ardAlarmStealelecMapper.selectCountByStartTime(refreshTime);
countMap.put("1001", count1001);
- int count1014 = ardAlarmTubeMapper.selectCountByStartTime(refreshTime);
+ int count1002 = ardAlarmCameraMapper.selectCountByAlarmTime(refreshTime);
+ countMap.put("1002", count1002);
+ int count1014 = ardAlarmTubeMapper.selectCountByAlarmTime(refreshTime);
countMap.put("1014", count1014);
- return countMap;
+ map.put("20000",countMap);
+ return map;
}
@Override
@@ -398,4 +402,25 @@
}
return null;
}
+ public static void main(String[] args) {
+ // 缁欏畾鍧愭爣 A
+ double Ax = 0;
+ double Ay = 0;
+
+ // 缁欏畾瑙掑害锛堜互搴︿负鍗曚綅锛�
+ double angle = 45;
+
+ // 缁欏畾璺濈
+ double distance = 1.414;
+
+ // 灏嗚搴﹁浆鎹负寮у害
+ double radians = Math.toRadians(angle);
+
+ // 璁＄畻 B 鍧愭爣
+ double Bx = Ax + distance * Math.cos(radians);
+ double By = Ay + distance * Math.sin(radians);
+
+ // 杈撳嚭缁撴灉
+ System.out.println("鍧愭爣 B: (" + Bx + ", " + By + ")");
+ }
}
diff --git a/ard-work/src/main/java/com/ruoyi/alarm/tubeAlarm/mapper/ArdAlarmTubeMapper.java b/ard-work/src/main/java/com/ruoyi/alarm/tubeAlarm/mapper/ArdAlarmTubeMapper.java
index ca03b00..fdf19bf 100644
--- a/ard-work/src/main/java/com/ruoyi/alarm/tubeAlarm/mapper/ArdAlarmTubeMapper.java
+++ b/ard-work/src/main/java/com/ruoyi/alarm/tubeAlarm/mapper/ArdAlarmTubeMapper.java
@@ -64,6 +64,6 @@
public int deleteArdAlarmTubeByIds(String[] ids);
public List<ArdAlarmTube> selectListAllByCommand(@Param("refreshTime")String refreshTime);
- int selectCountByStartTime(@Param("refreshTime")String refreshTime);
+ int selectCountByAlarmTime(@Param("refreshTime")String refreshTime);
public int updateViewTimeByTubeId(@Param("tubeId")String tubeId,@Param("alarmTime") String alarmTime,@Param("viewTime") String viewTime);
}
diff --git a/ard-work/src/main/resources/mapper/alarm/ArdAlarmCameraMapper.xml b/ard-work/src/main/resources/mapper/alarm/ArdAlarmCameraMapper.xml
index a2ac369..e93692a 100644
--- a/ard-work/src/main/resources/mapper/alarm/ArdAlarmCameraMapper.xml
+++ b/ard-work/src/main/resources/mapper/alarm/ArdAlarmCameraMapper.xml
@@ -161,4 +161,9 @@
WHERE
T.rn = 1
</select>
+ <select id="selectCountByAlarmTime" resultType="Integer">
+ SELECT COUNT(DISTINCT aac.camera_name)
+ FROM ard_alarm_camera aac
+ WHERE aac.alarm_time >= CURRENT_TIMESTAMP - INTERVAL '%${refreshTime}%' MINUTE
+ </select>
</mapper>
\ No newline at end of file
diff --git a/ard-work/src/main/resources/mapper/alarm/ArdAlarmTubeMapper.xml b/ard-work/src/main/resources/mapper/alarm/ArdAlarmTubeMapper.xml
index b81216b..b2b2643 100644
--- a/ard-work/src/main/resources/mapper/alarm/ArdAlarmTubeMapper.xml
+++ b/ard-work/src/main/resources/mapper/alarm/ArdAlarmTubeMapper.xml
@@ -182,7 +182,7 @@
) T
WHERE T.rn = 1
</select>
- <select id="selectCountByStartTime" resultType="Integer">
+ <select id="selectCountByAlarmTime" resultType="Integer">
SELECT COUNT(DISTINCT aat.tube_id)
FROM ard_alarm_tube aat
WHERE aat.alarm_time >= CURRENT_TIMESTAMP - INTERVAL '%${refreshTime}%' MINUTE
diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/AlarmTask.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/AlarmTask.java
index 609af09..5257595 100644
--- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/AlarmTask.java
+++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/AlarmTask.java
@@ -39,7 +39,7 @@
*/
public void globalAlarmCountPush() {
IGlobalAlarmService globalAlarmService = SpringUtils.getBean(IGlobalAlarmService.class);
- Map<String, Integer> stringIntegerMap = globalAlarmService.selectAlarmLogsCount();
+ Map<String, Object> stringIntegerMap = globalAlarmService.selectAlarmLogsCount();
if (ONLINE_USER_SESSIONS.size() > 0) {
WebSocketUtils.sendMessageAll(stringIntegerMap);
}
--
Gitblit v1.9.3