From c45ce58884c59ddf8a6051ba370215e6f62adeb8 Mon Sep 17 00:00:00 2001
From: Administrator <1144154118@qq.com>
Date: 星期五, 28 七月 2023 10:11:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-system/src/main/java/com/ruoyi/alarm/config/service/impl/ArdAlarmTypeConfigServiceImpl.java | 51 +++------------------------------------------------
1 files changed, 3 insertions(+), 48 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/alarm/config/service/impl/ArdAlarmTypeConfigServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/alarm/config/service/impl/ArdAlarmTypeConfigServiceImpl.java
similarity index 63%
rename from ard-work/src/main/java/com/ruoyi/alarm/config/service/impl/ArdAlarmTypeConfigServiceImpl.java
rename to ruoyi-system/src/main/java/com/ruoyi/alarm/config/service/impl/ArdAlarmTypeConfigServiceImpl.java
index 92ed5dd..472f039 100644
--- a/ard-work/src/main/java/com/ruoyi/alarm/config/service/impl/ArdAlarmTypeConfigServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/alarm/config/service/impl/ArdAlarmTypeConfigServiceImpl.java
@@ -1,7 +1,6 @@
package com.ruoyi.alarm.config.service.impl;
-
import com.ruoyi.alarm.config.domain.ArdAlarmTypeConfig;
import com.ruoyi.alarm.config.mapper.ArdAlarmTypeConfigMapper;
import com.ruoyi.alarm.config.service.IArdAlarmTypeConfigService;
@@ -12,6 +11,8 @@
import com.ruoyi.system.mapper.SysDictDataMapper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
import java.util.List;
import java.util.Map;
import java.util.Objects;
@@ -25,10 +26,8 @@
*/
@Service
public class ArdAlarmTypeConfigServiceImpl implements IArdAlarmTypeConfigService {
- @Autowired
+ @Resource
private ArdAlarmTypeConfigMapper ardAlarmTypeConfigMapper;
- @Autowired
- private SysDictDataMapper dictDataMapper;
/**
* 鏌ヨ鎶ヨ绫诲瀷鐢ㄦ埛鍏宠仈
*
@@ -59,8 +58,6 @@
*/
@Override
public int insertArdAlarmTypeConfig(ArdAlarmTypeConfig ardAlarmTypeConfig) {
- ardAlarmTypeConfig.setCreateBy(SecurityUtils.getUsername());
- ardAlarmTypeConfig.setCreateTime(DateUtils.getNowDate());
ardAlarmTypeConfig.setUserId(SecurityUtils.getUserId());
return ardAlarmTypeConfigMapper.insertArdAlarmTypeConfig(ardAlarmTypeConfig);
}
@@ -96,47 +93,5 @@
@Override
public int deleteArdAlarmTypeConfigById(String id) {
return ardAlarmTypeConfigMapper.deleteArdAlarmTypeConfigById(id);
- }
- /**
- * 鎵归噺鎶ヨ绫诲瀷鐢ㄦ埛鍏宠仈
- *
- * @param configInfo 鎶ヨ绫诲瀷鍒楄〃
- * @return 缁撴灉
- */
- @Override
- 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)
- {
- ArdAlarmTypeConfig config=new ArdAlarmTypeConfig();
- config.setId(IdUtils.simpleUUID());
- config.setCommand(command);
- 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(userId);
- config.setCreateTime(DateUtils.getNowDate());
- int i = ardAlarmTypeConfigMapper.insertArdAlarmTypeConfig(config);
- if(i>0)
- {
- resNum++;
- }
- }
- return resNum;
}
}
--
Gitblit v1.9.3