图片，文件上传文件名修改

Administrator

2022-06-11 3a5d12b67221a19ff199846c19c4e74b71f3be84

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

@@ -33,6 +33,7 @@
import lombok.AllArgsConstructor;
import net.sf.json.JSONObject;
import org.apache.commons.codec.Charsets;
import org.apache.commons.lang3.StringUtils;
import org.springblade.common.cache.DictCache;
import org.springblade.common.config.FtpConfig;
import org.springblade.common.enums.DictEnum;
@@ -58,6 +59,8 @@
import org.springblade.core.tool.support.Kv;
import org.springblade.core.tool.utils.*;
import org.springblade.modules.FTP.FtpUtil;
import org.springblade.modules.FTP.Monitor;
import org.springblade.modules.FTP.Result;
import org.springblade.modules.accreditation.entity.AccreditationRecords;
import org.springblade.modules.accreditation.service.AccreditationRecordsService;
import org.springblade.modules.dispatcher.entity.Dispatcher;
@@ -86,6 +89,7 @@
import org.springblade.modules.system.wrapper.UserWrapper;
import org.springblade.modules.training.entity.TrainingRegistration;
import org.springblade.modules.training.service.TrainingRegistrationService;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.scheduling.annotation.Async;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
@@ -104,11 +108,13 @@
import java.security.NoSuchAlgorithmException;
import java.text.SimpleDateFormat;
import java.util.*;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.stream.Collectors;

import static org.springblade.common.config.FtpConfig.*;
import static org.springblade.core.cache.constant.CacheConstant.SYS_CACHE;
import static org.springblade.core.cache.constant.CacheConstant.USER_CACHE;
import static org.springblade.modules.FTP.DataHandler.handlerUserInfo;

