From cc057177b2fb17aee9a173a6adbabdc578fd74c7 Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Mon, 06 Dec 2021 10:30:44 +0800
Subject: [PATCH] 1.许可
---
src/main/java/org/springblade/modules/system/controller/UserController.java | 415 +++++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 391 insertions(+), 24 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 021b09b..e58b4eb 100644
--- a/src/main/java/org/springblade/modules/system/controller/UserController.java
+++ b/src/main/java/org/springblade/modules/system/controller/UserController.java
@@ -17,14 +17,20 @@
package org.springblade.modules.system.controller;
+import com.aliyun.oss.ServiceException;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import io.swagger.annotations.ApiImplicitParam;
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.constant.FtpConstant;
+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;
@@ -38,12 +44,24 @@
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.utils.DateUtil;
-import org.springblade.core.tool.utils.StringPool;
+import org.springblade.core.tool.support.Kv;
+import org.springblade.core.tool.utils.*;
+import org.springblade.modules.FTP.FtpUtil;
+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;
+import org.springblade.modules.system.excel.SecurityImporter;
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;
import org.springblade.modules.system.wrapper.UserWrapper;
import org.springframework.web.bind.annotation.*;
@@ -52,10 +70,13 @@
import javax.servlet.http.HttpServletResponse;
import javax.validation.Valid;
+import java.text.SimpleDateFormat;
import java.util.ArrayList;
+import java.util.Date;
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;
/**
@@ -71,6 +92,11 @@
public class UserController {
private final IUserService userService;
+ private final IDeptService iDeptService;
+ private final IRoleService roleService;
+ private final IExperienceService experienceService;
+
+ private final JurisdictionService jurisdictionService;
/**
* 查询单条
@@ -78,7 +104,7 @@
@ApiOperationSupport(order = 1)
@ApiOperation(value = "查看详情", notes = "传入id")
@GetMapping("/detail")
- @PreAuth(RoleConstant.HAS_ROLE_ADMIN)
+// @PreAuth(RoleConstant.HAS_ROLE_ADMIN)
public R<UserVO> detail(User user) {
User detail = userService.getOne(Condition.getQueryWrapper(user));
return R.data(UserWrapper.build().entityVO(detail));
@@ -115,6 +141,22 @@
/**
* 自定义用户列表
*/
+ @GetMapping("/pages")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "account", value = "账号名", paramType = "query", dataType = "string"),
+ @ApiImplicitParam(name = "realName", value = "姓名", paramType = "query", dataType = "string")
+ })
+ @ApiOperationSupport(order = 3)
+ @ApiOperation(value = "列表", notes = "传入account和realName")
+ //@PreAuth(RoleConstant.HAS_ROLE_ADMIN)
+ public R<IPage<UserVO>> pages(@ApiIgnore UserVO user, Query query) {
+ IPage<UserVO> pages = userService.selectUserPages(Condition.getPage(query), user);
+ return R.data(pages);
+ }
+
+ /**
+ * 自定义用户列表
+ */
@GetMapping("/page")
@ApiImplicitParams({
@ApiImplicitParam(name = "account", value = "账号名", paramType = "query", dataType = "string"),
@@ -137,9 +179,46 @@
//@PreAuth(RoleConstant.HAS_ROLE_ADMIN)
public R submit(@Valid @RequestBody User user) throws Exception {
CacheUtil.clear(USER_CACHE);
- arg arg = new arg();
- arg.test01(arg.url+"/blade-user/save",user);
- return R.status(userService.submit(user));
+ //查询角色
+// 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());
+// }
+ userService.submit(user);
+ // String birthday = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(user.getBirthday());
+ String rtime = null;
+ if (null!=user.getRtime()) {
+ rtime = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(user.getRtime());
+ }
+ String s = "insert into blade_user(id,tenant_id,account,password,name,real_name,avatar,email,phone,birthday,sex,role_id,dept_id,cardid,nativePlace,nation,education," +
+ "politicaloutlook,healstats,height,address,registered,rtime,securitynumber,hold,jurisdiction) " +
+ "values(" + "'" + user.getId() + "'" + "," + "'" + 000000 + "'" + "," + "'" + user.getAccount() + "'" + "," +
+ "'" + user.getPassword() + "'" + "," +"'" + user.getName() + "'" + "," + "'" + user.getRealName() + "'" + "," + "'" + user.getAvatar() + "'" + "," +
+ "'" + user.getEmail() + "'" + "," + "'" + user.getPhone() + "'" + "," + "'" + user.getSex() + "'" + "," + "'" + user.getRoleId() + "'" +
+ "," + "'" + user.getDeptId() + "'" + "," + "'" + user.getCardid() + "'" + "," + "'" + user.getNativeplace() + "'" + "," + "'"
+ + user.getNation() + "'" + "," + "'" + user.getEducation() + "'" + "," + "'" + user.getPoliticaloutlook() + "'" + "," + "'" + user.getHealstats() + "'"
+ + "," +"'" + user.getHeight() + "'" + "," + "'" + user.getAddress() + "'" +"," + "'" + user.getRegistered() + "'"+ "," +
+ "'" + rtime + "'"+ "," + "'" + user.getSecuritynumber() + "'"+"," + "'" + user.getHold() + "'"+"," + "'" + user.getJurisdiction() + "'"+")";
+ FtpUtil.sqlFileUpload(s);
+ return R.success("成功");
}
/**
@@ -150,7 +229,50 @@
@ApiOperation(value = "修改", notes = "传入User")
public R update(@Valid @RequestBody User user) {
CacheUtil.clear(USER_CACHE);
- return R.status(userService.updateUser(user));
+ userService.updateUser(user);
+ Date birthday1 = user.getBirthday();
+ String birthday;
+ String rtime;
+ if (user.getBirthday()==null){
+ birthday =null;
+ }
+ else {
+ birthday = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(user.getBirthday());
+ }
+
+ if ( user.getRtime()==null){
+ rtime =null;
+ }
+ else {
+ rtime = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(user.getRtime());
+ }
+
+ String s1 =
+ "update blade_user set account = " + "'" + user.getAccount()+ "'"
+ + ",name = " + "'" + user.getName()+"'"
+ + ",real_name = " + "'" + user.getRealName()+"'"
+ + ",avatar = " + "'" + user.getAvatar()+"'"
+ + ",email = " + "'" + user.getEmail()+"'"
+ + ",phone = " + "'" + user.getPhone()+"'"
+ + ",sex = " + "'" + user.getSex()+"'"
+ + ",role_id = " + "'" + user.getRoleId()+"'"
+ + ",dept_id = " + "'" + user.getDeptId()+"'"
+ + ",cardid = " + "'" + user.getCardid()+"'"
+ + ",nativePlace = " + "'" +user.getNativeplace()+"'"
+ + ",nation = " + "'" +user.getNation()+"'"
+ + ",education = " + "'" +user.getEducation()+"'"
+ + ",politicaloutlook = " + "'" +user.getPoliticaloutlook()+"'"
+ + ",healstats = " + "'" +user.getHealstats()+"'"
+ + ",height = " + "'" +user.getHeight()+"'"
+ + ",address = " + "'" +user.getAddress()+"'"
+ + ",registered = " + "'" +user.getRegistered()+"'"
+ + ",rtime = " + "'" +rtime+"'"
+ + ",securitynumber = " + "'" +user.getSecuritynumber()+"'"
+ + ",hold = " + "'" +user.getHold()+"'"
+ + ",jurisdiction = " + "'" +user.getJurisdiction()+"'"
+ + " " +"where id = " + "'" + user.getId() + "'";
+ FtpUtil.sqlFileUpload(s1);
+ return R.success("修改成功");
}
/**
@@ -227,32 +349,45 @@
}
/**
- * 导入用户
+ * 导入用户page-security-apply
*/
@PostMapping("import-user")
@ApiOperationSupport(order = 12)
@ApiOperation(value = "导入用户", notes = "传入excel")
public R importUser(MultipartFile file, Integer isCovered) {
- UserImporter userImporter = new UserImporter(userService, isCovered == 1);
+ UserImporter userImporter = new UserImporter(userService, false);
ExcelUtil.save(file, userImporter, UserExcel.class);
return R.success("操作成功");
}
+
/**
- * 导出用户
+ * 导入保安员
*/
- @GetMapping("export-user")
- @ApiOperationSupport(order = 13)
- @ApiOperation(value = "导出用户", notes = "传入user")
- public void exportUser(@ApiIgnore @RequestParam Map<String, Object> user, BladeUser bladeUser, HttpServletResponse response) {
- QueryWrapper<User> queryWrapper = Condition.getQueryWrapper(user, User.class);
- if (!AuthUtil.isAdministrator()) {
- queryWrapper.lambda().eq(User::getTenantId, bladeUser.getTenantId());
- }
- queryWrapper.lambda().eq(User::getIsDeleted, BladeConstant.DB_NOT_DELETED);
- List<UserExcel> list = userService.exportUser(queryWrapper);
- ExcelUtil.export(response, "用户数据" + DateUtil.time(), "用户数据表", list, UserExcel.class);
+ @PostMapping("import-security")
+ @ApiOperationSupport(order = 12)
+ @ApiOperation(value = "导入用户", notes = "传入excel")
+ public R importSecurity(MultipartFile file, Integer isCovered) {
+ SecurityImporter securityImporter = new SecurityImporter(userService, false);
+ ExcelUtil.save(file, securityImporter, UserExcel.class);
+ return R.success("操作成功");
}
+
+// /**
+// * 导出用户
+// */
+// @GetMapping("export-user")
+// @ApiOperationSupport(order = 13)
+// @ApiOperation(value = "导出用户", notes = "传入user")
+// public void exportUser(@ApiIgnore @RequestParam Map<String, Object> user, BladeUser bladeUser, HttpServletResponse response) {
+// QueryWrapper<User> queryWrapper = Condition.getQueryWrapper(user, User.class);
+// if (!AuthUtil.isAdministrator()) {
+// queryWrapper.lambda().eq(User::getTenantId, bladeUser.getTenantId());
+// }
+// queryWrapper.lambda().eq(User::getIsDeleted, BladeConstant.DB_NOT_DELETED);
+// List<UserExcel> list = userService.exportUser(queryWrapper);
+// ExcelUtil.export(response, "用户数据" + DateUtil.time(), "用户数据表", list, UserExcel.class);
+// }
/**
* 导出模板
@@ -263,6 +398,51 @@
public void exportUser(HttpServletResponse response) {
List<UserExcel> list = new ArrayList<>();
ExcelUtil.export(response, "用户数据模板", "用户数据表", list, UserExcel.class);
+ }
+
+ /**
+ * 保安员导出模板
+ */
+ @GetMapping("export-template-security")
+ @ApiOperationSupport(order = 14)
+ @ApiOperation(value = "导出模板")
+ public void exportSecurity(HttpServletResponse response) {
+ List<UserExcel> list = new ArrayList<>();
+ UserExcel userExcel = new UserExcel();
+ userExcel.setDeptId("xxx保安公司");
+ userExcel.setRealName("张三");
+ userExcel.setEmail("xxx@**.com");
+ userExcel.setPhone("12345678901");
+ userExcel.setSex("男");
+ userExcel.setCardid("360XXX19XXXXXX****");
+ userExcel.setNativeplace("江西南昌");
+ userExcel.setNation("汉");
+ userExcel.setPoliticaloutlook("中共党员");
+ userExcel.setHeight(180);
+ userExcel.setAddress("江西省南昌市******");
+ userExcel.setRegistered("江西南昌");
+ userExcel.setRtime("2021-05-01");
+ userExcel.setHold("是");
+ userExcel.setSecuritynumber("赣洪202100001");
+ list.add(userExcel);
+ UserExcel userExcel1 = new UserExcel();
+ userExcel1.setDeptId("xxx保安公司");
+ userExcel1.setRealName("李四");
+ userExcel1.setEmail("xxx@**.com");
+ userExcel1.setPhone("12345678901");
+ userExcel1.setSex("女");
+ userExcel1.setCardid("360XXX19XXXXXX****");
+ userExcel1.setNativeplace("江西南昌");
+ userExcel1.setNation("汉");
+ userExcel1.setPoliticaloutlook("中共党员");
+ userExcel1.setHeight(180);
+ userExcel1.setAddress("江西省南昌市******");
+ userExcel1.setRegistered("江西南昌");
+ userExcel1.setRtime("2021-05-01");
+ userExcel1.setHold("否");
+ userExcel1.setSecuritynumber("");
+ list.add(userExcel1);
+ ExcelUtil.export(response, "保安员导入数据模板", "保安员数据表", list, UserExcel.class);
}
@@ -319,10 +499,197 @@
* 自定义用户列表(只有保安员)
*/
@GetMapping("/page-security")
- public R<IPage<UserVO>> pageSecurity(@ApiIgnore User user, Query query, Long deptId, BladeUser bladeUser) {
- user.setAccount("admin");
- IPage<User> pages = userService.selectUserPageSecurity(Condition.getPage(query), user, deptId, (bladeUser.getTenantId().equals(BladeConstant.ADMIN_TENANT_ID) ? StringPool.EMPTY : bladeUser.getTenantId()));
+ 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));
}
+ /**
+ * 自定义用户列表(只有保安员)
+ */
+ @GetMapping("/page-security-unit")
+ public List<User> pageSecurityUnit(@ApiIgnore User user, Query query) {
+ List<User> pages = userService.selectUserPageSecurityUnit(Condition.getPage(query), user);
+ return pages;
+ }
+
+ /**
+ * 自定义用户列表(只有保安员)
+ */
+ @GetMapping("/page-security-units")
+ public R pageSecurityUnits(@ApiIgnore User user, Query query) {
+ List<User> pages = userService.selectUserPageSecurityUnit(Condition.getPage(query),user);
+ return R.data(pages);
+ }
+
+ /**
+ * 保安员列表，帅选无保安证
+ */
+ @GetMapping("/page-security-apply")
+ public R<IPage<UserVO>> pageSecurityApply(@ApiIgnore UserVO user, Query query) {
+ IPage<UserVO> pages = userService.selectUserPageSecurityApply(Condition.getPage(query), user);
+ return R.data(pages);
+ }
+
+ /**
+ * 保安员列表树，帅选无保安证,下拉tree
+ */
+ @GetMapping("/security-apply-tree")
+ public R<List<TreeNode>> securityApplyTree(UserVO user) {
+ List<TreeNode> tree = userService.getSecurityApplyTree(user);
+ return R.data(tree);
+ }
+
+ /**
+ * 自定义用户列表(只有保安员)
+ */
+ @GetMapping("/selectInr")
+ public R selectInr(String deptid) {
+ 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.setTenantId("000000");
+ user.setAccount(username);
+ user.setPassword(DigestUtil.encrypt(password));
+ user.setRoleId("1428177141018771458");
+ 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);
+ //判断是否为空
+
+ //分配保安角色
+ Role role = new Role();
+ role.setRoleAlias("保安");
+ Role oneRole = roleService.getOne(Condition.getQueryWrapper(role));
+ user.setRoleId(oneRole.getId().toString());
+ user.setDispatch("1");
+
+ Integer userCount = userService.selectCount(user.getAccount());
+ if (userCount > 0 && Func.isEmpty(user.getId())) {
+ throw new ServiceException(StringUtil.format("当前用户 [{}] 已存在!", user.getAccount()));
+ }
+
+ //密码加密
+ if (Func.isNotEmpty(user.getPassword())) {
+ user.setPassword(DigestUtil.encrypt(user.getPassword()));
+ }
+ user.setTenantId("000000");
+ //用户新增
+ boolean status = userService.save(user);
+
+ String birthday;
+ String rtime;
+ if (user.getBirthday()==null){
+ birthday =null;
+ }
+ else {
+ birthday = new SimpleDateFormat("yyyy-MM-dd").format(user.getBirthday());
+ }
+
+ if ( user.getRtime()==null){
+ rtime =null;
+ }
+ else {
+ rtime = new SimpleDateFormat("yyyy-MM-dd").format(user.getRtime());
+ }
+ String urla = "";
+ if (null!=user.getFingerprint() && !user.getFingerprint().equals("")) {
+ String[] split = user.getAvatar().split(",");
+ for (int i = 0; i < split.length; i++) {
+ String s = split[i].substring(26, split[i].length());
+ urla += FtpConstant.ip + s + ",";
+ }
+ String substring = urla.substring(0, urla.length() - 1);
+ user.setAvatar(substring);
+ }
+
+ String urlf = "";
+ if (null!=user.getFingerprint() && !user.getFingerprint().equals("")) {
+ String[] splits = user.getFingerprint().split(",");
+ for (int i = 0; i < splits.length; i++) {
+ String s = splits[i].substring(26, splits[i].length());
+ urlf += FtpConstant.ip + s + ",";
+ }
+ String substrings = urla.substring(0, urlf.length() - 1);
+ user.setFingerprint(substrings);
+ }
+
+ String s = "insert into blade_user(id,tenant_id,account,password,name,real_name,avatar,email,phone,sex,role_id,dept_id,cardid,nativePlace,nation,fingerprint,education," +
+ "politicaloutlook,healstats,height,address,registered,rtime,securitynumber,hold,jurisdiction,dispatch) " +
+ "values(" + "'" + user.getId() + "'" + "," + "'" + user.getTenantId() + "'" + "," + "'" + user.getAccount() + "'" + "," +
+ "'" + user.getPassword() + "'" + "," + "'" + user.getName() + "'" + "," + "'" + user.getRealName() + "'" + "," + "'" + user.getAvatar() + "'" + "," +
+ "'" + user.getEmail() + "'" + "," + "'" + user.getPhone() + "'" + "," + "'" + user.getSex() + "'" + "," + "'" + user.getRoleId() + "'" +
+ "," + "'" + user.getDeptId() + "'" +
+ "," + "'" + user.getCardid() + "'" +
+ "," + "'" + user.getNativeplace() + "'" +
+ "," + "'" + user.getNation() + "'" +
+ "," + "'" + user.getFingerprint() + "'" +
+ "," + "'" + user.getEducation() + "'" +
+ "," + "'" + user.getPoliticaloutlook() + "'" +
+ "," + "'" + user.getHealstats() + "'"
+ + "," + "'" + user.getHeight() + "'" +
+ "," + "'" + user.getAddress() + "'" +
+ "," + "'" + user.getRegistered() + "'" + "," +
+ "'" + rtime + "'" + "," + "'" + user.getSecuritynumber() + "'" +
+ "," + "'" + user.getHold() + "'" +
+ "," + "'" + user.getJurisdiction() + "'" +
+ "," + "'" + user.getDispatch() + "'" + ")";
+ FtpUtil.sqlFileUpload(s);
+
+ //获取从业记录
+// 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);
+ }
+
+
+ /**
+ * 保安员信息
+ * @param user
+ * @return
+ */
+ @GetMapping("/getUserDetails")
+ public R getUserDetails(User user) {
+ return R.data(userService.getUserDetails(user));
+ }
+
+
+ /**
+ *
+ * @param type 1:保安 2:公安
+ * @param deptid
+ * @param jurisdiction
+ * @return
+ */
+ @GetMapping("/seleL")
+ public R seleL(String type,String deptid, String jurisdiction,Long userId) {
+ List<Map<String, Object>> list = userService.seleL(type,deptid, jurisdiction,userId);
+ return R.data(list);
+ }
+
+
+
}
--
Gitblit v1.9.3