From f1092d53966cf3b3b93be7fc59d913cd13d2ec37 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Mon, 16 Aug 2021 16:17:47 +0800
Subject: [PATCH] 1.用户新增角色关联持证字段 2.新增接口，考试开始，修改考试的状态为考试中 3.考试查询接口修改
---
src/main/java/org/springblade/modules/system/controller/UserController.java | 88 ++++++++++++++++++++++++++++++++++---------
1 files changed, 69 insertions(+), 19 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 42ac1e0..ace0f09 100644
--- a/src/main/java/org/springblade/modules/system/controller/UserController.java
+++ b/src/main/java/org/springblade/modules/system/controller/UserController.java
@@ -24,6 +24,7 @@
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;
@@ -44,12 +45,16 @@
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;
import org.springblade.modules.system.vo.UserVO;
@@ -81,6 +86,8 @@
private final IUserService userService;
private final IDeptService iDeptService;
+ private final IRoleService roleService;
+ private final IExperienceService experienceService;
/**
* 查询单条
@@ -133,7 +140,7 @@
@ApiOperationSupport(order = 3)
@ApiOperation(value = "列表", notes = "传入account和realName")
//@PreAuth(RoleConstant.HAS_ROLE_ADMIN)
- public R<IPage<UserVO>> pages(@ApiIgnore User user, Query query, Long deptId, BladeUser bladeUser) {
+ public R<IPage<UserVO>> pages(@ApiIgnore UserVO user, Query query, Long deptId, BladeUser bladeUser) {
IPage<UserVO> pages = userService.selectUserPages(Condition.getPage(query), user, deptId, "000000");
return R.data(pages);
}
@@ -163,6 +170,19 @@
//@PreAuth(RoleConstant.HAS_ROLE_ADMIN)
public R submit(@Valid @RequestBody User user) throws Exception {
CacheUtil.clear(USER_CACHE);
+ //查询角色
+ if (null!=user.getRoleId()){
+ Role role = new Role();
+ role.setId(Long.parseLong(user.getRoleId()));
+ Role one = roleService.getOne(Condition.getQueryWrapper(role));
+ if (one.getRoleAlias().equals("保安")){
+ user.setHold("1");
+ }
+ if (one.getRoleAlias().equals("未持证保安")){
+ user.setHold("2");
+ }
+ }
+
return R.status(userService.submit(user));
}
@@ -399,30 +419,60 @@
return R.data(list);
}
@GetMapping("/zc")
- public R zc(String deptname,String username,String password,String sname,String phone) {
- Dept dept = new Dept();
- Long i = 1426355050199945218L;
- dept.setParentId(i);
- dept.setTenantId("000000");
- dept.setDeptName(deptname);
- dept.setAncestors("0,1426354978959691778,1426355050199945218");
- dept.setDeptCategory(1);
+ public R zc(String username,String password) {
User user = new User();
user.setAccount(username);
user.setPassword(DigestUtil.encrypt(password));
- user.setRealName(sname);
- user.setPhone(phone);
- if (iDeptService.submit(dept)) {
- CacheUtil.clear(SYS_CACHE);
- // 返回懒加载树更新节点所需字段
- Kv kv = Kv.create().set("id", String.valueOf(dept.getId())).set("tenantId", dept.getTenantId())
- .set("deptCategoryName", DictCache.getValue(DictEnum.ORG_CATEGORY, dept.getDeptCategory()));
- String id = kv.get("id").toString();
- user.setDeptId(id);
- }
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