用户新增时判断角色是否为保安员，如果是需要判断是否已存在身份证号相同的保安员，如果存在则提示

zhongrj

2023-08-30 d3d7222cb64de2cb5390fc57fa1049d800e44786

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

@@ -34,6 +34,7 @@
import net.sf.json.JSONObject;
import org.apache.commons.codec.Charsets;
import org.springblade.common.cache.DictCache;
import org.springblade.common.config.FileConfig;
import org.springblade.common.config.FtpConfig;
import org.springblade.common.enums.DictEnum;
import org.springblade.common.excel.CustomCellWriteHeightConfig;
@@ -211,7 +212,9 @@
   @ApiOperation(value = "列表", notes = "传入account和realName")
   //@PreAuth(RoleConstant.HAS_ROLE_ADMIN)
   public R<IPage<UserVO>> page(@ApiIgnore User user, Query query, Long deptId, BladeUser bladeUser) {
      System.out.println("在线更新代码.... ");
      IPage<UserVO> pages = userService.selectUserPage(Condition.getPage(query), user, deptId, (bladeUser.getTenantId().equals(BladeConstant.ADMIN_TENANT_ID) ? StringPool.EMPTY : bladeUser.getTenantId()));
      System.out.println("=================在线更新代码==================");
      return R.data(pages);
   }

@@ -233,6 +236,18 @@
         if (userCount > 0) {
            throw new org.springblade.core.log.exception.ServiceException(StringUtil.format("当前用户 [{}] 已存在!", user.getAccount()));
         }
         // 校验保安员，如果角色为保安员，则需要判断身份证号是否已注册
         List<String> roleIds = Arrays.asList(user.getRoleId().split(","));
         String roleId = "1412226235153731586";
         if (roleIds.contains(roleId)){
            // 判断是否已存在，通过身份证号码查询用户信息
            QueryWrapper<User> wrapper = new QueryWrapper<>();
            wrapper.eq("is_deleted",0).eq("status",1).eq("cardid",user.getCardid()).like("role_id","%"+roleId+"%");
            List<User> list = userService.list(wrapper);
            if (list.size()>0){
               throw new org.springblade.core.log.exception.ServiceException(StringUtil.format("当前保安员身份证号码 [{}] 已存在!", user.getCardid()));
            }
         }
         user.setTenantId("000000");
         user.setStatus(1);
         user.setIsDeleted(0);
@@ -251,51 +266,12 @@
         }
         //新增
         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);
         }
      }

      //返回
@@ -372,7 +348,7 @@
                        "update sys_dispatcher set status = " + "'" + dispatcher1.getStatus() + "'"
                           + ",update_time = " + "'" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(dispatcher1.getUpdateTime()) + "'"
                           + " " + "where id = " + "'" + dispatcher1.getId() + "'";
                     myAsyncService.FTP(s1);
                     myAsyncService.dataSync(s1);
                  }
               });
            }
@@ -397,7 +373,7 @@
                  "update sys_experience set departureTime = " + "'" + new SimpleDateFormat("yyyy-MM-dd").format(experience1.getDeparturetime()) + "'"
                     + " " + "where id = " + "'" + experience1.getId() + "'";
               //FtpUtil.sqlFileUpload(s1);
               myAsyncService.FTP(s1);
               myAsyncService.dataSync(s1);
            } else {
               //新增
               if (null != user.getRtime()) {
@@ -426,21 +402,21 @@
                     "," + "'" + experience.getCompanyname() + "'" +
                     "," + "'" + experience.getSecurityid() + "'"
                     + ")";
                  myAsyncService.FTP(s);
                  myAsyncService.dataSync(s);
               }
            }

            boolean status = userService.updateById(user);
            //qfqk 数据推送
            if (status) {
               myAsyncService.updateUserByQfqk(user);
//               myAsyncService.updateUserByQfqk(user);
               //内网更新
               String s1 =
                  "update blade_user set status = " + "'" + user.getStatus() + "'"
                     + ",update_time = " + "'" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()) + "'"
                     + " " + "where id = " + "'" + user.getId() + "'";
               myAsyncService.FTP(s1);
               myAsyncService.dataSync(s1);
            }

            return R.success("修改成功");
         }
      }
