Middleware/cn-data-platform
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

调整实体

Browse Source
This commit is contained in:
wr
2025-03-12 09:57:00 +08:00
parent be8cf0e03b
commit efab972d0b
23 changed files with 250 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/serviceimpl/line/IDataOnlineRateServiceImpl.java
View File

@@ -11,8 +11,8 @@ import com.njcn.dataProcess.api.DataOnlineRateFeignClient;
import com.njcn.dataProcess.api.DataVFeignClient;
import com.njcn.dataProcess.api.PqsCommunicateFeignClient;
import com.njcn.dataProcess.param.LineCountEvaluateParam;
import com.njcn.dataProcess.pojo.dto.DataOnlineRateDto;
import com.njcn.dataProcess.pojo.dto.PqsCommunicateDto;
import com.njcn.dataProcess.pojo.dto.RStatOnlineRateDto;
import com.njcn.dataProcess.util.TimeUtils;
import com.njcn.device.biz.pojo.dto.LineDevGetDTO;
import com.njcn.influx.deprecated.InfluxDBPublicParam;
@@ -49,10 +49,10 @@ public class IDataOnlineRateServiceImpl implements IDataOnlineRateService {
List<LineDevGetDTO> devList = calculatedParam.getIdList();
Map<String, List<LineDevGetDTO>> LineDevGetMap = devList.stream().collect(Collectors.groupingBy(LineDevGetDTO::getDevId));
List<RStatOnlineRateDto.Detail> list = new ArrayList<>();
List<DataOnlineRateDto.Detail> list = new ArrayList<>();
if(ObjectUtil.isNotNull(calculatedParam.getType())){
LineDevGetMap.forEach((key,value)->{
RStatOnlineRateDto.Detail onlineRateDpo = new RStatOnlineRateDto.Detail();
DataOnlineRateDto.Detail onlineRateDpo = new DataOnlineRateDto.Detail();
List<String> collect = value.stream().map(LineDevGetDTO::getPointId).collect(Collectors.toList());
lineParam.setLineId(collect);
Integer data = dataVFeignClient.getCountRawData(lineParam).getData();
@@ -76,10 +76,10 @@ public class IDataOnlineRateServiceImpl implements IDataOnlineRateService {
});
Date dateOut = DateUtil.parse(calculatedParam.getDataDate());
for (PqsCommunicateDto pqsCommunicate : outCommunicateData) {
RStatOnlineRateDto.Detail onlineRateDpo = new RStatOnlineRateDto.Detail();
DataOnlineRateDto.Detail onlineRateDpo = new DataOnlineRateDto.Detail();
Date newDate = DateUtil.parse(pqsCommunicate.getTime());
lineParam.setLineId(Arrays.asList(pqsCommunicate.getDevId()));
RStatOnlineRateDto onLineRate = onLineMinute(newDate, dateOut, pqsCommunicate.getType(), lineParam);
DataOnlineRateDto onLineRate = onLineMinute(newDate, dateOut, pqsCommunicate.getType(), lineParam);
onlineRateDpo.setTimeId(calculatedParam.getDataDate());
onlineRateDpo.setDevIndex(pqsCommunicate.getDevId());
onlineRateDpo.setOnlineMin(onLineRate.getOnlineMin());
@@ -95,8 +95,8 @@ public class IDataOnlineRateServiceImpl implements IDataOnlineRateService {
/**
* new的时间和当前统计时间 不是/是 同一天
*/
private RStatOnlineRateDto onLineMinute(Date newDate, Date date, Integer type, LineCountEvaluateParam lineParam) {
RStatOnlineRateDto onLineRate = new RStatOnlineRateDto();
private DataOnlineRateDto onLineMinute(Date newDate, Date date, Integer type, LineCountEvaluateParam lineParam) {
DataOnlineRateDto onLineRate = new DataOnlineRateDto();
Integer minute = 0;
/*new的时间和当前统计时间是同一天*/
if (DateUtil.isSameDay(newDate, date)) {