diff --git a/algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/ExecutionCenter.java b/algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/ExecutionCenter.java index aaf7895..5d764f1 100644 --- a/algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/ExecutionCenter.java +++ b/algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/ExecutionCenter.java @@ -125,6 +125,8 @@ public class ExecutionCenter extends BaseController { CalculatedParam calculatedParam = judgeExecuteParam(baseParam); // 测点索引 if (CollectionUtils.isEmpty(calculatedParam.getIdList())) { +// calculatedParam.setIdList(Arrays.asList("c5f4925dbe333230810fe1a6afc51dfb","293178e56cd207e6e33586090f5034be","2df0cb6a87ef523b726c0a9ff6cfd288","43a1391b503bcd7f1b9a2f8f90e53e0f" +// )); calculatedParam.setIdList(commTerminalGeneralClient.getRunMonitorIds().getData()); } LiteflowResponse liteflowResponse; diff --git a/algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/serviceimpl/line/DayDataServiceImpl.java b/algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/serviceimpl/line/DayDataServiceImpl.java index 63dbb48..981b7a4 100644 --- a/algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/serviceimpl/line/DayDataServiceImpl.java +++ b/algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/serviceimpl/line/DayDataServiceImpl.java @@ -1289,7 +1289,7 @@ public class DayDataServiceImpl implements IDayDataService { dto.setI47(getData(type,valueType.getValueList().get(46),scheme)); dto.setI48(getData(type,valueType.getValueList().get(47),scheme)); dto.setI49(getData(type,valueType.getValueList().get(48),scheme)); - dto.setI50(getData(type,valueType.getValueList().get(50),scheme)); + dto.setI50(getData(type,valueType.getValueList().get(49),scheme)); } public void channelDataHarmRateVHandler(CommonMinuteDto.ValueType pojo1, CommonMinuteDto.ValueType pojo2, DataHarmRateVDto dto, boolean scheme) { @@ -1356,7 +1356,7 @@ public class DayDataServiceImpl implements IDayDataService { dto.setV47(getData(type,valueType.getValueList().get(46),scheme)); dto.setV48(getData(type,valueType.getValueList().get(47),scheme)); dto.setV49(getData(type,valueType.getValueList().get(48),scheme)); - dto.setV50(getData(type,valueType.getValueList().get(50),scheme)); + dto.setV50(getData(type,valueType.getValueList().get(49),scheme)); } public void channelDataInHarmIHandler(CommonMinuteDto.ValueType pojo1, CommonMinuteDto.ValueType pojo2, DataInHarmIDto dto, boolean scheme) { @@ -1423,7 +1423,7 @@ public class DayDataServiceImpl implements IDayDataService { dto.setI47(getData(type,valueType.getValueList().get(46),scheme)); dto.setI48(getData(type,valueType.getValueList().get(47),scheme)); dto.setI49(getData(type,valueType.getValueList().get(48),scheme)); - dto.setI50(getData(type,valueType.getValueList().get(50),scheme)); + dto.setI50(getData(type,valueType.getValueList().get(49),scheme)); } public void channelDataInHarmVHandler(CommonMinuteDto.ValueType pojo1, CommonMinuteDto.ValueType pojo2, DataInHarmVDto dto, boolean scheme) { @@ -1490,7 +1490,7 @@ public class DayDataServiceImpl implements IDayDataService { dto.setV47(getData(type,valueType.getValueList().get(46),scheme)); dto.setV48(getData(type,valueType.getValueList().get(47),scheme)); dto.setV49(getData(type,valueType.getValueList().get(48),scheme)); - dto.setV50(getData(type,valueType.getValueList().get(50),scheme)); + dto.setV50(getData(type,valueType.getValueList().get(49),scheme)); } public void channelDataPltHandler(CommonMinuteDto.ValueType pojo1, DataPltDto dto, String valueType, boolean scheme) { diff --git a/algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/serviceimpl/line/IDataCrossingServiceImpl.java b/algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/serviceimpl/line/IDataCrossingServiceImpl.java index 6fb076b..4aedc66 100644 --- a/algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/serviceimpl/line/IDataCrossingServiceImpl.java +++ b/algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/serviceimpl/line/IDataCrossingServiceImpl.java @@ -201,20 +201,21 @@ public class IDataCrossingServiceImpl implements IDataCrossingService { .collect(Collectors.groupingBy(DataPltDto::getLineId)); for (String item : list) { - result.addAll(getData(calculatedParam.getDataDate(), - overLimitMap.get(item), - allTime.get(item), - flickerAllTime.get(item), - harmRateV.get(item), - dataI.get(item), - inHarmV.get(item), - dataVThd.get(item), - dataVUnbalance.get(item), - dataINeg.get(item), - dataVFreq.get(item), - dataVDev.get(item), - dataPlt.get(item))); - + if(ObjectUtil.isNotNull(overLimitMap.get(item))){ + result.addAll(getData(calculatedParam.getDataDate(), + overLimitMap.get(item), + allTime.get(item), + flickerAllTime.get(item), + harmRateV.get(item), + dataI.get(item), + inHarmV.get(item), + dataVThd.get(item), + dataVUnbalance.get(item), + dataINeg.get(item), + dataVFreq.get(item), + dataVDev.get(item), + dataPlt.get(item))); + } } }); diff --git a/algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/serviceimpl/line/IDataOrgPointServiceImpl.java b/algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/serviceimpl/line/IDataOrgPointServiceImpl.java index fb3a103..cd08cc5 100644 --- a/algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/serviceimpl/line/IDataOrgPointServiceImpl.java +++ b/algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/serviceimpl/line/IDataOrgPointServiceImpl.java @@ -12,7 +12,6 @@ import com.njcn.dataProcess.util.TimeUtils; import com.njcn.device.biz.pojo.dto.DeptGetChildrenMoreDTO; import com.njcn.device.biz.pojo.dto.LineDevGetDTO; import lombok.RequiredArgsConstructor; -import org.apache.commons.collections4.ListUtils; import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/influxdb/InfluxdbDataFlickerImpl.java b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/influxdb/InfluxdbDataFlickerImpl.java index bad7194..6ad9a75 100644 --- a/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/influxdb/InfluxdbDataFlickerImpl.java +++ b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/influxdb/InfluxdbDataFlickerImpl.java @@ -144,12 +144,21 @@ public class InfluxdbDataFlickerImpl extends MppServiceImpl result = new ArrayList<>(); - quality(result, influxQueryWrapper, lineParam); + List list = dataFlickerMapper.selectByQueryWrapper(influxQueryWrapper); + if (CollUtil.isNotEmpty(list)) { + Map> abnormalTime = lineParam.getAbnormalTime(); + if (abnormalTime.containsKey(lineParam.getLineId().get(0))) { + List timeList = abnormalTime.get(lineParam.getLineId().get(0)); + //有异常数据,当前监测点自身的异常数据 + if (CollectionUtil.isNotEmpty(timeList)) { + result.addAll(list.stream().filter(item -> !timeList.contains(DATE_TIME_FORMATTER.format(item.getTime()))).collect(Collectors.toList())); + } + } + } return result.size(); } private void quality(List result, InfluxQueryWrapper influxQueryWrapper, LineCountEvaluateParam lineParam) { - List list = dataFlickerMapper.selectByQueryWrapper(influxQueryWrapper); Map> lineMap = list.stream().collect(Collectors.groupingBy(DataFlicker::getLineId)); //有异常数据 diff --git a/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/influxdb/InfluxdbDataVImpl.java b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/influxdb/InfluxdbDataVImpl.java index aa6f7f1..7673242 100644 --- a/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/influxdb/InfluxdbDataVImpl.java +++ b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/influxdb/InfluxdbDataVImpl.java @@ -181,8 +181,18 @@ public class InfluxdbDataVImpl extends MppServiceImpl result=new ArrayList<>(); - quality(result, influxQueryWrapper,lineParam); + List result = new ArrayList<>(); + List list = dataVMapper.selectByQueryWrapper(influxQueryWrapper); + if (CollUtil.isNotEmpty(list)) { + Map> abnormalTime = lineParam.getAbnormalTime(); + if (abnormalTime.containsKey(lineParam.getLineId().get(0))) { + List timeList = abnormalTime.get(lineParam.getLineId().get(0)); + //有异常数据,当前监测点自身的异常数据 + if (CollectionUtil.isNotEmpty(timeList)) { + result.addAll(list.stream().filter(item -> !timeList.contains(DATE_TIME_FORMATTER.format(item.getTime()))).collect(Collectors.toList())); + } + } + } return result.size(); } @@ -339,7 +349,8 @@ public class InfluxdbDataVImpl extends MppServiceImpl getMeasurementCount(List lineIndex, String startTime, String endTime) { + public List getMeasurementCount(List lineIndex, String startTime, String + endTime) { InfluxQueryWrapper influxQueryWrapper = new InfluxQueryWrapper(DataV.class, MeasurementCountDTO.class); influxQueryWrapper.regular(DataV::getLineId, lineIndex) .eq(DataV::getValueType, InfluxDbSqlConstant.MAX) @@ -388,40 +399,43 @@ public class InfluxdbDataVImpl extends MppServiceImpl result,InfluxQueryWrapper influxQueryWrapper, LineCountEvaluateParam lineParam) { + private void quality(List result, InfluxQueryWrapper influxQueryWrapper, LineCountEvaluateParam + lineParam) { List list = dataVMapper.selectByQueryWrapper(influxQueryWrapper); - Map> lineMap = list.stream().collect(Collectors.groupingBy(DataV::getLineId)); - //有异常数据 - Map> timeMap = lineParam.getAbnormalTime(); - if (CollectionUtil.isNotEmpty(timeMap)) { - lineMap.forEach((k, v) -> { - List timeList = timeMap.get(k); - //有异常数据,当前监测点自身的异常数据 - if (CollectionUtil.isNotEmpty(timeList)) { - List filterList = v.stream().filter(item -> !timeList.contains(DATE_TIME_FORMATTER.format(item.getTime()))).collect(Collectors.toList()); - //1.过滤掉异常数据后还有正常数据，则用正常数据计算 - if (CollectionUtil.isNotEmpty(filterList)) { - result.addAll(filterList); + if (CollUtil.isNotEmpty(list)) { + Map> lineMap = list.stream().collect(Collectors.groupingBy(DataV::getLineId)); + //有异常数据 + Map> timeMap = lineParam.getAbnormalTime(); + if (CollectionUtil.isNotEmpty(timeMap)) { + lineMap.forEach((k, v) -> { + List timeList = timeMap.get(k); + //有异常数据,当前监测点自身的异常数据 + if (CollectionUtil.isNotEmpty(timeList)) { + List filterList = v.stream().filter(item -> !timeList.contains(DATE_TIME_FORMATTER.format(item.getTime()))).collect(Collectors.toList()); + //1.过滤掉异常数据后还有正常数据，则用正常数据计算 + if (CollectionUtil.isNotEmpty(filterList)) { + result.addAll(filterList); + } + //2.过滤掉异常数据后没有正常数据，则用所有异常数据计算，但是需要标记数据为异常的 + else { + v.parallelStream().forEach(item -> item.setQualityFlag("1")); + result.addAll(v); + } } - //2.过滤掉异常数据后没有正常数据，则用所有异常数据计算，但是需要标记数据为异常的 + //没有异常数据，则使用原数据 else { - v.parallelStream().forEach(item -> item.setQualityFlag("1")); result.addAll(v); } - } - //没有异常数据，则使用原数据 - else { - result.addAll(v); - } - }); - } - //没有异常数据，则使用原数据 - else { - result.addAll(list); + }); + } + //没有异常数据，则使用原数据 + else { + result.addAll(list); + } } } } diff --git a/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/relation/RelationDataHarmRateVImpl.java b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/relation/RelationDataHarmRateVImpl.java index 1b2b1bc..91764dd 100644 --- a/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/relation/RelationDataHarmRateVImpl.java +++ b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/relation/RelationDataHarmRateVImpl.java @@ -3,6 +3,7 @@ package com.njcn.dataProcess.service.impl.relation; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.date.DatePattern; +import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.github.jeffreyning.mybatisplus.service.MppServiceImpl; import com.njcn.dataProcess.dao.relation.mapper.DataHarmrateVRelationMapper; @@ -52,13 +53,12 @@ public class RelationDataHarmRateVImpl extends MppServiceImpl dataHarmrateVDTOList) { int totalCount = dataHarmrateVDTOList.size(); int minSize = Math.min(120, totalCount); - if(totalCount<=0){ + if (totalCount <= 0) { return; } List collect = dataHarmrateVDTOList.stream().map(temp -> { @@ -87,7 +87,7 @@ public class RelationDataHarmRateVImpl extends MppServiceImpl list) { List result = new ArrayList<>(); - list.forEach(item->{ + list.forEach(item -> { RStatDataHarmRateVD data = new RStatDataHarmRateVD(); data.setTime(TimeUtils.LocalDataTimeToLocalDate2(item.getTime())); data.setPhasicType(item.getPhasicType()); @@ -107,18 +107,20 @@ public class RelationDataHarmRateVImpl extends MppServiceImpl getHarmRateVData(LineCountEvaluateParam lineParam) { List result = new ArrayList<>(); List rStatDataHarmRateVDList = dataHarmRateV.list(new LambdaQueryWrapper() - .in(RStatDataHarmRateVD::getLineId,lineParam.getLineId()) + .in(RStatDataHarmRateVD::getLineId, lineParam.getLineId()) .in(RStatDataHarmRateVD::getValueType, lineParam.getValueType()) .in(RStatDataHarmRateVD::getPhasicType, lineParam.getPhasicType()) .ge(RStatDataHarmRateVD::getTime, lineParam.getStartTime()) .le(RStatDataHarmRateVD::getTime, lineParam.getEndTime()) ); - for(RStatDataHarmRateVD rStatDataHarmRateVD : rStatDataHarmRateVDList){ - DataHarmDto dto = BeanUtil.copyProperties(rStatDataHarmRateVD,DataHarmDto.class); - dto.setTime(rStatDataHarmRateVD.getTime().format(DateTimeFormatter.ofPattern(DatePattern.NORM_DATE_PATTERN))); + for (RStatDataHarmRateVD rStatDataHarmRateVD : rStatDataHarmRateVDList) { + DataHarmDto dto = BeanUtil.copyProperties(rStatDataHarmRateVD, DataHarmDto.class); + if (ObjectUtil.isNotNull(rStatDataHarmRateVD.getTime())) { + dto.setTime(rStatDataHarmRateVD.getTime().format(DateTimeFormatter.ofPattern(DatePattern.NORM_DATE_PATTERN))); + } result.add(dto); } - return quality(result,lineParam); + return quality(result, lineParam); } private List quality(List list, LineCountEvaluateParam lineParam) { diff --git a/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/relation/RelationDataIImpl.java b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/relation/RelationDataIImpl.java index 2150827..3ca9844 100644 --- a/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/relation/RelationDataIImpl.java +++ b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/relation/RelationDataIImpl.java @@ -3,6 +3,7 @@ package com.njcn.dataProcess.service.impl.relation; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.date.DatePattern; +import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -49,9 +50,9 @@ public class RelationDataIImpl extends MppServiceImpl dataIDTOList) { int totalCount = dataIDTOList.size(); - int minSize = Math.min(120, totalCount); + int minSize = Math.min(120, totalCount); - if(totalCount<=0){ + if (totalCount <= 0) { return; } List collect = dataIDTOList.stream().map(temp -> { @@ -84,7 +85,7 @@ public class RelationDataIImpl extends MppServiceImpl dataIDtoList) { List result = new ArrayList<>(); - dataIDtoList.forEach(item->{ + dataIDtoList.forEach(item -> { RStatDataID dataI = new RStatDataID(); dataI.setTime(TimeUtils.LocalDataTimeToLocalDate2(item.getTime())); dataI.setPhasicType(item.getPhasicType()); @@ -100,7 +101,7 @@ public class RelationDataIImpl extends MppServiceImpl result = new ArrayList<>(); QueryWrapper queryWrapper = new QueryWrapper<>(); - if(StrUtil.isNotBlank(lineParam.getColumnName())){ + if (StrUtil.isNotBlank(lineParam.getColumnName())) { queryWrapper.select(lineParam.getColumnName()); } queryWrapper.lambda() @@ -108,15 +109,17 @@ public class RelationDataIImpl extends MppServiceImpl list = this.list(queryWrapper); - for(RStatDataID rStatDataID:list){ - DataIDto dto =BeanUtil.copyProperties(rStatDataID,DataIDto.class); - dto.setTime(rStatDataID.getTime().format(DateTimeFormatter.ofPattern(DatePattern.NORM_DATE_PATTERN))); + for (RStatDataID rStatDataID : list) { + DataIDto dto = BeanUtil.copyProperties(rStatDataID, DataIDto.class); + if (ObjectUtil.isNotNull(rStatDataID.getTime())) { + dto.setTime(rStatDataID.getTime().format(DateTimeFormatter.ofPattern(DatePattern.NORM_DATE_PATTERN))); + } result.add(dto); } - return quality(result,lineParam); + return quality(result, lineParam); } private List quality(List list, LineCountEvaluateParam lineParam) { diff --git a/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/relation/RelationDataPltImpl.java b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/relation/RelationDataPltImpl.java index f3f41b4..e3c38b6 100644 --- a/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/relation/RelationDataPltImpl.java +++ b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/relation/RelationDataPltImpl.java @@ -3,6 +3,7 @@ package com.njcn.dataProcess.service.impl.relation; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.date.DatePattern; +import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.github.jeffreyning.mybatisplus.service.MppServiceImpl; @@ -46,9 +47,9 @@ public class RelationDataPltImpl extends MppServiceImpl dataPltDTOList) { int totalCount = dataPltDTOList.size(); - int minSize = Math.min(120, totalCount); + int minSize = Math.min(120, totalCount); - if(totalCount<=0){ + if (totalCount <= 0) { return; } List collect = dataPltDTOList.stream().map(temp -> { @@ -82,7 +83,7 @@ public class RelationDataPltImpl extends MppServiceImpl list) { List result = new ArrayList<>(); - list.forEach(item->{ + list.forEach(item -> { RStatDataPltD data = new RStatDataPltD(); data.setTime(TimeUtils.LocalDataTimeToLocalDate2(item.getTime())); data.setPhasicType(item.getPhasicType()); @@ -97,7 +98,7 @@ public class RelationDataPltImpl extends MppServiceImpl getDataPlt(LineCountEvaluateParam lineParam) { List result = new ArrayList<>(); QueryWrapper queryWrapper = new QueryWrapper<>(); - if(StrUtil.isNotBlank(lineParam.getColumnName())){ + if (StrUtil.isNotBlank(lineParam.getColumnName())) { queryWrapper.select(lineParam.getColumnName()); } queryWrapper.lambda() @@ -107,12 +108,14 @@ public class RelationDataPltImpl extends MppServiceImpl rStatDataVDList = this.list(queryWrapper); - for(RStatDataPltD rStatDataPltD : rStatDataVDList){ - DataPltDto dto = BeanUtil.copyProperties(rStatDataPltD,DataPltDto.class); - dto.setTime(rStatDataPltD.getTime().format(DateTimeFormatter.ofPattern(DatePattern.NORM_DATE_PATTERN))); + for (RStatDataPltD rStatDataPltD : rStatDataVDList) { + DataPltDto dto = BeanUtil.copyProperties(rStatDataPltD, DataPltDto.class); + if (ObjectUtil.isNotNull(rStatDataPltD.getTime())) { + dto.setTime(rStatDataPltD.getTime().format(DateTimeFormatter.ofPattern(DatePattern.NORM_DATE_PATTERN))); + } result.add(dto); } - return quality(result,lineParam); + return quality(result, lineParam); } private List quality(List list, LineCountEvaluateParam lineParam) { diff --git a/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/relation/RelationDataVImpl.java b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/relation/RelationDataVImpl.java index f5da65f..3281c9b 100644 --- a/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/relation/RelationDataVImpl.java +++ b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/relation/RelationDataVImpl.java @@ -3,6 +3,7 @@ package com.njcn.dataProcess.service.impl.relation; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.date.DatePattern; +import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.github.jeffreyning.mybatisplus.service.MppServiceImpl; @@ -153,10 +154,12 @@ public class RelationDataVImpl extends MppServiceImpl rStatDataVDList = this.list(queryWrapper); for (RStatDataVD rStatDataVD : rStatDataVDList) { DataVDto dto = BeanUtil.copyProperties(rStatDataVD, DataVDto.class); - dto.setTime(rStatDataVD.getTime().format(DateTimeFormatter.ofPattern(DatePattern.NORM_DATE_PATTERN))); + if (ObjectUtil.isNotNull(rStatDataVD.getTime())) { + dto.setTime(rStatDataVD.getTime().format(DateTimeFormatter.ofPattern(DatePattern.NORM_DATE_PATTERN))); + } info.add(dto); } - return quality(info,lineParam); + return quality(info, lineParam); } private List quality(List list, LineCountEvaluateParam lineParam) {