注册登录，车辆，装备，枪支，招聘，培训考试修改

Administrator

2021-09-27 345d17cf82e1bbc1fbfbeec10193c2bed59cd674

 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;
@@ -64,17 +67,17 @@
import org.springblade.modules.system.vo.DeptVO;
import org.springblade.modules.system.vo.UserVO;
import org.springblade.modules.system.wrapper.UserWrapper;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import springfox.documentation.annotations.ApiIgnore;

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

import static org.springblade.core.cache.constant.CacheConstant.SYS_CACHE;
import static org.springblade.core.cache.constant.CacheConstant.USER_CACHE;
@@ -231,7 +234,9 @@
   @ApiOperation(value = "修改", notes = "传入User")
   public R update(@Valid @RequestBody User user) {
      CacheUtil.clear(USER_CACHE);
      userService.updateUser(user);
      User user1 = userService.getById(user.getId());
      user.setPassword(user1.getPassword());
      userService.updateById(user);
      Date birthday1 = user.getBirthday();
      String birthday;
      String rtime;
@@ -285,6 +290,12 @@
   //@PreAuth(RoleConstant.HAS_ROLE_ADMIN)
   public R remove(@RequestParam String ids) {
      CacheUtil.clear(USER_CACHE);
      List<String> list = Arrays.asList(ids.split(","));
      list.forEach(id -> {
         //内网同步
         String s1 = "update blade_user set is_deleted = 1 where id = " + "'" + id + "'";
         FtpUtil.sqlFileUpload(s1);
      });
      return R.status(userService.removeUser(ids));
   }

@@ -355,8 +366,8 @@
   @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("操作成功");
   }
@@ -407,7 +418,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保安公司");
@@ -443,7 +454,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);
   }


@@ -565,6 +587,7 @@
    * 保安员新增
    */
   @PostMapping("/securitySave")
   @Transactional(rollbackFor = Exception.class)
   public R securitySave(@Valid @RequestBody Map<String, Object> userMap) {
      //获取user
      User user = JSON.parseObject(JSON.toJSONString(userMap.get("user")), User.class);
@@ -578,6 +601,7 @@
      Role oneRole = roleService.getOne(Condition.getQueryWrapper(role));
      user.setRoleId(oneRole.getId().toString());
      user.setDispatch("1");
      user.setExaminationType("0");

      Integer userCount = userService.selectCount(user.getAccount());
      if (userCount > 0 && Func.isEmpty(user.getId())) {
@@ -614,26 +638,19 @@
      } else {
         rtime = new SimpleDateFormat("yyyy-MM-dd").format(user.getRtime());
      }
      String urla = "";
      String[] split = user.getAvatar().split(",");
      for (int i = 0; i < split.length; i++) {
         String s = split[i].substring(26, split[i].length());
         urla += FtpConfig.ip + s + ",";
      }
      String substring = urla.substring(0, urla.length() - 1);
      user.setAvatar(substring);

      String urlf = "";
      String[] splits = user.getFingerprint().split(",");
      for (int i = 0; i < splits.length; i++) {
         String s = splits[i].substring(26, splits[i].length());
         urlf += FtpConfig.ip + s + ",";
      //头像
      if (null!=user.getAvatar() && !user.getAvatar().equals("")) {
         user.setAvatar(FtpConfig.ip + user.getAvatar().substring(26));
      }
      String substrings = urla.substring(0, urlf.length() - 1);
      user.setFingerprint(substrings);

      //指纹
      if (null!=user.getFingerprint() && !user.getFingerprint().equals("")) {
         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,status,is_deleted,dispatch) " +
         "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() + "'" +
@@ -648,9 +665,11 @@
         + "," + "'" + user.getHeight() + "'" +
         "," + "'" + user.getAddress() + "'" +
         "," + "'" + user.getRegistered() + "'" + "," +
         "'" + rtime + "'" + "," + "'" + user.getSecuritynumber() + "'" +
         "'" + rtime + "'" +
         "," + "'" + user.getSecuritynumber() + "'" +
         "," + "'" + user.getHold() + "'" +
         "," + "'" + user.getJurisdiction() + "'" +
         "," + "'" + user.getExaminationType() + "'" +
         "," + "'" + user.getStatus() + "'" +
         "," + "'" + user.getIsDeleted() + "'" +
         "," + "'" + user.getDispatch() + "'" + ")";