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

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

@@ -333,6 +333,7 @@ public class FileController {
                     header.put("原文链接", "sourceAddress");
                     header.put("发布时间", "publishDate");
                     header.put("正文内容", "content");
+                    header.put("摘要", "summary");
                     reader.setHeaderAlias(header);
                     List<FileDataVO> informationList = reader.read(0, 1, FileDataVO.class);
                     informationService.importDataInfo(informationList,subjectId);

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

@@ -1159,7 +1159,7 @@ public class SubjectManageController {
     }
 
     /**
-     * 单挑数据填充
+     * 单条数据填充
      *
      * @param subjectId     专题id
      * @param webSiteName   信息源名称

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

@@ -30,6 +30,8 @@ public class SubjectStatisticInfo {
     private String id;
     /**信息总数量*/
     private Integer totalNum;
+    /**模型推荐数量*/
+    private Integer modelNum;
     /**待审核数量*/
     private Integer unCheckNum;
     /**绑定信息源数量*/

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

@@ -1855,12 +1855,13 @@ public class EsService {
      * 专题信息数量统计
      *
      * @param subjectIds  专题id集合
-     * @param auditStatus 审核状态
+     * @param auditStatus 审核状态-平台(null-全部;1-通过;2-未审核;3-暂定;4-删除;5-免审核)
+     * @param auditStatus 审核状态-研究中心(0-全部;1-模型推荐;2-精选;3-待定;4-移除)
      * @param type        是否多层聚合(先按专题，再按发布时间)
      * @author lkg
      * @date 2025/3/25
      */
-    public List<StatisticVO> subjectStatisticInfo(List<String> subjectIds, Integer auditStatus, Integer type) {
+    public List<StatisticVO> subjectStatisticInfo(List<String> subjectIds, Integer auditStatus,Integer status, Integer type) {
         List<StatisticVO> list = new ArrayList<>();
         SearchRequest searchRequest = new SearchRequest(Constants.SUBJECT_INDEX);
         SearchSourceBuilder searchSourceBuilder = new SearchSourceBuilder();
@@ -1870,6 +1871,9 @@ public class EsService {
         if (auditStatus != null) {
             searchCondition.setAuditStatus(auditStatus);
         }
+        if (status != null) {
+            searchCondition.setStatus(status);
+        }
         BoolQueryBuilder boolQuery = buildQuery(searchCondition, subjectIds);
         searchSourceBuilder.query(boolQuery);
         TermsAggregationBuilder aggregationBuilder = AggregationBuilders.terms("group_subject");

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

@@ -151,10 +151,16 @@
         d.status,
         d.estimate_status,
         d.create_by,
-        c.type_name as subjectTypeName
+        c.type_name as subjectTypeName,
+        s.total_num,
+        s.un_check_num,
+        s.bind_source_num,
+        s.bind_keyword_num,
+        s.latest_data_date
         from subject d
         LEFT JOIN subject_type_map b ON b.subject_id = d.id
         LEFT JOIN subject_type c ON b.type_id = c.id
+        LEFT JOIN subject_statistic_info s on s.subject_id = d.id
         where 1 = 1
         <if test="subjectCondition.typeIds!=null and subjectCondition.typeIds.size()>0">
             and b.type_id in
@@ -196,10 +202,16 @@
         d.status,
         d.estimate_status,
         d.create_by,
-        c.type_name as subjectTypeName
+        c.type_name as subjectTypeName,
+        s.total_num,
+        s.un_check_num,
+        s.bind_source_num,
+        s.bind_keyword_num,
+        s.latest_data_date
         from subject d
         LEFT JOIN subject_type_map b ON b.subject_id = d.id
         LEFT JOIN subject_type c ON b.type_id = c.id
+        LEFT JOIN subject_statistic_info s on s.subject_id = d.id
         where
         ((d.face_public = 1 and d.create_by = #{username}) or (d.face_public = 1 and ${sql}))
         <if test="subjectCondition.environment !=null and subjectCondition.environment !=''">
@@ -296,7 +308,7 @@
         SELECT MIN(create_time) FROM `subject` WHERE 1=1
         <if test="subjectIdList != null">
             <foreach collection="subjectIdList" item="item" open="and id in (" close=")" separator=",">
-              #{item}
+                #{item}
             </foreach>
         </if>
     </select>

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

@@ -156,10 +156,13 @@ public class InformationServiceImpl implements InformationService {
                 for (SpecialInformation specialInformation : records) {
                     DisplayInfo info = new DisplayInfo();
                     BeanUtils.copyProperties(specialInformation, info);
-                    String publishDate = EsDateUtil.esFieldDateMapping(info.getPublishDate());
-                    String dateFormat = searchCondition.getDateFormat();
-                    if (!dateFormat.equals("yyyy-MM-dd HH:mm:ss")) {
-                        info.setPublishDate(DateUtil.formatStr(publishDate,"yyyy-MM-dd HH:mm:ss", dateFormat));
+                    String publishDate = info.getPublishDate();
+                    if (StringUtils.isNotEmpty(publishDate) && publishDate.length() > 10) {
+                        publishDate = EsDateUtil.esFieldDateMapping(info.getPublishDate());
+                        String dateFormat = searchCondition.getDateFormat();
+                        if (!dateFormat.equals("yyyy-MM-dd HH:mm:ss")) {
+                            info.setPublishDate(DateUtil.formatStr(publishDate,"yyyy-MM-dd HH:mm:ss", dateFormat));
+                        }
                     }
                     //标签处理
                     List<LabelModelVo> modelVoList = modelMap.get(info.getSubjectId());
@@ -1066,6 +1069,9 @@ public class InformationServiceImpl implements InformationService {
                 if (StringUtils.isNotEmpty(info.getContent())) {
                     specialInformation.setContent(info.getContent());
                 }
+                if (StringUtils.isNotEmpty(info.getSummary())) {
+                    specialInformation.setContent(info.getSummary());
+                }
                 specialInformation.setCheckStatus(1);
                 specialInformation.setDeleteFlag(0);
                 specialInformation.setTopNum(0);

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

@@ -205,13 +205,6 @@ public class SubjectServiceImpl extends ServiceImpl<SubjectMapper, Subject> impl
         Map<String, Integer> keyWordsNumMap = commonService.bindKeyWordsCountList(subjectIds).stream().collect(Collectors.toMap(SubjectPage::getId, SubjectPage::getKeyWordsNum));
         //按专题分组，统计绑定信息源的数量
         Map<String, Integer> sourceCountMap = commonService.bindSourceCount(subjectIds);
-        //专题统计信息-总数量、最新资讯日期
-        List<StatisticVO> totalAndLatestDateList = esService.subjectStatisticInfo(subjectIds, null, 1);
-        Map<String,StatisticVO> totalAndLatestDateMap = totalAndLatestDateList.stream().collect(Collectors.toMap(StatisticVO::getSubjectId, e -> e));
-        //专题统计信息-待审核数量
-        List<StatisticVO> unCheckNumList = esService.subjectStatisticInfo(subjectIds, 2, null);
-        Map<String, StatisticVO> unCheckNumMap = unCheckNumList.stream().collect(Collectors.toMap(StatisticVO::getSubjectId, e->e));
-
         //绑定全部信息源的专题
         Map<String, Integer> infoSourceNumMap = new HashMap<>();
         List<Subject> subjects = baseMapper.selectBatchIds(subjectIds);
@@ -224,12 +217,22 @@ public class SubjectServiceImpl extends ServiceImpl<SubjectMapper, Subject> impl
                 }
             });
         }
+        //专题统计信息-总数量、最新资讯日期
+        List<StatisticVO> totalAndLatestDateList = esService.subjectStatisticInfo(subjectIds, null,null, 1);
+        Map<String,StatisticVO> totalAndLatestDateMap = totalAndLatestDateList.stream().collect(Collectors.toMap(StatisticVO::getSubjectId, e -> e));
+        //专题统计信息-待审核数量
+        List<StatisticVO> unCheckNumList = esService.subjectStatisticInfo(subjectIds, 2,null, null);
+        Map<String, StatisticVO> unCheckNumMap = unCheckNumList.stream().collect(Collectors.toMap(StatisticVO::getSubjectId, e->e));
+        //专题统计信息-模型推荐数量
+        List<StatisticVO> modelNumList = esService.subjectStatisticInfo(subjectIds, null,1, null);
+        Map<String, StatisticVO> modelNumMap = modelNumList.stream().collect(Collectors.toMap(StatisticVO::getSubjectId, e->e));
         for (String subjectId : subjectIds) {
             SubjectStatisticInfo subjectStatisticInfo = new SubjectStatisticInfo();
             subjectStatisticInfo.setSubjectId(subjectId);
             subjectStatisticInfo.setTotalNum(totalAndLatestDateMap.get(subjectId).getCount());
             subjectStatisticInfo.setLatestDataDate(totalAndLatestDateMap.get(subjectId).getPublishDate());
             subjectStatisticInfo.setUnCheckNum(unCheckNumMap.get(subjectId).getCount());
+            subjectStatisticInfo.setModelNum(modelNumMap.get(subjectId).getCount());
             if (infoSourceNumMap.containsKey(subjectId)) {
                 subjectStatisticInfo.setBindSourceNum(infoSourceNumMap.get(subjectId));
             } else {

src/main/java/com/zzsn/event/task/SubjectStatisticTask.java

@@ -32,15 +32,8 @@ public class SubjectStatisticTask {
     @Autowired
     private SubjectStatisticInfoService subjectStatisticInfoService;
 
-    @Value("${scheduling.yjzxEnable:false}")
-    Boolean yjzxEnable;
-
     @Scheduled(cron = "0 30 0 * * ?")
     public void statistic() {
-        if(yjzxEnable){
-            //研究中心不需要此任务
-            return;
-        }
         LambdaQueryWrapper<Subject> queryWrapper = Wrappers.lambdaQuery();
         queryWrapper.select(Subject::getId).eq(Subject::getSubjectType, 1);
         List<Subject> list = subjectService.list(queryWrapper);

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

@@ -12,6 +12,7 @@ import lombok.Data;
 public class FileDataVO {
 
     private String title;
+    private String summary;
     private String content;
     private String author;
     private String origin;

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

@@ -185,4 +185,17 @@ public class SubjectPage {
     private String environment;
     /**是否处理无发布时间的资讯：1是，0否--默认为0*/
     private Integer noPublishTimeFlag=0;
+
+    /**信息总数量*/
+    private Integer totalNum;
+    /**待审核数量*/
+    private Integer unCheckNum;
+    /**绑定信息源数量*/
+    private Integer bindSourceNum;
+    /**绑定关键词组数量*/
+    private Integer bindKeywordNum;
+    /**最新数据日期*/
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    private Date latestDataDate;
 }