From df054296327ebca617a9c19bb01139b9c40bf232 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Tue, 07 Jun 2022 11:25:44 +0800
Subject: [PATCH] 培训报名，保安员头像导入新增修改
---
src/main/java/org/springblade/modules/training/controller/TrainingRegistrationController.java | 61 +++++++++++++++
src/main/java/org/springblade/modules/resource/endpoint/OssEndpoint.java | 141 +++++++++++++++++++++++++++++++++++
src/main/java/org/springblade/modules/system/excel/SecurityExcel.java | 6 +
src/main/resources/application-test.yml | 6
4 files changed, 211 insertions(+), 3 deletions(-)
diff --git a/src/main/java/org/springblade/modules/resource/endpoint/OssEndpoint.java b/src/main/java/org/springblade/modules/resource/endpoint/OssEndpoint.java
index d866716..97b996a 100644
--- a/src/main/java/org/springblade/modules/resource/endpoint/OssEndpoint.java
+++ b/src/main/java/org/springblade/modules/resource/endpoint/OssEndpoint.java
@@ -462,6 +462,147 @@
return R.data(map);
}
+ /**
+ * 文件上传,zip(保安员头像上传)
+ *
+ * @param file 图片对象
+ */
+ @PostMapping("put-file-zips")
+ public R putFileZips(@RequestParam MultipartFile file) throws Exception {
+ Map<String, Object> map = new HashMap<>(1);
+ //填写你文件上传的地址以及相应信息
+ String url = "http://61.131.136.25:2081";
+ String access = "zhbaadmin";
+ String secret = "zhbapassword";
+ String bucket = "zhba";
+ MinioClient minioClient =
+ MinioClient.builder()
+ .endpoint(url)
+ .credentials(access, secret)
+ .build();
+ // 检查存储桶是否已经存在
+ boolean isExist = minioClient.bucketExists(BucketExistsArgs.builder().bucket(bucket).build());
+ if (!isExist) {
+ // 创建一个名为zip的存储桶，用于zip文件。
+ minioClient.makeBucket(MakeBucketArgs.builder().bucket(bucket).build());
+ minioClient.setBucketPolicy(SetBucketPolicyArgs.builder().bucket(bucket).build());
+ }
+ String fileName = file.getOriginalFilename();
+ String namePath = fileName.substring(0,fileName.lastIndexOf("."));
+ String fileType = fileName.substring(fileName.lastIndexOf(".") + 1).toLowerCase(Locale.US);
+ //判断文件是不是zip类型
+ if(!fileType.equals("zip")){
+// map.put("data","上传文件类型不符!");
+// return R.data(map);
+ throw new ServiceException("上传文件类型不符!必须是 zip 压缩文件格式!");
+ }
+ //FileConfig.localtion是配置文件和config类生产的，测试demo可以直接把FileConfig.localtion替换成D:/test
+ String uuid = UUID.randomUUID().toString();
+ String desPath = FileConfig.localtion + File.separator + uuid.replaceAll("-", "");
+// String desPath = "D:/test" + File.separator + uuid.replaceAll("-", "");
+
+ //遗漏了这个代码，在本地测试环境不会出问题，在服务器上一定会报没有找到文件的错误
+ String savePath = FileConfig.localtion + File.separator;
+ FileUtil fileUtil = new FileUtil();
+ //解压zip文件
+ FileUtil.unZip(file, desPath,savePath);
+
+ List<MultipartFile> fileList = new ArrayList<>();
+ //获取图片文件
+// fileList = fileUtil.getSubFiles(desPath+File.separator+namePath,fileList);
+ fileList = fileUtil.getSubFiles(desPath,fileList);
+ //将不能导入的保安员账号存起来
+ List<String> errorList = new ArrayList<>();
+ List<String> picList = new ArrayList<>();
+ //导入状态，默认为true ,如果有一个出现问题则为 false
+ AtomicBoolean pic = new AtomicBoolean(true);
+ AtomicBoolean status = new AtomicBoolean(true);
+ //遍历
+ for (MultipartFile multipartFile : fileList){
+ long size = multipartFile.getSize();
+ if (size<30*1024 || size>500*1024){
+ status.set(false);
+ //取出身份证号,查询用户信息，更新用户信息
+ String pictrueName = multipartFile.getName().substring(0, multipartFile.getName().lastIndexOf("."));
+ String regex ="[\u4e00-\u9fa5]";
+ Pattern compile = Pattern.compile(regex);
+ String idCardNo = compile.matcher(pictrueName).replaceAll("");
+ //加入集合
+ errorList.add(idCardNo);
+
+ }
+ if(multipartFile.getName().toLowerCase().endsWith(".png") || multipartFile.getName().toLowerCase().endsWith(".jpg")) {
+ String newName = "upload/picture/" + UUID.randomUUID().toString().replaceAll("-", "") + multipartFile.getName().substring(multipartFile.getName().lastIndexOf("."));
+ InputStream in = multipartFile.getInputStream();
+ String[] split = newName.split("/");
+ //创建头部信息
+ Map<String, String> headers = new HashMap<>(1 << 2);
+ //添加自定义内容类型
+ headers.put("Content-Type", "application/octet-stream");
+ //上传
+ minioClient.putObject(
+ PutObjectArgs.builder().bucket(bucket).object(newName).stream(
+ in, in.available(), -1)
+ .headers(headers)
+ .build());
+
+ String urls = "http://61.131.136.25:2081/zhba/" + newName;
+ //内网
+ String inUrl = FtpConfig.ip + "/zhba/" + newName;
+ //取出身份证号,查询用户信息，更新用户信息
+ String pictrueName = multipartFile.getName().substring(0, multipartFile.getName().lastIndexOf("."));
+// String regex ="([1-9]\\d{5}(18|19|20)\\d{2}((0[1-9])|(10|11|12))(([0-2][1-9])|10|20|30|31)\\d{3}[0-9Xx])|([1-9]\\d{5}\\d{2}((0[1-9])|(10|11|12))(([0-2][1-9])|10|20|30|31)\\d{3})";
+ String regex ="[\u4e00-\u9fa5]";
+ Pattern compile = Pattern.compile(regex);
+ String idCardNo = compile.matcher(pictrueName).replaceAll("");
+ User user = userService.getById(idCardNo);
+ //设置用户头像url
+ if (null!=user){
+// user.setAvatar(urls);
+// user.setAvatar("");
+// //更新用户信息
+// userService.updateById(user);
+
+ //内网数据推送
+ //数据推送
+ String s = "update blade_user set avatar = " + "'" + inUrl + "'" + "where id = " + "'" + user.getId() + "'";
+ //FtpUtil.sqlFileUpload(s);
+ myAsyncService.FTP(s);
+
+ //文件推送
+ InputStream inputStream = multipartFile.getInputStream();
+ FtpUtil.uploadFile(FtpConfig.ftpHost, ftpPort, FtpConfig.ftpUserName, ftpPassword, ftpPath, "/", "f"+split[2], inputStream);
+ in.close();
+ }else {
+ pic.set(false);
+ picList.add(idCardNo);
+ }
+ }
+ }
+ //最后要删除文件
+ FileUtil.clearFiles(FileConfig.localtion + File.separator + file.getOriginalFilename());
+ FileUtil.clearFiles(desPath);
+ //数据封装
+ map.put("data", "上传成功!");
+ //如果所有数据导入有一个异常
+ StringBuilder errorBuilder = new StringBuilder();
+ if (!status.get()) {
+ String errorAccount = StringUtils.join(errorList, "\\\n");
+ errorBuilder.append("用户:[" + errorAccount + "]照片导入失败!照片不能小于30KB,且不能大于500KB!!");
+ }
+
+ if (!pic.get()){
+ String errorAccount = StringUtils.join(picList, "\\\n");
+ errorBuilder.append("用户:[" + errorAccount + "]导入失败!编号不存在，请检查核对后再上传!");
+ }
+ //抛出异常
+ if (errorBuilder.length()>0){
+ throw new ServiceException(errorBuilder.toString());
+ }
+ //返回
+ return R.data(map);
+ }
+
/**
* 文件上传,zip , 缴费凭证
diff --git a/src/main/java/org/springblade/modules/system/excel/SecurityExcel.java b/src/main/java/org/springblade/modules/system/excel/SecurityExcel.java
index 007c1a0..0f5e90c 100644
--- a/src/main/java/org/springblade/modules/system/excel/SecurityExcel.java
+++ b/src/main/java/org/springblade/modules/system/excel/SecurityExcel.java
@@ -37,10 +37,16 @@
public class SecurityExcel implements Serializable {
private static final long serialVersionUID = 1L;
+
+ @ExcelProperty("编号*")
+ @ColumnWidth(30)
+ private Long id;
+
@ExcelProperty("企业名称*")
@ColumnWidth(30)
private String deptId;
+
@ColumnWidth(10)
@ExcelProperty("姓名*")
private String realName;
diff --git a/src/main/java/org/springblade/modules/training/controller/TrainingRegistrationController.java b/src/main/java/org/springblade/modules/training/controller/TrainingRegistrationController.java
index 310b423..e166706 100644
--- a/src/main/java/org/springblade/modules/training/controller/TrainingRegistrationController.java
+++ b/src/main/java/org/springblade/modules/training/controller/TrainingRegistrationController.java
@@ -430,6 +430,67 @@
}
/**
+ * 批量报名
+ * @param trainingRegistration 考试报名信息对象
+ */
+ @PostMapping("/batchTrains")
+ public R batchApplys(@RequestBody TrainingRegistrationVo trainingRegistration){
+ List<String> list = Arrays.asList(trainingRegistration.getUserIds().split(","));
+
+ if (list.size()>0) {
+ //遍历
+ list.forEach(userId -> {
+ User user = userService.getUserById(userId);
+ //未报名的新增，已报名的不做处理
+ if (null == user.getIsTrain()) {
+ TrainingRegistration trainingRegistration1 = new TrainingRegistration();
+ trainingRegistration1.setCancel(1);
+ //默认为未考试状态
+ trainingRegistration1.setIsExam(1);
+ //未提交考试审核
+ trainingRegistration1.setAuditStatus(4);
+ trainingRegistration1.setTrainingTime(new Date());
+ trainingRegistration1.setUserId(userId);
+ trainingRegistration1.setTrainingUnitId(trainingRegistration.getTrainingUnitId());
+ trainingRegistrationService.save(trainingRegistration1);
+ //修改保安报名状态
+ user.setIsTrain(1);
+ userService.updateById(user);
+
+ //数据同步
+ saveTrainingRegistration(trainingRegistration1, user);
+ } else {
+ if (user.getIsTrain() != 1) {
+ TrainingRegistration trainingRegistration1 = new TrainingRegistration();
+ trainingRegistration1.setCancel(1);
+ //默认为未考试状态
+ trainingRegistration1.setIsExam(1);
+ //未提交考试审核
+ trainingRegistration1.setAuditStatus(4);
+ trainingRegistration1.setTrainingTime(new Date());
+ trainingRegistration1.setUserId(userId);
+ trainingRegistration1.setTrainingUnitId(trainingRegistration.getTrainingUnitId());
+ trainingRegistrationService.save(trainingRegistration1);
+ //修改保安报名状态
+ user.setIsTrain(1);
+ userService.updateById(user);
+
+ //数据同步
+ saveTrainingRegistration(trainingRegistration1, user);
+ }
+ }
+ });
+ }
+
+ //如果存在年龄不符的，则抛出异常
+// if (number.get()>0){
+// String errorAccount = StringUtils.join(errorList, "\\\n");
+// throw new ServiceException("保安员:[" + errorAccount + "]报名失败!年龄不符,报名年龄为[18-60]周岁!");
+// }
+ return R.data(200,"报名成功");
+ }
+
+ /**
* 修改
* @param trainingRegistration 报名培训信息对象
*/
diff --git a/src/main/resources/application-test.yml b/src/main/resources/application-test.yml
index 9999121..44644f1 100644
--- a/src/main/resources/application-test.yml
+++ b/src/main/resources/application-test.yml
@@ -56,10 +56,10 @@
#ftp 设置
ftp:
sqlConnect: jdbc:mysql://61.131.136.25:2083/zhbaw-test?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
- ftpHost: 117.40.91.118
+ ftpHost: 192.168.0.198
ftpPort: 21
- ftpUserName: zhbain
- ftpPassword: zhbain@123
+ ftpUserName: arsn
+ ftpPassword: 123456
ftpUserNameIn: baftpout
ftpPasswordIn: baftpout
ftpPath: anbao/
--
Gitblit v1.9.3