Project-全网搜数据源下线

src/main/java/com/zhiwei/brandkbs2/pojo/Project.java

@@ -21,11 +21,6 @@ import java.util.Map;
 public class Project extends AbstractProject {
 
     /**
-     * 全网搜数据源(1:舆情库,2:商业数据库)
-     */
-    private Integer wholeSearchDataSource;
-
-    /**
      * 数据起始时间(能够绑定关联关系的时间点)
      */
     private Long importTime;
@@ -106,7 +101,6 @@ public class Project extends AbstractProject {
         projectVO.setId(this.getId());
         // 主品牌
         projectVO.setProjectName(this.getProjectName());
-        projectVO.setWholeSearchDataSource(this.getWholeSearchDataSource());
         projectVO.setImportTime(new Date(this.getImportTime()));
         projectVO.setBrandName(this.getBrandName());
         projectVO.setBrandLinkedGroup(this.getBrandLinkedGroup());

src/main/java/com/zhiwei/brandkbs2/pojo/vo/ProjectVO.java

@@ -38,12 +38,6 @@ public class ProjectVO {
     private String projectName;
 
     /**
-     * 全网搜数据源(1:舆情库,2:商业数据库)
-     */
-    @ApiModelProperty("全网搜数据源(1:舆情库,2:商业数据库)")
-    private Integer wholeSearchDataSource;
-
-    /**
      * 数据起始时间
      */
     @ApiModelProperty("数据起始时间")
@@ -149,7 +143,6 @@ public class ProjectVO {
         } else {
             project.setAvatarUrl(this.getAvatarUrl());
         }
-        project.setWholeSearchDataSource(this.getWholeSearchDataSource());
         project.setImportTime(this.getImportTime().getTime());
         project.setHasContend(null != this.getContendList());
         project.setContendList(this.getContendList().stream().peek(contend -> {

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

@@ -1121,24 +1121,8 @@ public class MarkDataServiceImpl implements MarkDataService {
         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", "舆情");
-            platformList = commonService.getQbjcPlatform("id", "name").stream().filter(s -> !s.get("name").equals("脉脉")).collect(Collectors.toList());
-        }
-        result.put("platformList", platformList);
+        result.put("platformList", commonService.getQbjcPlatform("id", "name").stream().filter(s -> !s.get("name").equals("脉脉")).collect(Collectors.toList()));
         return result;
     }
 

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

@@ -61,7 +61,7 @@ public class MarkDataServiceTest {
 
     @Test
     public void getYuqingMarkCriteriaTest(){
-        JSONObject yuqingMarkCriteria = markDataService.getYuqingMarkCriteria(null);
+        JSONObject yuqingMarkCriteria = markDataService.getYuqingMarkCriteria();
         System.out.println(yuqingMarkCriteria);
     }
 
@@ -179,9 +179,8 @@ public class MarkDataServiceTest {
     @Test
     public void searchWholeNetworkTest(){
         SearchFilterDTO dto = new SearchFilterDTO();
-        dto.setProjectId("62beadd1bbf8eb20f96d2f2f");
         dto.setSearch("阿里");
-        JSONObject jsonObject = markDataService.searchWholeNetwork(dto);
+        JSONObject jsonObject = markDataService.searchWholeNetworkWithBalance(dto).getLeft();
         System.out.println(jsonObject);
     }