保安员新增修改接口修改

Administrator

2021-10-27 37e8b95d39c30dd0f59d2dcc2b73fb64ee493a42

 src/main/java/org/springblade/modules/system/controller/UserController.java

@@ -17,6 +17,7 @@
package org.springblade.modules.system.controller;


import com.alibaba.excel.EasyExcel;
import com.aliyun.oss.ServiceException;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -28,9 +29,11 @@
import io.swagger.annotations.ApiParam;
import com.alibaba.fastjson.JSON;
import lombok.AllArgsConstructor;
import org.apache.commons.codec.Charsets;
import org.springblade.common.cache.DictCache;
import org.springblade.common.config.FtpConfig;
import org.springblade.common.enums.DictEnum;
import org.springblade.common.excel.RowWriteHandler;
import org.springblade.common.utils.arg;
import org.springblade.core.cache.utils.CacheUtil;
import org.springblade.core.excel.util.ExcelUtil;
@@ -54,9 +57,7 @@
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.excel.*;
import org.springblade.modules.system.node.TreeNode;
import org.springblade.modules.system.service.IDeptService;
import org.springblade.modules.system.service.IRoleService;
@@ -71,6 +72,8 @@

import javax.servlet.http.HttpServletResponse;
import javax.validation.Valid;
import java.io.IOException;
import java.net.URLEncoder;
import java.text.SimpleDateFormat;
import java.util.*;

@@ -232,19 +235,19 @@
      User user1 = userService.getById(user.getId());
      user.setPassword(user1.getPassword());
      userService.updateById(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").format(user.getRtime());
      }

      String paperTime;
      //发证日期处理
      if (user.getPaperTime() == null) {
         paperTime = null;
      } else {
         paperTime = new SimpleDateFormat("yyyy-MM-dd").format(user.getPaperTime());
      }

      String s1 =
@@ -361,9 +364,22 @@
   @PostMapping("import-user")
   @ApiOperationSupport(order = 12)
   @ApiOperation(value = "导入用户", notes = "传入excel")
   public R importUser(MultipartFile file, Integer isCovered) {
      UserImporter userImporter = new UserImporter(userService, false);
   public R importUser(MultipartFile file, Integer isCovered,String deptId) {
      UserImporter userImporter = new UserImporter(userService, false,deptId);
      ExcelUtil.save(file, userImporter, UserExcel.class);
      return R.success("操作成功");
   }


   /**
    * 保安员证二维码批量生成
    */
   @PostMapping("import-qrCode")
   @ApiOperationSupport(order = 12)
   @ApiOperation(value = "导入用户", notes = "传入excel")
   public R importQrCode(@RequestParam("file") MultipartFile file, Integer isCovered,String deptId) {
      QrCodeImporter qrCodeImporter = new QrCodeImporter(userService, false,deptId);
      ExcelUtil.save(file, qrCodeImporter, QrCodeExcel.class);
      return R.success("操作成功");
   }

@@ -413,7 +429,7 @@
   @GetMapping("export-template-security")
   @ApiOperationSupport(order = 14)
   @ApiOperation(value = "导出模板")
   public void exportSecurity(HttpServletResponse response) {
   public void exportSecurity(HttpServletResponse response) throws IOException {
      List<UserExcel> list = new ArrayList<>();
      UserExcel userExcel = new UserExcel();
      userExcel.setDeptId("xxx保安公司");
@@ -449,7 +465,18 @@
      userExcel1.setHold("否");
      userExcel1.setSecuritynumber("");
      list.add(userExcel1);
      ExcelUtil.export(response, "保安员导入数据模板", "保安员数据表", list, UserExcel.class);
      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());
         response.setHeader("Content-disposition", "attachment;filename=" + fileName + ".xlsx");
         //修改单元格格式为文本格式
         EasyExcel.write(response.getOutputStream(), UserExcel.class).sheet("保安员数据表").registerWriteHandler(new RowWriteHandler()).doWrite(list);
      } catch (Throwable var6) {
         throw var6;
      }
//      ExcelUtil.export(response, "保安员导入数据模板", "保安员数据表", list, UserExcel.class);
   }


@@ -575,10 +602,6 @@
   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("保安");
@@ -586,6 +609,7 @@
      user.setRoleId(oneRole.getId().toString());
      user.setDispatch("1");
      user.setExaminationType("0");
      user.setAccount(user.getCardid());

      Integer userCount = userService.selectCount(user.getAccount());
      if (userCount > 0 && Func.isEmpty(user.getId())) {
@@ -602,27 +626,27 @@
//         }
//      }
      //密码加密
      if (Func.isNotEmpty(user.getPassword())) {
         user.setPassword(DigestUtil.encrypt(user.getPassword()));
      if (Func.isNotEmpty(user.getCardid())) {
//         user.setPassword(DigestUtil.encrypt(user.getPassword()));
         //取身份证号码后6位作为密码
         user.setPassword(DigestUtil.encrypt(user.getCardid().substring(user.getCardid().length() - 6)));
      }
      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());
      }

      String paperTime;
      if (user.getRtime() == null) {
         rtime = null;
      } else {
         rtime = new SimpleDateFormat("yyyy-MM-dd").format(user.getRtime());
      }

      //发证日期处理
      if (user.getPaperTime() == null) {
         paperTime = "";
      } else {
         paperTime = new SimpleDateFormat("yyyy-MM-dd").format(user.getPaperTime());
      }
      //头像
      if (null!=user.getAvatar() && !user.getAvatar().equals("")) {
         user.setAvatar(FtpConfig.ip + user.getAvatar().substring(26));
@@ -633,11 +657,22 @@
         user.setFingerprint(FtpConfig.ip + user.getFingerprint().substring(26));
      }

      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,examination_type,status,is_deleted,dispatch) " +
         "values(" + "'" + user.getId() + "'" + "," + "'" + user.getTenantId() + "'" + "," + "'" + user.getAccount() + "'" + "," +
         "'" + user.getPassword() + "'" + "," + "'" + user.getName() + "'" + "," + "'" + user.getRealName() + "'" + "," + "'" + user.getAvatar() + "'" + "," +
         "'" + user.getEmail() + "'" + "," + "'" + user.getPhone() + "'" + "," + "'" + user.getSex() + "'" + "," + "'" + user.getRoleId() + "'" +
      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,examination_type,status,is_deleted,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() + "'" +
@@ -645,11 +680,11 @@
         "," + "'" + user.getFingerprint() + "'" +
         "," + "'" + user.getEducation() + "'" +
         "," + "'" + user.getPoliticaloutlook() + "'" +
         "," + "'" + user.getHealstats() + "'"
         + "," + "'" + user.getHeight() + "'" +
         "," + "'" + user.getHealstats() + "'"+
         "," + "'" + user.getHeight() + "'" +
         "," + "'" + user.getAddress() + "'" +
         "," + "'" + user.getRegistered() + "'" + "," +
         "'" + rtime + "'" +
         "," + "'" + user.getRegistered() + "'" +
         "," +"'" + rtime + "'" +
         "," + "'" + user.getSecuritynumber() + "'" +
         "," + "'" + user.getHold() + "'" +
         "," + "'" + user.getJurisdiction() + "'" +