Merge branch 'feature' into 'dev'

Feature

See merge request !33

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

 package com.zhiwei.brandkbs2.controller.app;
 
+import com.alibaba.fastjson.JSONObject;
 import com.zhiwei.brandkbs2.auth.Auth;
+import com.zhiwei.brandkbs2.auth.UserThreadLocal;
 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.BaseMap;
 import com.zhiwei.brandkbs2.pojo.dto.ExportAppYuqingDTO;
 import com.zhiwei.brandkbs2.pojo.dto.MarkSearchDTO;
 import com.zhiwei.brandkbs2.service.MarkDataService;
+import com.zhiwei.brandkbs2.service.ProjectService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.time.DateUtils;
 import org.apache.commons.lang3.tuple.Pair;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import java.io.IOException;
+import java.util.Date;
 import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * @ClassName AppContendController

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

@@ -116,30 +116,31 @@ public class AppHotController extends BaseController {
         }
     }
 
-    @ApiOperation("热点库-最新资讯")
+    @ApiOperation("竞品库-最新资讯")
     @GetMapping("/latestNews")
-    public ResponseResult latestNews(@RequestParam(value = "size",defaultValue = "5") Integer size) throws IOException {
+    public ResponseResult latestNews(@RequestParam(value = "size", defaultValue = "5") Integer size,
+                                     @RequestParam(value = "include", defaultValue = "true") boolean include) throws IOException {
         String projectId = UserThreadLocal.getProjectId();
         String linkedGroupId = projectService.getProjectVOById(projectId).getBrandLinkedGroupId();
         Date endDate = new Date();
         Date startDate = DateUtils.addHours(endDate, -24);
 
         List<Map.Entry<String, Integer>> markTopTitleList =
-                    markDataService.getMarkTopTitle(startDate.getTime(), endDate.getTime(), null, projectId, linkedGroupId, Constant.PRIMARY_CONTEND_ID, size);
+                markDataService.getMarkTopTitle(startDate.getTime(), endDate.getTime(), null, projectId, linkedGroupId, Constant.PRIMARY_CONTEND_ID, size, include);
 
         List<JSONObject> resultList = markTopTitleList.stream().map(map -> {
             JSONObject resultJsonObject = new JSONObject();
             resultJsonObject.put("title", map.getKey());
             resultJsonObject.put("num", map.getValue());
             try {
-                BaseMap firstArticle = markDataService.getFirstArticle(startDate.getTime(), endDate.getTime(), map.getKey(), projectId, linkedGroupId, Constant.PRIMARY_CONTEND_ID);
+                BaseMap firstArticle = markDataService.getFirstArticle(startDate.getTime(), endDate.getTime(), map.getKey(), projectId, linkedGroupId, Constant.PRIMARY_CONTEND_ID, include);
                 resultJsonObject.put("content", firstArticle.getContent());
                 resultJsonObject.put("url", firstArticle.getUrl());
                 resultJsonObject.put("realSource", firstArticle.getRealSource());
             } catch (IOException ignored) {
             }
             return resultJsonObject;
-            }).collect(Collectors.toList());
+        }).collect(Collectors.toList());
         return ResponseResult.success(resultList);
     }
 }

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

@@ -5,15 +5,15 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.zhiwei.brandkbs2.auth.Auth;
 import com.zhiwei.brandkbs2.config.Constant;
+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.service.ChannelService;
-import com.zhiwei.brandkbs2.service.CommonService;
-import com.zhiwei.brandkbs2.service.EventService;
-import com.zhiwei.brandkbs2.service.MarkDataService;
+import com.zhiwei.brandkbs2.service.*;
 import com.zhiwei.brandkbs2.util.Tools;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -41,7 +41,7 @@ import java.util.Objects;
 @RequestMapping("/app/search")
 @Api(tags = "前台搜索相关接口", description = "提供搜索相关功能")
 @Auth(role = RoleEnum.CUSTOMER)
