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

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

@@ -23,11 +23,9 @@ import com.zzsn.event.vo.*;
 import com.zzsn.event.vo.es.SpecialInformation;
 import com.zzsn.event.xxljob.entity.XxlJobInfo;
 import com.zzsn.event.xxljob.service.IXxlJobInfoService;
-import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
-import org.apache.kafka.common.utils.SecurityUtils;
 import org.apache.poi.hwpf.HWPFDocument;
 import org.apache.poi.hwpf.extractor.WordExtractor;
 import org.apache.poi.xwpf.extractor.XWPFWordExtractor;
@@ -282,6 +280,18 @@ public class SubjectManageController {
     }
 
     /**
+     * 获取专题详情(只包含专题信息)
+     *
+     * @param subjectId 专题id
+     * @author lkg
+     * @date 2025/1/8
+     */
+    @GetMapping("/getById")
+    public Result<?> detailById(@RequestParam String subjectId) {
+        return Result.OK(subjectService.getById(subjectId));
+    }
+
+    /**
      * 添加
      *
      * @param subjectPage

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

@@ -160,7 +160,10 @@ public class SubjectPage {
     private Integer category;
     /**预估状态*/
     private String estimateStatus;
-
+    /**是否审核*/
+    private String enterpriseCheck;
+    /**数据类型*/
+    private String additionDataType;
     /**
      * 信息源绑定-新
      * */