Microservice/govern
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1.bug修改

Browse Source
This commit is contained in:
chendaofei
2025-11-28 16:43:04 +08:00
parent cdd1b5075c
commit 8e4c4383c0
6 changed files with 70 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/CsEventPOServiceImpl.java
View File

@@ -178,8 +178,8 @@ public class CsEventPOServiceImpl extends ServiceImpl<CsEventPOMapper, CsEventPO
@Override
public Page<DataGroupEventVO> pageEvent(EventStatisticParam baseParam) {
Page<DataGroupEventVO> result = new Page<>(PageFactory.getPageNum(baseParam),PageFactory.getPageSize(baseParam));
DateTime begin = DateUtil.parse(baseParam.getSearchBeginTime(), DatePattern.NORM_DATE_PATTERN);
DateTime end = DateUtil.parse(baseParam.getSearchEndTime(), DatePattern.NORM_DATE_PATTERN);
DateTime begin = DateUtil.beginOfDay(DateUtil.parse(baseParam.getSearchBeginTime(), DatePattern.NORM_DATE_PATTERN));
DateTime end = DateUtil.endOfDay(DateUtil.parse(baseParam.getSearchEndTime(), DatePattern.NORM_DATE_PATTERN));
List<String> EVENT_TAGS = Arrays.asList(
EVT_SYS_DIPSTR.getCode(),

11
cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/event/EventOverviewServiceImpl.java
View File

@@ -157,13 +157,21 @@ public class EventOverviewServiceImpl implements EventOverviewService {
return Collections.emptyList();
}
List<CsEventPO> csEventPOList = csEventPOService.lambdaQuery().select(CsEventPO::getId,CsEventPO::getStartTime,CsEventPO::getTag,CsEventPO::getPersistTime,CsEventPO::getAmplitude)
List<CsEventPO> csEventPOList = csEventPOService.lambdaQuery().select(CsEventPO::getId,CsEventPO::getLineId,CsEventPO::getStartTime,CsEventPO::getTag,CsEventPO::getPersistTime,CsEventPO::getAmplitude)
.between(CsEventPO::getStartTime, start, end)
.eq(CsEventPO::getType, CsEventEnum.EVENT_TYPE.getCode())
.in(CsEventPO::getTag, EVENT_TAGS)
.in(CsEventPO::getLineId,ids)
.list();
if(CollUtil.isEmpty(csEventPOList)){
return Collections.emptyList();
}
List<String> monitorIds = csEventPOList.stream().map(CsEventPO::getLineId).distinct().collect(Collectors.toList());
List<CsLinePO> csLinePOList = csLineFeignClient.queryLineById(monitorIds).getData();
Map<String,String> nameMap = csLinePOList.stream().collect(Collectors.toMap(CsLinePO::getLineId, CsLinePO::getName));
List<F47Curve> f47CurveList = csEventPOList.stream().map(item->{
F47Curve f47Curve = new F47Curve();
f47Curve.setEventId(item.getId());
@@ -171,6 +179,7 @@ public class EventOverviewServiceImpl implements EventOverviewService {
f47Curve.setTag(item.getTag());
f47Curve.setPersistTime(BigDecimal.valueOf(item.getPersistTime()).setScale(3, RoundingMode.HALF_UP));
f47Curve.setEventValue(BigDecimal.valueOf(item.getAmplitude()));
f47Curve.setLineName(nameMap.getOrDefault(item.getLineId(),"异常测点"));
return f47Curve;
}).collect(Collectors.toList());
return f47CurveList;