diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/modules/system/mapper/DictDetailMapper.java b/cutejava/cutejava-system/src/main/java/cn/odboy/modules/system/mapper/DictDetailMapper.java index 868b0a91..42a74ba1 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/modules/system/mapper/DictDetailMapper.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/modules/system/mapper/DictDetailMapper.java @@ -15,9 +15,9 @@ import java.util.Set; @Mapper public interface DictDetailMapper extends BaseMapper { - List findByDictName(@Param("name") String name); + List selectByDictName(@Param("name") String name); - IPage findAll(@Param("criteria") DictDetailQueryCriteria criteria, Page page); + IPage selectByPage(@Param("criteria") DictDetailQueryCriteria criteria, Page page); - void deleteByDictBatchIds(@Param("dictIds") Set dictIds); + void deleteBatchByDictIds(@Param("dictIds") Set dictIds); } \ No newline at end of file diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/modules/system/service/impl/DeptServiceImpl.java b/cutejava/cutejava-system/src/main/java/cn/odboy/modules/system/service/impl/DeptServiceImpl.java index e9af6434..66d82ae8 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/modules/system/service/impl/DeptServiceImpl.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/modules/system/service/impl/DeptServiceImpl.java @@ -34,8 +34,8 @@ import java.util.stream.Collectors; public class DeptServiceImpl extends ServiceImpl implements DeptService { private final DeptMapper deptMapper; private final UserMapper userMapper; - private final RedisUtil redisUtil; private final RoleMapper roleMapper; + private final RedisUtil redisUtil; @Override public List queryAll(DeptQueryCriteria criteria, Boolean isQuery) throws Exception { diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/modules/system/service/impl/DictDetailServiceImpl.java b/cutejava/cutejava-system/src/main/java/cn/odboy/modules/system/service/impl/DictDetailServiceImpl.java index d4f7afd7..3922eba7 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/modules/system/service/impl/DictDetailServiceImpl.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/modules/system/service/impl/DictDetailServiceImpl.java @@ -23,14 +23,13 @@ import java.util.concurrent.TimeUnit; @Service @RequiredArgsConstructor public class DictDetailServiceImpl extends ServiceImpl implements DictDetailService { - private final DictMapper dictMapper; private final DictDetailMapper dictDetailMapper; private final RedisUtil redisUtil; @Override public PageResult queryAll(DictDetailQueryCriteria criteria, Page page) { - return PageUtil.toPage(dictDetailMapper.findAll(criteria, page)); + return PageUtil.toPage(dictDetailMapper.selectByPage(criteria, page)); } @Override @@ -58,7 +57,7 @@ public class DictDetailServiceImpl extends ServiceImpl dictDetails = redisUtil.getList(key, DictDetail.class); if (CollUtil.isEmpty(dictDetails)) { - dictDetails = dictDetailMapper.findByDictName(name); + dictDetails = dictDetailMapper.selectByDictName(name); redisUtil.set(key, dictDetails, 1, TimeUnit.DAYS); } return dictDetails; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/modules/system/service/impl/DictServiceImpl.java b/cutejava/cutejava-system/src/main/java/cn/odboy/modules/system/service/impl/DictServiceImpl.java index 18151863..5202a4d8 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/modules/system/service/impl/DictServiceImpl.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/modules/system/service/impl/DictServiceImpl.java @@ -26,11 +26,9 @@ import java.util.*; @Service @RequiredArgsConstructor public class DictServiceImpl extends ServiceImpl implements DictService { - private final DictMapper dictMapper; - private final RedisUtil redisUtil; - private final DictDetailMapper deleteDetail; private final DictDetailMapper dictDetailMapper; + private final RedisUtil redisUtil; @Override public PageResult queryAll(DictQueryCriteria criteria, Page page) { @@ -71,14 +69,14 @@ public class DictServiceImpl extends ServiceImpl implements Di // 删除字典 dictMapper.deleteBatchIds(ids); // 删除字典详情 - deleteDetail.deleteByDictBatchIds(ids); + dictDetailMapper.deleteBatchByDictIds(ids); } @Override public void download(List dicts, HttpServletResponse response) throws IOException { List> list = new ArrayList<>(); for (Dict dict : dicts) { - List dictDetails = dictDetailMapper.findByDictName(dict.getName()); + List dictDetails = dictDetailMapper.selectByDictName(dict.getName()); if (CollectionUtil.isNotEmpty(dictDetails)) { for (DictDetail dictDetail : dictDetails) { Map map = new LinkedHashMap<>(); diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/modules/system/service/impl/JobServiceImpl.java b/cutejava/cutejava-system/src/main/java/cn/odboy/modules/system/service/impl/JobServiceImpl.java index 8b4b92b3..5cb18a0a 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/modules/system/service/impl/JobServiceImpl.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/modules/system/service/impl/JobServiceImpl.java @@ -26,10 +26,9 @@ import java.util.concurrent.TimeUnit; @Service @RequiredArgsConstructor public class JobServiceImpl extends ServiceImpl implements JobService { - private final JobMapper jobMapper; - private final RedisUtil redisUtil; private final UserMapper userMapper; + private final RedisUtil redisUtil; @Override public PageResult queryAll(JobQueryCriteria criteria, Page page) { diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/modules/system/service/impl/MenuServiceImpl.java b/cutejava/cutejava-system/src/main/java/cn/odboy/modules/system/service/impl/MenuServiceImpl.java index d6707258..99b15f7a 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/modules/system/service/impl/MenuServiceImpl.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/modules/system/service/impl/MenuServiceImpl.java @@ -36,7 +36,6 @@ import java.util.stream.Collectors; @Service @RequiredArgsConstructor public class MenuServiceImpl extends ServiceImpl implements MenuService { - private final MenuMapper menuMapper; private final RoleMenuMapper roleMenuMapper; private final UserMapper userMapper; diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/modules/system/service/impl/MonitorServiceImpl.java b/cutejava/cutejava-system/src/main/java/cn/odboy/modules/system/service/impl/MonitorServiceImpl.java index 3da42317..48a2b5f2 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/modules/system/service/impl/MonitorServiceImpl.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/modules/system/service/impl/MonitorServiceImpl.java @@ -26,7 +26,6 @@ import java.util.*; @Slf4j @Service public class MonitorServiceImpl implements MonitorService { - private final DecimalFormat df = new DecimalFormat("0.00"); @Override diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/modules/system/service/impl/RoleServiceImpl.java b/cutejava/cutejava-system/src/main/java/cn/odboy/modules/system/service/impl/RoleServiceImpl.java index fba3a994..ce791a4e 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/modules/system/service/impl/RoleServiceImpl.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/modules/system/service/impl/RoleServiceImpl.java @@ -39,9 +39,9 @@ public class RoleServiceImpl extends ServiceImpl implements Ro private final RoleMapper roleMapper; private final RoleDeptMapper roleDeptMapper; private final RoleMenuMapper roleMenuMapper; - private final RedisUtil redisUtil; private final UserMapper userMapper; private final UserCacheService userCacheService; + private final RedisUtil redisUtil; @Override public List queryAll() { diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/modules/system/service/impl/UserServiceImpl.java b/cutejava/cutejava-system/src/main/java/cn/odboy/modules/system/service/impl/UserServiceImpl.java index 567aebb2..3151a75e 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/modules/system/service/impl/UserServiceImpl.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/modules/system/service/impl/UserServiceImpl.java @@ -34,11 +34,10 @@ import java.util.stream.Collectors; @Service @RequiredArgsConstructor public class UserServiceImpl extends ServiceImpl implements UserService { - private final UserMapper userMapper; private final UserJobMapper userJobMapper; private final UserRoleMapper userRoleMapper; - private final FileProperties properties; + private final FileProperties fileProperties; private final RedisUtil redisUtil; private final UserCacheService userCacheService; private final OnlineUserService onlineUserService; @@ -207,7 +206,7 @@ public class UserServiceImpl extends ServiceImpl implements Us @Transactional(rollbackFor = Exception.class) public Map updateAvatar(MultipartFile multipartFile) { // 文件大小验证 - FileUtil.checkSize(properties.getAvatarMaxSize(), multipartFile.getSize()); + FileUtil.checkSize(fileProperties.getAvatarMaxSize(), multipartFile.getSize()); // 验证文件上传的格式 String image = "gif jpg png jpeg"; String fileType = FileUtil.getExtensionName(multipartFile.getOriginalFilename()); @@ -216,7 +215,7 @@ public class UserServiceImpl extends ServiceImpl implements Us } User user = userMapper.findByUsername(SecurityUtil.getCurrentUsername()); String oldPath = user.getAvatarPath(); - File file = FileUtil.upload(multipartFile, properties.getPath().getAvatar()); + File file = FileUtil.upload(multipartFile, fileProperties.getPath().getAvatar()); user.setAvatarPath(Objects.requireNonNull(file).getPath()); user.setAvatarName(file.getName()); saveOrUpdate(user); diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/modules/system/service/impl/VerifyServiceImpl.java b/cutejava/cutejava-system/src/main/java/cn/odboy/modules/system/service/impl/VerifyServiceImpl.java index e599d626..262eb00e 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/modules/system/service/impl/VerifyServiceImpl.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/modules/system/service/impl/VerifyServiceImpl.java @@ -20,10 +20,10 @@ import java.util.Collections; @Service @RequiredArgsConstructor public class VerifyServiceImpl implements VerifyService { + private final RedisUtil redisUtil; @Value("${code.expiration}") private Long expiration; - private final RedisUtil redisUtil; @Override @Transactional(rollbackFor = Exception.class) diff --git a/cutejava/cutejava-system/src/main/resources/mapper/DictDetailMapper.xml b/cutejava/cutejava-system/src/main/resources/mapper/DictDetailMapper.xml index 489c02d9..ae38af9e 100644 --- a/cutejava/cutejava-system/src/main/resources/mapper/DictDetailMapper.xml +++ b/cutejava/cutejava-system/src/main/resources/mapper/DictDetailMapper.xml @@ -17,8 +17,7 @@ - - select dd.id, dd.label, dd.`value`, dd.`dict_sort`, dd.create_by, dd.update_by, dd.create_time, dd.update_time, d.id as dict_id, d.name @@ -33,7 +32,7 @@ order by dd.dict_sort, dd.dict_id desc - select dd.id, dd.label, dd.`value`, dd.`dict_sort`, dd.create_by, dd.update_by, dd.create_time, dd.update_time, d.id as dict_id, d.name @@ -45,7 +44,7 @@ order by dd.dict_sort - + delete from sys_dict_detail where dict_id in