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

1.添加登录用户查询监测点，设备，电能质量用户公共接口

Browse Source
This commit is contained in:
chendaofei
2025-11-25 10:15:09 +08:00
parent 9ae17b14f5
commit 85ae7e7ddb
4 changed files with 70 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.google.common.collect.ImmutableMap;
import com.njcn.common.pojo.enums.response.CommonResponseEnum;
import com.njcn.common.pojo.exception.BusinessException;
import com.njcn.csdevice.api.CsCommTerminalFeignClient;
import com.njcn.csdevice.api.CsLineFeignClient;
import com.njcn.csdevice.pojo.po.CsLinePO;
import com.njcn.csharmonic.enums.CsEventEnum;
@@ -19,20 +20,12 @@ import com.njcn.csharmonic.pojo.vo.event.EventStatisticVO;
import com.njcn.csharmonic.pojo.vo.event.F47Curve;
import com.njcn.csharmonic.service.CsEventPOService;
import com.njcn.csharmonic.service.event.EventOverviewService;
import com.njcn.parser.component.WaveFileComponent;
import com.njcn.parser.pojo.dto.WaveDataDTO;
import com.njcn.parser.utils.WaveUtil;
import com.njcn.web.pojo.param.BaseParam;
import com.njcn.web.utils.RequestUtil;
import lombok.RequiredArgsConstructor;
import org.apache.commons.lang.StringUtils;
import org.checkerframework.checker.units.qual.A;
import org.springframework.stereotype.Service;
import java.io.InputStream;
import java.math.BigDecimal;
import java.util.*;
import java.util.stream.Collectors;
import java.util.stream.Stream;
/**
* @Author: cdf
@@ -50,12 +43,15 @@ public class EventOverviewServiceImpl implements EventOverviewService {
private final CsEventPOService csEventPOService;
private final CsLineFeignClient csLineFeignClient;
private final CsCommTerminalFeignClient csCommTerminalFeignClient;
@Override
public EventStatisticVO netEventEcharts(EventStatisticParam baseParam) {
DateTime start = DateUtil.beginOfDay(DateUtil.parse(baseParam.getSearchBeginTime()));
DateTime end = DateUtil.endOfDay(DateUtil.parse(baseParam.getSearchEndTime()));
List<String> ids = csCommTerminalFeignClient.getLineIdsByUser(RequestUtil.getUserIndex()).getData();
List<CsEventPO> csEventPOList = csEventPOService.lambdaQuery()
.between(CsEventPO::getStartTime, start, end)
.eq(CsEventPO::getType, CsEventEnum.EVENT_TYPE.getCode())
@@ -80,6 +76,9 @@ public class EventOverviewServiceImpl implements EventOverviewService {
DateTime start = DateUtil.beginOfDay(DateUtil.parse(baseParam.getSearchBeginTime()));
DateTime end = DateUtil.endOfDay(DateUtil.parse(baseParam.getSearchEndTime()));
List<String> ids = csCommTerminalFeignClient.getLineIdsByUser(RequestUtil.getUserIndex()).getData();
List<String> lineIds = StrUtil.isBlank(baseParam.getSearchValue())
? csLineFeignClient.getAllLine().getData()
: Collections.singletonList(baseParam.getSearchValue());
@@ -142,6 +141,9 @@ public class EventOverviewServiceImpl implements EventOverviewService {
DateTime start = DateUtil.beginOfDay(DateUtil.parse(baseParam.getSearchBeginTime()));
DateTime end = DateUtil.endOfDay(DateUtil.parse(baseParam.getSearchEndTime()));
List<String> ids = csCommTerminalFeignClient.getLineIdsByUser(RequestUtil.getUserIndex()).getData();
List<CsEventPO> csEventPOList = csEventPOService.lambdaQuery().select(CsEventPO::getId,CsEventPO::getTag,CsEventPO::getPersistTime,CsEventPO::getAmplitude)
.between(CsEventPO::getStartTime, start, end)
.eq(CsEventPO::getType, CsEventEnum.EVENT_TYPE.getCode())
@@ -168,6 +170,10 @@ public class EventOverviewServiceImpl implements EventOverviewService {
DateTime dateTime = DateUtil.parse(baseParam.getSearchBeginTime(), DatePattern.NORM_MONTH_PATTERN);
DateTime start = DateUtil.beginOfMonth(dateTime);
DateTime end = DateUtil.endOfMonth(dateTime);
List<String> ids = csCommTerminalFeignClient.getLineIdsByUser(RequestUtil.getUserIndex()).getData();
List<DateTime> rangList = DateUtil.rangeToList(start,end, DateField.DAY_OF_MONTH);
@@ -206,7 +212,7 @@ public class EventOverviewServiceImpl implements EventOverviewService {
@Override
public List<EventCoordsVO> getEventCoords(EventStatisticParam baseParam) {
// 初始化结果列表：10行 x 9列（根据原始代码的循环推断）
// 初始化结果列表
List<EventCoordsVO> result = new ArrayList<>(90);
for (int i = 0; i < 10; i++) {
for (int j = 0; j < 9; j++) {
@@ -223,8 +229,7 @@ public class EventOverviewServiceImpl implements EventOverviewService {
//TODO
.list();
// 定义振幅和持续时间的分类规则
// 振幅分类规则
// 定义幅值和持续时间的分类规则
Map<Double, Integer> amplitudeRanges = ImmutableMap.<Double, Integer>builder()
.put(0.0, 0)
.put(0.1, 1)
@@ -288,6 +293,7 @@ public class EventOverviewServiceImpl implements EventOverviewService {
return entry.getValue();
}
}
return ranges.size() - 1; // 默认返回最大分组
// 默认返回最大分组
return ranges.size() - 1;
}
}