diff --git a/src/main/java/com/supervision/config/WebConfig.java b/src/main/java/com/supervision/config/WebConfig.java index 6d90d2a..6825e8f 100644 --- a/src/main/java/com/supervision/config/WebConfig.java +++ b/src/main/java/com/supervision/config/WebConfig.java @@ -31,6 +31,7 @@ public class WebConfig implements WebMvcConfigurer { paths.add("/favicon.ico"); paths.add("/user/login"); paths.add("/minio/downloadFile"); + paths.add("/minio/uploadFile"); paths.add("/user/changePassWord"); paths.add("/fileManage/downloadFile"); // 开发环境,放开不校验token.每次修改这里需要重启(热部署不行) diff --git a/src/main/java/com/supervision/minio/controller/MinioController.java b/src/main/java/com/supervision/minio/controller/MinioController.java index 7ac72c0..a869406 100644 --- a/src/main/java/com/supervision/minio/controller/MinioController.java +++ b/src/main/java/com/supervision/minio/controller/MinioController.java @@ -2,7 +2,7 @@ package com.supervision.minio.controller; import com.supervision.common.domain.R; import com.supervision.minio.service.MinioService; -import org.springframework.beans.factory.annotation.Autowired; +import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; @@ -11,10 +11,10 @@ import java.io.IOException; @RestController @RequestMapping("minio") +@RequiredArgsConstructor public class MinioController { - @Autowired - private MinioService minioService; + private final MinioService minioService; @PostMapping("/uploadFile") public R uploadFile(@RequestPart("file") MultipartFile file) throws IOException { diff --git a/src/main/java/com/supervision/minio/service/impl/MinioServiceImpl.java b/src/main/java/com/supervision/minio/service/impl/MinioServiceImpl.java index cc7bb2d..364c7a0 100644 --- a/src/main/java/com/supervision/minio/service/impl/MinioServiceImpl.java +++ b/src/main/java/com/supervision/minio/service/impl/MinioServiceImpl.java @@ -8,7 +8,7 @@ import com.supervision.minio.client.MinioTemplate; import com.supervision.minio.domain.MinioFile; import com.supervision.minio.mapper.MinioFileMapper; import com.supervision.minio.service.MinioService; -import org.springframework.beans.factory.annotation.Autowired; +import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import org.springframework.web.multipart.MultipartFile; @@ -19,16 +19,15 @@ import java.io.InputStream; import java.util.*; @Service +@RequiredArgsConstructor public class MinioServiceImpl implements MinioService { - @Autowired - private MinioTemplate minioTemplate; + private final MinioTemplate minioTemplate; @Value("${minio.bucketName}") private String bucketName; - @Autowired - private MinioFileMapper minioFileMapper; + private final MinioFileMapper minioFileMapper; @Override public String uploadFile(MultipartFile file) throws IOException { diff --git a/src/main/java/com/supervision/police/service/impl/ComDictionaryServiceImpl.java b/src/main/java/com/supervision/police/service/impl/ComDictionaryServiceImpl.java index e67a7b8..e834e6a 100644 --- a/src/main/java/com/supervision/police/service/impl/ComDictionaryServiceImpl.java +++ b/src/main/java/com/supervision/police/service/impl/ComDictionaryServiceImpl.java @@ -1,6 +1,7 @@ package com.supervision.police.service.impl; import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.lang.Assert; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -106,6 +107,10 @@ public class ComDictionaryServiceImpl extends ServiceImpl insertDictionary(ComDictionary dictionary) { + + Assert.notEmpty(dictionary.getType(), "字典类型不能为空"); + Assert.notEmpty(dictionary.getLabel(), "字典名称不能为空"); + comDictionaryMapper.insert(dictionary); return R.okMsg("新增成功"); } diff --git a/src/main/java/com/supervision/police/service/impl/SystemUserServiceImpl.java b/src/main/java/com/supervision/police/service/impl/SystemUserServiceImpl.java index d1ac47d..c04071a 100644 --- a/src/main/java/com/supervision/police/service/impl/SystemUserServiceImpl.java +++ b/src/main/java/com/supervision/police/service/impl/SystemUserServiceImpl.java @@ -5,6 +5,7 @@ import cn.hutool.core.lang.Assert; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.conditions.update.LambdaUpdateChainWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.supervision.police.domain.SystemUser; @@ -107,16 +108,20 @@ public class SystemUserServiceImpl extends ServiceImpl updateChainWrapper = super.lambdaUpdate() .set(SystemUser::getHeadPicId, userInfoReqVo.getHeadPicId()) .set(SystemUser::getUserName, userInfoReqVo.getUserName()) .set(SystemUser::getAccount, userInfoReqVo.getAccount()) .set(SystemUser::getPhoneNum, userInfoReqVo.getPhoneNum()) - .set(StrUtil.isNotEmpty(userInfoReqVo.getPassword()),SystemUser::getUserPd, UserUtil.signPassword(userInfoReqVo.getPassword())) - .set(Objects.nonNull(userInfoReqVo.getStatus()),SystemUser::getStatus, userInfoReqVo.getStatus()) + .set(Objects.nonNull(userInfoReqVo.getStatus()), SystemUser::getStatus, userInfoReqVo.getStatus()) .set(SystemUser::getRemark, userInfoReqVo.getRemark()) - .eq(SystemUser::getId, userInfoReqVo.getId()) - .update(); + .eq(SystemUser::getId, userInfoReqVo.getId()); + + if (StrUtil.isNotEmpty(userInfoReqVo.getPassword())) { + updateChainWrapper.set(SystemUser::getUserPd, UserUtil.signPassword(userInfoReqVo.getPassword())); + } + + updateChainWrapper.update(); userRoleRelationManageService.updateUserRoleRelation(userInfoReqVo.getId(), userInfoReqVo.getRoleIdList()); } @@ -151,7 +156,7 @@ public class SystemUserServiceImpl extends ServiceImpl userInfoPage = super.page(Page.of(pageNum, pageSize), new LambdaQueryWrapper() - .eq(StrUtil.isNotEmpty(userName), SystemUser::getUserName, userName) + .like(StrUtil.isNotEmpty(userName), SystemUser::getUserName, userName) .in(CollUtil.isNotEmpty(userRoleFilterList), SystemUser::getId, userRoleFilterList.stream().map(UserRoleDTO::getUserId).toList())); if (CollUtil.isEmpty(userInfoPage.getRecords())){