Переглянути джерело

feat:分页查询企微账号

zhaohaipeng 1 місяць тому
батько
коміт
fffdc3e035

+ 1 - 1
risk-control-core/src/main/java/com/tzld/piaoquan/risk/control/model/dto/WorkWechatUserInfo.java

@@ -13,6 +13,6 @@ public class WorkWechatUserInfo {
 
     private String corpName;
 
-    private String loginStatus;
+    private Integer loginStatus;
 
 }

+ 25 - 6
risk-control-core/src/main/java/com/tzld/piaoquan/risk/control/service/impl/WorkWechatServiceImpl.java

@@ -8,12 +8,11 @@ import com.tzld.piaoquan.risk.control.model.po.UserBase;
 import com.tzld.piaoquan.risk.control.model.po.UserBaseExample;
 import com.tzld.piaoquan.risk.control.service.WorkWechatService;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
 import java.util.List;
-import java.util.stream.Collectors;
 
 @Slf4j
 @Service
@@ -26,15 +25,35 @@ public class WorkWechatServiceImpl implements WorkWechatService {
     public Page<WorkWechatUserInfo> findUserInfoList(int pageSize, int currentPage) {
 
         Page<WorkWechatUserInfo> page = new Page<>();
-        Long userId = LoginUserContext.getUserId();
 
         UserBaseExample userBaseExample = new UserBaseExample();
+        userBaseExample.createCriteria().andCreateUserEqualTo(LoginUserContext.getUserId());
+
+        long total = userBaseMapper.countByExample(userBaseExample);
+
         userBaseExample.setPage(new Page<UserBase>(currentPage, pageSize));
         List<UserBase> userBases = userBaseMapper.selectByExample(userBaseExample);
-        if (CollectionUtils.isNotEmpty(userBases)) {
-            List<String> vids = userBases.stream().map(UserBase::getVid).distinct().collect(Collectors.toList());
-        }
 
+        List<WorkWechatUserInfo> workWechatUserInfos = getWorkWechatUserInfos(userBases);
+
+        page.setTotalSize((int) total);
+        page.setObjs(workWechatUserInfos);
+        page.setCurrentPage(currentPage);
+        page.setPageSize(pageSize);
         return page;
     }
+
+    private static List<WorkWechatUserInfo> getWorkWechatUserInfos(List<UserBase> userBases) {
+        List<WorkWechatUserInfo> workWechatUserInfos = new ArrayList<>();
+        for (UserBase userBase : userBases) {
+            WorkWechatUserInfo workWechatUserInfo = new WorkWechatUserInfo();
+            workWechatUserInfo.setId(userBase.getId());
+            workWechatUserInfo.setPhone(userBase.getMobile());
+            workWechatUserInfo.setName(userBase.getRealname());
+            workWechatUserInfo.setCorpName(userBase.getCorpName());
+            workWechatUserInfo.setLoginStatus(userBase.getLoginStatus());
+            workWechatUserInfos.add(workWechatUserInfo);
+        }
+        return workWechatUserInfos;
+    }
 }

+ 4 - 3
risk-control-server/src/main/java/com/tzld/piaoquan/risk/control/controller/UserController.java

@@ -2,14 +2,15 @@ package com.tzld.piaoquan.risk.control.controller;
 
 import com.tzld.piaoquan.risk.control.common.annotation.UnAuth;
 import com.tzld.piaoquan.risk.control.common.base.CommonResponse;
-import com.tzld.piaoquan.risk.control.config.LoginUserContext;
 import com.tzld.piaoquan.risk.control.model.dto.LoginDTO;
 import com.tzld.piaoquan.risk.control.model.param.LoginAndRegisterParam;
-import com.tzld.piaoquan.risk.control.model.po.User;
 import com.tzld.piaoquan.risk.control.service.UserService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 @Slf4j
 @RestController