索引名称修改

src/main/java/com/zzsn/event/constant/Constants.java

@@ -46,9 +46,6 @@ public class Constants {
     //重复数索引ku
     public final static String ES_REPEAT_OLD = "repeathold";
 
-    //处理后的专题资讯信息存储索引。
-    public final static String ES_DATA_FOR_SUBJECT = "subjectdatabase_2023";
-
 
     public final static String HEADER_KEY = "X-Access-Token";
     //用户-普通用户

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

@@ -215,7 +215,7 @@ public class EsService {
      */
     public IPage<SubjectDataVo> frontListByPage(List<String> subjectIdList, String searchWord, String position, Integer category,
                                                 String column, String order, int pageNo, int pageSize) {
-        SearchRequest searchRequest = new SearchRequest(Constants.ES_DATA_FOR_SUBJECT);
+        SearchRequest searchRequest = new SearchRequest(Constants.SUBJECT_INDEX);
         SearchSourceBuilder searchSourceBuilder = new SearchSourceBuilder();
         //设置分页参数
         searchSourceBuilder.size(pageSize);
@@ -323,7 +323,7 @@ public class EsService {
      * @date 2024/4/10
      */
     public List<SubjectDataVo> queryRecommendList(String subjectId,String id, String title, Integer pageNo, Integer pageSize) {
-        SearchRequest searchRequest = new SearchRequest(Constants.ES_DATA_FOR_SUBJECT);
+        SearchRequest searchRequest = new SearchRequest(Constants.SUBJECT_INDEX);
         SearchSourceBuilder searchSourceBuilder = new SearchSourceBuilder();
         //设置分页参数
         int offset = (pageNo - 1) * pageSize;
@@ -510,7 +510,7 @@ public class EsService {
      */
     public List<SubjectDataVo> exportDataList(List<String> subjectIdList, String searchWord, String position, Integer category,
                                               List<String> articleIdList, String column, String order,Integer type, Integer pageSize) {
-        SearchRequest searchRequest = new SearchRequest(Constants.ES_DATA_FOR_SUBJECT);
+        SearchRequest searchRequest = new SearchRequest(Constants.SUBJECT_INDEX);
         SearchSourceBuilder searchSourceBuilder = new SearchSourceBuilder();
         if (CollectionUtils.isNotEmpty(articleIdList)) {
             pageSize = articleIdList.size();

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

@@ -53,7 +53,7 @@ public class EsStatisticsServiceImpl implements EsStatisticsService {
         long totalCount = 0L;
         long max = 0L;
         String maxTime = null;
-        SearchRequest searchRequest = new SearchRequest(Constants.ES_DATA_FOR_SUBJECT);
+        SearchRequest searchRequest = new SearchRequest(Constants.SUBJECT_INDEX);
         SearchSourceBuilder searchSourceBuilder = formatSourceBuilder(subjectId, null, startTime, endTime);
         searchSourceBuilder.size(0);
         searchSourceBuilder.trackTotalHits(true);
@@ -95,7 +95,7 @@ public class EsStatisticsServiceImpl implements EsStatisticsService {
         CountVO countVO = new CountVO();
         LabelEntity labelEntity = labelEntityService.getById(labelId);
         countVO.setName(labelEntity.getName());
-        SearchRequest searchRequest = new SearchRequest(Constants.ES_DATA_FOR_SUBJECT);
+        SearchRequest searchRequest = new SearchRequest(Constants.SUBJECT_INDEX);
         SearchSourceBuilder searchSourceBuilder = formatSourceBuilder(subjectId, labelId, startTime, endTime);
         searchSourceBuilder.size(0);
         searchSourceBuilder.trackTotalHits(true);
@@ -134,7 +134,7 @@ public class EsStatisticsServiceImpl implements EsStatisticsService {
     @Override
     public List<CountVO> origin(String subjectId, String startTime, String endTime) {
         List<CountVO> list = new ArrayList<>();
-        SearchRequest searchRequest = new SearchRequest(Constants.ES_DATA_FOR_SUBJECT);
+        SearchRequest searchRequest = new SearchRequest(Constants.SUBJECT_INDEX);
         SearchSourceBuilder searchSourceBuilder = formatSourceBuilder(subjectId, null, startTime, endTime);
         searchSourceBuilder.size(0);
         searchSourceBuilder.trackTotalHits(true);
@@ -254,7 +254,7 @@ public class EsStatisticsServiceImpl implements EsStatisticsService {
 
     @Override
     public List<CountVO> flowData(String subjectId, String startTime, String endTime,Integer type) {
-        SearchRequest searchRequest = new SearchRequest(Constants.ES_DATA_FOR_SUBJECT);
+        SearchRequest searchRequest = new SearchRequest(Constants.SUBJECT_INDEX);
         SearchSourceBuilder searchSourceBuilder = formatSourceBuilder(subjectId, null, startTime, endTime);
         searchSourceBuilder.size(0);
         searchSourceBuilder.trackTotalHits(true);
@@ -290,7 +290,7 @@ public class EsStatisticsServiceImpl implements EsStatisticsService {
     @Override
     public long totalCount(List<String> eventIdList, String startTime, String endTime) {
         long count = 0;
-        SearchRequest searchRequest = new SearchRequest(Constants.ES_DATA_FOR_SUBJECT);
+        SearchRequest searchRequest = new SearchRequest(Constants.SUBJECT_INDEX);
         String eventIds = String.join(",", eventIdList);
         SearchSourceBuilder searchSourceBuilder = formatSourceBuilder(eventIds, null, startTime, endTime);
         searchSourceBuilder.size(0);

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

@@ -178,7 +178,7 @@ public class EventServiceImpl extends ServiceImpl<EventMapper, Event> implements
         Map<String, String> map = new HashMap<>();
         List<String> eventIdList = new ArrayList<>();
         pageList.forEach(e -> eventIdList.add(e.getId()));
-        SearchRequest searchRequest = new SearchRequest(Constants.ES_DATA_FOR_SUBJECT);
+        SearchRequest searchRequest = new SearchRequest(Constants.SUBJECT_INDEX);
         //根据设备查询设备的相关信息
         SearchSourceBuilder searchSourceBuilder = new SearchSourceBuilder();
         searchSourceBuilder.from(0);
@@ -515,7 +515,7 @@ public class EventServiceImpl extends ServiceImpl<EventMapper, Event> implements
 
     //查询每个专题的数量
     private Map<String, Integer> subjectInfoCountMap(List<String> subjectIdList, List<Integer> checkStatusList) {
-        SearchRequest searchRequest = new SearchRequest(Constants.ES_DATA_FOR_SUBJECT);
+        SearchRequest searchRequest = new SearchRequest(Constants.SUBJECT_INDEX);
         SearchSourceBuilder searchSourceBuilder = new SearchSourceBuilder();
         //默认最大数量是10000，设置为true后，显示准确数量
         searchSourceBuilder.trackTotalHits(true);