Merge branch 'feature' into 'dev'

2022/9/9 10:23

See merge request !35

src/main/java/com/zhiwei/brandkbs2/common/GlobalPojo.java

@@ -12,6 +12,7 @@ import org.springframework.stereotype.Component;
 
 import javax.annotation.PostConstruct;
 import javax.annotation.Resource;
+import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
@@ -47,6 +48,10 @@ public class GlobalPojo {
      */
     public static Map<String, Map<String, String>> MEDIA_TYPE;
 
+    public static final List<String> PERMANENT_PLATFORM_NAMES = Arrays.asList("网媒", "微博", "微信", "今日头条");
+
+    public static final String ELSE_PLATFORM_NAME = "其他自媒体";
+
     @PostConstruct
     public void start() {
         try {
@@ -92,6 +97,14 @@ public class GlobalPojo {
         return null;
     }
 
+    public static String getPermanentPlatformNameById(String platformId) {
+        String platformName = getPlatformNameById(platformId);
+        if (PERMANENT_PLATFORM_NAMES.contains(platformName)) {
+            return platformName;
+        }
+        return ELSE_PLATFORM_NAME;
+    }
+
     public static String getMediaType(String projectId, String platform, String source) {
         return MEDIA_TYPE.get(projectId).get(platform + source);
     }

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

@@ -9,10 +9,7 @@ import com.zhiwei.brandkbs2.controller.BaseController;
 import com.zhiwei.brandkbs2.easyexcel.EasyExcelUtil;
 import com.zhiwei.brandkbs2.enmus.RoleEnum;
 import com.zhiwei.brandkbs2.model.ResponseResult;
-import com.zhiwei.brandkbs2.pojo.dto.EventSearchDTO;
-import com.zhiwei.brandkbs2.pojo.dto.ExportSearchWholeDTO;
-import com.zhiwei.brandkbs2.pojo.dto.MarkSearchDTO;
-import com.zhiwei.brandkbs2.pojo.dto.SearchFilterDTO;
+import com.zhiwei.brandkbs2.pojo.dto.*;
 import com.zhiwei.brandkbs2.service.*;
 import com.zhiwei.brandkbs2.util.Tools;
 import io.swagger.annotations.Api;
@@ -181,15 +178,9 @@ public class AppSearchController extends BaseController {
 
     @ApiOperation("搜索-渠道列表")
     @PostMapping(value = "/channel/channelList")
-    public ResponseResult getChannelList(@RequestParam(value = "page", defaultValue = "1") int page,
-                                         @RequestParam(value = "pageSize", defaultValue = "20") int pageSize,
-                                         @RequestParam(value = "keyword", required = false) String keyword,
-                                         @RequestParam(value = "platforms", required = false) List<String> platforms,
-                                         @RequestParam(value = "emotions", required = false) List<Integer> emotions,
-                                         @RequestParam(value = "mediaTypes", required = false) List<String> mediaTypes,
-                                         @RequestParam(value = "articlesCount", required = false) String[] articlesCount,
-                                         @RequestParam(value = "sorter", defaultValue = "{\"influence\":\"descend\"}") String sorter) {
-        return ResponseResult.success(channelService.getChannelList(page, pageSize, keyword, platforms, emotions, mediaTypes, articlesCount, sorter));
+    public ResponseResult getChannelList(@RequestBody ChannelSearchDTO channelSearchDTO) {
+        return ResponseResult.success(channelService.getChannelList(channelSearchDTO.getPage(), channelSearchDTO.getPageSize(), channelSearchDTO.getKeyword(),
+                channelSearchDTO.getPlatform(), channelSearchDTO.getEmotions(), channelSearchDTO.getMediaTypes(), channelSearchDTO.getArticlesCount(), channelSearchDTO.getSorter()));
     }
 
     @ApiOperation("搜索-热门事件")

src/main/java/com/zhiwei/brandkbs2/pojo/dto/ChannelSearchDTO.java

+package com.zhiwei.brandkbs2.pojo.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @ClassName: ChannelSearchDTO
+ * @Description ChannelSearchDTO
+ * @author: sjj
+ * @date: 2022-09-08 11:10
+ */
+@Data
+@ApiModel("渠道搜索传输类")
+public class ChannelSearchDTO {
+
+    @ApiModelProperty("页码")
+    private int page = 1;
+
+    @ApiModelProperty("页码大小")
+    private int pageSize = 20;
+
+    @ApiModelProperty("关键词")
+    private String keyword;
+
+    @ApiModelProperty("平台")
+    private List<String> platform;
+
+    @ApiModelProperty("情感倾向")
+    private List<Integer> emotions;
+
+    @ApiModelProperty("媒体类型")
+    private List<String> mediaTypes;
+
+    @ApiModelProperty("文章数")
+    private Integer[] articlesCount;
+
+    @ApiModelProperty("排序字段")
+    private String sorter = "{\"influence\":\"descend\"}";
+
+}

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

@@ -260,6 +260,6 @@ public interface ChannelService {
     JSONObject getChannelSearchCriteria();
 
     PageVO<ChannelVO> getChannelList(int page, int pageSize, String keyword, List<String> platforms, List<Integer> emotions, List<String> mediaTypes,
-                                     String[] articlesCount, String sorter);
+                                     Integer[] articlesCount, String sorter);
 
 }

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

@@ -805,14 +805,14 @@ public class ChannelServiceImpl implements ChannelService {
 
     @Override
     public PageVO<ChannelVO> getChannelList(int page, int pageSize, String keyword, List<String> platforms, List<Integer> emotions, List<String> mediaTypes,
-                                            String[] articlesCount, String sorter) {
+                                            Integer[] articlesCount, String sorter) {
         String projectId = UserThreadLocal.getProjectId();
         String contendId = "0";
         String linkedGroupId = projectService.getProjectByContendId(projectId, contendId).getBrandLinkedGroupId();
         Query query = new Query(Criteria.where("projectId").is(projectId).and("contendId").is(contendId));
         channelDao.addKeywordFuzz(query, keyword, "source");
         if (!(null == platforms || platforms.contains("全部"))) {
-            query.addCriteria(Criteria.where("platform").in(platforms));
+            query.addCriteria(Criteria.where("platform").in(platforms.stream().map(GlobalPojo::getPlatformNameById).collect(Collectors.toList())));
         }
         if (!(null == emotions || emotions.contains(-1))) {
             query.addCriteria(Criteria.where("emotion").in(emotions));
@@ -823,8 +823,8 @@ public class ChannelServiceImpl implements ChannelService {
         if (null != articlesCount) {
             query.addCriteria(Criteria.where("articleCount").gte(articlesCount[0]).lt(articlesCount[1]));
         }
-        mongoUtil.start(page, pageSize, query);
         long total = channelDao.count(query);
+        mongoUtil.start(page, pageSize, query);
         channelDao.addSort(query, sorter);
         List<Channel> channelList = channelDao.findList(query);
         List<CompletableFuture<JSONObject>> futureList = channelList.stream().map(channel -> CompletableFuture.supplyAsync(() -> {
@@ -1395,9 +1395,9 @@ public class ChannelServiceImpl implements ChannelService {
         String platformId = GlobalPojo.getPlatformIdByName(platform);
         if (null != platformId) {
             query.must(QueryBuilders.termQuery(GenericAttribute.ES_PLATFORM_ID, platformId));
-        } else if ("其他自媒体".equals(platform)) {
+        } else if (GlobalPojo.ELSE_PLATFORM_NAME.equals(platform)) {
             // 不是 网媒,微博,微信,今日头条
-            EsQueryTools.platformMustNot(query, "网媒", "平媒", "微博", "微信", "今日头条");
+            EsQueryTools.platformMustNot(query, GlobalPojo.PERMANENT_PLATFORM_NAMES.toArray(new String[0]));
         }
         // keyword
         if (StringUtils.isNotEmpty(keyword)) {

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

@@ -308,7 +308,7 @@ public class IndexServiceImpl implements IndexService {
             } catch (IOException ignored) {
                 count = -1;
             }
-            result.put("platform", GlobalPojo.getPlatformNameById(platformId));
+            result.put("platform", GlobalPojo.getPermanentPlatformNameById(platformId));
             result.put("num", count);
             result.put("proportion", normalCount == 0 ? 0d : count / (double) normalCount);
             resultList.add(result);

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

@@ -782,7 +782,7 @@ public class MarkDataServiceImpl implements MarkDataService {
             line.put("time", day.getLongValue("date"));
             lineList.add(line);
         });
-        redisUtil.setExpire(redisKey, JSON.toJSONString(result));
+        redisUtil.setExpire(redisKey, JSON.toJSONString(lineList));
         return lineList;
     }