From e6eb9f63b54fabc6d2ff55a360a874043bb79cab Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Fri, 25 Feb 2022 17:31:18 +0800
Subject: [PATCH] 1.用户添加字段

---
 src/main/java/org/springblade/modules/system/controller/UserController.java |  120 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 115 insertions(+), 5 deletions(-)

diff --git a/src/main/java/org/springblade/modules/system/controller/UserController.java b/src/main/java/org/springblade/modules/system/controller/UserController.java
index e3f78b2..2f5cc6a 100644
--- a/src/main/java/org/springblade/modules/system/controller/UserController.java
+++ b/src/main/java/org/springblade/modules/system/controller/UserController.java
@@ -45,10 +45,13 @@
 import org.springblade.core.tool.constant.RoleConstant;
 import org.springblade.core.tool.utils.*;
 import org.springblade.modules.FTP.FtpUtil;
+import org.springblade.modules.system.dto.UserDTO;
 import org.springblade.modules.system.entity.Role;
 import org.springblade.modules.system.entity.User;
 import org.springblade.modules.system.excel.UserExcel;
+import org.springblade.modules.system.excel.UserExcels;
 import org.springblade.modules.system.excel.UserImporter;
+import org.springblade.modules.system.excel.UserImporters;
 import org.springblade.modules.system.service.IRoleService;
 import org.springblade.modules.system.service.IUserService;
 import org.springblade.modules.system.vo.UserVO;
@@ -64,10 +67,7 @@
 import javax.validation.Valid;
 import java.io.IOException;
 import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 import static org.springblade.core.cache.constant.CacheConstant.USER_CACHE;
 
@@ -349,6 +349,17 @@
 	}
 
 	/**
+	 * 导入用户(保安员)
+	 */
+	@PostMapping("import-users")
+	@ApiOperation(value = "导入用户", notes = "传入excel")
+	public R importUsers(MultipartFile file, Integer isCovered) {
+		UserImporters userImporter = new UserImporters(userService, isCovered == 1);
+		ExcelUtil.save(file, userImporter, UserExcels.class);
+		return R.success("操作成功");
+	}
+
+	/**
 	 * 导出用户
 	 */
 	@GetMapping("export-user")
@@ -520,5 +531,104 @@
 //		FtpUtil.sqlFileUpload(s);
 		return R.status(status);
 	}
-};
+
+
+	/**
+	 * 保安员新增(数据同步调用)
+	 */
+	@PostMapping("/securitySaves")
+	@Transactional(rollbackFor = Exception.class)
+	public R securitySaves(@RequestBody User user) {
+		Integer userCount = userService.selectCount(user.getAccount());
+		//判断用户是否存在
+		if (userCount > 0) {
+			throw new ServiceException(StringUtil.format("当前用户 [{}] 已存在!", user.getAccount()));
+		}
+		user.setRoleId("1372092102682521602");
+		user.setDeptId("1424615972718895106");
+		user.setId(null);
+		//用户新增
+		boolean status = userService.save(user);
+//		System.out.println("user = " + user);
+		//返回
+		return R.status(status);
+	}
+
+	/**
+	 * 保安员新增(数据同步调用)
+	 */
+	@PostMapping("/updateBySecurtiy")
+	@Transactional(rollbackFor = Exception.class)
+	public R updateBySecurtiy(@RequestBody User user) {
+		User user1 = new User();
+		user1.setIsDeleted(0);
+		user1.setStatus(1);
+		user1.setCardid(user.getCardid());
+		User one = userService.getOne(Condition.getQueryWrapper(user1));
+		boolean status = false;
+		if (null!=one){
+			one.setRealName(user.getRealName());
+			one.setAvatar(user.getAvatar());
+			one.setPhone(user.getPhone());
+			one.setExamination_type(user.getExamination_type());
+			one.setStatus(user.getStatus());
+			one.setUpdateTime(new Date());
+			//修改
+			status = userService.updateById(one);
+		}
+		//返回
+		return R.status(status);
+	}
+
+	/**
+	 * 保安员信息修改(账号,身份证,密码 修改)
+	 */
+	@PostMapping("/updateUserByAccount")
+	@Transactional(rollbackFor = Exception.class)
+	public R updateUserByAccount(@RequestBody UserDTO user) {
+		User user1 = new User();
+		user1.setIsDeleted(0);
+		user1.setStatus(1);
+		user1.setCardid(user.getOldCardid());
+		User one = userService.getOne(Condition.getQueryWrapper(user1));
+		boolean status = false;
+		if (null!=one){
+			//修改
+			one.setAccount(user.getCardid());
+			one.setCardid(user.getCardid());
+			one.setPassword(user.getPassword());
+			one.setAvatar(user.getAvatar());
+			one.setPhone(user.getPhone());
+			one.setRealName(user.getRealName());
+			one.setUpdateTime(new Date());
+			//用户修改
+		    status = userService.updateById(one);
+		}
+		//返回
+		return R.status(status);
+	}
+
+	/**
+	 * 同步删除
+	 */
+	@PostMapping("/removeSecurity")
+	@Transactional(rollbackFor = Exception.class)
+	public R removeSecurity(@RequestBody User user) {
+		User user1 = new User();
+		user1.setIsDeleted(0);
+		user1.setStatus(1);
+		user1.setCardid(user.getCardid());
+		User one = userService.getOne(Condition.getQueryWrapper(user1));
+		boolean status = false;
+		if (null!=one){
+			//修改
+			one.setIsDeleted(1);
+			//用户修改
+			status = userService.removeById(one.getId());
+		}
+		//返回
+		return R.status(status);
+	}
+
+}
 

--
Gitblit v1.9.3