From 68656aa409a46995c9949c580cc3ed150755b2bc Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Wed, 08 Jun 2022 20:41:56 +0800
Subject: [PATCH] ftp 个人保安新增修改

---
 src/main/java/org/springblade/modules/FTP/DataHandler.java |  114 ++++----------------------------------------------------
 1 files changed, 9 insertions(+), 105 deletions(-)

diff --git a/src/main/java/org/springblade/modules/FTP/DataHandler.java b/src/main/java/org/springblade/modules/FTP/DataHandler.java
index 3f48d40..c485591 100644
--- a/src/main/java/org/springblade/modules/FTP/DataHandler.java
+++ b/src/main/java/org/springblade/modules/FTP/DataHandler.java
@@ -90,119 +90,23 @@
 	}
 
 	/**
-	 * 数据处理(用户单个新增)
+	 * 数据处理
 	 * @param json json 字符串
 	 * @param uuid 随机字符串
 	 * @return
 	 */
 	public static Result handler(String json, String uuid){
-		//读取数据
-		List<String> list = Arrays.asList(json.split(";"));
-		for (String s : list) {
-			Map map = JSON.parseObject(s, Map.class);
-			//获取结果
-			Object o = map.get(uuid);
-			if (null== o || o.equals("")){
-				return new Result(400,null,"uuid 不匹配",null);
-			}
+		Map map = JSON.parseObject(json, Map.class);
+		//获取结果
+		Object o = map.get(uuid);
+		if (null== o || o.equals("")){
+			return new Result(400,null,"uuid 不匹配",null);
+		}else {
 			//转换
 			Result result = JSON.parseObject(o.toString(), Result.class);
-			System.out.println("解析结果result = " + result);
-			//判断结果
-			if (result.getCode()==200){
-				//新增
-				//用户数处理
-				User user = handlerUserInfo(uuid);
-				user.setId(result.getUserId());
-				user.setStatus(1);
-				//插入数据库
-//				boolean save = handler.userService.insert(user);
-				boolean save = handler.userService.save(user);
-				if (save){
-					//异步同步到群防群控
-					handler.myAsyncService.qfqkUserSave(user);
-					//返回
-					return new Result(200,null,"新增成功",null);
-				}else {
-					return new Result(205,null,"新增失败",null);
-				}
-			}else if (result.getCode()==201) {
-				//修改
-				//用户数处理
-				User user = handlerUserInfo(uuid);
-				user.setId(result.getUserId());
-				//先查询当前库是否有改用户?
-				User user1 = handler.userService.getById(result.getUserId());
-				if (null!=user1) {
-					//数据修改
-					boolean b = handler.userService.updateById(user);
-					if (b) {
-						//异步同步到群防群控
-						handler.myAsyncService.updateUserByQfqk(user);
-						//返回
-						return new Result(200, null, "修改成功", null);
-					} else {
-						return new Result(205, null, "修改失败", null);
-					}
-				}else {
-					//新增
-					boolean save = handler.userService.save(user);
-					if (save){
-						//异步同步到群防群控
-						handler.myAsyncService.qfqkUserSave(user);
-						//返回
-						return new Result(200,null,"新增成功",null);
-					}else {
-						return new Result(205,null,"新增失败",null);
-					}
-				}
-			}else if (result.getCode()==203){
-				//新增
-				//用户数处理
-				User user = handlerUserInfo(uuid);
-				user.setId(result.getUserId());
-				//插入数据库
-				boolean save = handler.userService.save(user);
-				if (save) {
-					//异步同步到群防群控
-					handler.myAsyncService.qfqkUserSave(user);
-				}
-				//失败,返回保安员证编号校验失败消息
-				return new Result(203,null,result.getMsg(),null);
-			}else if (result.getCode()==204){
-				//先查询当前库是否有改用户?
-				User user1 = handler.userService.getById(result.getUserId());
-				//用户数处理
-				User user = handlerUserInfo(uuid);
-				user.setId(result.getUserId());
-				if (null!=user1) {
-					//修改
-					//数据修改
-					boolean b = handler.userService.updateById(user);
-					if (b){
-						//异步同步到群防群控
-						handler.myAsyncService.updateUserByQfqk(user);
-					}
-				}else {
-					//新增
-					boolean save = handler.userService.save(user);
-					if (save){
-						//异步同步到群防群控
-						handler.myAsyncService.qfqkUserSave(user);
-						//返回
-						return new Result(200,null,"新增成功",null);
-					}else {
-						return new Result(205,null,"新增失败",null);
-					}
-				}
-				//失败,返回保安员证编号校验失败消息
-				return new Result(202,null,result.getMsg(),null);
-			}else {
-				//失败,返回失败消息
-				return new Result(202,null,result.getMsg(),null);
-			}
+			//返回
+			return result;
 		}
-		return new Result(400,null,"未能找到对应数据",null);
 	}
 
 	/**

--
Gitblit v1.9.3