From 8b464ee379c5b35ac8b22b4e5dde25c4f6fb75cf Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Thu, 19 Aug 2021 15:03:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/system/controller/UserController.java | 60 ++++++++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 44 insertions(+), 16 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 283ed70..67e1d92 100644
--- a/src/main/java/org/springblade/modules/system/controller/UserController.java
+++ b/src/main/java/org/springblade/modules/system/controller/UserController.java
@@ -44,9 +44,12 @@
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.Func;
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.jurisdiction.entity.Jurisdiction;
+import org.springblade.modules.jurisdiction.service.JurisdictionService;
import org.springblade.modules.system.entity.Dept;
import org.springblade.modules.system.entity.Role;
import org.springblade.modules.system.entity.User;
@@ -88,6 +91,8 @@
private final IDeptService iDeptService;
private final IRoleService roleService;
private final IExperienceService experienceService;
+
+ private final JurisdictionService jurisdictionService;
/**
* 查询单条
@@ -140,8 +145,8 @@
@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) {
- IPage<UserVO> pages = userService.selectUserPages(Condition.getPage(query), user, deptId, "000000");
+ public R<IPage<UserVO>> pages(@ApiIgnore UserVO user, Query query) {
+ IPage<UserVO> pages = userService.selectUserPages(Condition.getPage(query), user);
return R.data(pages);
}
@@ -170,6 +175,29 @@
//@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");
+ }
+ }
+
+ //根据 deptId 查询dept信息,公安管理员
+ Dept dept = iDeptService.getById(user.getDeptId());
+ Long sid = 1123598813738675201L;
+ if (dept.getParentId().equals(sid)){
+ //获取辖区的数据
+ Jurisdiction jurisdiction = new Jurisdiction();
+ jurisdiction.setDeptName(dept.getDeptName());
+ Jurisdiction one = jurisdictionService.getOne(Condition.getQueryWrapper(jurisdiction));
+ user.setJurisdiction(one.getId().toString());
+ }
return R.status(userService.submit(user));
}
@@ -350,10 +378,8 @@
* 自定义用户列表(只有保安员)
*/
@GetMapping("/page-security")
- public R<IPage<UserVO>> pageSecurity(@ApiIgnore User user, Query query, Long deptId, BladeUser bladeUser) {
- user.setAccount("admin");
- bladeUser.setTenantId("000000");
- IPage<User> pages = userService.selectUserPageSecurity(Condition.getPage(query), user, deptId, "000000");
+ public R<IPage<UserVO>> pageSecurity(@ApiIgnore User user, Query query) {
+ IPage<User> pages = userService.selectUserPageSecurity(Condition.getPage(query), user);
return R.data(UserWrapper.build().pageVO(pages));
}
@@ -361,10 +387,8 @@
* 自定义用户列表(只有保安员)
*/
@GetMapping("/page-security-unit")
- public List<User> pageSecurityUnit(@ApiIgnore User user, Query query, Long deptId, BladeUser bladeUser) {
- user.setAccount("admin");
- bladeUser.setTenantId("000000");
- List<User> pages = userService.selectUserPageSecurityUnit(Condition.getPage(query), user, deptId, "000000");
+ public List<User> pageSecurityUnit(@ApiIgnore User user, Query query) {
+ List<User> pages = userService.selectUserPageSecurityUnit(Condition.getPage(query), user);
return pages;
}
@@ -372,9 +396,8 @@
* 自定义用户列表(只有保安员)
*/
@GetMapping("/page-security-units")
- public R pageSecurityUnits(@ApiIgnore User user, Query query, Long deptId, BladeUser bladeUser) {
- bladeUser.setTenantId("000000");
- List<User> pages = userService.selectUserPageSecurityUnit(Condition.getPage(query), user, deptId, "000000");
+ public R pageSecurityUnits(@ApiIgnore User user, Query query) {
+ List<User> pages = userService.selectUserPageSecurityUnit(Condition.getPage(query),user);
return R.data(pages);
}
@@ -382,9 +405,8 @@
* 保安员列表，帅选无保安证
*/
@GetMapping("/page-security-apply")
- public R<IPage<UserVO>> pageSecurityApply(@ApiIgnore UserVO user, Query query, Long deptId, BladeUser bladeUser) {
- bladeUser.setTenantId("000000");
- IPage<UserVO> pages = userService.selectUserPageSecurityApply(Condition.getPage(query), user, deptId, "000000");
+ public R<IPage<UserVO>> pageSecurityApply(@ApiIgnore UserVO user, Query query) {
+ IPage<UserVO> pages = userService.selectUserPageSecurityApply(Condition.getPage(query), user);
return R.data(pages);
}
@@ -408,8 +430,10 @@
@GetMapping("/zc")
public R zc(String username,String password) {
User user = new User();
+ user.setTenantId("000000");
user.setAccount(username);
user.setPassword(DigestUtil.encrypt(password));
+ user.setRoleId("1428177141018771458");
userService.saveOrUpdate(user);
return R.success("注册成功");
}
@@ -440,6 +464,10 @@
user.setRoleId(oneRole.getId().toString());
}
}
+ //密码加密
+ if (Func.isNotEmpty(user.getPassword())) {
+ user.setPassword(DigestUtil.encrypt(user.getPassword()));
+ }
//用户新增
boolean status = userService.save(user);
//获取从业记录
--
Gitblit v1.9.3