【fix】平台接口bug修改

src/main/java/com/zzsn/event/controller/SubjectManageController.java

@@ -99,8 +99,6 @@ public class SubjectManageController {
     private PythonUtil pythonUtil;
     @Autowired(required = false)
     private RemoteModelService remoteModelService;
-    @Autowired
-    private ConfigurationMessageService configurationMessageService;
 
     @Value("${kafka.topic.subject.run:}")
     private String SUBJECT_MODEL_KAFKA_CHANNEL;
@@ -455,8 +453,6 @@ public class SubjectManageController {
     @GetMapping(value = "/bindKeyWordsList")
     public Result<?> bindKeyWordsList(@RequestParam(name = "id") String id,@RequestParam(name = "bindingType",required = false) String bindingType) {
         List<KeyWordsPage> bindKeyWordsList = subjectKeywordsMapService.bindKeyWordsList(id,bindingType);
-        //同步配置到采集
-        configurationMessageService.bindKeyWordsSend(id);
         return Result.OK(bindKeyWordsList);
     }
 

src/main/java/com/zzsn/event/es/EsService.java

@@ -650,9 +650,7 @@ public class EsService {
             }
             //装配信息源的条件
             if (CollectionUtils.isNotEmpty(infoSourceIdList)) {
-                BoolQueryBuilder childQuery = QueryBuilders.boolQuery();
-                childQuery.should(QueryBuilders.termsQuery("sid", infoSourceIdList));
-                boolQuery.must(childQuery);
+                boolQuery.must(QueryBuilders.termsQuery("sid", infoSourceIdList.stream().filter(StringUtils::isNotEmpty).collect(Collectors.toList())));
             } else {
                 return new Page<>();
             }

src/main/java/com/zzsn/event/mapper/xml/SubjectTypeMapper.xml

@@ -36,13 +36,13 @@
         SELECT s.id,s.subject_name as name,m.type_id as pid,'0' as subjectCount,s.create_time,'true' as ynSubject
         FROM subject s
         inner join `subject_type_map` m on s.id = m.subject_id
-        order by s.create_time
+        order by s.sort_order,s.create_time desc
     </select>
     <select id="typeBindEventList" resultType="com.zzsn.event.vo.SubjectTypeTreeVO">
         SELECT s.id,s.event_name as name,m.type_id as pid,'0' as subjectCount,s.create_time,'true' as ynSubject
         FROM event s
         inner join `subject_type_map` m on s.id = m.subject_id
-        order by s.create_time
+        order by s.sort_order,s.create_time desc
     </select>
 
     <select id="subjectsByFacePublic" resultType="com.zzsn.event.vo.SubjectTreeVO">
@@ -204,4 +204,4 @@
         ) x
         order by x.create_time desc
     </select>
-</mapper>
+</mapper>
\ No newline at end of file

src/main/java/com/zzsn/event/vo/InfoDataSearchCondition.java

@@ -53,7 +53,7 @@ public class InfoDataSearchCondition {
     //审核操作(0：未审核  1：审核通过  2：审核未通过  3：暂定  默认值为0)
     private Integer checkStatus;
 
-    //删除标记(1:删除；0:保留)
+    //删除标记(1:删除；0:未删除)
     private Integer deleteFlag = 0;
 
     //关联标签名称

src/main/resources/application-dev.yml

@@ -169,3 +169,16 @@ clb:
     default:
       processing:
         advanceMonth: 6
+caiji:
+  infosourcebind:
+    url: http://1.95.133.166:8823/baseSourceInfo/api/subject/infoSourceEdit
+  keyWordsbind:
+    url: http://1.95.133.166:8823/baseSourceInfo/api/subject/keywordEdit
+  keyWordsEdit:
+    url: http://1.95.133.166:8823/baseSourceInfo/api/keyword/edit
+  allInfosourcebind:
+    url: http://1.95.133.166:8823/baseSourceInfo/api/subject/infoSourceSave
+  allKeyWordsBind:
+    url: http://1.95.133.166:8823/baseSourceInfo/api/subject/keywordSave
+  projectCode: zzsn_prod
+  projectName: 克虏宝正式