提交 9184ac5a 作者: yanxin

首次启动项目逻辑更新

上级 a53dafc5
......@@ -1740,6 +1740,11 @@ public class EsService {
searchSourceBuilder.trackTotalHits(true);
searchSourceBuilder.size(1);
searchSourceBuilder.query(boolQueryBuilder);
if("asc".equals(sortOrder)){
searchSourceBuilder.sort("publishDate", SortOrder.ASC);
}else {
searchSourceBuilder.sort("publishDate", SortOrder.DESC);
}
searchRequest.source(searchSourceBuilder);
try {
SearchResponse searchResponse = client.search(searchRequest, RequestOptions.DEFAULT);
......
......@@ -17,6 +17,7 @@ import com.zzsn.event.entity.*;
import com.zzsn.event.enums.EnumHandlerStatus;
import com.zzsn.event.enums.EnumOperateWay;
import com.zzsn.event.es.EsService;
import com.zzsn.event.mapper.SubjectMapper;
import com.zzsn.event.service.*;
import com.zzsn.event.util.*;
import com.zzsn.event.util.user.AuthUtil;
......@@ -154,6 +155,9 @@ public class InformationServiceImpl implements InformationService {
return page;
}
@Autowired
private SubjectMapper subjectMapper;
@Override
public Result subjectPageListGroupByLabel(UserVo userVo, InfoDataSearchCondition searchCondition) {
......@@ -962,16 +966,21 @@ public class InformationServiceImpl implements InformationService {
@Override
public void supplyByCondition(String subjectId, List<String> themeIds) {
List<String> bindSubjectIds = subjectMapper.getBindSubjectIds(subjectId);
Subject subject = subjectService.getById(subjectId);
String startTime = esService.getFirstTime(themeIds, "asc");
String endTime = esService.getFirstTime(themeIds, "desc");
String startTime = esService.getFirstTime(bindSubjectIds, "asc");
String endTime = esService.getFirstTime(bindSubjectIds, "desc");
List<String> dateList = DateUtil.betweenDate(startTime, endTime);
if (CollectionUtils.isNotEmpty(dateList)) {
List<String> redisCacheList = new ArrayList<>();
for (String date : dateList) {
//2025-01-21:123,123,123
String dateStr = date + ":" + StringUtils.join(",", themeIds);
redisCacheList.add(dateStr);
if(themeIds != null && !themeIds.isEmpty()){
//2025-01-21:123,123,123
String dateStr = date + ":" + StringUtils.join(",", themeIds);
redisCacheList.add(dateStr);
}else{
redisCacheList.add(date);
}
}
redisUtil.rpushMultipleValues(Constants.HISTORY_SUBJECT_DATE_QUEUE + subject.getSubjectCode(),redisCacheList.toArray(new String[0]));
}
......
......@@ -246,8 +246,7 @@ public class SubjectServiceImpl extends ServiceImpl<SubjectMapper, Subject> impl
//第一次启用时,添加redis缓存,,用于向专题里进数据
if (byId.getSubjectType() == 3) {
//复合专题根据绑定的专题数据时间确定要入库的数据时间范围
List<String> ids = this.baseMapper.getBindSubjectIds(byId.getId());
informationService.supplyByCondition(subjectId, ids);
informationService.supplyByCondition(subjectId, null);
} else {
setRedisCache(subjectId);
}
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论