日志列表

src/main/java/com/fdkankan/site/controller/ProjectLogController.java

@@ -1,6 +1,7 @@
 package com.fdkankan.site.controller;
 
 
+import com.fdkankan.site.common.BaseController;
 import com.fdkankan.site.common.RequestBase;
 import com.fdkankan.site.common.ResultData;
 import com.fdkankan.site.request.SceneParam;
@@ -22,14 +23,14 @@ import org.springframework.web.bind.annotation.RestController;
  */
 @RestController
 @RequestMapping("/projectLog")
-public class ProjectLogController {
+public class ProjectLogController extends BaseController {
 
     @Autowired
     IProjectLogService projectLogService;
 
     @PostMapping("/list")
     public ResultData list(@RequestBody RequestBase param){
-        return ResultData.ok(projectLogService.pageList(param));
+        return ResultData.ok(projectLogService.pageList(param,getToken()));
     }
 }
 

src/main/java/com/fdkankan/site/service/IProjectLogService.java

@@ -4,6 +4,7 @@ import com.fdkankan.site.common.PageInfo;
 import com.fdkankan.site.common.RequestBase;
 import com.fdkankan.site.entity.ProjectLog;
 import com.baomidou.mybatisplus.extension.service.IService;
+import org.apache.commons.lang3.StringUtils;
 
 import java.util.List;
 
@@ -17,7 +18,7 @@ import java.util.List;
  */
 public interface IProjectLogService extends IService<ProjectLog> {
 
-    PageInfo pageList(RequestBase param);
+    PageInfo pageList(RequestBase param, String token);
 
     void addLog(Integer projectId, String logMsg, String token, List<String> numList);
 }

src/main/java/com/fdkankan/site/service/impl/ProjectLogServiceImpl.java

@@ -1,18 +1,21 @@
 package com.fdkankan.site.service.impl;
 
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fdkankan.site.common.PageInfo;
 import com.fdkankan.site.common.RequestBase;
 import com.fdkankan.site.common.util.JwtUtil;
 import com.fdkankan.site.entity.Project;
 import com.fdkankan.site.entity.ProjectLog;
+import com.fdkankan.site.entity.ProjectTeam;
 import com.fdkankan.site.mapper.IProjectLogMapper;
 import com.fdkankan.site.response.ProjectLogVo;
 import com.fdkankan.site.response.SceneVo;
 import com.fdkankan.site.service.IProjectLogService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fdkankan.site.service.IProjectService;
+import com.fdkankan.site.service.IProjectTeamService;
 import com.fdkankan.site.service.ISceneService;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
@@ -37,10 +40,22 @@ public class ProjectLogServiceImpl extends ServiceImpl<IProjectLogMapper, Projec
     IProjectService projectService;
     @Autowired
     ISceneService sceneService;
+    @Autowired
+    IProjectTeamService projectTeamService;
+
 
     @Override
-    public PageInfo pageList(RequestBase param) {
-        Page<ProjectLog> page = this.page(new Page<>(param.getPageNum(), param.getPageSize()));
+    public PageInfo pageList(RequestBase param,String token) {
+        String userName = JwtUtil.getUserName(token);
+        List<ProjectTeam> teamList = projectTeamService.getListByUserName(userName);
+        Set<Integer> projectIdSet = teamList.stream().map(ProjectTeam::getProjectId).collect(Collectors.toSet());
+        if(projectIdSet.size() <=0){
+            return new PageInfo();
+        }
+        LambdaQueryWrapper<ProjectLog> wrapper = new LambdaQueryWrapper<>();
+        wrapper.in(ProjectLog::getProjectId,projectIdSet);
+
+        Page<ProjectLog> page = this.page(new Page<>(param.getPageNum(), param.getPageSize()),wrapper);
         List<ProjectLogVo> voList = new ArrayList<>();
         Set<Integer> projectIds = page.getRecords().stream().map(ProjectLog::getProjectId).collect(Collectors.toSet());
         HashMap<Integer,Project> projectHashMap = projectService.getByIds(projectIds);