From b403ba0d0c43bd02456e6f830d7aec06f0b6885b Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Fri, 10 Jun 2022 10:21:39 +0800
Subject: [PATCH] 异常日志查询修改

---
 src/main/java/org/springblade/modules/quartz/task/Task.java |   24 ++++++++++++++++++------
 1 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/src/main/java/org/springblade/modules/quartz/task/Task.java b/src/main/java/org/springblade/modules/quartz/task/Task.java
index 08b0cdf..aa0287e 100644
--- a/src/main/java/org/springblade/modules/quartz/task/Task.java
+++ b/src/main/java/org/springblade/modules/quartz/task/Task.java
@@ -126,8 +126,9 @@
 			else {
 				for (int i = files.length-1; i >=0 ; i--) {
 					String fileName = files[i].getName();
+					String substring1 = fileName.substring(0, 2);
 					System.out.println(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date())+":读取到文件 = " + fileName);
-					if (fileName.contains("nq")) {
+					if (substring1.contains("nq")) {
 						//把文件下载到本地
 						long l = System.currentTimeMillis();
 						FtpUtil.downloadFtpFile(ftpHost, ftpUserNameIn, ftpPasswordIn, ftpPort, ftpPath, localPath, fileName);
@@ -229,8 +230,9 @@
 			else {
 				for (int i = files.length-1; i >=0 ; i--) {
 					String fileName = files[i].getName();
+					String substring = fileName.substring(0, 2);
 					System.out.println(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date())+":读取到文件 = " + fileName);
-					if (fileName.contains("ni")) {
+					if (substring.contains("ni")) {
 //						InputStream is = ftp.retrieveFileStream(new String(fileName.getBytes("GBK"), FTP.DEFAULT_CONTROL_ENCODING));
 						//把文件下载到本地
 						long l = System.currentTimeMillis();
@@ -330,8 +332,9 @@
 			else {
 				for (int i = files.length-1; i >=0 ; i--) {
 					String fileName = files[i].getName();
+					String substring = fileName.substring(0, 2);
 					System.out.println(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date())+":读取到文件 = " + fileName);
-					if (fileName.contains("nl")) {
+					if (substring.contains("nl")) {
 						//把文件下载到本地
 						long l = System.currentTimeMillis();
 						FtpUtil.downloadFtpFile(ftpHost, ftpUserNameIn, ftpPasswordIn, ftpPort, ftpPath, localPath, fileName);
@@ -444,9 +447,11 @@
 				}
 				if (result1.getCode()==203){
 					//保安证编号不匹配,请核实!也可通过提供保安证件信息提交核实申请! 内网用户已存在情况
-					user.setId(result.getUserId());
+					user.setHold("2");
+					user.setSecuritynumber("");
+					user.setId(result1.getUserId());
 					//先查询当前库是否有改用户?
-					User user2 = userService.getById(result.getUserId());
+					User user2 = userService.getById(result1.getUserId());
 					//判断
 					if (null != user2) {
 						//修改
@@ -523,8 +528,9 @@
 			else {
 				for (int i = files.length-1; i >=0 ; i--) {
 					String fileName = files[i].getName();
+					String substring = fileName.substring(0, 2);
 					System.out.println(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date())+":读取到文件 = " + fileName);
-					if (fileName.contains("nt")) {
+					if (substring.contains("nt")) {
 						//把文件下载到本地
 						long l = System.currentTimeMillis();
 						FtpUtil.downloadFtpFile(ftpHost, ftpUserNameIn, ftpPasswordIn, ftpPort, ftpPath, localPath, fileName);
@@ -580,6 +586,8 @@
 		//取出培训学校id
 		//从redis 中获取用户数据
 		String s = redisTemplate.opsForValue().get(uuid).toString();
+		//删除
+		redisTemplate.delete(uuid);
 		if (null!=s && !s.equals("")) {
 			//创建集合,存年龄符合要求
 			List<String> ageList = new ArrayList<>();
@@ -746,6 +754,8 @@
 				}
 			} else if (result.getCode() == 203) {
 				//保安证编号不匹配,请核实!也可通过提供保安证件信息提交核实申请! 用户为新增
+				users.setHold("2");
+				users.setSecuritynumber("");
 				//新增
 				users.setId(result.getUserId());
 				//插入数据库
@@ -765,6 +775,8 @@
 				handlerLogService.save(handlerLog);
 			} else if (result.getCode() == 204) {
 				//保安证编号不匹配,请核实!也可通过提供保安证件信息提交核实申请! 内网用户已存在情况
+				users.setHold("2");
+				users.setSecuritynumber("");
 				users.setId(result.getUserId());
 				//先查询当前库是否有改用户?
 				User user2 = userService.getById(result.getUserId());

--
Gitblit v1.9.3