Merge remote-tracking branch 'origin/event_fusion' into event_fusion

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

@@ -109,6 +109,22 @@ public class SubjectSimpleController {
         return Result.OK(subjectDetailVO);
     }
 
+
+
+    /**
+     * 专题详情(无验证版本)
+     *
+     * @param subjectId 专题id
+     * @author lkg
+     * @date 2025/1/9
+     */
+    @GetMapping("/queryInfoNoSign")
+    public Result<?> queryInfoNoSign(@RequestParam String subjectId){
+        SubjectDetailVO subjectDetailVO = subjectSimpleService.queryInfo(subjectId);
+        return Result.OK(subjectDetailVO);
+    }
+
+
     /**
      * 删除专题
      *

src/main/java/com/zzsn/event/entity/Subject.java

@@ -109,7 +109,8 @@ public class Subject implements Serializable {
     private Date firstOpenTime;
     /**预估状态*/
     private String estimateStatus;
-
+    /** 环境 1-测试 2-正式 */
+    private String environment;
     /**专题分类id*/
     @TableField(exist = false)
     private String typeId;

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

@@ -160,6 +160,7 @@
         <result column="library" property="library"/>
         <result column="face_public" property="facePublic"/>
         <result column="first_open_time" property="firstOpenTime"/>
+        <result column="estimate_status" property="estimateStatus"/>
         <collection property="sampleFileList" ofType="com.zzsn.event.entity.SubjectSampleFile">
             <id column="id" property="id"/>
             <result column="file_name" property="fileName"/>
@@ -176,6 +177,7 @@
                s.data_source,
                s.face_public,
                s.library,
+               s.estimate_status,
                s.first_open_time,
                c.id as subjectTypeId,
                c.type_name as subjectTypeName,

src/main/java/com/zzsn/event/service/impl/ConfigurationMessageService.java

@@ -403,7 +403,7 @@ public class ConfigurationMessageService {
         if (CollectionUtil.isNotEmpty(excludeIds)) {
             bindIds.removeAll(excludeIds);
         }
-        return bindIds;
+        return bindIds.stream().distinct().collect(Collectors.toList());
     }
 
 
@@ -422,8 +422,7 @@ public class ConfigurationMessageService {
         }
         //查询排除的标签信息源id
         List<SubjectInfoSourceMap> excludeInfoSourceLabel = iSubjectInfoSourceMapService.list(Wrappers.<SubjectInfoSourceMap>lambdaQuery()
-                .select(SubjectInfoSourceMap::getSourceId)
-                .select(SubjectInfoSourceMap::getSourceItemId)
+                .select(SubjectInfoSourceMap::getSourceId,SubjectInfoSourceMap::getSourceItemId)
                 .eq(SubjectInfoSourceMap::getSubjectId, subjectId)
                 .eq(SubjectInfoSourceMap::getType, BindTypeEnum.EXCLUDE_INFO_SOURCE_LABEL.getvalue())
         );
@@ -441,7 +440,7 @@ public class ConfigurationMessageService {
             );
             if (CollectionUtil.isNotEmpty(list)){
                 List<String> infoSourceCodes = list.stream().map(ClbLabelInfoSourceMap::getEntityCode).distinct().collect(Collectors.toList());
-                List<InfoSource> list1 = iInfoSourceService.list(Wrappers.<InfoSource>lambdaQuery().select(InfoSource::getId).in(InfoSource::getInfoSourceCode, infoSourceCodes));
+                List<InfoSource> list1 = iInfoSourceService.list(Wrappers.<InfoSource>lambdaQuery().select(InfoSource::getId).in(InfoSource::getId, infoSourceCodes));
                 if (CollectionUtil.isNotEmpty(list1)){
                     List<String> collect = list1.stream().map(InfoSource::getId).collect(Collectors.toList());
                     excludeIds.addAll(collect);
@@ -478,8 +477,7 @@ public class ConfigurationMessageService {
         }
         //查询绑定的标签信息源id
         List<SubjectInfoSourceMap> excludeInfoSourceLabel = iSubjectInfoSourceMapService.list(Wrappers.<SubjectInfoSourceMap>lambdaQuery()
-                .select(SubjectInfoSourceMap::getSourceId)
-                .select(SubjectInfoSourceMap::getSourceItemId)
+                .select(SubjectInfoSourceMap::getSourceId,SubjectInfoSourceMap::getSourceItemId)
                 .eq(SubjectInfoSourceMap::getSubjectId, subjectId)
                 .in(SubjectInfoSourceMap::getType, Arrays.asList(BindTypeEnum.INFO_SOURCE_LABEL.getvalue(),BindTypeEnum.DIRECTIONA_INFO_SOURCE_LABEL.getvalue()))
         );
@@ -497,7 +495,7 @@ public class ConfigurationMessageService {
             );
             if (CollectionUtil.isNotEmpty(list)){
                 List<String> infoSourceCodes = list.stream().map(ClbLabelInfoSourceMap::getEntityCode).distinct().collect(Collectors.toList());
-                List<InfoSource> list1 = iInfoSourceService.list(Wrappers.<InfoSource>lambdaQuery().select(InfoSource::getId).in(InfoSource::getInfoSourceCode, infoSourceCodes));
+                List<InfoSource> list1 = iInfoSourceService.list(Wrappers.<InfoSource>lambdaQuery().select(InfoSource::getId).in(InfoSource::getId, infoSourceCodes));
                 if (CollectionUtil.isNotEmpty(list1)){
                     List<String> collect = list1.stream().map(InfoSource::getId).collect(Collectors.toList());
                     excludeIds.addAll(collect);

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

@@ -50,4 +50,6 @@ public class SubjectDetailVO {
     private List<SubjectSampleFile> sampleFileList;
     /**关键词信息*/
     private List<SearchWordVO> keywords;
+    /**预估状态*/
+    private String estimateStatus;
 }

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

@@ -181,5 +181,6 @@ public class SubjectPage {
 
 
     private List<ClbModelArrange> clbModelArranges;
-
+    /** 环境 1-测试 2-正式 */
+    private String environment;
 }

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

@@ -36,4 +36,6 @@ public class SubjectSimpleVO {
     private Integer facePublic;
     /**关键词*/
     private List<SearchWordVO> keywords;
+    /** 环境 1-测试 2-正式 */
+    private String environment;
 }