From 0e5b425783f87d734d07e83779988c8d18bb2dc7 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Tue, 09 Nov 2021 23:19:31 +0800
Subject: [PATCH] 保安员新增，修改接口修改，判断是否为民警，导入接口修改
---
src/main/java/org/springblade/modules/system/controller/UserController.java | 222 ++++++++++++++++++++++++++++++++++--------------------
1 files changed, 139 insertions(+), 83 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 a3fe945..dc28eb4 100644
--- a/src/main/java/org/springblade/modules/system/controller/UserController.java
+++ b/src/main/java/org/springblade/modules/system/controller/UserController.java
@@ -33,6 +33,8 @@
import org.springblade.common.cache.DictCache;
import org.springblade.common.config.FtpConfig;
import org.springblade.common.enums.DictEnum;
+import org.springblade.common.excel.CustomCellWriteHeightConfig;
+import org.springblade.common.excel.CustomCellWriteWeightConfig;
import org.springblade.common.excel.RowWriteHandler;
import org.springblade.common.utils.arg;
import org.springblade.core.cache.utils.CacheUtil;
@@ -50,6 +52,7 @@
import org.springblade.core.tool.support.Kv;
import org.springblade.core.tool.utils.*;
import org.springblade.modules.FTP.FtpUtil;
+import org.springblade.modules.exam.excel.ExportExamScoreExcel;
import org.springblade.modules.experience.entity.Experience;
import org.springblade.modules.experience.service.IExperienceService;
import org.springblade.modules.jurisdiction.entity.Jurisdiction;
@@ -178,49 +181,78 @@
@ApiOperationSupport(order = 4)
@ApiOperation(value = "新增或修改", notes = "传入User")
//@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");
-// }
-// }
+ public R submit(@Valid @RequestBody User user){
+ if (null==user.getId()) {
+ //新增
+ //密码加密
+ if (Func.isNotEmpty(user.getPassword())) {
+ user.setPassword(DigestUtil.encrypt(user.getPassword()));
+ }
+ Integer userCount = userService.selectCountAccount(user.getAccount());
+ if (userCount > 0) {
+ throw new org.springblade.core.log.exception.ServiceException(StringUtil.format("当前用户 [{}] 已存在!", user.getAccount()));
+ }
+ user.setTenantId("000000");
+ user.setStatus(1);
+ user.setCreateTime(new Date());
+ user.setUpdateTime(new Date());
+ //判断是否为民警 code
+ if (null != user.getCode() && !user.getCode().equals("")) {
+ //民警
+ //根据 deptId 查询dept信息,公安管理员
+ Dept dept = iDeptService.getById(user.getDeptId());
+ //获取辖区的数据
+ Jurisdiction jurisdiction = new Jurisdiction();
+ jurisdiction.setDeptName(dept.getDeptName());
+ Jurisdiction one = jurisdictionService.getOne(Condition.getQueryWrapper(jurisdiction));
+ user.setJurisdiction(one.getId().toString());
+ }
+ //新增
+ userService.save(user);
+ //内网同步
+ String s = "insert into blade_user(" +
+ "id,tenant_id,code,account,password,real_name,phone,sex,role_id,dept_id," +
+ "create_time,update_time,cardid,status,is_deleted,jurisdiction) " +
+ "values(" + "'" + user.getId() + "'" + "," +
+ "'" + user.getTenantId() + "'" + "," +
+ "'" + user.getCode() + "'" + "," +
+ "'" + user.getAccount() + "'" + "," +
+ "'" + user.getPassword() + "'" + "," +
+ "'" + user.getRealName() + "'" + "," +
+ "'" + user.getPhone() + "'" + "," +
+ "'" + user.getSex() + "'" + "," +
+ "'" + user.getRoleId() + "'" +
+ "," + "'" + user.getDeptId() + "'" +
+ "," + "'" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(user.getCreateTime()) + "'" +
+ "," + "'" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(user.getUpdateTime()) + "'" +
+ "," + "'" + user.getCardid() + "'" +
+ "," + "'" + user.getStatus() + "'" +
+ "," + "'" + user.getIsDeleted() + "'" +
+ "," + "'" + user.getJurisdiction() + "'"
+ + ")";
+ FtpUtil.sqlFileUpload(s);
+ }else {
+ //修改
+ User user1 = userService.getById(user.getId());
+ user.setPassword(user1.getPassword());
+ user.setUpdateTime(new Date());
+ userService.updateById(user);
-// //根据 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());
-// }
- //user.setRoleId("1412226235153731586");
- 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());
-// }
-// user.setIsDeleted(0);
-// 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,education," +
-// "politicaloutlook,healstats,height,address,registered,rtime,securitynumber,hold,jurisdiction,is_deleted) " +
-// "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() + "'"+"," + "'" +user.getIsDeleted() + "'"+ ")";
-// FtpUtil.sqlFileUpload(s);
+ String s1 =
+ "update blade_user set account = " + "'" + user.getAccount() + "'"
+ + ",code = " + "'" + user.getCode() + "'"
+ + ",real_name = " + "'" + user.getRealName() + "'"
+ + ",phone = " + "'" + user.getPhone() + "'"
+ + ",sex = " + "'" + user.getSex() + "'"
+ + ",update_time = " + "'" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(user.getUpdateTime()) + "'"
+ + ",role_id = " + "'" + user.getRoleId() + "'"
+ + ",dept_id = " + "'" + user.getDeptId() + "'"
+ + ",cardid = " + "'" + user.getCardid() + "'"
+ + " " + "where id = " + "'" + user.getId() + "'";
+ FtpUtil.sqlFileUpload(s1);
+ }
+
+ //返回
return R.success("成功");
}
@@ -274,6 +306,29 @@
+ ",hold = " + "'" + user.getHold() + "'"
+ ",jurisdiction = " + "'" + user.getJurisdiction() + "'"
+ ",reason_for_leav = " + "'" + user.getReasonForLeav() + "'"
+ + " " + "where id = " + "'" + user.getId() + "'";
+ FtpUtil.sqlFileUpload(s1);
+ return R.success("修改成功");
+ }
+
+
+ /**
+ * 修改发证时间
+ */
+ @PostMapping("/updatePaperTime")
+ public R updatePaperTime(@RequestBody User user) {
+ user.setPaperTime(new Date());
+ userService.updateById(user);
+ String paperTime = null;
+ //发证日期处理
+ if (user.getPaperTime() == null) {
+ paperTime = null;
+ } else {
+ paperTime = new SimpleDateFormat("yyyy-MM-dd").format(user.getPaperTime());
+ }
+ String s1 =
+ "update blade_user set paper_time = " + "'" + paperTime + "'"
+ + ",user_type = " + "'" + user.getUserType() + "'"
+ " " + "where id = " + "'" + user.getId() + "'";
FtpUtil.sqlFileUpload(s1);
return R.success("修改成功");
@@ -390,9 +445,9 @@
@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);
+ public R importSecurity(MultipartFile file, Integer isCovered,String deptId) {
+ SecurityImporter securityImporter = new SecurityImporter(userService, false,deptId);
+ ExcelUtil.save(file, securityImporter, SecurityExcel.class);
return R.success("操作成功");
}
@@ -412,6 +467,7 @@
// ExcelUtil.export(response, "用户数据" + DateUtil.time(), "用户数据表", list, UserExcel.class);
// }
+
/**
* 导出模板
*/
@@ -430,49 +486,38 @@
@ApiOperationSupport(order = 14)
@ApiOperation(value = "导出模板")
public void exportSecurity(HttpServletResponse response) throws IOException {
- 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);
+ List<SecurityExcel> list = new ArrayList<>();
+ SecurityExcel securityExcel = new SecurityExcel();
+ securityExcel.setDeptId("xxx保安公司");
+ securityExcel.setRealName("张三");
+ securityExcel.setPhone("12345678901");
+ securityExcel.setSex("男");
+ securityExcel.setCardid("360XXX19XXXXXX****");
+ securityExcel.setNation("汉");
+ securityExcel.setRegistered("江西省南昌市******");
+ securityExcel.setHold("是");
+ securityExcel.setSecuritynumber("赣洪202100001");
+ list.add(securityExcel);
+
+ SecurityExcel securityExcel1 = new SecurityExcel();
+ securityExcel1.setDeptId("xxx保安公司");
+ securityExcel1.setRealName("李四");
+ securityExcel1.setPhone("12345678901");
+ securityExcel1.setSex("女");
+ securityExcel1.setCardid("360XXX19XXXXXX****");
+ securityExcel1.setNation("汉");
+ securityExcel1.setRegistered("江西省南昌市******");
+ securityExcel1.setHold("否");
+ securityExcel1.setSecuritynumber("");
+ list.add(securityExcel1);
String fileName = null;
try {
response.setContentType("application/vnd.ms-excel");
response.setCharacterEncoding(org.apache.commons.codec.Charsets.UTF_8.name());
- fileName = URLEncoder.encode("保安员导入数据模板", Charsets.UTF_8.name());
+ fileName = URLEncoder.encode("保安员导入数据模板"+DateUtil.time(), Charsets.UTF_8.name());
response.setHeader("Content-disposition", "attachment;filename=" + fileName + ".xlsx");
//修改单元格格式为文本格式
- EasyExcel.write(response.getOutputStream(), UserExcel.class).sheet("保安员数据表").registerWriteHandler(new RowWriteHandler()).doWrite(list);
+ EasyExcel.write(response.getOutputStream(), SecurityExcel.class).sheet("保安员数据表").registerWriteHandler(new RowWriteHandler()).doWrite(list);
} catch (Throwable var6) {
throw var6;
}
@@ -575,6 +620,15 @@
}
/**
+ * 保安员列表树，帅选无保安证,下拉tree
+ */
+ @GetMapping("/security-dispatcher-tree")
+ public R<List<TreeNode>> getSecurityDispatcherTree(UserVO user) {
+ List<TreeNode> tree = userService.getSecurityDispatcherTree(user);
+ return R.data(tree);
+ }
+
+ /**
* 自定义用户列表(只有保安员)
*/
@GetMapping("/selectInr")
@@ -584,12 +638,14 @@
}
@GetMapping("/zc")
- public R zc(String username, String password) {
+ public R zc(String username, String password,String phone) {
User user = new User();
user.setTenantId("000000");
user.setAccount(username);
user.setPassword(DigestUtil.encrypt(password));
+ user.setDeptId("1426355050199945218");
user.setRoleId("1428177141018771458");
+ user.setPhone(phone);
userService.saveOrUpdate(user);
return R.success("注册成功");
}
--
Gitblit v1.9.3