From 93120f37786869b89ea512ea2aedfce02f38ba98 Mon Sep 17 00:00:00 2001 From: zhaowenyuan Date: Thu, 27 Jun 2024 15:17:47 +0800 Subject: [PATCH] =?UTF-8?q?1.=20=E6=B7=BB=E5=8A=A0=E9=83=A8=E5=88=86?= =?UTF-8?q?=E7=BC=93=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../work/service/impl/WrkInfoPhoneServiceImpl.java | 10 ++++++---- .../chushang/system/controller/UserController.java | 1 + .../com/chushang/system/service/ISysUserService.java | 2 ++ .../system/service/impl/SysUserServiceImpl.java | 11 +++++++++++ 4 files changed, 20 insertions(+), 4 deletions(-) diff --git a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/work/service/impl/WrkInfoPhoneServiceImpl.java b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/work/service/impl/WrkInfoPhoneServiceImpl.java index b2c917b..0db1142 100644 --- a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/work/service/impl/WrkInfoPhoneServiceImpl.java +++ b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/work/service/impl/WrkInfoPhoneServiceImpl.java @@ -133,7 +133,8 @@ public class WrkInfoPhoneServiceImpl extends ServiceImpl savePhoneInfo(String params){ + public Result savePhoneInfo(String params) + { if (StringUtils.isEmpty(params)){ return Result.failed("获取信息为空"); } @@ -209,7 +210,7 @@ public class WrkInfoPhoneServiceImpl extends ServiceImpl idByUsernames) { + private WrkInfoPhone convert(WrkInfoPhoneImportDTO wrkInfoPhoneImportDTO, Map idByUsernames) + { WrkInfoPhone wrkInfoPhone = new WrkInfoPhone(); wrkInfoPhone.setDelState(false); // 理论上这个应该是框架 进行赋值的 String userName = wrkInfoPhoneImportDTO.getUserName(); - + wrkInfoPhone.setDeptId(SecurityContextHolder.getDeptId()); wrkInfoPhone.setUserId(idByUsernames.get(userName)); wrkInfoPhone.setUserName(userName); wrkInfoPhone.setWrkStatus(1); diff --git a/chushang-modules/chushang-module-system/system-service/src/main/java/com/chushang/system/controller/UserController.java b/chushang-modules/chushang-module-system/system-service/src/main/java/com/chushang/system/controller/UserController.java index 9a1e6b8..353dac3 100644 --- a/chushang-modules/chushang-module-system/system-service/src/main/java/com/chushang/system/controller/UserController.java +++ b/chushang-modules/chushang-module-system/system-service/src/main/java/com/chushang/system/controller/UserController.java @@ -22,6 +22,7 @@ import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; import javax.annotation.Resource; +import javax.cache.annotation.CacheRemove; import javax.validation.Valid; import java.util.*; import java.util.stream.Collectors; diff --git a/chushang-modules/chushang-module-system/system-service/src/main/java/com/chushang/system/service/ISysUserService.java b/chushang-modules/chushang-module-system/system-service/src/main/java/com/chushang/system/service/ISysUserService.java index 54e15d3..ebe5628 100644 --- a/chushang-modules/chushang-module-system/system-service/src/main/java/com/chushang/system/service/ISysUserService.java +++ b/chushang-modules/chushang-module-system/system-service/src/main/java/com/chushang/system/service/ISysUserService.java @@ -8,6 +8,8 @@ import com.chushang.common.core.web.AjaxResult; import com.chushang.security.utils.SecurityUtils; import com.chushang.system.entity.dto.ListUserDTO; import com.chushang.security.entity.po.SysUser; +import org.springframework.cache.annotation.CacheConfig; +import org.springframework.cache.annotation.Cacheable; import java.util.Collection; import java.util.Map; diff --git a/chushang-modules/chushang-module-system/system-service/src/main/java/com/chushang/system/service/impl/SysUserServiceImpl.java b/chushang-modules/chushang-module-system/system-service/src/main/java/com/chushang/system/service/impl/SysUserServiceImpl.java index bede9cd..fa9362a 100644 --- a/chushang-modules/chushang-module-system/system-service/src/main/java/com/chushang/system/service/impl/SysUserServiceImpl.java +++ b/chushang-modules/chushang-module-system/system-service/src/main/java/com/chushang/system/service/impl/SysUserServiceImpl.java @@ -20,9 +20,13 @@ import com.chushang.system.entity.po.SysUserRole; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.cache.annotation.CacheConfig; +import org.springframework.cache.annotation.CacheEvict; +import org.springframework.cache.annotation.Cacheable; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import javax.cache.annotation.CacheRemove; import java.time.LocalDateTime; import java.util.Arrays; import java.util.Collection; @@ -40,6 +44,7 @@ import java.util.stream.Collectors; */ @Slf4j @Service +@CacheConfig(cacheNames = "user") public class SysUserServiceImpl extends ServiceImpl implements ISysUserService { @Autowired @@ -102,6 +107,7 @@ public class SysUserServiceImpl extends ServiceImpl impl @Override @Transactional + @CacheEvict(allEntries = true) public void saveUser(SysUser user) { SpringUtils.getAopProxy(this).checkUsernameUnique(user.getUsername()); @@ -123,6 +129,8 @@ public class SysUserServiceImpl extends ServiceImpl impl } @Override + @Transactional + @CacheEvict(allEntries = true) public void update(SysUser user) { if(StringUtils.isBlank(user.getPassword())){ user.setPassword(null); @@ -136,6 +144,7 @@ public class SysUserServiceImpl extends ServiceImpl impl @Override @Transactional + @CacheEvict(allEntries = true) public void deleteBatch(Collection userIds) { for (Long userId : userIds) @@ -231,6 +240,7 @@ public class SysUserServiceImpl extends ServiceImpl impl * 根据 userName 获取 用户id */ @Override + @Cacheable("getIdByUsernames") public Map getIdByUsernames(Collection userNames) { List list = list(new LambdaQueryWrapper() .in(SysUser::getUsername, userNames)); @@ -242,6 +252,7 @@ public class SysUserServiceImpl extends ServiceImpl impl } @Override + @Cacheable("getIdByNicknames") public Map getIdByNicknames(Collection nickNames) { List list = list(new LambdaQueryWrapper() .in(SysUser::getNickName, nickNames));