智慧保安后台管理-外网
Administrator
2022-06-07 df054296327ebca617a9c19bb01139b9c40bf232
src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java
@@ -1314,10 +1314,10 @@
         user.setStatus(1);
         user.setIsDeleted(0);
         //分配保安角色
         Role role = new Role();
         role.setRoleAlias("保安");
         Role oneRole = roleService.getOne(Condition.getQueryWrapper(role));
         user.setRoleId(oneRole.getId().toString());
//         Role role = new Role();
//         role.setRoleAlias("保安");
//         Role oneRole = roleService.getOne(Condition.getQueryWrapper(role));
         user.setRoleId("1412226235153731586");
         if (null!=user.getSecuritynumber() && !user.getSecuritynumber().equals("")){
            user.setHold("1");
@@ -1339,7 +1339,10 @@
         }
         //设置账号
         user.setAccount(user.getRealName());
         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)));
         user.setCreateTime(new Date());
@@ -1409,7 +1412,11 @@
               User user = handlerUserInfo(uuid);
               if (result1.getCode()==200){
                  user.setId(result1.getUserId());
                  this.save(user);
                  boolean save = this.save(user);
                  //同步用户数据到群防群控
                  if (save) {
                     myAsyncService.qfqkUserSave(user);
                  }
                  //加入新增集合
//                  addList.add(user);
               }
@@ -1477,6 +1484,7 @@
      //返回的user,需处理敏感数据
      User user1 = Objects.requireNonNull(BeanUtil.copy(user,User.class));
      //敏感数据处理
      user1.setRealName(DesensitizedUtil.desensitizedName(user.getRealName()));
      user1.setCardid(DesensitizedUtil.desensitizedIdNumberBy4(user.getCardid()));
      user1.setPhone(DesensitizedUtil.desensitizedPhoneNumber(user.getPhone()));
      user1.setRegistered(DesensitizedUtil.desensitizedAddress(user.getRegistered()));
@@ -1592,7 +1600,10 @@
         }
         //设置账号
         user.setAccount(user.getRealName());
         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)));
         user.setCreateTime(new Date());
@@ -1656,14 +1667,22 @@
               User user = handlerUserInfo(uuid);
               if (result1.getCode()==200){
                  user.setId(result1.getUserId());
                  this.save(user);
                  boolean save = this.save(user);
                  if (save){
                     //数据异步同步到群防群控
                     myAsyncService.qfqkUserSave(user);
                  }
                  //加入新增集合
//                  addList.add(user);
               }
               if (result1.getCode()==201){
                  user.setId(result1.getUserId());
                  user.setCreateTime(null);
                  this.updateById(user);
                  boolean update = this.updateById(user);
                  if (update){
                     //数据异步同步到群防群控
                     myAsyncService.updateUserByQfqk(user);
                  }
                  //加入更新集合
//                  updateList.add(user);
               }