From 7b291d619aa70e5bb33f2b1caabe7f4b0bd003d9 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Fri, 10 Jun 2022 17:28:15 +0800
Subject: [PATCH] 制证数据更新
---
src/main/java/org/springblade/modules/FTP/DataHanlder.java | 33 +++++++++++++++++++++++++--------
1 files changed, 25 insertions(+), 8 deletions(-)
diff --git a/src/main/java/org/springblade/modules/FTP/DataHanlder.java b/src/main/java/org/springblade/modules/FTP/DataHanlder.java
index c366fa7..33fa6ed 100644
--- a/src/main/java/org/springblade/modules/FTP/DataHanlder.java
+++ b/src/main/java/org/springblade/modules/FTP/DataHanlder.java
@@ -1,11 +1,8 @@
package org.springblade.modules.FTP;
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;
import org.springblade.modules.dispatcher.service.IDispatcherService;
import org.springblade.modules.experience.entity.Experience;
@@ -18,7 +15,6 @@
import org.springblade.modules.system.service.IUserService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
-
import javax.annotation.PostConstruct;
import java.text.SimpleDateFormat;
import java.util.*;
@@ -62,6 +58,19 @@
hanlder.myAsyncService = this.myAsyncService;
hanlder.dispatcherService = this.dispatcherService;
hanlder.iDeptService = this.iDeptService;
+ }
+
+
+ /**
+ * 保安员审查
+ * @param json
+ */
+ public static void handlerUserExamine(String json) {
+ User user = JSON.parseObject(json, User.class);
+ //获取用户cardid
+ User user1 = hanlder.userService.getById(user.getId());
+ //用户审查
+ hanlder.myAsyncService.checkUserExamineByCardNo(user1);
}
/**
@@ -207,7 +216,7 @@
}
/**
- * 数据处理
+ * 数据处理（单个保安员新增）
* @param json
*/
public static void handler(String json){
@@ -218,6 +227,8 @@
Map map = JSON.parseObject(s, Map.class);
Object user = map.get("user");
User user1 = JSON.parseObject(user.toString(), User.class);
+ System.out.println("user1 = " + user1);
+
//获取 uuid
String uuid = user1.getReasonForLeav();
//用户数据校验
@@ -283,8 +294,9 @@
}
Map<String, Object> map1 = new HashMap<>(1);
map1.put(uuid,result1);
+ System.out.println("用户新增：开始向外网推送数据............");
//向外网发送数据
- FtpUtil.objectFileUpload(map1);
+ FtpUtil.objectFileUpload(map1,uuid);
}
}
@@ -311,7 +323,7 @@
one.setUpdateTime(new Date());
//离职
hanlder.userService.updateById(one);
- //内网同步
+ //同步外网
String s1 = "update blade_user set status = " + one.getStatus() +
",update_time = " + "'" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(one.getUpdateTime()) + "'" +
" where id = " + "'" + one.getId() + "'";
@@ -319,6 +331,8 @@
//人员离职后修改派遣记录，修改从业记录
hanlder.updateUserDispatcherExp(one);
+ //返回
+ return new Result(200,null,"");
}
}
return new Result(400,null,user.getRealName() + "已在其他单位导入");
@@ -418,7 +432,10 @@
//2.保安证编号校验
//判断是否持证
boolean states = false;
- if (user.getHold().equals("1") && null!=user.getSecuritynumber() && !user.getSecuritynumber().equals("")){
+ if (null!= user.getHold()
+ && user.getHold().equals("1")
+ && null!=user.getSecuritynumber()
+ && !user.getSecuritynumber().equals("")){
//持证，校验保安证编号是否合法
SecurityPaper securityPaper = new SecurityPaper();
securityPaper.setIdCardNo(user.getCardid());
--
Gitblit v1.9.3