考试题目乱序问题处理

Administrator

2022-06-20 3313278404a469d4d9f4608d2cb9d5792eb0cf75

 src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java

@@ -58,11 +58,9 @@
import org.springblade.modules.jurisdiction.service.JurisdictionService;
import org.springblade.modules.securitypaper.entity.SecurityPaper;
import org.springblade.modules.securitypaper.service.SecurityPaperService;
import org.springblade.modules.system.dto.UserDTO;
import org.springblade.modules.system.entity.*;
import org.springblade.modules.system.excel.QrCodeExcel;
import org.springblade.modules.system.excel.SecurityExcel;
import org.springblade.modules.system.excel.SecurityYyExcel;
import org.springblade.modules.system.excel.UserExcel;
import org.springblade.modules.system.excel.*;
import org.springblade.modules.system.mapper.UserMapper;
import org.springblade.modules.system.node.TreeNode;
import org.springblade.modules.system.service.*;
@@ -350,8 +348,12 @@

   @Override
   public UserInfo userInfo(String tenantId, String account, String password, UserEnum userEnum) {
      User user = baseMapper.getUser(tenantId, account, password);
      return buildUserInfo(user, userEnum);
      try {
         User user = baseMapper.getUser(tenantId, account, password);
         return buildUserInfo(user, userEnum);
      }catch (Exception e){
         throw new ServiceException("账号["+account+"]"+"重复!");
      }
   }

   private UserInfo buildUserInfo(User user) {
@@ -430,7 +432,23 @@
      User user = new User();
      user.setPassword(DigestUtil.encrypt(CommonConstant.DEFAULT_PASSWORD));
      user.setUpdateTime(DateUtil.now());
      return this.update(user, Wrappers.<User>update().lambda().in(User::getId, Func.toLongList(userIds)));
      boolean update = this.update(user, Wrappers.<User>update().lambda().in(User::getId, Func.toLongList(userIds)));
      if (update){
         //如果是保安员同步群防群控
         List<String> list = Arrays.asList(userIds.split(","));
         for (String s : list) {
            User user1 = getById(userIds);
            UserDTO userDTO = new UserDTO();
            userDTO.setAccount(user1.getAccount());
            userDTO.setPassword(user1.getPassword());
            userDTO.setSecurityId(user1.getId().toString());
            userDTO.setPhone(user1.getPhone());
            userDTO.setAvatar(user1.getAvatar());
            //异步修改群防群控
            myAsyncService.updateUserByAccount(userDTO);
         }
      }
      return update;
   }

   @Override
