From 98505f497a12382b259f643232f2c6c63f5004f8 Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期六, 24 六月 2023 10:40:23 +0800
Subject: [PATCH] 增加历史报警数据按command和时间区间查询
---
ard-work/src/main/java/com/ruoyi/alarm/config/service/impl/ArdAlarmTypeConfigServiceImpl.java | 27 +++++++++++++++++++--------
1 files changed, 19 insertions(+), 8 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/alarm/config/service/impl/ArdAlarmTypeConfigServiceImpl.java b/ard-work/src/main/java/com/ruoyi/alarm/config/service/impl/ArdAlarmTypeConfigServiceImpl.java
index 1679570..92ed5dd 100644
--- a/ard-work/src/main/java/com/ruoyi/alarm/config/service/impl/ArdAlarmTypeConfigServiceImpl.java
+++ b/ard-work/src/main/java/com/ruoyi/alarm/config/service/impl/ArdAlarmTypeConfigServiceImpl.java
@@ -13,6 +13,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
+import java.util.Map;
import java.util.Objects;
@@ -99,11 +100,26 @@
/**
* 鎵归噺鎶ヨ绫诲瀷鐢ㄦ埛鍏宠仈
*
- * @param commands 鎶ヨ绫诲瀷鍒楄〃
+ * @param configInfo 鎶ヨ绫诲瀷鍒楄〃
* @return 缁撴灉
*/
@Override
- public int insertArdAlarmTypeConfig(List<Integer> commands) {
+ public int insertArdAlarmTypeConfig(Map<String,Object> configInfo) {
+ String userId =(String) configInfo.get("userId");
+ if(userId==null)
+ {
+ return 0;
+ }
+ ardAlarmTypeConfigMapper.deleteArdAlarmTypeConfigByCurrentUserId(userId);
+ List<Integer> commands=(List<Integer>) configInfo.get("commands");
+ if(commands==null)
+ {
+ return 0;
+ }
+ if(commands.size()==0)
+ {
+ return 0;
+ }
int resNum=0;
for(Integer command :commands)
{
@@ -113,7 +129,7 @@
List<SysDictData> dictDatas = dictDataMapper.selectDictDataByType("alarm_type");
SysDictData sysDictData = dictDatas.stream().filter(s -> Objects.equals(s.getDictValue(), command.toString())).findFirst().orElse(null);
config.setAlarmType(sysDictData.getDictLabel());
- config.setUserId(SecurityUtils.getUserId());
+ config.setUserId(userId);
config.setCreateTime(DateUtils.getNowDate());
int i = ardAlarmTypeConfigMapper.insertArdAlarmTypeConfig(config);
if(i>0)
@@ -122,10 +138,5 @@
}
}
return resNum;
- }
-
- @Override
- public int deleteArdAlarmTypeConfigByCurrentUserId() {
- return ardAlarmTypeConfigMapper.deleteArdAlarmTypeConfigByCurrentUserId(SecurityUtils.getUserId());
}
}
--
Gitblit v1.9.3