From 9dbf954f33e02e65621b4afdc55e8f642c6a6095 Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期二, 27 六月 2023 17:15:28 +0800
Subject: [PATCH] ptz推送websocket增加操作过期时间
---
ard-work/src/main/java/com/ruoyi/alarm/globalAlarm/service/impl/GlobalAlarmServiceImpl.java | 42 ++++++++++++++++++++++++++++++++++++++----
1 files changed, 38 insertions(+), 4 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/globalAlarm/service/impl/GlobalAlarmServiceImpl.java
index 175017b..1bf8e38 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
@@ -35,8 +35,15 @@
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
+import java.io.UnsupportedEncodingException;
+import java.math.BigInteger;
+import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
+import java.text.DateFormat;
import java.text.SimpleDateFormat;
import java.util.*;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
import java.util.stream.Collectors;
@@ -358,18 +365,22 @@
* @淇敼浜哄拰鍏跺畠淇℃伅
*/
@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
- public Object selectAlarmList(Integer command, String beginTime, String endTime,Integer pageNum,Integer pageSize) {
+ public Object selectAlarmList(Integer command, String beginTime, String endTime, Integer pageNum, Integer pageSize) {
Map<String, Object> params = new HashMap<>();
params.put("beginTime", beginTime);
params.put("endTime", endTime);
@@ -398,4 +409,27 @@
}
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 + ")");
+ }
+
}
--
Gitblit v1.9.3