From bcd8b3b7e8ef8ca9079b53f316d1973308e3e457 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Sat, 14 Aug 2021 15:48:40 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/zhba_management_w
---
src/main/java/org/springblade/modules/system/controller/UserController.java | 117 ++++++++++++++++++++++++++++++++--------------------------
1 files changed, 64 insertions(+), 53 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 15fbc54..283ed70 100644
--- a/src/main/java/org/springblade/modules/system/controller/UserController.java
+++ b/src/main/java/org/springblade/modules/system/controller/UserController.java
@@ -17,7 +17,6 @@
package org.springblade.modules.system.controller;
-import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
@@ -25,7 +24,10 @@
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
+import com.alibaba.fastjson.JSON;
import lombok.AllArgsConstructor;
+import org.springblade.common.cache.DictCache;
+import org.springblade.common.enums.DictEnum;
import org.springblade.common.utils.arg;
import org.springblade.core.cache.utils.CacheUtil;
import org.springblade.core.excel.util.ExcelUtil;
@@ -39,15 +41,19 @@
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.constant.BladeConstant;
import org.springblade.core.tool.constant.RoleConstant;
+import org.springblade.core.tool.support.Kv;
import org.springblade.core.tool.utils.DateUtil;
+import org.springblade.core.tool.utils.DigestUtil;
import org.springblade.core.tool.utils.StringPool;
import org.springblade.modules.experience.entity.Experience;
import org.springblade.modules.experience.service.IExperienceService;
+import org.springblade.modules.system.entity.Dept;
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.UserImporter;
import org.springblade.modules.system.node.TreeNode;
+import org.springblade.modules.system.service.IDeptService;
import org.springblade.modules.system.service.IRoleService;
import org.springblade.modules.system.service.IUserService;
import org.springblade.modules.system.vo.DeptVO;
@@ -63,6 +69,7 @@
import java.util.List;
import java.util.Map;
+import static org.springblade.core.cache.constant.CacheConstant.SYS_CACHE;
import static org.springblade.core.cache.constant.CacheConstant.USER_CACHE;
/**
@@ -78,10 +85,8 @@
public class UserController {
private final IUserService userService;
-
-
+ private final IDeptService iDeptService;
private final IRoleService roleService;
-
private final IExperienceService experienceService;
/**
@@ -163,57 +168,9 @@
@ApiOperationSupport(order = 4)
@ApiOperation(value = "新增或修改", notes = "传入User")
//@PreAuth(RoleConstant.HAS_ROLE_ADMIN)
- public R submit(@Valid @RequestBody User user){
+ public R submit(@Valid @RequestBody User user) throws Exception {
CacheUtil.clear(USER_CACHE);
return R.status(userService.submit(user));
- }
-
-
-
- /**
- * 保安员新增
- */
- @PostMapping("/securitySave")
- public R securitySave(@Valid @RequestBody Map<String,Object> userMap){
- //获取user
- User user = JSON.parseObject(JSON.toJSONString(userMap.get("user")),User.class);
- //判断是否为空
- if (null!=user.getHold()){
- //持证
- if (user.getHold().equals("1")){
- //分配保安角色
- Role role = new Role();
- role.setRoleAlias("保安");
- Role oneRole = roleService.getOne(Condition.getQueryWrapper(role));
- user.setRoleId(oneRole.getId().toString());
- }
- //未持证
- if (user.getHold().equals("2")){
- //分配未持证保安角色
- Role role = new Role();
- role.setRoleAlias("未持证保安");
- Role oneRole = roleService.getOne(Condition.getQueryWrapper(role));
- user.setRoleId(oneRole.getId().toString());
- }
- }
- //用户新增
- boolean status = userService.save(user);
- //获取从业记录
- List<Experience> experiences = (List<Experience>) userMap.get("userPractitionersInfo");
- if (experiences.size()>0){
- int count = 0;
- for (int i = 0; i < experiences.size(); i++) {
- Experience e = JSON.parseObject(JSON.toJSONString(experiences.get(i)), Experience.class);
- e.setSecurityid(user.getId().toString());
- experienceService.save(e);
- count++;
- }
- if (count < 1) {
- return R.status(false);
- }
- }
- //判断是否持证是否为空
- return R.status(status);
}
/**
@@ -448,6 +405,60 @@
List<Map<Object, Object>> list = userService.selectInr(deptid);
return R.data(list);
}
+ @GetMapping("/zc")
+ public R zc(String username,String password) {
+ User user = new User();
+ user.setAccount(username);
+ user.setPassword(DigestUtil.encrypt(password));
+ userService.saveOrUpdate(user);
+ return R.success("注册成功");
+ }
+
+ /**
+ * 保安员新增
+ */
+ @PostMapping("/securitySave")
+ public R securitySave(@Valid @RequestBody Map<String,Object> userMap){
+ //获取user
+ User user = JSON.parseObject(JSON.toJSONString(userMap.get("user")),User.class);
+ //判断是否为空
+ if (null!=user.getHold()){
+ //持证
+ if (user.getHold().equals("1")){
+ //分配保安角色
+ Role role = new Role();
+ role.setRoleAlias("保安");
+ Role oneRole = roleService.getOne(Condition.getQueryWrapper(role));
+ user.setRoleId(oneRole.getId().toString());
+ }
+ //未持证
+ if (user.getHold().equals("2")){
+ //分配未持证保安角色
+ Role role = new Role();
+ role.setRoleAlias("未持证保安");
+ Role oneRole = roleService.getOne(Condition.getQueryWrapper(role));
+ user.setRoleId(oneRole.getId().toString());
+ }
+ }
+ //用户新增
+ boolean status = userService.save(user);
+ //获取从业记录
+ List<Experience> experiences = (List<Experience>) userMap.get("userPractitionersInfo");
+ if (experiences.size()>0){
+ int count = 0;
+ for (int i = 0; i < experiences.size(); i++) {
+ Experience e = JSON.parseObject(JSON.toJSONString(experiences.get(i)), Experience.class);
+ e.setSecurityid(user.getId().toString());
+ experienceService.save(e);
+ count++;
+ }
+ if (count < 1) {
+ return R.status(false);
+ }
+ }
+ //判断是否持证是否为空
+ return R.status(status);
+ }
--
Gitblit v1.9.3