/**
 * 控制器
@@ -142,6 +148,8 @@
   private final SecurityPaperService securityPaperService;

   private final MyAsyncService myAsyncService;

   private final RedisTemplate redisTemplate;

   /**
    * 查询单条
@@ -224,20 +232,37 @@
   //@PreAuth(RoleConstant.HAS_ROLE_ADMIN)
   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()));
         }
         //判断角色
         if(user.getRoleId().equals("1412226235153731586")){
            //如果是保安员,默认为无证
            user.setHold("2");
         }
         user.setTenantId("000000");
         user.setDispatch("1");
         //待审查
         user.setExaminationType("2");
//         String realName = user.getRealName();
//         String cardid = user.getCardid();
////         user.setAccount(user.getRealName());
//         user.setAccount(realName.substring(0,1)+cardid.substring(cardid.length()-4));
         //默认在职
         user.setStatus(1);
         user.setIsDeleted(0);
         user.setCreateTime(new Date());
         user.setUpdateTime(new Date());

         //密码加密
         if (Func.isNotEmpty(user.getCardid())) {
            //取身份证号码后6位作为密码
            user.setPassword(DigestUtil.encrypt(user.getCardid().substring(user.getCardid().length() - 6)));
         }
         user.setCreateTime(new Date());
         user.setTenantId("000000");

         //判断是否为民警 code
         if (null != user.getCode() && !user.getCode().equals("")) {
            //民警
@@ -249,32 +274,73 @@
            Jurisdiction one = jurisdictionService.getOne(Condition.getQueryWrapper(jurisdiction));
            user.setJurisdiction(one.getId().toString());
         }
         //新增
         boolean stats = userService.save(user);
         if (stats) {
            //内网同步
            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() + "'"
               + ")";
            myAsyncService.FTP(s);
         //用户新增
//      boolean status = userService.save(user);


         User user1 = Objects.requireNonNull(BeanUtil.copy(user,User.class));

         //生成随机数
         String uuid = UUID.randomUUID().toString();
         //将 user 存入 redis
         redisTemplate.opsForValue().set(uuid,JSON.toJSONString(user));
         //user1 临时设置uuid 到 reason_for_leav 离职原因字段
         user1.setReasonForLeav(uuid);

         //数据推送
         Map<String, Object> map = new HashMap<>(1);
         map.put("user",user1);
         myAsyncService.FTPObject(map);

         int count = 0;
         int flag = 1;
         Result result = new Result();
         //调用ftp获取返回数据
         while (true){
            try {
               Thread.sleep(1000);
            } catch (InterruptedException e) {
               e.printStackTrace();
            }
            //调用ftp获取返回数据
            result = Monitor.isFTPFileExist(uuid);
            //如果返回true,就退处
            if (result.getCode()==200){
               flag = 1;
               break;
            }else if (result.getCode()==201){
               flag = 2;
               break;
            }else if (result.getCode()==202){
               flag = 3;
               break;
            }else if (result.getCode()==203){
               flag = 4;
               break;
            }else{
               //计数
               count++;
               //如果超过10s 没有读取到，则退出
               if (count == 60) {
                  System.out.println("等待超时.....................");
                  break;
               }
            }
         }
         if (flag==1 || flag==2) {
            //返回
            return R.data(200, null, "新增成功!");
         }else if (flag==3){
            throw new ServiceException(result.getMsg());
         }else if (flag==4){
//         return R.data(201, null, "保安证编号不匹配,请核实!也可通过提供保安证件信息提交核实申请!");
            return R.data(201, null, "保安证编号不匹配,请核实!");
         }else{
            //返回
            return R.data(400, null, "新增失败!");
         }


      } else {
         //修改
         User user1 = userService.getById(user.getId());
@@ -301,6 +367,93 @@
      //返回
      return R.success("成功");
   }

   /**
//    * 新增或修改
//    */
//   @PostMapping("/submit")
//   @ApiOperationSupport(order = 4)
//   @ApiOperation(value = "新增或修改", notes = "传入User")
//   //@PreAuth(RoleConstant.HAS_ROLE_ADMIN)
//   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.setIsDeleted(0);
//         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());
//         }
//         //新增
//         boolean stats = userService.save(user);
//         if (stats) {
//            //内网同步
//            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() + "'"
//               + ")";
//            myAsyncService.FTP(s);
//         }
//      } else {
//         //修改
//         User user1 = userService.getById(user.getId());
//         user.setPassword(user1.getPassword());
//         user.setUpdateTime(new Date());
//         boolean b = userService.updateById(user);
//         if (b) {
//            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() + "'"
//                  + ",guncode = " + "'" + user.getGuncode() + "'"
//                  + " " + "where id = " + "'" + user.getId() + "'";
//            myAsyncService.FTP(s1);
//         }
//      }
//
//      //返回
//      return R.success("成功");
//   }

   /**
    * 修改
@@ -567,6 +720,41 @@
      return R.data(200,null,"修改成功!");
   }

   /**
    * 账号修改
    * @param user
    * @return
    */
   @PostMapping("/update_account")
   public R updataAccount(@RequestBody User user){
      boolean status = false;
      //校验账户是否重复
      User user1 = new User();
      user1.setIsDeleted(0);
      user1.setStatus(1);
      user1.setAccount(user.getAccount());
      List<User> list = userService.list(new QueryWrapper<>(user1));
      if (list.size()>0){
         throw new ServiceException("账号：["+user.getAccount()+"]已存在!");
      }
      //如果不重复，则进行修改操作
      //更新用户账户信息
      status = userService.updateById(user);
      if (status){
         System.out.println("user = " + user);
         UserDTO userDTO = new UserDTO();
         userDTO.setAccount(user.getAccount());
         userDTO.setPassword(user.getPassword());
         userDTO.setSecurityId(user.getId().toString());
         userDTO.setPhone(user.getPhone());
         userDTO.setAvatar(user.getAvatar());
         //异步修改群防群控
         myAsyncService.updateUserByAccount(userDTO);
      }
      //返回
      return R.status(status);
   }


   /**
    * 修改
@@ -658,7 +846,7 @@
         }
      }
      //填写你文件上传的地址以及相应信息
      String url = "http://223.82.109.183:2081";
      String url = "http://61.131.136.25:2081";
      String access = "zhbaadmin";
      String secret = "zhbapassword";
      String bucket = "zhba";
@@ -674,7 +862,7 @@
         minioClient.makeBucket(MakeBucketArgs.builder().bucket(bucket).build());
         minioClient.setBucketPolicy(SetBucketPolicyArgs.builder().bucket(bucket).build());
      }
      String newName = "upload/picture/" + UUID.randomUUID().toString().replaceAll("-", "") + ".jpg";
      String newName = "upload/picture/f" + UUID.randomUUID().toString().replaceAll("-", "") + ".jpg";
      InputStream in = new ByteArrayInputStream(b);
      String[] split = newName.split("/");
      //创建头部信息
@@ -691,7 +879,7 @@
      FtpUtil.uploadFile(FtpConfig.ftpHost, ftpPort, FtpConfig.ftpUserName, ftpPassword, ftpPath, "/", split[2], inputStream);
      in.close();
      //外围url
      String urls = "http://223.82.109.183:2081/zhba/" + newName;
      String urls = "http://61.131.136.25:2081/zhba/" + newName;
      //内网
      String inUrl = FtpConfig.ip + "/zhba/" + newName;
      //返回
@@ -890,7 +1078,7 @@
   @ApiOperationSupport(order = 12)
   @ApiOperation(value = "导入用户", notes = "传入excel")
   public R importSecurityTest(MultipartFile file, Integer isCovered, String deptId) {
      SecurityImporterTest securityImporter = new SecurityImporterTest(userService, false, deptId);
      SecurityImporterTest securityImporter = new SecurityImporterTest(userService);
      ExcelUtil.save(file, securityImporter, SecurityExcel.class);
      return R.success("操作成功");
   }
@@ -1128,6 +1316,7 @@
   @GetMapping("/security-apply-tree")
   public R<List<TreeNode>> securityApplyTree(UserVO user) {
      List<TreeNode> tree = userService.getSecurityApplyTree(user);
      System.out.println("tree = " + tree);
      return R.data(tree);
   }

@@ -1178,6 +1367,7 @@
      user.setDispatch("1");
      user.setExaminationType("0");
      user.setAccount(user.getCardid());
      user.setStatus(1);

      User user1 = new User();
      user1.setIsDeleted(0);
@@ -1283,13 +1473,6 @@
      experience.setPost("保安员");
      experienceService.save(experience);


      //发证日期处理
//      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));
@@ -1374,6 +1557,201 @@
   }

   /**
    * 保安员新增(外网不能存敏感数据)
    * @since 2022-04-26
    * @param userMap
    */
   @PostMapping("/securitySaves")
   @Transactional(rollbackFor = Exception.class)
   public R securitySaves(@Valid @RequestBody Map<String, Object> userMap) throws Exception {
      //获取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");
      //待审查
      user.setExaminationType("2");
      String realName = user.getRealName();
      String cardid = user.getCardid();
//         user.setAccount(user.getRealName());
      user.setAccount(realName.substring(0,1)+cardid.substring(cardid.length()-4));
      user.setStatus(1);

      //密码加密
      if (Func.isNotEmpty(user.getCardid())) {
         //取身份证号码后6位作为密码
         user.setPassword(DigestUtil.encrypt(user.getCardid().substring(user.getCardid().length() - 6)));
      }
      user.setCreateTime(new Date());
      user.setTenantId("000000");
      //用户新增
//      boolean status = userService.save(user);


      User user1 = Objects.requireNonNull(BeanUtil.copy(user,User.class));
      //头像
      if (null != user.getAvatar() && !user.getAvatar().equals("")) {
         user1.setAvatar(FtpConfig.ip +"/"+ user.getAvatar().substring(26));
      }
      //指纹
      String url = "";
      if (null != user.getFingerprint() && !user.getFingerprint().equals("")) {
         if (user.getFingerprint().length() > 100) {
            String s = uploadBase64String(user);
            String[] split = s.split(",");
            user.setFingerprint(split[0]);
            url = split[1];
            user1.setFingerprint(url);
         }
      }

      //生成随机数
      String uuid = UUID.randomUUID().toString();
      //将 user 存入 redis
      redisTemplate.opsForValue().set(uuid,JSON.toJSONString(user));
      //user1 临时设置uuid 到 reason_for_leav 离职原因字段
      user1.setReasonForLeav(uuid);

      //数据推送
      Map<String, Object> map = new HashMap<>(1);
      map.put("user",user1);
      myAsyncService.FTPObject(map);

//      int count = 0;
//      int flag = 1;
//      Result result0 = new Result();
//      //调用ftp获取返回数据
//      while (true){
//         System.out.println("用户新增开始接收消息......................");
//         Thread.sleep(2000);
//         //调用ftp获取返回数据
//         result0 = Monitor.isFTPFileExist(uuid);
//         System.out.println("result0 ftp 返回结果 = " + result0);
//         //如果返回true,就退处
//         if (result0.getCode()==200){
//            break;
//         }else{
//            //计数
//            count++;
//            //如果超过60s 没有读取到，则退出
//            if (count == 20) {
//               break;
//            }
//         }
//      }
//
//      //将不能导入的保安员账号存起来
//      List<String> errorList = new ArrayList<>();
//      //保安员证编号不符的保安员信息存入集合
//      List<String> securityInvalidList = new ArrayList<>();
//      //导入状态，默认为true ,如果有一个出现问题则为 false
//      AtomicBoolean status = new AtomicBoolean(true);
//      AtomicBoolean securityInvalidStatus = new AtomicBoolean(true);
//      if (null!=result0){
//         Result result = result0.getData().get(0);
//         //用户数处理
//         User users = handlerUserInfo(uuid);
//         System.out.println("用户数据处理---------------");
//         System.out.println("用户数据 = " + users);
//         //判断结果
//         if (result.getCode()==200){
//            //新增
//            users.setId(result.getUserId());
//            users.setStatus(1);
//            //插入数据库
//            boolean save = userService.save(users);
//            if (save){
//               //异步同步到群防群控
//               myAsyncService.qfqkUserSave(users);
//            }
//         }else if (result.getCode()==201) {
//            //修改
//            users.setId(result.getUserId());
//            //先查询当前库是否有改用户？
//            User user2 = userService.getById(result.getUserId());
//            if (null!=user2) {
//               //数据修改
//               boolean b = userService.updateById(users);
//               if (b) {
//                  //异步同步到群防群控
//                  myAsyncService.updateUserByQfqk(users);
//               }
//            }else {
//               //新增
//               boolean save = userService.save(users);
//               if (save){
//                  //异步同步到群防群控
//                  myAsyncService.qfqkUserSave(users);
//               }
//            }
//         }else if (result.getCode()==203){
//            //保安证编号不匹配,请核实!也可通过提供保安证件信息提交核实申请! 用户为新增
//            //新增
//            users.setId(result.getUserId());
//            //插入数据库
//            boolean save = userService.save(users);
//            if (save) {
//               //异步同步到群防群控
//               myAsyncService.qfqkUserSave(users);
//            }
//            securityInvalidStatus.set(false);
//            //保安证编号不匹配
//            securityInvalidList.add(user.getCardid());
//         }else if (result.getCode()==204){
//            //保安证编号不匹配,请核实!也可通过提供保安证件信息提交核实申请! 内网用户已存在情况
//            users.setId(result.getUserId());
//            //先查询当前库是否有改用户？
//            User user2 = userService.getById(result.getUserId());
//            //判断
//            if (null!=user2) {
//               //修改
//               //数据修改
//               boolean b = userService.updateById(users);
//               if (b){
//                  //异步同步到群防群控
//                  myAsyncService.updateUserByQfqk(users);
//               }
//            }else {
//               //新增
//               boolean save = userService.save(users);
//               if (save){
//                  //异步同步到群防群控
//                  myAsyncService.qfqkUserSave(users);
//               }
//            }
//            securityInvalidStatus.set(false);
//            //保安证编号不匹配
//            securityInvalidList.add(user.getCardid());
//         }else {
//            status.set(false);
//            //已在其他单位存在
//            errorList.add(user.getCardid());
//         }
//      }

      //如果所有数据导入有一个异常
//      StringBuilder errorBuilder = new StringBuilder();
//      if (!status.get()){
//         String errorAccount = StringUtils.join(errorList, "\\\n");
//         errorBuilder.append("用户:[" + errorAccount + "]导入失败!已在其他单位存在!");
//      }
//      //抛出异常
//      if (errorBuilder.length()>0){
//         throw new org.springblade.core.log.exception.ServiceException(errorBuilder.toString());
//      }
//
//      if (!securityInvalidStatus.get()){
////         return R.data(201, null, "保安证编号不匹配,请核实!也可通过提供保安证件信息提交核实申请!");
//         return R.data(201, null, "保安证编号不匹配,请核实!");
//      }
      return R.data(200, null, "新增成功!");
   }

   /**
    * 修改派遣记录，修改从业记录
    *
    * @param user
@@ -1448,7 +1826,6 @@
            "," + "'" + experience.getCompanyname() + "'" +
            "," + "'" + experience.getSecurityid() + "'"
            + ")";
         //FtpUtil.sqlFileUpload(s);
         myAsyncService.FTP(s);
      }
   }
@@ -1491,7 +1868,6 @@
      if (null != user1.getFingerprint() && !user1.getFingerprint().equals("")) {
         //url 转base64
         String base64Url = ImageUtils.imageUrlToBase64(user1.getFingerprint());
         System.out.println("base64Url = " + base64Url);
         user1.setFingerprint(base64Url);
      }
      return R.data(user1);
@@ -1506,7 +1882,7 @@
    */
   @GetMapping("export-security-info")
   public void exportSecurityInfo(HttpServletResponse response, UserVO user) throws IOException {
      List<SecurityExcel> list = userService.exportSecurityInfo(user);
      List<ExportSecurityExcel> list = userService.exportSecurityInfo(user);
      String fileName = null;
      try {
         response.setContentType("application/vnd.ms-excel");
@@ -1514,7 +1890,7 @@
         fileName = URLEncoder.encode("保安员数据导出" + DateUtil.time(), Charsets.UTF_8.name());
         response.setHeader("Content-disposition", "attachment;filename=" + fileName + ".xlsx");
         //修改单元格格式为文本格式
         EasyExcel.write(response.getOutputStream(), SecurityExcel.class).sheet("保安员数据表").registerWriteHandler(new RowWriteHandler()).doWrite(list);
         EasyExcel.write(response.getOutputStream(), ExportSecurityExcel.class).sheet("保安员数据表").registerWriteHandler(new RowWriteHandler()).doWrite(list);
      } catch (Throwable var6) {
         throw var6;
      }
@@ -1572,4 +1948,19 @@
   public R getNotUpdatePwdInfo() {
      return R.data(userService.getNotUpdatePwdInfo());
   }

   /**
    * 用户手动离职（用户数据未同步成功的）
    * @param user
    * @return
    */
   @GetMapping("/leave")
   public void leave(User user){
      user.setStatus(2);
      String s1 =
         "update blade_user set status = " + "'" + user.getStatus() + "'"
            + ",update_time = " + "'" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()) + "'"
            + " " + "where cardid = " + "'" + user.getCardid() + "'";
      myAsyncService.FTP(s1);
   }
}