瀏覽代碼

授权用户列表分页

lyhzzz 2 年之前
父節點
當前提交
9d385f3607

+ 4 - 3
src/main/java/com/fdkankan/manage/controller/JySceneUserController.java

@@ -4,6 +4,7 @@ import com.fdkankan.manage.common.Result;
 import com.fdkankan.manage.common.ResultData;
 import com.fdkankan.manage.entity.JySceneUserAuth;
 import com.fdkankan.manage.service.IJySceneUserAuthService;
+import com.fdkankan.manage.vo.request.SceneParam;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -14,10 +15,10 @@ public class JySceneUserController {
     @Autowired
     IJySceneUserAuthService jySceneUserAuthService;
 
-    @GetMapping("/getAuthList")
-    public ResultData getAuthList(@RequestParam(required = false) String num){
+    @PostMapping("/getAuthList")
+    public ResultData getAuthList(@RequestBody SceneParam param){
 
-        return ResultData.ok(jySceneUserAuthService.getAuthList(num));
+        return ResultData.ok(jySceneUserAuthService.getAuthList(param));
     }
 
 

+ 2 - 1
src/main/java/com/fdkankan/manage/entity/JySceneAuth.java

@@ -10,6 +10,7 @@ import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
+import com.fdkankan.manage.common.PageInfo;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -54,7 +55,7 @@ public class JySceneAuth implements Serializable {
     private Date updateTime;
 
     @TableField(exist = false)
-    private List<JySceneUserAuth> userAuthList = new ArrayList<>();
+    private PageInfo<JySceneUserAuth> userAuthList ;
 
     public JySceneAuth(Integer authType) {
         this.authType = authType;

+ 2 - 1
src/main/java/com/fdkankan/manage/service/IJySceneUserAuthService.java

@@ -2,6 +2,7 @@ package com.fdkankan.manage.service;
 
 import com.fdkankan.manage.entity.JySceneUserAuth;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.fdkankan.manage.vo.request.SceneParam;
 
 /**
  * <p>
@@ -13,7 +14,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface IJySceneUserAuthService extends IService<JySceneUserAuth> {
 
-    Object getAuthList(String num);
+    Object getAuthList(SceneParam param);
 
     void addAuth(JySceneUserAuth param);
 

+ 11 - 11
src/main/java/com/fdkankan/manage/service/impl/JySceneUserAuthServiceImpl.java

@@ -1,12 +1,15 @@
 package com.fdkankan.manage.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fdkankan.manage.common.PageInfo;
 import com.fdkankan.manage.common.ResultCode;
 import com.fdkankan.manage.entity.*;
 import com.fdkankan.manage.exception.BusinessException;
 import com.fdkankan.manage.mapper.IJySceneUserAuthMapper;
 import com.fdkankan.manage.service.*;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.fdkankan.manage.vo.request.SceneParam;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -36,32 +39,29 @@ public class JySceneUserAuthServiceImpl extends ServiceImpl<IJySceneUserAuthMapp
     IScenePlusService scenePlusService;
 
     @Override
-    public Object getAuthList(String num) {
-        if(StringUtils.isBlank(num)){
+    public Object getAuthList(SceneParam param) {
+        if(StringUtils.isBlank(param.getNum())){
             throw new BusinessException(ResultCode.MISSING_REQUIRED_PARAMETERS);
         }
-        JySceneAuth jySceneAuth = jySceneAuthService.getByNum(num);
+        JySceneAuth jySceneAuth = jySceneAuthService.getByNum(param.getNum());
         if(jySceneAuth == null){
             return new JySceneAuth(0);
         }
 
         LambdaQueryWrapper<JySceneUserAuth> wrapper = new LambdaQueryWrapper<>();
-        wrapper.eq(JySceneUserAuth::getNum,num);
+        wrapper.eq(JySceneUserAuth::getNum,param.getNum());
         wrapper.orderByDesc(JySceneUserAuth::getCreateTime);
-        List<JySceneUserAuth> list = this.list(wrapper);
-        if(list.isEmpty()){
-            return list;
-        }
-        List<Integer> jyUserIds = list.stream().map(JySceneUserAuth::getJyUserId).collect(Collectors.toList());
+        Page<JySceneUserAuth> page = this.page(new Page<>(param.getPageNum(), param.getPageSize()), wrapper);
+        List<Integer> jyUserIds = page.getRecords().stream().map(JySceneUserAuth::getJyUserId).collect(Collectors.toList());
         HashMap<Integer, JyUser> map = jyUserService.getByIds(jyUserIds);
-        for (JySceneUserAuth jySceneUserAuth : list) {
+        for (JySceneUserAuth jySceneUserAuth : page.getRecords()) {
             JyUser jyUser = map.get(jySceneUserAuth.getJyUserId());
             if(jyUser != null){
                 jySceneUserAuth.setRyId(jyUser.getRyId());
                 jySceneUserAuth.setRyNickName(jyUser.getRyNickName());
             }
         }
-        jySceneAuth.setUserAuthList(list);
+        jySceneAuth.setUserAuthList(PageInfo.PageInfo(page));
         return jySceneAuth;
     }
 

+ 2 - 0
src/main/java/com/fdkankan/manage/vo/response/SceneVo.java

@@ -22,4 +22,6 @@ public class SceneVo {
 
     private String algorithmTime;  //v4场景计算完成时间
 
+    private Boolean isAuth = false;          //是否有授权按钮
+
 }