保安员批量导入修改完善

Administrator

2022-04-28 6288b5181c16ebdb0b8568023de21c79cf495acc

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

@@ -1319,6 +1319,12 @@
         Role oneRole = roleService.getOne(Condition.getQueryWrapper(role));
         user.setRoleId(oneRole.getId().toString());

         if (null!=user.getSecuritynumber() && !user.getSecuritynumber().equals("")){
            user.setHold("1");
         }else {
            user.setHold("2");
         }

         //性别
         if (null != userExcel.getSex()) {
            if (userExcel.getSex().equals("男")) {
@@ -1335,10 +1341,9 @@
         //设置账号
         user.setAccount(user.getRealName());
         //加密
         if (Func.isNotEmpty(user.getPassword())) {
            user.setPassword(DigestUtil.encrypt(user.getCardid().substring(user.getCardid().length() - 6)));
         }
         user.setPassword(DigestUtil.encrypt(user.getCardid().substring(user.getCardid().length() - 6)));
         user.setCreateTime(new Date());
         user.setUpdateTime(new Date());
         user.setDispatch("1");
         user.setExaminationType("0");

@@ -1375,7 +1380,7 @@
               e.printStackTrace();
            }
            //调用ftp获取返回数据
            result = Monitor.getFtpDataByUuidList(null);
            result = Monitor.getFtpDataByUuidList(uuid);
            //如果返回true,就退处
            if (result.getCode() == 200) {
               break;
@@ -1399,13 +1404,16 @@
               User user = handlerUserInfo(uuid);
               if (result1.getCode()==200){
                  user.setId(result1.getUserId());
                  this.save(user);
                  //加入新增集合
                  addList.add(user);
//                  addList.add(user);
               }
               if (result1.getCode()==201){
                  user.setId(result1.getUserId());
                  user.setCreateTime(null);
                  this.updateById(user);
                  //加入更新集合
                  updateList.add(user);
//                  updateList.add(user);
               }
               if (result1.getCode()==202){
                  status.set(false);