1. fix bugs

topo_dev
xueqingkun 9 months ago
parent c6369e0eb4
commit 2a75c1f417

@ -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.每次修改这里需要重启(热部署不行)

@ -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<String> uploadFile(@RequestPart("file") MultipartFile file) throws IOException {

@ -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 {

@ -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<SystemUserMapper, SystemU
.ne(SystemUser::getId, userInfoReqVo.getId()).count();
Assert.isTrue(count == 0, "用户名已存在,请更改用户名");
super.lambdaUpdate()
LambdaUpdateChainWrapper<SystemUser> 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<SystemUserMapper, SystemU
//查询用户数据
Page<SystemUser> userInfoPage = super.page(Page.of(pageNum, pageSize),
new LambdaQueryWrapper<SystemUser>()
.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())){

Loading…
Cancel
Save