From 1c0706a3eba8069b5b1da4955abc075d3facf11d Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Fri, 25 Feb 2022 14:57:51 +0800
Subject: [PATCH] 1.空间信息
---
src/main/java/org/springblade/modules/system/controller/UserController.java | 85 ++++++++++++++++++++++++++++++++++++++++--
1 files changed, 80 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 8d706a1..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,6 +45,7 @@
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;
@@ -66,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;
@@ -555,5 +553,82 @@
//返回
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