Merge remote-tracking branch 'origin/jtdev' into jtdev

xieb

2023-10-19 1dd5d8f8a616f5cf3caa7828d46989c7d3dcafc4

 skjcmanager/skjcmanager-service/skjcmanager-user/src/main/java/cn/gistack/system/user/feign/UserClient.java

@@ -31,6 +31,8 @@
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RestController;

import java.util.List;

/**
 * 用户服务Feign实现类
 *
@@ -62,6 +64,18 @@
   }

   @Override
   @GetMapping(USER_INFO_BY_PHONE)
   public R<List<User>> userInfoByPhone(String tenantId, String phone) {
      return R.data(service.userInfoByPhone(tenantId, phone));
   }

   @Override
   @GetMapping(USER_INFO_BY_PHONE_OR_ACCOUNT)
   public R<List<User>> userInfoByPhoneOrAccount(String tenantId, String phone) {
      return R.data(service.userInfoByPhoneOrAccount(tenantId, phone));
   }

   @Override
   @GetMapping(USER_INFO_BY_TYPE)
   public R<UserInfo> userInfo(String tenantId, String account, String userType) {
      return R.data(service.userInfo(tenantId, account, UserEnum.of(userType)));
@@ -80,9 +94,36 @@
   }

   @Override
   @PostMapping(UPDATE_USER)
   public R<Boolean> upateUser(User user) {
      return R.data(service.updateUser(user));
   }

   @Override
   @PostMapping(REMOVE_USER)
   public R<Boolean> removeUser(String tenantIds) {
      return R.data(service.remove(Wrappers.<User>query().lambda().in(User::getTenantId, Func.toStrList(tenantIds))));
   }

   @Override
   public R<List<User>> getAllUserList() {
      return R.data(service.list());
   }

   @GetMapping(ENCRYPT_USER)
   @Override
   public String encryptUser() {
      //查询所有用户
      List<User> list = service.list();
      int count  = 0;

      for (User user : list){
         boolean b = service.updateById(user);
         if (b){
            count++;
         }
      }
      return "共：<span style='color:red'>"+ list.size() + "</span>名用户，成功加密：<span style='color:red'>"+ count + "</span>名用户";
   }

}