@@ -486,80 +462,10 @@
            userDTO.setSex(user.getSex());
            userDTO.setAvatar(user.getAvatar());
            //推送qfqk
            myAsyncService.updateUserByAccount(userDTO);
//            myAsyncService.updateUserByAccount(userDTO);
         } else {
            myAsyncService.updateUserByQfqk(user);
//            myAsyncService.updateUserByQfqk(user);
         }
      }


      String rtime;
      if (user.getRtime() == null) {
         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() + "'"
               + ",fingerprint = " + "'" + url + "'"
               + ",my_picture = " + "'" + user.getMyPicture() + "'"
               + ",address = " + "'" + user.getAddress() + "'"
               + ",registered = " + "'" + user.getRegistered() + "'"
               + ",dispatch = " + "'" + user.getDispatch() + "'"
               + ",securitynumber = " + "'" + user.getSecuritynumber() + "'"
               + ",hold = " + "'" + user.getHold() + "'"
               + ",jurisdiction = " + "'" + user.getJurisdiction() + "'"
               + ",reason_for_leav = " + "'" + user.getReasonForLeav() + "'"
               + ",guncode = " + "'" + user.getGuncode() + "'"
               + ",update_time = " + "'" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(user.getUpdateTime()) + "'"
               + " " + "where id = " + "'" + user.getId() + "'";
         //FtpUtil.sqlFileUpload(s1);
         myAsyncService.FTP(s1);
      } else {
         rtime = new SimpleDateFormat("yyyy-MM-dd").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() + "'"
               + ",fingerprint = " + "'" + url + "'"
               + ",my_picture = " + "'" + user.getMyPicture() + "'"
               + ",address = " + "'" + user.getAddress() + "'"
               + ",registered = " + "'" + user.getRegistered() + "'"
               + ",rtime = " + "'" + rtime + "'"
               + ",dispatch = " + "'" + user.getDispatch() + "'"
               + ",securitynumber = " + "'" + user.getSecuritynumber() + "'"
               + ",hold = " + "'" + user.getHold() + "'"
               + ",jurisdiction = " + "'" + user.getJurisdiction() + "'"
               + ",reason_for_leav = " + "'" + user.getReasonForLeav() + "'"
               + ",guncode = " + "'" + user.getGuncode() + "'"
               + ",update_time = " + "'" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(user.getUpdateTime()) + "'"
               + " " + "where id = " + "'" + user.getId() + "'";
         //FtpUtil.sqlFileUpload(s1);
         myAsyncService.FTP(s1);
      }
      if (!states) {
         return R.data(201,null,"保安证编号不匹配,请核实!也可通过提供保安证件信息提交核实申请!");
@@ -635,7 +541,7 @@
            + ",cell = " + "'" + user.getCell() + "'"
            + " " + "where id = " + "'" + user.getId() + "'";
      //FtpUtil.sqlFileUpload(s1);
      myAsyncService.FTP(s1);
      myAsyncService.dataSync(s1);
      return R.success("修改成功");
   }

@@ -658,10 +564,10 @@
         }
      }
      //填写你文件上传的地址以及相应信息
      String url = "http://223.82.109.183:2081";
      String access = "zhbaadmin";
      String secret = "zhbapassword";
      String bucket = "zhba";
      String url = FileConfig.apiUrl;
      String access = FileConfig.access;
      String secret = FileConfig.secret;
      String bucket = FileConfig.bucket;
      MinioClient minioClient =
         MinioClient.builder()
            .endpoint(url)
@@ -687,11 +593,11 @@
            in, in.available(), -1)
            .headers(headers)
            .build());
      InputStream inputStream = new ByteArrayInputStream(b);
      FtpUtil.uploadFile(FtpConfig.ftpHost, ftpPort, FtpConfig.ftpUserName, ftpPassword, ftpPath, "/", split[2], inputStream);
//      InputStream inputStream = new ByteArrayInputStream(b);
//      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 = FileConfig.url + "/zhba/" + newName;
      //内网
      String inUrl = FtpConfig.ip + "/zhba/" + newName;
      //返回
