From a152548db005be9227730a3166dc233d94a52c5f Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期四, 31 八月 2023 10:29:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ard-work/src/main/java/com/ruoyi/alarmpoints/elecwall/service/impl/ArdWallServiceImpl.java | 45 ++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 40 insertions(+), 5 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/alarmpoints/elecwall/service/impl/ArdWallServiceImpl.java b/ard-work/src/main/java/com/ruoyi/alarmpoints/elecwall/service/impl/ArdWallServiceImpl.java
index 124fea2..4840e3c 100644
--- a/ard-work/src/main/java/com/ruoyi/alarmpoints/elecwall/service/impl/ArdWallServiceImpl.java
+++ b/ard-work/src/main/java/com/ruoyi/alarmpoints/elecwall/service/impl/ArdWallServiceImpl.java
@@ -1,9 +1,16 @@
package com.ruoyi.alarmpoints.elecwall.service.impl;
+import java.util.ArrayList;
import java.util.List;
+
+import com.ruoyi.alarmpoints.elecwall.domain.ArdWallUser;
+import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.uuid.IdUtils;
+import com.ruoyi.dispatch.domain.ArdDispatchPolice;
+import com.ruoyi.dispatch.domain.ArdDispatchPoliceUser;
import org.springframework.stereotype.Service;
import com.ruoyi.alarmpoints.elecwall.mapper.ArdWallMapper;
import com.ruoyi.alarmpoints.elecwall.domain.ArdWall;
@@ -53,9 +60,11 @@
@Override
public int insertArdWall(ArdWall ardWall) {
ardWall.setId(IdUtils.simpleUUID());
- ardWall.setCreateBy(SecurityUtils.getUsername());
- ardWall.setCreateTime(DateUtils.getNowDate());
- return ardWallMapper.insertArdWall(ardWall);
+ ardWall.setCreateBy(SecurityUtils.getUsername());
+ ardWall.setCreateTime(DateUtils.getNowDate());
+ int i = ardWallMapper.insertArdWall(ardWall);
+ insertArdWallUser(ardWall);
+ return i;
}
/**
@@ -66,8 +75,10 @@
*/
@Override
public int updateArdWall(ArdWall ardWall) {
- ardWall.setUpdateBy(SecurityUtils.getUsername());
- ardWall.setUpdateTime(DateUtils.getNowDate());
+ ardWall.setUpdateBy(SecurityUtils.getUsername());
+ ardWall.setUpdateTime(DateUtils.getNowDate());
+ ardWallMapper.deleteArdWallUserByWallId(ardWall.getId());
+ insertArdWallUser(ardWall);
return ardWallMapper.updateArdWall(ardWall);
}
@@ -79,6 +90,7 @@
*/
@Override
public int deleteArdWallByIds(String[] ids) {
+ ardWallMapper.deleteArdWallUserByWallIds(ids);
return ardWallMapper.deleteArdWallByIds(ids);
}
@@ -90,6 +102,29 @@
*/
@Override
public int deleteArdWallById(String id) {
+ ardWallMapper.deleteArdWallUserByWallId(id);
return ardWallMapper.deleteArdWallById(id);
}
+
+ /**
+ * 鏂板鐢靛瓙鍥存爮鍏宠仈鐢ㄦ埛淇℃伅
+ *
+ * @param ardWall 鐢靛瓙鍥存爮绠＄悊瀵硅薄
+ */
+ public void insertArdWallUser(ArdWall ardWall) {
+ List<SysUser> sysUserList = ardWall.getSysUserList();
+ String id = ardWall.getId();
+ if (StringUtils.isNotNull(sysUserList)) {
+ List<ArdWallUser> list = new ArrayList<ArdWallUser>();
+ for (SysUser user : sysUserList) {
+ ArdWallUser ardWallUser = new ArdWallUser();
+ ardWallUser.setWallId(id);
+ ardWallUser.setUserId(user.getUserId());
+ list.add(ardWallUser);
+ }
+ if (list.size() > 0) {
+ ardWallMapper.batchArdWallUser(list);
+ }
+ }
+ }
}
--
Gitblit v1.9.3