ftp 个人保安新增修改

Administrator

2022-06-08 7f36a55767f870937a473f9c0eebf0240300a5ef

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

@@ -1302,8 +1302,6 @@
               agetStatus.set(false);
               ageErrorList.add(user.getCardid());
//               throw new ServiceException("导入失败!身份证号码[ "+user.getCardid()+" ]不正确,请核对!");
               //forEach 只能使用 return 跳出本次循环
//               return;
               continue;
            }
         }
@@ -1379,7 +1377,7 @@
         //调用ftp获取返回数据
         while (true){
            try {
               Thread.sleep(1000);
               Thread.sleep(3000);
            } catch (InterruptedException e) {
               e.printStackTrace();
            }
@@ -1389,12 +1387,12 @@
            if (result.getCode() == 200) {
               break;
            }
//            else {
//               count++;
//               if (count == 60) {
//                  break;
//               }
//            }
            else {
               count++;
               if (count == 60) {
                  break;
               }
            }
         }
      }

@@ -1421,9 +1419,26 @@
//                  addList.add(user);
               }
               if (result1.getCode()==201){
                  user.setId(result1.getUserId());
                  user.setCreateTime(null);
                  this.updateById(user);
                  //先查询当前库是否有改用户？
                  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);
               }
@@ -1640,7 +1655,7 @@
         //调用ftp获取返回数据
         while (true){
            try {
               Thread.sleep(1000);
               Thread.sleep(2000);
            } catch (InterruptedException e) {
               e.printStackTrace();
            }
@@ -1675,13 +1690,27 @@
                  //加入新增集合
//                  addList.add(user);
               }
               //更新
               if (result1.getCode()==201){
                  user.setId(result1.getUserId());
                  user.setCreateTime(null);
                  boolean update = this.updateById(user);
                  if (update){
                     //数据异步同步到群防群控
                     myAsyncService.updateUserByQfqk(user);
                  //先查询当前库是否有改用户？
                  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);