From 8b375fe00a241b3a769b82fe3dac8d1c9dce8a02 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Thu, 16 Jun 2022 14:36:07 +0800
Subject: [PATCH] 模拟考试修改

---
 src/main/java/org/springblade/modules/system/service/MyAsyncService.java |   90 +++++++--------------------------------------
 1 files changed, 14 insertions(+), 76 deletions(-)

diff --git a/src/main/java/org/springblade/modules/system/service/MyAsyncService.java b/src/main/java/org/springblade/modules/system/service/MyAsyncService.java
index a0c7a13..8b5b350 100644
--- a/src/main/java/org/springblade/modules/system/service/MyAsyncService.java
+++ b/src/main/java/org/springblade/modules/system/service/MyAsyncService.java
@@ -21,9 +21,6 @@
 @Service
 public class MyAsyncService {
 
-	@Autowired
-	private IUserService userService;
-
 	/**
 	 * 用户新增
 	 * @param user
@@ -47,6 +44,7 @@
 		JSONObject jsonObject = JSONObject.fromObject(userDTO);
 		//发送请求
 		try {
+			System.out.println("发起异步推送qfqk----用户新增");
 			HttpClientUtils.httpPostWithjson(requestUrl,jsonObject.toString());
 			System.out.println("用户新增请求已发送....");
 		} catch (IOException e) {
@@ -75,6 +73,7 @@
 		JSONObject jsonObject = JSONObject.fromObject(userDTO);
 		//发送请求
 		try {
+			System.out.println("发起异步推送qfqk----用户更新");
 			HttpClientUtils.httpPostWithjson(requestUrl,jsonObject.toString());
 		} catch (IOException e) {
 			e.printStackTrace();
@@ -212,80 +211,19 @@
 		FtpUtil.getSecurityNumberBit(map);
 	}
 
+	/**
+	 * 考试实操成绩推送内网导入
+	 * @param map
+	 */
+	public void FTPObjectExamScore(Map<String, Object> map) {
+		FtpUtil.objectFileUploadExamScore(map);
+	}
 
 	/**
-	 * 用户信息处理
-	 * @param uuid
-	 * @param result
+	 * 管理员导入保安人员并创建保安证编号
+	 * @param map
 	 */
-	@Async
-	public void userInfoHandler(String uuid, Result result){
-		//用户数处理
-		User users = handlerUserInfo(uuid);
-		System.out.println("用户数据 = " + users);
-		//判断结果
-		if (result.getCode()==200){
-			//新增
-			users.setId(result.getUserId());
-			users.setStatus(1);
-			//插入数据库
-			boolean save = userService.save(users);
-			if (save){
-				//异步同步到群防群控
-				qfqkUserSave(users);
-			}
-		}else if (result.getCode()==201) {
-			//修改
-			users.setId(result.getUserId());
-			//先查询当前库是否有改用户?
-			User user2 = userService.getById(result.getUserId());
-			if (null!=user2) {
-				//数据修改
-				boolean b = userService.updateById(users);
-				if (b) {
-					//异步同步到群防群控
-					updateUserByQfqk(users);
-				}
-			}else {
-				//新增
-				boolean save = userService.save(users);
-				if (save){
-					//异步同步到群防群控
-					qfqkUserSave(users);
-				}
-			}
-		}else if (result.getCode()==203){
-			//保安证编号不匹配,请核实!也可通过提供保安证件信息提交核实申请! 用户为新增
-			//新增
-			users.setId(result.getUserId());
-			//插入数据库
-			boolean save = userService.save(users);
-			if (save) {
-				//异步同步到群防群控
-				qfqkUserSave(users);
-			}
-		}else if (result.getCode()==204){
-			//保安证编号不匹配,请核实!也可通过提供保安证件信息提交核实申请! 内网用户已存在情况
-			users.setId(result.getUserId());
-			//先查询当前库是否有改用户?
-			User user2 = userService.getById(result.getUserId());
-			//判断
-			if (null!=user2) {
-				//修改
-				//数据修改
-				boolean b = userService.updateById(users);
-				if (b){
-					//异步同步到群防群控
-					updateUserByQfqk(users);
-				}
-			}else {
-				//新增
-				boolean save = userService.save(users);
-				if (save){
-					//异步同步到群防群控
-					qfqkUserSave(users);
-				}
-			}
-		}
-	}
+    public void FTPSecurityPaperAndUserImport(Map<String, Object> map) {
+		FtpUtil.getSecurityPaperAndUserImport(map);
+    }
 }

--
Gitblit v1.9.3