From ac120f258131bbc3a91f784345b19fb88dbca33e Mon Sep 17 00:00:00 2001
From: 钟日健 <5689795+arsn@user.noreply.gitee.com>
Date: Wed, 27 Apr 2022 17:19:19 +0800
Subject: [PATCH] 从业记录新增修改,ftp 配置修改
---
src/main/java/org/springblade/modules/FTP/DataHanlder.java | 22 +++++++++++++++++-----
1 files changed, 17 insertions(+), 5 deletions(-)
diff --git a/src/main/java/org/springblade/modules/FTP/DataHanlder.java b/src/main/java/org/springblade/modules/FTP/DataHanlder.java
index cc6ab6b..f5cf8da 100644
--- a/src/main/java/org/springblade/modules/FTP/DataHanlder.java
+++ b/src/main/java/org/springblade/modules/FTP/DataHanlder.java
@@ -3,6 +3,7 @@
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import liquibase.pro.packaged.M;
+import org.springblade.common.utils.DesensitizedUtil;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.tool.api.R;
import org.springblade.modules.dispatcher.entity.Dispatcher;
@@ -77,15 +78,21 @@
String uuid = user1.getReasonForLeav();
//用户数据校验
Result result = userCheckOut(user1);
- System.out.println("result = " + result);
//创建返回对象
Result result1 = new Result();
if (result.getCode()==200){
user1.setReasonForLeav("");
//校验保安员证编号
Result result2 = hanlder.checkSecurityNumber(user1);
+ User user2 = result2.getUser();
//去新增
- hanlder.userService.save(result2.getUser());
+ boolean save = hanlder.userService.save(user2);
+ if (save){
+ //异步新增从业记录
+ hanlder.myAsyncService.insertExperience(user2);
+ //异步审查
+ hanlder.myAsyncService.checkUserExamineByCardNo(user2);
+ }
if (result2.getCode()==200){
//设置返回结果
@@ -238,14 +245,17 @@
//新增
experienceService.save(experience);
+ // 身份证号脱敏
+ String cardid = DesensitizedUtil.desensitizedIdNumberBy4(user.getCardid());
+
//内网同步
String s = "insert into sys_experience(id,name,entryTime,departureTime,leaving,cardId,companyname,securityId) " +
- "values(" + "'" + experience.getId() + "'" + "," +
- "'" + experience.getName() + "'" + "," +
+ "values(" + "'" + experience.getId() + "'" +
+ "," + "'" + experience.getName() + "'" +
"," + "'" + new SimpleDateFormat("yyyy-MM-dd").format(experience.getEntrytime()) + "'" +
"," + "'" + new SimpleDateFormat("yyyy-MM-dd").format(experience.getDeparturetime()) + "'" +
"," + "'" + experience.getLeaving() + "'" +
- "," + "'" + experience.getCardid() + "'" +
+ "," + "'" + cardid + "'" +
"," + "'" + experience.getCompanyname() + "'" +
"," + "'" + experience.getSecurityid() + "'"
+ ")";
@@ -281,6 +291,8 @@
states = false;
user.setHold("2");
}
+ }else {
+ states = true;
}
if (!states) {
--
Gitblit v1.9.3