Merge branch 'feature' into 'dev'

获取项目时添加权限判断

See merge request !297

src/main/java/com/zhiwei/brandkbs2/controller/CommonController.java

@@ -58,7 +58,7 @@ public class CommonController extends BaseController {
     @GetMapping("/user/getUserAllProjects")
     @Auth(role = RoleEnum.CUSTOMER)
     public ResponseResult getUserAllProjects() {
-        return ResponseResult.success(projectService.getUserAllProjects());
+        return projectService.getUserAllProjects();
     }
 
 //    @ApiOperation("获取默认天间隔时间节点")

src/main/java/com/zhiwei/brandkbs2/controller/admin/ProjectController.java

@@ -194,7 +194,7 @@ public class ProjectController extends BaseController {
     @GetMapping("/user/getUserAllProjects")
     @Auth(role = RoleEnum.CUSTOMER)
     public ResponseResult getUserAllProjects() {
-        return ResponseResult.success(ProjectService.getUserAllProjects());
+        return ProjectService.getUserAllProjects();
     }
 
     @ApiOperation("获取事件标签信息")

src/main/java/com/zhiwei/brandkbs2/controller/app/AppArticleController.java

@@ -55,6 +55,7 @@ public class AppArticleController extends BaseController {
 
     @ApiOperation("原始数据列表")
     @PostMapping("/origin/list")
+    @LogRecord(description = "舆情库-原始数据列表")
     public ResponseResult getOriginList(@RequestBody MarkSearchDTO markSearchDTO) {
         return ResponseResult.success(markDataService.getOriginList(markSearchDTO));
     }

src/main/java/com/zhiwei/brandkbs2/controller/mobile/MobileUserController.java

@@ -55,7 +55,7 @@ public class MobileUserController extends BaseController {
     @ApiOperation("项目列表")
     @GetMapping("/projects")
     public ResponseResult projectList() {
-        return ResponseResult.success(projectService.getUserAllProjects());
+        return projectService.getUserAllProjects();
     }
 
 }

src/main/java/com/zhiwei/brandkbs2/service/ProjectService.java

@@ -85,7 +85,7 @@ public interface ProjectService {
      *
      * @return
      */
-    List<JSONObject> getUserAllProjects();
+    ResponseResult getUserAllProjects();
 
     List<JSONObject> getUserAllProjectsPrimary(String userId);
 

src/main/java/com/zhiwei/brandkbs2/service/impl/MarkDataServiceImpl.java

@@ -666,7 +666,7 @@ public class MarkDataServiceImpl implements MarkDataService {
             query.addCriteria((orCriteria.orOperator(tagCriteria.toArray(new Criteria[0]))));
         }
         // 关键词模糊查询
-        aggreeResultDao.addKeywordFuzz(query, dto.getKeyword(), "data.source");
+        aggreeResultDao.addKeywordFuzz(query, dto.getSourceKeyword(), "data.source");
         return query;
     }
 
@@ -1790,7 +1790,7 @@ public class MarkDataServiceImpl implements MarkDataService {
         // 开启分页
         mongoUtil.start(dto.getPage(), dto.getPageSize(), query);
         // 排序
-        aggreeResultDao.addSort(query, null == dto.getSorter() ? "{\"aggreeSize\":\"descend\"}" : dto.getSorter().toString());
+        aggreeResultDao.addSort(query, Tools.isEmpty(dto.getSorter()) ? "{\"aggreeSize\":\"descend\"}" : dto.getSorter().toString());
         // 返回结果
         List<MarkFlowEntity> resList = new ArrayList<>();
         List<AggreeResult> fatherList = aggreeResultDao.findList(query);

src/main/java/com/zhiwei/brandkbs2/service/impl/ProjectServiceImpl.java

@@ -260,12 +260,16 @@ public class ProjectServiceImpl implements ProjectService {
     }
 
     @Override
-    public List<JSONObject> getUserAllProjects() {
+    public ResponseResult getUserAllProjects() {
         User user = userDao.findOneById(UserThreadLocal.getUserId());
         if (null == user) {
-            return Collections.emptyList();
+            return new ResponseResult(CommonCodeEnum.UN_AUTHORISE);
+        }
+        List<JSONObject> userAllProjects = getProjectListByUser(user, false);
+        if (userAllProjects.isEmpty()) {
+            return new ResponseResult(CommonCodeEnum.UNAUTHENTICATED);
         }
-        return getProjectListByUser(user, false);
+        return ResponseResult.success(userAllProjects);
     }
 
     @Override
@@ -456,16 +460,18 @@ public class ProjectServiceImpl implements ProjectService {
             json.put("group", project.getBrandLinkedGroup());
             json.put("avatarUrl", project.getAvatarUrl());
             json.put("permission", getPermissionList(project));
-            if (retainExpired) {
             Date expiredTime = roleExpired.get(project.getId());
             if (null == expiredTime || expiredTime.after(new Date())) {
                 json.put("expired", false);
             } else {
                 json.put("expired", true);
+                // 不包含过期项目则过滤
+                if (!retainExpired) {
+                    return null;
                 }
             }
             return json;
-        }).collect(Collectors.toList());
+        }).filter(Objects::nonNull).collect(Collectors.toList());
     }
 
     /**

src/test/java/com/zhiwei/brandkbs2/ProjectServiceTest.java

@@ -2,6 +2,7 @@ package com.zhiwei.brandkbs2;
 
 import com.alibaba.fastjson.JSONObject;
 import com.zhiwei.brandkbs2.auth.UserThreadLocal;
+import com.zhiwei.brandkbs2.model.ResponseResult;
 import com.zhiwei.brandkbs2.pojo.AbstractProject;
 import com.zhiwei.brandkbs2.pojo.Project;
 import com.zhiwei.brandkbs2.pojo.vo.PageVO;
@@ -43,8 +44,8 @@ public class ProjectServiceTest {
 
     @Test
     public void getUserAllProjectsTest(){
-        List<JSONObject> userAllProjects = projectService.getUserAllProjects();
-        for (JSONObject userAllProject : userAllProjects) {
+        ResponseResult userAllProjects = projectService.getUserAllProjects();
+        for (JSONObject userAllProject : (List<JSONObject>)userAllProjects.getData()) {
             System.out.println(userAllProject);
         }
     }