|
|
@@ -9,13 +9,13 @@ import com.jzg.commons.core.page.HttpResult;
|
|
|
import com.jzg.commons.entity.po.*;
|
|
|
import com.jzg.commons.entity.vo.*;
|
|
|
import com.jzg.commons.exception.SystemException;
|
|
|
+import com.jzg.commons.util.MinioUtils;
|
|
|
import com.jzg.commons.util.PasswordUtils;
|
|
|
import com.jzg.commons.util.idgen.IdGenerate;
|
|
|
import com.jzg.organization.mapper.SysUploadFilesMapper;
|
|
|
import com.jzg.organization.mapper.SysUserJzgInfoMapper;
|
|
|
import com.jzg.organization.mapper.SysUserMapper;
|
|
|
import com.jzg.organization.service.*;
|
|
|
-import com.jzg.organization.utils.MinioUtils;
|
|
|
import com.jzg.organization.service.*;
|
|
|
import com.jzg.organization.state.UserState;
|
|
|
import jakarta.annotation.Resource;
|
|
|
@@ -99,8 +99,6 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
|
|
|
@Resource
|
|
|
private SysUserJzgInfoFileService sysUserJzgInfoFileService;
|
|
|
|
|
|
- @Resource
|
|
|
- private MinioUtils minioUtils;
|
|
|
|
|
|
@Override
|
|
|
public List<SysUserVo> getUserInfo(SysUserVo sysUserVo) {
|
|
|
@@ -285,7 +283,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
|
|
|
sysUserJzgInfoFile.setFileId(sysUserJzgInfoBankCardVo.getAttachment());
|
|
|
sysUserJzgInfoFile.setUserJzgInfoId(sysUserJzgInfoBankCardVo.getUserJzgInfoId());
|
|
|
sysUserJzgInfoFile.setFileName(sysUploadFiles.getFileName());
|
|
|
- sysUserJzgInfoFile.setFileUrl(minioUtils.getPresignedObjectUrl("jzg", sysUploadFiles.getFileName()));
|
|
|
+ sysUserJzgInfoFile.setFileUrl(MinioUtils.getPresignedObjectUrl("jzg", sysUploadFiles.getFileName()));
|
|
|
sysUserJzgInfoFile.setFileType("bankcard");
|
|
|
sysUserJzgInfoFileService.save(sysUserJzgInfoFile);
|
|
|
}
|
|
|
@@ -383,7 +381,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
|
|
|
sysUserJzgInfoFile.setFileType("sfz1");
|
|
|
sysUserJzgInfoFile.setUserJzgInfoId(userId);
|
|
|
sysUserJzgInfoFile.setFileName(sysUploadFiles.getFileName());
|
|
|
- sysUserJzgInfoFile.setFileUrl(minioUtils.getPresignedObjectUrl("jzg", sysUploadFiles.getFileName()));
|
|
|
+ sysUserJzgInfoFile.setFileUrl(MinioUtils.getPresignedObjectUrl("jzg", sysUploadFiles.getFileName()));
|
|
|
sysUserJzgInfoFileService.save(sysUserJzgInfoFile);
|
|
|
}
|
|
|
if (sfz2 != null) {
|
|
|
@@ -393,7 +391,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
|
|
|
sysUserJzgInfoFile.setFileId(sfz2);
|
|
|
sysUserJzgInfoFile.setFileType("sfz2");
|
|
|
sysUserJzgInfoFile.setUserJzgInfoId(userId);
|
|
|
- sysUserJzgInfoFile.setFileUrl(minioUtils.getPresignedObjectUrl("jzg", sysUploadFiles.getFileName()));
|
|
|
+ sysUserJzgInfoFile.setFileUrl(MinioUtils.getPresignedObjectUrl("jzg", sysUploadFiles.getFileName()));
|
|
|
sysUserJzgInfoFile.setFileName(sysUploadFiles.getFileName());
|
|
|
sysUserJzgInfoFileService.save(sysUserJzgInfoFile);
|
|
|
}
|
|
|
@@ -403,7 +401,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
|
|
|
SysUserJzgInfoFile sysUserJzgInfoFile = new SysUserJzgInfoFile();
|
|
|
sysUserJzgInfoFile.setFileId(qualification);
|
|
|
sysUserJzgInfoFile.setFileType("qualification");
|
|
|
- sysUserJzgInfoFile.setFileUrl(minioUtils.getPresignedObjectUrl("jzg", sysUploadFiles.getFileName()));
|
|
|
+ sysUserJzgInfoFile.setFileUrl(MinioUtils.getPresignedObjectUrl("jzg", sysUploadFiles.getFileName()));
|
|
|
sysUserJzgInfoFile.setUserJzgInfoId(userId);
|
|
|
sysUserJzgInfoFile.setFileName(sysUploadFiles.getFileName());
|
|
|
sysUserJzgInfoFileService.save(sysUserJzgInfoFile);
|
|
|
@@ -414,7 +412,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
|
|
|
SysUserJzgInfoFile sysUserJzgInfoFile = new SysUserJzgInfoFile();
|
|
|
sysUserJzgInfoFile.setFileId(contract);
|
|
|
sysUserJzgInfoFile.setFileType("contract");
|
|
|
- sysUserJzgInfoFile.setFileUrl(minioUtils.getPresignedObjectUrl("jzg", sysUploadFiles.getFileName()));
|
|
|
+ sysUserJzgInfoFile.setFileUrl(MinioUtils.getPresignedObjectUrl("jzg", sysUploadFiles.getFileName()));
|
|
|
sysUserJzgInfoFile.setUserJzgInfoId(userId);
|
|
|
sysUserJzgInfoFile.setFileName(sysUploadFiles.getFileName());
|
|
|
sysUserJzgInfoFileService.save(sysUserJzgInfoFile);
|
|
|
@@ -425,7 +423,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
|
|
|
SysUserJzgInfoFile sysUserJzgInfoFile = new SysUserJzgInfoFile();
|
|
|
sysUserJzgInfoFile.setFileId(applicant);
|
|
|
sysUserJzgInfoFile.setFileType("applicant");
|
|
|
- sysUserJzgInfoFile.setFileUrl(minioUtils.getPresignedObjectUrl("jzg", sysUploadFiles.getFileName()));
|
|
|
+ sysUserJzgInfoFile.setFileUrl(MinioUtils.getPresignedObjectUrl("jzg", sysUploadFiles.getFileName()));
|
|
|
sysUserJzgInfoFile.setUserJzgInfoId(userId);
|
|
|
sysUserJzgInfoFile.setFileName(sysUploadFiles.getFileName());
|
|
|
sysUserJzgInfoFileService.save(sysUserJzgInfoFile);
|
|
|
@@ -436,7 +434,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
|
|
|
SysUserJzgInfoFile sysUserJzgInfoFile = new SysUserJzgInfoFile();
|
|
|
sysUserJzgInfoFile.setFileId(salaryTable);
|
|
|
sysUserJzgInfoFile.setFileType("salary");
|
|
|
- sysUserJzgInfoFile.setFileUrl(minioUtils.getPresignedObjectUrl("jzg", sysUploadFiles.getFileName()));
|
|
|
+ sysUserJzgInfoFile.setFileUrl(MinioUtils.getPresignedObjectUrl("jzg", sysUploadFiles.getFileName()));
|
|
|
sysUserJzgInfoFile.setUserJzgInfoId(userId);
|
|
|
sysUserJzgInfoFile.setFileName(sysUploadFiles.getFileName());
|
|
|
sysUserJzgInfoFileService.save(sysUserJzgInfoFile);
|
|
|
@@ -447,7 +445,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
|
|
|
SysUserJzgInfoFile sysUserJzgInfoFile = new SysUserJzgInfoFile();
|
|
|
sysUserJzgInfoFile.setFileId(leaveTable);
|
|
|
sysUserJzgInfoFile.setFileType("leave");
|
|
|
- sysUserJzgInfoFile.setFileUrl(minioUtils.getPresignedObjectUrl("jzg", sysUploadFiles.getFileName()));
|
|
|
+ sysUserJzgInfoFile.setFileUrl(MinioUtils.getPresignedObjectUrl("jzg", sysUploadFiles.getFileName()));
|
|
|
sysUserJzgInfoFile.setUserJzgInfoId(userId);
|
|
|
sysUserJzgInfoFile.setFileName(sysUploadFiles.getFileName());
|
|
|
sysUserJzgInfoFileService.save(sysUserJzgInfoFile);
|