全网搜-实时采集筛选条件调整

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

@@ -133,9 +133,8 @@ public class AppSearchController extends BaseController {
 
     @ApiOperation("搜索-全网搜条件")
     @GetMapping("/getWholeSearchCriteria")
-    public ResponseResult getWholeSearchCriteria() {
-        JSONObject wholeSearchCriteria = markDataService.getWholeNetworkSearchCriteria();
-        wholeSearchCriteria.putAll(systemInfoService.getExtraParam());
+    public ResponseResult getWholeSearchCriteria(@RequestParam(value = "externalDataSource", defaultValue = "false") boolean externalDataSource) {
+        JSONObject wholeSearchCriteria = markDataService.getWholeNetworkSearchCriteria(externalDataSource);
         return ResponseResult.success(wholeSearchCriteria);
     }
 

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

@@ -296,7 +296,7 @@ public interface MarkDataService {
      * 搜索-全网搜条件
      * @return JSONObject
      */
-    JSONObject getWholeNetworkSearchCriteria();
+    JSONObject getWholeNetworkSearchCriteria(boolean externalDataSource);
 
     /**
      * 搜索-全网搜

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

@@ -163,6 +163,9 @@ public class MarkDataServiceImpl implements MarkDataService {
     @Resource(name = "extraServiceImpl")
     private ExtraService extraService;
 
+    @Resource(name = "systemInfoServiceImpl")
+    SystemInfoService systemInfoService;
+
     @Value("${brandkbs.file.url}")
     private String brandkbsFilePath;
 
@@ -1128,14 +1131,19 @@ public class MarkDataServiceImpl implements MarkDataService {
     }
 
     @Override
-    public JSONObject getWholeNetworkSearchCriteria() {
-        String projectId = UserThreadLocal.getProjectId();
-        Project project = projectService.getProjectById(projectId);
+    public JSONObject getWholeNetworkSearchCriteria(boolean externalDataSource) {
         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());
-        result.put("platformList", commonService.getQbjcPlatform("id", "name").stream().filter(s -> !s.get("name").equals("脉脉")).collect(Collectors.toList()));
+        // 外部数据源（实时采集）条件
+        if (externalDataSource) {
+            result.put("platformList", Arrays.asList("App", "博客", "平媒", "新闻", "微博", "微信", "论坛", "视频", "短视频"));
+        } else {
+            result.put("platformList", commonService.getQbjcPlatform("id", "name")
+                    .stream().filter(s -> !s.get("name").equals("脉脉")).collect(Collectors.toList()));
+            result.putAll(systemInfoService.getExtraParam());
+        }
         return result;
     }
 
@@ -1144,9 +1152,6 @@ public class MarkDataServiceImpl implements MarkDataService {
         if (dto.isExternalDataSource()) { // 查商业数据库
             try {
                 JSONObject params = externalTransform(dto);
-//                JSONObject params = IstarShineUtil.getKSSearchParam(dto.getSearch(), dto.getFilterWords(), dto.getStartTime(), dto.getEndTime(), dto.getPlatformsStr(),
-//                        dto.getFilterForward(), dto.getSortOf(), dto.getPage(), dto.getPageSize(), dto.getMatchFields(), null, null);
-
                 JSONObject taskEntity = new JSONObject();
                 taskEntity.put("appId", "6183571e0d710000f6003a12");   // 应用id, 由张志伟提供给使用者
                 taskEntity.put("taskType", null);                      // 可为null, 任务类型
@@ -1154,7 +1159,6 @@ public class MarkDataServiceImpl implements MarkDataService {
                 taskEntity.put("taskName", UserThreadLocal.getProjectId() + "_" + UserThreadLocal.getUserId());
                 taskEntity.put("userName", "品见");                     // 提交任务的人
                 taskEntity.put("searchParams", params);                // 任务详情参数
-
                 ResponseEntity<JSONObject> responseEntity = restTemplate.postForEntity(addIStarShineKSDataUrl, taskEntity, JSONObject.class);
                 JSONObject result = Objects.requireNonNull(responseEntity.getBody()).getJSONObject("data");
                 JSONObject json = searchWholeBackUp(result.get("id").toString());
@@ -1249,8 +1253,12 @@ public class MarkDataServiceImpl implements MarkDataService {
                 //pageSize
                 Integer receiveCount = task.getInteger("receiveCount");
                 Integer searchCount = task.getInteger("searchCount");
-                int totalPage = searchCount % receiveCount == 0 ? searchCount / receiveCount : (searchCount / receiveCount + 1);
-
+                int totalPage;
+                if (0 == receiveCount || 0 == searchCount){
+                    totalPage = 0;
+                }else {
+                    totalPage = searchCount % receiveCount == 0 ? searchCount / receiveCount : (searchCount / receiveCount + 1);
+                }
                 List<JSONObject> listArray = data.getJSONArray("data").toJavaList(JSONObject.class);
                 for (JSONObject json : listArray) {
                     JSONObject result = new JSONObject();