@@ -743,7 +649,7 @@
               "update sys_accreditation_records set status = " + "'" + accreditationRecords1.getStatus() + "'" +
               " " + "where id = " + "'" + accreditationRecords1.getId() + "'";
         //FtpUtil.sqlFileUpload(s1);
         myAsyncService.FTP(s1);
         myAsyncService.dataSync(s1);
         //返回
         return R.success("修改成功");
      }
@@ -754,7 +660,7 @@
            + ",update_time = " + "'" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(user.getUpdateTime()) + "'"
            + " " + "where id = " + "'" + user.getId() + "'";
      //FtpUtil.sqlFileUpload(s1);
      myAsyncService.FTP(s1);
      myAsyncService.dataSync(s1);
      return R.success("修改成功");
   }

@@ -767,20 +673,22 @@
   //@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 -> {
         User user = userService.getById(id);
         User user1 = new User();
         user1.setId(user.getId());
         user1.setCardid(user.getCardid());
         user1.setIsDeleted(1);
         //qfqk 同步
         myAsyncService.deleteUserByQfqk(user1);
         //内网同步
         String s1 = "update blade_user set is_deleted = 1 where id = " + "'" + id + "'";
         //FtpUtil.sqlFileUpload(s1);
         myAsyncService.FTP(s1);
      });
//      List<String> list = Arrays.asList(ids.split(","));
//      list.forEach(id -> {
//         User user = userService.getById(id);
//         User user1 = new User();
//         user1.setId(user.getId());
//         user1.setCardid(user.getCardid());
//         user1.setIsDeleted(1);
//         //qfqk 同步
////         myAsyncService.deleteUserByQfqk(user1);
//         //内网同步
//         String s1 = "update blade_user set is_deleted = 1"
//            + ",update_time = " + "'" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()) + "'"
//            + " " + "where id = " + "'" + id + "'";
//         //FtpUtil.sqlFileUpload(s1);
//         myAsyncService.dataSync(s1);
//      });
      return R.status(userService.removeUser(ids));
   }

@@ -961,9 +869,11 @@
      securityExcel.setSex("男");
      securityExcel.setCardid("360XXX19XXXXXX****");
      securityExcel.setNation("汉");
      securityExcel.setRegistered("江西省南昌市******");
//      securityExcel.setHold("是");
      securityExcel.setSecuritynumber("赣洪202100001");
      securityExcel.setRegistered("山西省晋城市******");
      securityExcel.setEducation("本科");
      securityExcel.setPoliticaloutlook("群众");
      securityExcel.setUnitName("晋城市***公司");
      securityExcel.setAddress("山西省晋城市******");
      list.add(securityExcel);

      SecurityExcel securityExcel1 = new SecurityExcel();
@@ -973,9 +883,11 @@
      securityExcel1.setSex("女");
      securityExcel1.setCardid("360XXX19XXXXXX****");
      securityExcel1.setNation("汉");
      securityExcel1.setRegistered("江西省南昌市******");