@@ -1245,27 +1263,11 @@
    */
   @Override
   public void importSecurity(List<SecurityExcel> data, Boolean isCovered, String deptId) {
      long time = System.currentTimeMillis();
      //uuidList
      List<String> uuidList = new ArrayList<>();
      //将不能导入的保安员账号存起来
      List<String> errorList = new ArrayList<>();
      //年龄不符的保安员信息存入集合
      List<String> ageErrorList = new ArrayList<>();
      //保安员证编号不符的保安员信息存入集合
      List<String> securityInvalidList = new ArrayList<>();
      //将需要更新的保安员信息存入集合
      List<User> updateList = new ArrayList<>();
      //需要推送内网的保安员信息集合
      List<User> userList = new ArrayList<>();
      //需要新增的保安员集合
      List<User> addList = new ArrayList<>();
      //需要新增的从业记录集合
      List<Experience> experienceList = new ArrayList<>();
      //导入状态，默认为true ,如果有一个出现问题则为 false
      AtomicBoolean status = new AtomicBoolean(true);
      AtomicBoolean agetStatus = new AtomicBoolean(true);
      AtomicBoolean securityInvalidStatus = new AtomicBoolean(true);
      //遍历
      for (SecurityExcel userExcel : data) {
         User user = Objects.requireNonNull(BeanUtil.copy(userExcel, User.class));
@@ -1273,8 +1275,11 @@
         String deptIds = userDeptService.selectIn(user.getDeptId());
         if (null!=deptIds && !deptIds.equals("")) {
            if (null != deptId && !deptId.equals("")) {
               //管理员不分单位导入
               if (!deptId.equals(deptIds)) {
                  throw new ServiceException("导入失败!不能导入不是本公司的保安员数据!");
                  if(!deptId.equals("1123598813738675201")) {
                     throw new ServiceException("导入失败!不能导入不是本公司的保安员数据!");
                  }
               }
            }
            user.setDeptId(deptIds);
@@ -1312,9 +1317,6 @@
         user.setStatus(1);
         user.setIsDeleted(0);
         //分配保安角色
//         Role role = new Role();
//         role.setRoleAlias("保安");
//         Role oneRole = roleService.getOne(Condition.getQueryWrapper(role));
         user.setRoleId("1412226235153731586");

         if (null!=user.getSecuritynumber() && !user.getSecuritynumber().equals("")){
@@ -1324,22 +1326,15 @@
         }

         //性别
         if (null != userExcel.getSex()) {
            if (userExcel.getSex().equals("男")) {
               user.setSex(1);
            }else if (userExcel.getSex().equals("女")) {
               user.setSex(2);
            }else {
               user.setSex(1);
            }
         }else {
         if (IdCardNoUtil.getSex(userExcel.getCardid()).equals("男")) {
            user.setSex(1);
         }else {
            user.setSex(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.setPassword(DigestUtil.encrypt(user.getCardid().substring(user.getCardid().length() - 6)));
@@ -1360,10 +1355,8 @@
         user0.setReasonForLeav(uuid);
         //加入集合
         userList.add(user0);
         uuidList.add(uuid);
      }

      Result result = new Result();
      //用户批量插入
      if (userList.size()>0) {
         //生成随机数
@@ -1372,113 +1365,91 @@
         Map<String, Object> map = new HashMap<>(1);
         map.put(uuid, userList);
         myAsyncService.FTPObjectList(map);

         int count = 0;
         //调用ftp获取返回数据
         while (true){
            try {
               Thread.sleep(3000);
            } catch (InterruptedException e) {
               e.printStackTrace();
            }
            //调用ftp获取返回数据
            result = Monitor.getFtpDataByUuidList(uuid);
            //如果返回true,就退处
            if (result.getCode() == 200) {
               break;
            }
            else {
               count++;
               if (count == 60) {
                  break;
               }
            }
         }
      }

      if (null!=result){
         //获取 result
         List<Result> data1 = result.getData();
         if (data1.size()>0){
            for (Result result1 : data1) {
               // 取出 Msg ,此 msg 存的对应的 uuid
               String uuid = result1.getMsg();
               //从redis 中获取用户数据
               Object o1 = redisTemplate.opsForValue().get(uuid);
               User user0 = JSON.parseObject(o1.toString(), User.class);
               // 从redis 中获取对应的用户信息,脱敏处理过
               User user = handlerUserInfo(uuid);
               if (result1.getCode()==200){
                  user.setId(result1.getUserId());
                  boolean save = this.save(user);
                  //同步用户数据到群防群控
                  if (save) {
                     myAsyncService.qfqkUserSave(user);
                  }
                  //加入新增集合
//                  addList.add(user);
               }
               if (result1.getCode()==201){
                  //先查询当前库是否有改用户？
                  User user1 = this.getById(result1.getUserId());
                  if (null!=user1) {
                     //存在，更新
                     user.setId(result1.getUserId());
                     user.setCreateTime(null);
                     boolean update = this.updateById(user);
                     if (update) {
                        //数据异步同步到群防群控
                        myAsyncService.updateUserByQfqk(user);
                     }
                  }else {
                     //不存在，则新增
                     user.setId(result1.getUserId());
                     boolean save = this.save(user);
                     if (save){
                        //数据异步同步到群防群控
                        myAsyncService.qfqkUserSave(user);
                     }
                  }
                  //加入更新集合
//                  updateList.add(user);
               }
               if (result1.getCode()==202){
                  status.set(false);
                  //已在其他单位存在
                  errorList.add(user0.getCardid());
               }
               if (result1.getCode()==203){
                  securityInvalidStatus.set(false);
                  //保安证编号不匹配
                  securityInvalidList.add(user0.getCardid());
               }
            }
//            //批量插入
//            if (addList.size()>0){
//               baseMapper.batchUserList(addList);
//      if (null!=result){
//         //获取 result
//         List<Result> data1 = result.getData();
//         if (data1.size()>0){
//            for (Result result1 : data1) {
//               // 取出 Msg ,此 msg 存的对应的 uuid
//               String uuid = result1.getMsg();
//               //从redis 中获取用户数据
//               Object o1 = redisTemplate.opsForValue().get(uuid);
//               User user0 = JSON.parseObject(o1.toString(), User.class);
//               // 从redis 中获取对应的用户信息,脱敏处理过
//               User user = handlerUserInfo(uuid);
//               if (result1.getCode()==200){
//                  user.setId(result1.getUserId());
//                  boolean save = this.save(user);
//                  //同步用户数据到群防群控
//                  if (save) {
//                     myAsyncService.qfqkUserSave(user);
//                  }
//                  //加入新增集合
////                  addList.add(user);
//               }
//               if (result1.getCode()==201){
//                  //先查询当前库是否有改用户？
//                  User user1 = this.getById(result1.getUserId());
//                  if (null!=user1) {
//                     //存在，更新
//                     user.setId(result1.getUserId());
//                     user.setCreateTime(null);
//                     boolean update = this.updateById(user);
//                     if (update) {
//                        //数据异步同步到群防群控
//                        myAsyncService.updateUserByQfqk(user);
//                     }
//                  }else {
//                     //不存在，则新增
//                     user.setId(result1.getUserId());
//                     boolean save = this.save(user);
//                     if (save){
//                        //数据异步同步到群防群控
//                        myAsyncService.qfqkUserSave(user);
//                     }
//                  }
//                  //加入更新集合
////                  updateList.add(user);
//               }
//               if (result1.getCode()==202){
//                  status.set(false);
//                  //已在其他单位存在
//                  errorList.add(user0.getCardid());
//               }
//               if (result1.getCode()==203){
//                  securityInvalidStatus.set(false);
//                  //保安证编号不匹配
//                  securityInvalidList.add(user0.getCardid());
//               }
//            }
//            //批量更新
//            if (updateList.size()>0){
//               baseMapper.batchUpdateUserList(updateList);
//            }
         }
      }
////            //批量插入
////            if (addList.size()>0){
////               baseMapper.batchUserList(addList);
////            }
////            //批量更新
////            if (updateList.size()>0){
////               baseMapper.batchUpdateUserList(updateList);
////            }
//         }
//      }

      //如果所有数据导入有一个异常
//      //如果所有数据导入有一个异常
      StringBuilder errorBuilder = new StringBuilder();
      if (!status.get()){
         String errorAccount = StringUtils.join(errorList, "\\\n");
         errorBuilder.append("用户:[" + errorAccount + "]导入失败!已在其他单位存在!");
      }
//      if (!status.get()){
//         String errorAccount = StringUtils.join(errorList, "\\\n");
//         errorBuilder.append("用户:[" + errorAccount + "]导入失败!已在其他单位存在!");
//      }
      if (!agetStatus.get()){
         String errorAccount = StringUtils.join(ageErrorList, "\\\n");
         errorBuilder.append("用户:[" + errorAccount + "]导入失败!身份证号码不正确,请核对!");
      }
      if (!securityInvalidStatus.get()){
         String errorAccount = StringUtils.join(securityInvalidList, "\\\n");
//         errorBuilder.append("用户:[" + errorAccount + "]保安证编号不匹配,请核实!");
         errorBuilder.append("用户:[" + errorAccount + "]保安证编号不匹配,请核实!也可通过提供保安证件信息提交核实申请!");
      }
//      if (!securityInvalidStatus.get()){
//         String errorAccount = StringUtils.join(securityInvalidList, "\\\n");
////         errorBuilder.append("用户:[" + errorAccount + "]保安证编号不匹配,请核实!");
//         errorBuilder.append("用户:[" + errorAccount + "]保安证编号不匹配,请核实!也可通过提供保安证件信息提交核实申请!");
//      }
      //抛出异常
      if (errorBuilder.length()>0){
         throw new ServiceException(errorBuilder.toString());
@@ -1651,103 +1622,109 @@
         map.put(uuid, userList);
         myAsyncService.FTPObjectList(map);

         int count = 0;
         //调用ftp获取返回数据
         while (true){
            try {
               Thread.sleep(2000);
            } catch (InterruptedException e) {
               e.printStackTrace();
            }
            //调用ftp获取返回数据
            result = Monitor.getFtpDataByUuidList(uuid);
            //如果返回true,就退处
            if (result.getCode() == 200) {
               break;
            }
         }
//         int count = 0;
//         //调用ftp获取返回数据
//         while (true){
//            try {
//               Thread.sleep(4000);
//            } catch (InterruptedException e) {
//               e.printStackTrace();
//            }
//            //调用ftp获取返回数据
//            result = Monitor.getFtpDataByUuidList(uuid);
//            //如果返回true,就退处
//            if (result.getCode() == 200) {
//               break;
//            }
//            else {
//               count++;
//               if (count == 20) {
//                  break;
//               }
//            }
//         }
      }

      if (null!=result){
         //获取 result
         List<Result> data1 = result.getData();
         if (data1.size()>0){
            for (Result result1 : data1) {
               // 取出 Msg ,此 msg 存的对应的 uuid
               String uuid = result1.getMsg();
               //从redis 中获取用户数据
               Object o1 = redisTemplate.opsForValue().get(uuid);
               User user0 = JSON.parseObject(o1.toString(), User.class);
               // 从redis 中获取对应的用户信息,脱敏处理过
               User user = handlerUserInfo(uuid);
               if (result1.getCode()==200){
                  user.setId(result1.getUserId());
                  boolean save = this.save(user);
                  if (save){
                     //数据异步同步到群防群控
                     myAsyncService.qfqkUserSave(user);
                  }
                  //加入新增集合
//                  addList.add(user);
               }
               //更新
               if (result1.getCode()==201){
                  //先查询当前库是否有改用户？
                  User user1 = this.getById(result1.getUserId());
                  if (null!=user1) {
                     //存在，更新
                     user.setId(result1.getUserId());
                     user.setCreateTime(null);
                     boolean update = this.updateById(user);
                     if (update) {
                        //数据异步同步到群防群控
                        myAsyncService.updateUserByQfqk(user);
                     }
                  }else {
                     //不存在，则新增
                     user.setId(result1.getUserId());
                     boolean save = this.save(user);
                     if (save){
                        //数据异步同步到群防群控
                        myAsyncService.qfqkUserSave(user);
                     }
                  }
                  //加入更新集合
//                  updateList.add(user);
               }
               if (result1.getCode()==202){
                  status.set(false);
                  //已在其他单位存在
                  errorList.add(user0.getCardid());
               }
               if (result1.getCode()==203){
                  securityInvalidStatus.set(false);
                  //保安证编号不匹配
                  securityInvalidList.add(user0.getCardid());
               }
            }
         }
      }

      //如果所有数据导入有一个异常
      StringBuilder errorBuilder = new StringBuilder();
      if (!status.get()){
         String errorAccount = StringUtils.join(errorList, "\\\n");
         errorBuilder.append("用户:[" + errorAccount + "]导入失败!已在其他单位存在!");
      }
      if (!agetStatus.get()){
         String errorAccount = StringUtils.join(ageErrorList, "\\\n");
         errorBuilder.append("用户:[" + errorAccount + "]导入失败!身份证号码不正确,请核对!");
      }
      if (!securityInvalidStatus.get()){
         String errorAccount = StringUtils.join(securityInvalidList, "\\\n");
         errorBuilder.append("用户:[" + errorAccount + "]保安证编号不匹配,请核实!");
//         errorBuilder.append("用户:[" + errorAccount + "]保安证编号不匹配,请核实!也可通过提供保安证件信息提交核实申请!");
      }
      //抛出异常
      if (errorBuilder.length()>0){
         throw new ServiceException(errorBuilder.toString());
      }
//      if (null!=result){
//         //获取 result
//         List<Result> data1 = result.getData();
//         if (data1.size()>0){
//            for (Result result1 : data1) {
//               // 取出 Msg ,此 msg 存的对应的 uuid
//               String uuid = result1.getMsg();
//               //从redis 中获取用户数据
//               Object o1 = redisTemplate.opsForValue().get(uuid);
//               User user0 = JSON.parseObject(o1.toString(), User.class);
//               // 从redis 中获取对应的用户信息,脱敏处理过
//               User user = handlerUserInfo(uuid);
//               if (result1.getCode()==200){
//                  user.setId(result1.getUserId());
//                  boolean save = this.save(user);
//                  if (save){
//                     //数据异步同步到群防群控
//                     myAsyncService.qfqkUserSave(user);
//                  }
//                  //加入新增集合
////                  addList.add(user);
//               }
//               //更新
//               if (result1.getCode()==201){
//                  //先查询当前库是否有改用户？
//                  User user1 = this.getById(result1.getUserId());
//                  if (null!=user1) {
//                     //存在，更新
//                     user.setId(result1.getUserId());
//                     user.setCreateTime(null);
//                     boolean update = this.updateById(user);
//                     if (update) {
//                        //数据异步同步到群防群控
//                        myAsyncService.updateUserByQfqk(user);
//                     }
//                  }else {
//                     //不存在，则新增
//                     user.setId(result1.getUserId());
//                     boolean save = this.save(user);
//                     if (save){
//                        //数据异步同步到群防群控
//                        myAsyncService.qfqkUserSave(user);
//                     }
//                  }
//                  //加入更新集合
////                  updateList.add(user);
//               }
//               if (result1.getCode()==202){
//                  status.set(false);
//                  //已在其他单位存在
//                  errorList.add(user0.getCardid());
//               }
//               if (result1.getCode()==203){
//                  securityInvalidStatus.set(false);
//                  //保安证编号不匹配
//                  securityInvalidList.add(user0.getCardid());
//               }
//            }
//         }
//      }
//
//      //如果所有数据导入有一个异常
//      StringBuilder errorBuilder = new StringBuilder();
//      if (!status.get()){
//         String errorAccount = StringUtils.join(errorList, "\\\n");
//         errorBuilder.append("用户:[" + errorAccount + "]导入失败!已在其他单位存在!");
//      }
//      if (!agetStatus.get()){
//         String errorAccount = StringUtils.join(ageErrorList, "\\\n");
//         errorBuilder.append("用户:[" + errorAccount + "]导入失败!身份证号码不正确,请核对!");
//      }
//      if (!securityInvalidStatus.get()){
//         String errorAccount = StringUtils.join(securityInvalidList, "\\\n");
//         errorBuilder.append("用户:[" + errorAccount + "]保安证编号不匹配,请核实!");
////         errorBuilder.append("用户:[" + errorAccount + "]保安证编号不匹配,请核实!也可通过提供保安证件信息提交核实申请!");
//      }
//      //抛出异常
//      if (errorBuilder.length()>0){
//         throw new ServiceException(errorBuilder.toString());
//      }
   }


@@ -2297,7 +2274,7 @@
    * @return
    */
   @Override
   public List<SecurityExcel> exportSecurityInfo(UserVO user) {
   public List<ExportSecurityExcel> exportSecurityInfo(UserVO user) {
      return baseMapper.exportSecurityInfo(user);
   }