From 6e10fa6147dab847ef9d02248bdd028d6bdd2bb2 Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期二, 27 六月 2023 15:44:48 +0800
Subject: [PATCH] 雷达管理增加name
---
ard-work/src/main/java/com/ruoyi/alarm/globalAlarm/service/impl/GlobalAlarmServiceImpl.java | 15 ++++++++++++---
1 files changed, 12 insertions(+), 3 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 8bb6f21..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;
@@ -359,7 +366,7 @@
*/
@Override
public Map<String, Object> selectAlarmLogsCount() {
- Map<String,Object> map=new HashMap<>();
+ Map<String, Object> map = new HashMap<>();
Map<String, Integer> countMap = new HashMap<>();
String refreshTime = configService.selectConfigByKey("refreshTime");
int count1001 = ardAlarmStealelecMapper.selectCountByStartTime(refreshTime);
@@ -368,12 +375,12 @@
countMap.put("1002", count1002);
int count1014 = ardAlarmTubeMapper.selectCountByAlarmTime(refreshTime);
countMap.put("1014", count1014);
- map.put("20000",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);
@@ -402,6 +409,7 @@
}
return null;
}
+
public static void main(String[] args) {
// 缁欏畾鍧愭爣 A
double Ax = 0;
@@ -423,4 +431,5 @@
// 杈撳嚭缁撴灉
System.out.println("鍧愭爣 B: (" + Bx + ", " + By + ")");
}
+
}
--
Gitblit v1.9.3