数据新增bug修改，采集库支持指定索引

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

@@ -609,7 +609,7 @@ public class EsService {
      * @date 2024/5/6
      */
     public IPage<EventDataVO> collectPageList(InfoDataSearchCondition eventDataCondition) {
-        SearchRequest searchRequest = new SearchRequest(Constants.COLLECT_INDEX);
+        String index = Constants.COLLECT_INDEX;
         if ("1".equals(eventDataCondition.getIsSubject())) {
             Subject byId = subjectService.getById(eventDataCondition.getSubjectId());
             //更新开始、结束时间
@@ -625,10 +625,15 @@ public class EsService {
                     eventDataCondition.setEndTime(timeDisable);
                 }
             }
+            //以专题指定的索引为准
+            if(StringUtils.isNotEmpty(byId.getEsIndex())){
+                index = byId.getEsIndex();
+            }
         }
+        SearchRequest searchRequest = new SearchRequest(index);
         //根据检索开始结束时间确定索引范围
         String firstIndex = LocalDate.now().minusMonths(23).toString();
-        if (StringUtils.isNotEmpty(eventDataCondition.getStartTime()) && eventDataCondition.getStartTime().compareTo(firstIndex) > 0) {
+        if (Constants.COLLECT_INDEX.equals(index) && StringUtils.isNotEmpty(eventDataCondition.getStartTime()) && eventDataCondition.getStartTime().compareTo(firstIndex) > 0) {
             String[] indexs = EsIndexUtil.getIndexMonth(Constants.COLLECT_INDEX, eventDataCondition.getStartTime(), eventDataCondition.getEndTime());
             searchRequest = new SearchRequest(indexs);
         }

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

@@ -552,8 +552,7 @@ public class InformationServiceImpl implements InformationService {
                 e.setAttachmentId(attachmentInfo.getId().toString());
             });
         }
-        String index = Constants.SUBJECT_INDEX;
-        esOpUtil.docSavaByEntity(index, specialInformation.getId(), specialInformation);
+        esOpUtil.docSavaByEntity(EsIndexUtil.getIndexYear(Constants.SUBJECT_INDEX), specialInformation.getId(), specialInformation);
         // 发送数据生命周期日志  入专题库 新增消息到kafka
         final Subjectdatabase subjectdatabase = new Subjectdatabase();
         BeanUtil.copyProperties(specialInformation, subjectdatabase, CopyOptions.create().ignoreError().ignoreNullValue());
@@ -924,8 +923,7 @@ public class InformationServiceImpl implements InformationService {
                 }
                 specialInformation.setCreateDate(cn.hutool.core.date.DateUtil.format(new Date(), "yyyy-MM-dd'T'HH:mm:ss"));
                 specialInformation.setProcessDate(specialInformation.getCreateDate());
-                String index = Constants.SUBJECT_INDEX + "_" + DateUtils.getYear();
-                esOpUtil.docSavaByEntity(index, specialInformation.getId(), specialInformation);
+                esOpUtil.docSavaByEntity(EsIndexUtil.getIndexYear(Constants.SUBJECT_INDEX), specialInformation.getId(), specialInformation);
                 clbFileOperationLog.getClbFileOperationLogDetails().add(clbFileOperationLogDetailsService.buildFailDetails(info.get(1), info.get(5), info.get(7)));
             } catch (NumberFormatException e) {
                 ClbFileOperationLogDetails clbFileOperationLogDetails = clbFileOperationLogDetailsService.buildFailDetails(info.get(1), info.get(5), info.get(7), "插入es异常" + e.getMessage());