//      securityExcel1.setHold("否");
      securityExcel1.setSecuritynumber("");
      securityExcel1.setRegistered("山西省晋城市******");
      securityExcel1.setEducation("本科");
      securityExcel1.setPoliticaloutlook("党员");
      securityExcel1.setUnitName("晋城市***公司");
      securityExcel1.setAddress("山西省晋城市******");
      list.add(securityExcel1);
      String fileName = null;
      try {
@@ -1006,9 +918,9 @@
      securityExcel.setSex("男");
      securityExcel.setCardid("360XXX19XXXXXX****");
      securityExcel.setNation("汉");
      securityExcel.setRegistered("江西省南昌市******");
      securityExcel.setRegistered("山西省晋城市******");
//      securityExcel.setHold("是");
      securityExcel.setSecuritynumber("赣洪202100001");
//      securityExcel.setSecuritynumber("晋202100001");
      list.add(securityExcel);

      SecurityYyExcel securityExcel1 = new SecurityYyExcel();
@@ -1018,7 +930,7 @@
      securityExcel1.setSex("女");
      securityExcel1.setCardid("360XXX19XXXXXX****");
      securityExcel1.setNation("汉");
      securityExcel1.setRegistered("江西省南昌市******");
      securityExcel1.setRegistered("山西省晋城市******");
//      securityExcel1.setHold("否");
      securityExcel1.setSecuritynumber("");
      list.add(securityExcel1);
@@ -1200,7 +1112,7 @@
                        ",update_time = " + "'" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(user2.getUpdateTime()) + "'" +
                        " where id = " + "'" + user2.getId() + "'";
                     //FtpUtil.sqlFileUpload(s1);
                     myAsyncService.FTP(s1);
                     myAsyncService.dataSync(s1);

                     //人员离职后修改派遣记录，修改从业记录
                     updateUserDispatcherExp(user2);
@@ -1295,77 +1207,6 @@
         user.setAvatar(FtpConfig.ip + user.getAvatar().substring(26));
      }

      //数据推送
      //1.群访群控数据推送(异步)
      if (status) {
         myAsyncService.qfqkUserSave(user);
         //2.内网数据推送
         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,guncode,create_time,cell) " +
            "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() + "'" +
            "," + "'" + url + "'" +
            "," + "'" + user.getEducation() + "'" +
            "," + "'" + user.getPoliticaloutlook() + "'" +
            "," + "'" + user.getHealstats() + "'" +
            "," + "'" + user.getHeight() + "'" +
            "," + "'" + user.getAddress() + "'" +
            "," + "'" + user.getRegistered() + "'" +
            "," + "'" + rtime + "'" +
            "," + "'" + user.getSecuritynumber() + "'" +
            "," + "'" + user.getHold() + "'" +
            "," + "'" + user.getJurisdiction() + "'" +
            "," + "'" + user.getExaminationType() + "'" +
            "," + "'" + user.getStatus() + "'" +
            "," + "'" + user.getIsDeleted() + "'" +
            "," + "'" + user.getDispatch() + "'" +
            "," + "'" + user.getGuncode() + "'" +
            "," + "'" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(user.getCreateTime()) + "'" +
            "," + "'" + user.getCell() + "'" + ");" +
            "insert into sys_experience(id,name,post,entryTime," +
            "cardId,companyname,securityId) " +
            "values(" + "'" + experience.getId() + "'" + "," +
            "'" + experience.getName() + "'" + "," +
            "'" + experience.getPost() + "'" + "," +
            "," + "'" + new SimpleDateFormat("yyyy-MM-dd").format(experience.getEntrytime()) + "'" +
            "," + "'" + experience.getCardid() + "'" +
            "," + "'" + experience.getCompanyname() + "'" +
            "," + "'" + experience.getSecurityid() + "'"
            + ")";
         myAsyncService.FTP(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);
//         }
//      }
      //判断是否持证是否为空
      if (!state) {
         return R.data(201, null, "保安证编号不匹配,请核实!也可通过提供保安证件信息提交核实申请!");
@@ -1396,7 +1237,7 @@
                  + ",update_time = " + "'" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(dispatcher1.getUpdateTime()) + "'"
                  + " " + "where id = " + "'" + dispatcher1.getId() + "'";
            //FtpUtil.sqlFileUpload(s1);
            myAsyncService.FTP(s1);
            myAsyncService.dataSync(s1);
         });
      }

@@ -1419,7 +1260,7 @@
            "update sys_experience set departureTime = " + "'" + new SimpleDateFormat("yyyy-MM-dd").format(experience1.getDeparturetime()) + "'"
               + " " + "where id = " + "'" + experience1.getId() + "'";
         //FtpUtil.sqlFileUpload(s1);
         myAsyncService.FTP(s1);
         myAsyncService.dataSync(s1);
      } else {
         //新增
         if (null != user.getRtime()) {
@@ -1449,7 +1290,7 @@
            "," + "'" + experience.getSecurityid() + "'"
            + ")";
         //FtpUtil.sqlFileUpload(s);
         myAsyncService.FTP(s);
         myAsyncService.dataSync(s);
      }
   }