From 65df638262767763375933e8395d5e2253da1798 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Fri, 29 Apr 2022 17:33:56 +0800
Subject: [PATCH] 保安员证生成同步修改，外网编号，身份证号码脱敏处理
---
src/main/java/org/springblade/modules/exam/service/impl/ScoreAuditRecordsServiceImpl.java | 65 ++++++++++++++++++++++++--------
1 files changed, 49 insertions(+), 16 deletions(-)
diff --git a/src/main/java/org/springblade/modules/exam/service/impl/ScoreAuditRecordsServiceImpl.java b/src/main/java/org/springblade/modules/exam/service/impl/ScoreAuditRecordsServiceImpl.java
index f3b18a9..f054d9f 100644
--- a/src/main/java/org/springblade/modules/exam/service/impl/ScoreAuditRecordsServiceImpl.java
+++ b/src/main/java/org/springblade/modules/exam/service/impl/ScoreAuditRecordsServiceImpl.java
@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import lombok.AllArgsConstructor;
+import org.springblade.common.utils.DesensitizedUtil;
import org.springblade.common.utils.QRCodeUtil;
import org.springblade.modules.FTP.FtpUtil;
import org.springblade.modules.accreditation.excel.ExportSecurityPaperExcel;
@@ -18,6 +19,7 @@
import org.springblade.modules.securitypaper.service.SecurityPaperService;
import org.springblade.modules.system.entity.User;
import org.springblade.modules.system.service.IUserService;
+import org.springblade.modules.system.service.MyAsyncService;
import org.springblade.modules.system.vo.UserVO;
import org.springblade.modules.training.entity.TrainingRegistration;
import org.springblade.modules.training.service.TrainingRegistrationService;
@@ -53,6 +55,8 @@
@Autowired
private SecurityPaperService securityPaperService;
+ @Autowired
+ private MyAsyncService myAsyncService;
/**
* 自定义分页
@@ -146,7 +150,8 @@
" " + "where id = " + "'" + trainingRegistration.getId() + "';"+
"update blade_user set is_train = " + "'" + user.getIsTrain() + "'" +
" " + "where id = " + "'" + user.getId() + "'";
- FtpUtil.sqlFileUpload(s1);
+ //FtpUtil.sqlFileUpload(s1);
+ myAsyncService.FTP(s1);
} else {
//实操成绩不为空
if (examScore.getTheoryGrade() >= 60 && examScore.getLearnGrade() >= 60) {
@@ -172,8 +177,11 @@
user.setSecuritynumber(result);
//修改为持证保安
user.setHold("1");
+ //创建保安证脱敏对象
+ User user1 = user;
//更新保安数据
- userService.updateById(user);
+ user1.setSecuritynumber(DesensitizedUtil.desensitizedSecurityNumber(result));
+ userService.updateById(user1);
//生成保安证的同时向保安证管理表中插入一条数据
SecurityPaper securityPaper = new SecurityPaper();
@@ -184,21 +192,31 @@
securityPaper.setPeopleName(user.getRealName());
securityPaper.setExamId(Long.parseLong(examScore.getExamId()));
securityPaper.setApplyId(examScore.getApplyId());
+ securityPaper.setSource(1);
+ //创建内网对象
+ SecurityPaper paper = securityPaper;
+ //脱敏
+ securityPaper.setNumber(DesensitizedUtil.desensitizedSecurityNumber(result));
+ securityPaper.setIdCardNo("");
//新增保安员证信息
securityPaperService.save(securityPaper);
+ //设置id
+ paper.setId(securityPaper.getId());
+
//数据同步
- String s1 =
- "insert into sys_security_paper(id,number,create_time,people_name,id_card_no,user_id,apply_id,exam_id) " +
- "values(" + "'" + securityPaper.getId() + "'"
- + "," + "'" + securityPaper.getNumber() +"'"
- + "," + "'" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(securityPaper.getCreateTime()) +"'"
- + "," + "'" + securityPaper.getPeopleName() + "'"
- + "," + "'" + securityPaper.getIdCardNo() + "'"
- + "," + "'" + securityPaper.getUserId() + "'"
- + "," + "'" + securityPaper.getApplyId() + "'"
- + "," +"'" + securityPaper.getExamId() + "'" + ")";
- FtpUtil.sqlFileUpload(s1);
+ String s1 = "insert into sys_security_paper(id,number,create_time,people_name,id_card_no,user_id,apply_id,exam_id,source) " +
+ "values(" + "'" + paper.getId() + "'" + "," +
+ "'" + paper.getNumber() + "'" + "," +
+ "," + "'" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(paper.getCreateTime()) + "'" +
+ "," + "'" + paper.getPeopleName() + "'" +
+ "," + "'" + paper.getIdCardNo() + "'" +
+ "," + "'" + paper.getUserId() + "'" +
+ "," + "'" + paper.getApplyId() + "'" +
+ "," + "'" + paper.getExamId() + "'" +
+ "," + "'" + paper.getSource() + "'"
+ + ")";
+ myAsyncService.FTP(s1);
}
} else {
//不合格
@@ -238,7 +256,7 @@
",user_type = " + "'" + user.getUserType() + "'" +
",is_train = " + "'" + user.getIsTrain() + "'" +
" " + "where id = " + "'" + user.getId() + "'";
- FtpUtil.sqlFileUpload(s1);
+ myAsyncService.FTP(s1);
}
}
//审核时间
@@ -312,7 +330,8 @@
" " + "where id = " + "'" + trainingRegistration.getId() + "';"+
"update blade_user set is_train = " + "'" + user.getIsTrain() + "'" +
" " + "where id = " + "'" + user.getId() + "'";
- FtpUtil.sqlFileUpload(s1);
+ //FtpUtil.sqlFileUpload(s1);
+ myAsyncService.FTP(s1);
} else {
//实操成绩不为空
if (examScore.getTheoryGrade() >= 60 && examScore.getLearnGrade() >= 60) {
@@ -342,6 +361,19 @@
user.setHold("1");
//更新保安数据
userService.updateById(user);
+
+ //生成保安证的同时向保安证管理表中插入一条数据
+ SecurityPaper securityPaper = new SecurityPaper();
+ securityPaper.setUserId(user.getId());
+ securityPaper.setNumber(result);
+ securityPaper.setCreateTime(new Date());
+ securityPaper.setIdCardNo(user.getCardid());
+ securityPaper.setPeopleName(user.getRealName());
+ securityPaper.setExamId(Long.parseLong(examScore.getExamId()));
+ securityPaper.setApplyId(examScore.getApplyId());
+ securityPaper.setSource(1);
+ //新增保安员证信息
+ securityPaperService.save(securityPaper);
// String s1 =
// "update blade_user set hold = " + "'" + user.getHold() + "'" +
@@ -387,7 +419,8 @@
",user_type = " + "'" + user.getUserType() + "'" +
",is_train = " + "'" + user.getIsTrain() + "'" +
" " + "where id = " + "'" + user.getId() + "'";
- FtpUtil.sqlFileUpload(s1);
+ //FtpUtil.sqlFileUpload(s1);
+ myAsyncService.FTP(s1);
}
}
//审核时间
--
Gitblit v1.9.3