-public class AppSearchController {
+public class AppSearchController extends BaseController {
     @Autowired
     private RestTemplate restTemplate;
 
@@ -51,6 +51,9 @@ public class AppSearchController {
     @Value("${crisis.search.url}")
     private String crisisSearchUrl;
 
+    @Value("${crisis.searchTags.url}")
+    private String crisisTagsUrl;
+
     @Value("${ef.search.url}")
     private String getEfSearchUrl;
 
@@ -60,6 +63,9 @@ public class AppSearchController {
     @Resource(name = "channelServiceImpl")
     ChannelService channelService;
 
+    @Resource(name = "systemInfoServiceImpl")
+    SystemInfoService systemInfoService;
+
     @Resource(name = "eventServiceImpl")
     EventService eventService;
 
@@ -91,18 +97,38 @@ public class AppSearchController {
         return ResponseResult.success(result);
     }
 
+    @ApiOperation("搜索-通过标签查危机")
+    @GetMapping("/crisisTags")
+    public ResponseResult crisisTags(@RequestParam(value = "page",defaultValue = "1") Integer page,
+                                     @RequestParam(value = "pageSize",defaultValue = "10") Integer pageSize,
+                                     @RequestParam(value = "brand",required = false) String brand,
+                                     @RequestParam(value = "category",required = false) String category){
+        ResponseEntity<String> responseEntity = restTemplate.getForEntity(crisisTagsUrl, String.class, page, pageSize, brand, category);
+        Object data = JSON.parseObject(responseEntity.getBody()).get("data");
+        return ResponseResult.success(data);
+    }
+
     @ApiOperation("搜索-全网事件库-查事件")
     @GetMapping("/getWholeNetworkEvents")
     public ResponseResult getWholeNetworkEvents(@RequestParam("keyword") String keyword,
-                                                @RequestParam(value = "page", defaultValue = "1") Integer page) {
+                                                @RequestParam(value = "page", defaultValue = "1") Integer page,
+                                                @RequestParam(value = "pageSize", defaultValue = "20") Integer size) {
         String name = keyword.trim();
-        ResponseEntity<String> responseEntity = restTemplate.getForEntity(getEfSearchUrl, String.class, name, page);
+        ResponseEntity<String> responseEntity = restTemplate.getForEntity(getEfSearchUrl, String.class, name, page, size);
         JSONObject result = JSON.parseObject(responseEntity.getBody());
         return ResponseResult.success(result);
     }
 
+    @ApiOperation("搜索-全网搜条件")
+    @GetMapping("/getWholeSearchCriteria")
+    public ResponseResult getWholeSearchCriteria() {
+        JSONObject wholeSearchCriteria = markDataService.getWholeNetworkSearchCriteria();
+        wholeSearchCriteria.putAll(systemInfoService.getExtraParam());
+        return ResponseResult.success(wholeSearchCriteria);
+    }
+
     @ApiOperation("搜索-全网搜")
-    @GetMapping("/searchWhole")
+    @PostMapping("/searchWhole")
     public ResponseResult searchWholeNetwork(@RequestBody SearchFilterDTO dto) {
         long time = DateUtils.addDays(Tools.truncDate(new Date(), Constant.DAY_PATTERN), -89).getTime();
         if (time > dto.getStartTime()) {
@@ -115,7 +141,19 @@ public class AppSearchController {
         return ResponseResult.success(markDataService.searchWholeNetwork(dto));
     }
 
-    @ApiOperation("搜索-舆情列表")
+    @ApiOperation("搜索-全网搜-舆情导出")
+    @PostMapping("/exportSearchWhole")
+    public ResponseResult exportSearchWhole(@RequestBody SearchFilterDTO dto) {
+        long time = DateUtils.addDays(Tools.truncDate(new Date(), Constant.DAY_PATTERN), -89).getTime();
+        if (time > dto.getStartTime()) {
+            return ResponseResult.failure("仅能导出近3个月内信息");
+        }
+        List<ExportSearchWholeDTO> exportList = markDataService.exportSearchWhole(dto);
+        EasyExcelUtil.download("全网搜舆情列表数据", "sheet1", ExportSearchWholeDTO.class, exportList, response);
+        return ResponseResult.success();
+    }
+
+    @ApiOperation("舆情列表")
     @PostMapping("/mark/list")
     public ResponseResult getYuqingMarkList(@RequestBody MarkSearchDTO markSearchDTO) {
         return ResponseResult.success(markDataService.getYuqingMarkList(markSearchDTO));
@@ -183,4 +221,5 @@ public class AppSearchController {
     public ResponseResult getContendSearchCriteria(@RequestParam(required = false) String contendId) {
         return ResponseResult.success(markDataService.getContendSearchCriteria(contendId));
     }
+
 }

src/main/java/com/zhiwei/brandkbs2/es/EsQueryTools.java

@@ -2,6 +2,7 @@ package com.zhiwei.brandkbs2.es;
 
 import com.zhiwei.brandkbs2.common.GenericAttribute;
 import com.zhiwei.brandkbs2.common.GlobalPojo;
+import com.zhiwei.brandkbs2.config.Constant;
 import com.zhiwei.pushlog.tools.Tools;
 import com.zhiwei.qbjc.bean.pojo.common.MessagePlatform;
 import org.apache.commons.collections4.CollectionUtils;
@@ -109,6 +110,13 @@ public class EsQueryTools {
         return nestedBoolQueryBuilder;
     }
 
+    public static BoolQueryBuilder assembleCacheMapsQueryExcludePrimaryId(String projectId){
+        BoolQueryBuilder query = QueryBuilders.boolQuery();
+        query.must(cacheMapsNestedQuery(QueryBuilders.termQuery("brandkbs_cache_maps.project_id.keyword", projectId)));
+        query.mustNot(cacheMapsNestedQuery(QueryBuilders.termQuery("brandkbs_cache_maps.contend_id.keyword", Constant.PRIMARY_CONTEND_ID)));
+        return query;
+    }
+
     public static NestedQueryBuilder cacheMapsNestedQuery(QueryBuilder query) {
         return new NestedQueryBuilder(ES_BRANDKBS_CACHE_MAPS, query, ScoreMode.None);
     }

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

+package com.zhiwei.brandkbs2.pojo.dto;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.fastjson.JSONObject;
+import lombok.Data;
+import lombok.ToString;
+
+import java.util.Date;
+
+/**
+ * 全网搜舆情导出实体类
+ */
+@Data
+@ToString
+public class ExportSearchWholeDTO {
+    @ColumnWidth(20)
+    @ExcelProperty("时间")
+    private Date time;
+
+    @ColumnWidth(20)
+    @ExcelProperty("平台")
+    private String platform;
+
+    @ColumnWidth(20)
+    @ExcelProperty("渠道")
+    private String channel;
+
+    @ColumnWidth(50)
+    @ExcelProperty("标题")
+    private String title;
+
+    @ColumnWidth(50)
+    @ExcelProperty("文本")
+    private String content;
+
+    @ColumnWidth(50)
+    @ExcelProperty("地址")
+    private String url;
+
+    public static ExportSearchWholeDTO creatExportSearchWholeDTO(JSONObject jsonObject){
+        ExportSearchWholeDTO dto = new ExportSearchWholeDTO();
+        dto.setTime(new Date((Long) jsonObject.get("time")));
+        dto.setPlatform(jsonObject.getString("platform"));
+        dto.setChannel(jsonObject.getString("channel"));
+        dto.setTitle(jsonObject.getString("title"));
+        dto.setContent(jsonObject.getString("content"));
+        dto.setUrl(jsonObject.getString("url"));
+        return dto;
+    }
+}

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

 package com.zhiwei.brandkbs2.pojo.dto;
 
-import com.alibaba.fastjson.JSONObject;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -121,8 +120,8 @@ public class SearchFilterDTO {
 
     public Map<String, Object> toMap() {
         Map<String, Object> map = new HashMap<>();
-        map.put("timeType","time");
-        map.put("pt", getPt());
+        map.put("timeType", "time");
+        map.put("pt", getPlatforms());
         map.put("matchType", matchType);
         map.put("search", search);
         map.put("startTime", startTime);
@@ -138,7 +137,7 @@ public class SearchFilterDTO {
         return map;
     }
 
-    public List<String> getPt() {
+    public List<String> getPlatforms() {
         return Objects.nonNull(platforms) ? this.platforms : Collections.emptyList();
     }
 

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

@@ -5,6 +5,7 @@ import com.zhiwei.brandkbs2.pojo.BaseMap;
 import com.zhiwei.brandkbs2.pojo.Event;
 import com.zhiwei.brandkbs2.pojo.MarkFlowEntity;
 import com.zhiwei.brandkbs2.pojo.dto.ExportAppYuqingDTO;
+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.vo.PageVO;
@@ -133,6 +134,21 @@ public interface MarkDataService {
                                                      String contendId, int size) throws IOException;
 
     /**
+     * 获取时间段某情感数据最多的标题
+     *
+     * @param startTime     开始时间
+     * @param endTime       结束时间
+     * @param emotion       情感倾向名称
+     * @param projectId     项目id
+     * @param linkedGroupId 关联组id
+     * @param size          分页大小
+     * @param include       是否包含主品牌
+     * @return 最热标题
+     */
+    List<Map.Entry<String, Integer>> getMarkTopTitle(Long startTime, Long endTime, String emotion, String projectId, String linkedGroupId,
+                                                     String contendId, int size, boolean include) throws IOException;
+
+    /**
      * 根据聚合标题和时间获取首发稿件
      *
      * @param startTime     开始时间
@@ -145,6 +161,19 @@ public interface MarkDataService {
     BaseMap getFirstArticle(Long startTime, Long endTime, String aggTitle, String projectId, String linkedGroupId, String contendId) throws IOException;
 
     /**
+     * 根据聚合标题和时间获取首发稿件
+     *
+     * @param startTime     开始时间
+     * @param endTime       结束时间
+     * @param aggTitle      聚合标题
+     * @param projectId     项目id
+     * @param linkedGroupId 关联组id
+     * @param include       是否包含主品牌
+     * @return 首发稿件
+     */
+    BaseMap getFirstArticle(Long startTime, Long endTime, String aggTitle, String projectId, String linkedGroupId, String contendId, boolean include) throws IOException;
+
+    /**
      * 搜索标注数据通过事件
      *
      * @param event
@@ -196,7 +225,7 @@ public interface MarkDataService {
      * @param markSearchDTO  标注数据搜索传输类
      * @param hotArticleSize 热门稿件数量
      * @param cache          是否启用缓存
-     * @return
+     * @return JSONObject
      */
     JSONObject getContendSpreadAnalyze(MarkSearchDTO markSearchDTO, int hotArticleSize, boolean cache) throws IOException;
 
@@ -204,17 +233,30 @@ public interface MarkDataService {
      * 竞品库-舆情导出
      *
      * @param markSearchDTO 标注数据搜索传输类
-     * @return
+     * @return Pair<String, List<ExportAppYuqingDTO>>
      */
     Pair<String, List<ExportAppYuqingDTO>> downloadContendMarkList(MarkSearchDTO markSearchDTO);
 
     /**
+     * 搜索-全网搜条件
+     * @return JSONObject
+     */
+    JSONObject getWholeNetworkSearchCriteria();
+
+    /**
      * 搜索-全网搜
      *
-     * @param searchFilterDTO
-     * @return
+     * @param dto 全网搜搜索传输类
+     * @return JSONObject
+     */
+    JSONObject searchWholeNetwork(SearchFilterDTO dto);
+
+    /**
+     * 搜索-全网搜-舆情导出
+     * @param dto 全网搜搜索传输类
+     * @return List<ExportSearchWholeDTO>
      */
-    JSONObject searchWholeNetwork(SearchFilterDTO searchFilterDTO);
+    List<ExportSearchWholeDTO> exportSearchWhole(SearchFilterDTO dto);
 
     /**
      * 时间段内稿件数

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

 package com.zhiwei.brandkbs2.service;
 
+import com.alibaba.fastjson.JSONObject;
 import com.zhiwei.brandkbs2.pojo.ChannelTag;
 import com.zhiwei.qbjc.bean.pojo.common.MessagePlatform;
 import com.zhiwei.qbjc.bean.pojo.common.Tag;
@@ -38,4 +39,10 @@ public interface SystemInfoService {
 
     Map<String, Map<String, String>> getMediaTypes();
 
+    /**
+     * 从舆情系统 获取舆情查询额外参数
+     * @return JSONObject
+     */
+    JSONObject getExtraParam();
+
 }

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

@@ -685,14 +685,14 @@ public class EventServiceImpl implements EventService {
 
     private List<JSONObject> getDefaultVolumes() {
         List<JSONObject> res = new ArrayList<>();
-        for (String name : Arrays.asList("全部", "1-100", "100-1000", "1000-5000", ">=5000")) {
+        for (String name : Arrays.asList("全部", "1-100", "100-1000", "1000-5000", "≥5000")) {
             JSONObject json = new JSONObject();
             json.put("name", name);
             switch (name) {
                 case "全部":
                     json.put("totalDisseminationVolumes", null);
                     break;
-                case ">=5000":
+                case "≥5000":
                     json.put("totalDisseminationVolumes", new Long[]{5000L, -1L});
                     break;
                 default:

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

@@ -22,6 +22,7 @@ import com.zhiwei.brandkbs2.listener.ApplicationProjectListener;
 import com.zhiwei.brandkbs2.model.CommonCodeEnum;
 import com.zhiwei.brandkbs2.pojo.*;
 import com.zhiwei.brandkbs2.pojo.dto.ExportAppYuqingDTO;
+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.vo.CustomTagVo;
@@ -100,6 +101,9 @@ public class MarkDataServiceImpl implements MarkDataService {
     @Value("${whole.search.url}")
     private String wholeSearchUrl;
 
+    @Value("${whole.searchCriteria.url}")
+    private String wholeSearchCriteriaUrl;
+
     @Autowired
     private RestTemplate restTemplate;
 
@@ -782,6 +786,10 @@ public class MarkDataServiceImpl implements MarkDataService {
         return lineList;
     }
 
+    public List<Map.Entry<String, Integer>> getMarkTopTitle(Long startTime, Long endTime, String emotion, String projectId, String linkedGroupId, String contendId, int size) throws IOException {
+        return getMarkTopTitle(startTime, endTime, emotion, projectId, linkedGroupId, contendId, size, true);
+    }
+
     /**
      * 获取时间段某情感数据最多的标题
      *
@@ -791,9 +799,10 @@ public class MarkDataServiceImpl implements MarkDataService {
      * @param projectId     项目id
      * @param linkedGroupId 关联组id
      * @param size          分页大小
+     * @param include       是否包含主品牌
      * @return 最热标题
      */
-    public List<Map.Entry<String, Integer>> getMarkTopTitle(Long startTime, Long endTime, String emotion, String projectId, String linkedGroupId, String contendId, int size) throws IOException {
+    public List<Map.Entry<String, Integer>> getMarkTopTitle(Long startTime, Long endTime, String emotion, String projectId, String linkedGroupId, String contendId, int size, boolean include) throws IOException {
         // 索引
         String[] indexes = esClientDao.getIndexes();
         // TODO script使用
@@ -801,7 +810,12 @@ public class MarkDataServiceImpl implements MarkDataService {
 //        TermsAggregationBuilder aggregationBuilder = AggregationBuilders.terms("titles").script(script).order(BucketOrder.count(false)).size(60000);
         TermsAggregationBuilder aggregationBuilder = AggregationBuilders.terms("titles").field("agg_title.keyword").size(size * 10);
         // query
-        BoolQueryBuilder query = projectLinkedGroupContendIdQuery(projectId, linkedGroupId, contendId);
+        BoolQueryBuilder query;
+        if (include) {
+            query = projectLinkedGroupContendIdQuery(projectId, linkedGroupId, contendId);
+        }else {
+            query = EsQueryTools.assembleCacheMapsQueryExcludePrimaryId(projectId);
+        }
         query.must(QueryBuilders.rangeQuery("time").gte(startTime).lt(endTime))
                 // 过滤微博
                 .mustNot(QueryBuilders.termQuery("platform_id", "5d02236e6395002a7c380b79"));
@@ -824,12 +838,21 @@ public class MarkDataServiceImpl implements MarkDataService {
         return result.entrySet().stream().sorted(Map.Entry.comparingByValue(Comparator.reverseOrder())).limit(size).collect(Collectors.toList());
     }
 
-    @Override
     public BaseMap getFirstArticle(Long startTime, Long endTime, String aggTitle, String projectId, String linkedGroupId, String contendId) throws IOException {
+        return getFirstArticle(startTime, endTime, aggTitle, projectId, linkedGroupId, contendId, true);
+    }
+
+    @Override
+    public BaseMap getFirstArticle(Long startTime, Long endTime, String aggTitle, String projectId, String linkedGroupId, String contendId, boolean include) throws IOException {
         // 索引
         String[] indexes = esClientDao.getIndexes();
         // postFilter
-        BoolQueryBuilder postFilter = projectLinkedGroupContendIdQuery(projectId, linkedGroupId, contendId);
+        BoolQueryBuilder postFilter;
+        if (include) {
+            postFilter = projectLinkedGroupContendIdQuery(projectId, linkedGroupId, contendId);
+        }else {
+            postFilter = EsQueryTools.assembleCacheMapsQueryExcludePrimaryId(projectId);
+        }
         postFilter.must(QueryBuilders.rangeQuery("time").gte(startTime).lt(endTime)).must(QueryBuilders.termQuery("agg_title.keyword", aggTitle));
         //sort
         FieldSortBuilder sort = new FieldSortBuilder("time").order(SortOrder.ASC);
@@ -1218,8 +1241,61 @@ public class MarkDataServiceImpl implements MarkDataService {
     }
 
     @Override
+    public JSONObject getWholeNetworkSearchCriteria() {
+        String projectId = UserThreadLocal.getProjectId();
+        Project project = projectService.getProjectById(projectId);
+        JSONObject result = new JSONObject();
+        // 搜索时间
+        result.put("times", Arrays.asList("今天", "24小时", "三天", "七天", "近30天"));
+
+        result.put("ninetyDays",DateUtils.addDays(Tools.truncDate(new Date(), Constant.DAY_PATTERN), -89).getTime());
+
+        List<JSONObject> platformList = new ArrayList<>();
+        if (2 == project.getWholeSearchDataSource()) {
+            result.put("origin", "商业");
+            JSONObject backUpPlatform = getBackUpPlatform();
+            for (Map.Entry<String, Object> entry : backUpPlatform.entrySet()) {
+                JSONObject platformJSONObject = new JSONObject();
+                platformJSONObject.put("name", entry.getKey());
+                platformJSONObject.put("id", entry.getValue());
+                platformList.add(platformJSONObject);
+            }
+        }else {
+            result.put("origin", "舆情");
+            ResponseEntity<String> responseEntity = restTemplate.getForEntity(wholeSearchCriteriaUrl, String.class);
+            JSONObject jsonObject = JSON.parseObject(responseEntity.getBody());
+            Map data = (Map) jsonObject.get("data");
+            List<JSONObject> list = (List)data.get("list");
+            //发布平台删掉脉脉
+            List<JSONObject> collect = list.stream().filter(s -> !s.get("name").equals("脉脉")).collect(Collectors.toList());
+            for (JSONObject object : collect) {
+                JSONObject platformJSONObject = new JSONObject();
+                platformJSONObject.put("name",object.get("name"));
+                platformJSONObject.put("id",object.get("id"));
+                platformList.add(platformJSONObject);
+            }
+        }
+        result.put("platformList",platformList);
+        return result;
+    }
+
+    private JSONObject getBackUpPlatform(){
+        JSONObject jsonObject = new JSONObject();
+        jsonObject.put("全部","");
+        jsonObject.put("微博","微博");
+        jsonObject.put("微信","微信");
+        jsonObject.put("网媒","新闻");
+        jsonObject.put("平媒","平媒");
+        jsonObject.put("自媒体","自媒体");
+        jsonObject.put("贴吧论坛","论坛");
+        jsonObject.put("视频","视频");
+        jsonObject.put("短视频","短视频");
+        return jsonObject;
+    }
+
+    @Override
     public JSONObject searchWholeNetwork(SearchFilterDTO dto) {
-        Project project = projectService.getProjectById(dto.getProjectId());
+        Project project = projectService.getProjectById(UserThreadLocal.getProjectId());
         JSONObject jsonObject = new JSONObject();
         if (2 == project.getWholeSearchDataSource()) { // 查商业数据库
             defaultSearchFilter(dto);
@@ -1246,6 +1322,13 @@ public class MarkDataServiceImpl implements MarkDataService {
         return jsonObject;
     }
 
+    @Override
+    public List<ExportSearchWholeDTO> exportSearchWhole(SearchFilterDTO dto) {
+        JSONObject jsonObject = searchWholeNetwork(dto);
+        JSONArray jsonArray = jsonObject.getJSONArray("list");
+        return jsonArray.stream().map(json -> ExportSearchWholeDTO.creatExportSearchWholeDTO((JSONObject) json)).collect(Collectors.toList());
+    }
+
     private JSONObject searchWholeOpinion(ResponseEntity<JSONObject> responseEntity, JSONObject jsonObject) {
         JSONObject bodyData = Objects.requireNonNull(responseEntity.getBody()).getJSONObject("data");
         JSONObject data = bodyData.getJSONObject("data");
@@ -1257,7 +1340,6 @@ public class MarkDataServiceImpl implements MarkDataService {
             JSONObject result = new JSONObject();
             result.put("platform", list.get("real_source"));
             JSONArray contentArray = list.getJSONArray("ind_full_text");
-            assert contentArray == null;
             result.put("title", contentArray.get(0));
             result.put("content", contentArray.get(1));
             if (3 == contentArray.size()) {

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

 package com.zhiwei.brandkbs2.service.impl;
 
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
 import com.zhiwei.brandkbs2.dao.ChannelTagDao;
 import com.zhiwei.brandkbs2.dao.MediaTypeDao;
 import com.zhiwei.brandkbs2.dao.QbjcPojoDao;
@@ -8,12 +10,17 @@ import com.zhiwei.brandkbs2.pojo.MediaType;
 import com.zhiwei.brandkbs2.service.SystemInfoService;
 import com.zhiwei.qbjc.bean.pojo.common.MessagePlatform;
 import com.zhiwei.qbjc.bean.pojo.common.Tag;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Service;
+import org.springframework.web.client.RestTemplate;
 
 import javax.annotation.Resource;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 
 /**
  * @ClassName: SystemInfoServiceImpl
@@ -33,6 +40,12 @@ public class SystemInfoServiceImpl implements SystemInfoService {
     @Resource
     private MediaTypeDao mediaTypeDao;
 
+    @Autowired
+    private RestTemplate restTemplate;
+
+    @Value("${whole.extraParam.url}")
+    private String YU_QING_EXTRA_PARAM;
+
     @Override
     public List<MessagePlatform> getPlatforms() {
         return qbjcPojoDao.findMessagePlatformAll();
@@ -58,4 +71,14 @@ public class SystemInfoServiceImpl implements SystemInfoService {
         }
         return res;
     }
+
+    @Override
+    public JSONObject getExtraParam() {
+        ResponseEntity<String> forEntity = restTemplate.getForEntity(YU_QING_EXTRA_PARAM, String.class);
+        JSONObject jsonObject = JSON.parseObject(forEntity.getBody());
+        if (Objects.nonNull(jsonObject) && Boolean.TRUE.equals(jsonObject.getBoolean("status"))) {
+            return jsonObject.getJSONObject("data");
+        }
+        return null;
+    }
 }

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

@@ -100,7 +100,8 @@ public class TaskServiceImpl implements TaskService {
         // 替换成新的记录map
         channelIndexRecordMap = newRecordMap;
         ListUtils.partition(insertList, 1000).forEach(list -> {
-            channelDao.insertMany(list);
+            // TODO 2
+//            channelDao.insertMany(list);
         });
         log.info("渠道统计-渠道总计-录入完毕,新增渠道{}条,更新渠道{}条", insertList.size(), channelIndexRecordMap.size() - insertList.size());
         // 获得单位时间内最小最大时间戳
@@ -122,7 +123,8 @@ public class TaskServiceImpl implements TaskService {
                 insertList.add(channelService.calculateChannelEmotionIndex(channel));
             } else {
                 channel.setRecord(entry.getValue());
-                channelDao.updateOne(channelService.calculateChannelEmotionIndex(channel));
+                // TODO 2
+//                channelDao.updateOne(channelService.calculateChannelEmotionIndex(channel));
             }
             // 设置查询数值
             entry.getKey().setChannelInfo(channel);

src/main/resources/application-local.properties

@@ -71,7 +71,7 @@ trends.longTimeInListSearchByInner.url=https://trends.zhiweidata.com/hotSearchTr
 trends.findHotSearchESDataInTimeByInner.url=https://hotsearch-manage.zhiweidata.com/hotsearch/hotSearch/findHotSearchESDataInTimeByInner?limit={1}&page={2}&type={3}&word={4}
 trends.longTimeInListSearch.url=https://trends.zhiweidata.com/hotSearchTrend/search/longTimeInListSearch?type={1}&sortType=realTime
 #\u4E8B\u4EF6\u5E93\u5916\u90E8\u63A5\u53E3
-ef.search.url=https://ef.zhiweidata.com/external/search.do?name={1}&page={2}
+ef.search.url=https://ef.zhiweidata.com/external/search.do?name={1}&page={2}&size={3}
 ef.searchCriteria.url=https://ef.zhiweidata.com/index/getSearchKey.do
 ef.filterNew.url=https://ef.zhiweidata.com/filterNew.do?firstType={1}&start={2}&end={3}&page={4}
 ef.captcha.url=https://ef.zhiweidata.com/captchaApi/getNewCaptcha.do.do?type=test
@@ -79,4 +79,6 @@ ef.checkCaptcha.url=https://ef.zhiweidata.com/captchaApi/checkeCaptcha.do.do?id=
 #\u5168\u7F51\u641C\u5916\u90E8\u63A5\u53E3
 istarshine.addIStarShineKSData.url=https://istarshine-service.zhiweidata.com/istarshine/ks/addIStarShineKSData
 istarshine.getIStarShineKSInfoData.url=https://istarshine-service.zhiweidata.com/istarshine/ks/getIStarShineKSInfoData?taskId={1}&appId=6183571e0d710000f6003a12
-whole.search.url=https://yuqing.zhiweidata.com/qbjcbackPhoenix/interface/middleware/search/yuqing
+whole.search.url=https://yuqing.zhiweidata.com/qbjcbackPhoenix/interface/middleware/search/yuqing
\ No newline at end of file
+whole.searchCriteria.url=https://yuqing.zhiweidata.com/qbjcbackPhoenix/interface/middleware/search/pt
+whole.extraParam.url=https://yuqing.zhiweidata.com/qbjcbackPhoenix/interface/middleware/search/extra/param
\ No newline at end of file