From 644ed3e30bbee9a417dfbe649f2a72df25a7efb1 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Wed, 18 May 2022 10:10:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/FTP/DataHanlder.java | 30 +++++++++++++++++++++++++-----
1 files changed, 25 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 119686d..0b72586 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,24 @@
hanlder.myAsyncService = this.myAsyncService;
hanlder.dispatcherService = this.dispatcherService;
hanlder.iDeptService = this.iDeptService;
+ }
+
+ /**
+ * 获取保安员证编号
+ * @param json
+ */
+ public static void handlerSecurityNumerBit(String json) {
+ Map map = JSON.parseObject(json, Map.class);
+ //取出 key(uuid)
+ String key = map.keySet().toArray()[0].toString();
+ //编号前缀
+ String pre = map.get(key).toString();
+ Integer max = hanlder.userService.getSecurityPaperCount(pre);
+ Result result = new Result(200, null, max.toString(),null);
+ Map<String, Object> map1 = new HashMap<>(1);
+ map1.put(key, result);
+ //向外网发送数据
+ FtpUtil.objectFileUploadSecurityNumberCount(map1);
}
/**
@@ -200,6 +214,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();
//用户数据校验
@@ -265,6 +281,7 @@
}
Map<String, Object> map1 = new HashMap<>(1);
map1.put(uuid,result1);
+ System.out.println("用户新增：开始向外网推送数据............");
//向外网发送数据
FtpUtil.objectFileUpload(map1);
}
@@ -400,7 +417,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