From d12571400f35aaf96a4fdf0f2aa0b24560116367 Mon Sep 17 00:00:00 2001 From: wr <1754607820@qq.com> Date: Wed, 22 Jul 2026 16:27:13 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=BE=AE=E8=B0=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../algorithm/serviceimpl/line/PollutionCalcImpl.java | 9 +++++++-- .../algorithm/serviceimpl/line/PollutionServiceImpl.java | 8 ++++++-- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/serviceimpl/line/PollutionCalcImpl.java b/algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/serviceimpl/line/PollutionCalcImpl.java index 352c191..e26b0c7 100644 --- a/algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/serviceimpl/line/PollutionCalcImpl.java +++ b/algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/serviceimpl/line/PollutionCalcImpl.java @@ -4,6 +4,7 @@ import cn.hutool.core.collection.CollUtil; import cn.hutool.core.date.LocalDateTimeUtil; import com.njcn.algorithm.pojo.bo.CalculatedParam; import com.njcn.algorithm.service.line.IPollutionCalc; +import com.njcn.algorithm.utils.MemorySizeUtil; import com.njcn.common.utils.PubUtils; import com.njcn.dataProcess.api.DataHarmRateVFeignClient; import com.njcn.dataProcess.api.DataIFeignClient; @@ -24,10 +25,13 @@ import com.njcn.system.enums.DicDataTypeEnum; import com.njcn.system.pojo.po.DictData; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.stereotype.Service; import javax.annotation.Resource; import java.lang.reflect.Field; +import java.time.LocalDateTime; import java.util.*; import java.util.function.Function; import java.util.stream.Collectors; @@ -37,6 +41,7 @@ import java.util.stream.Collectors; @RequiredArgsConstructor public class PollutionCalcImpl implements IPollutionCalc { + private static final Logger logger = LoggerFactory.getLogger(DataCleanServiceImpl.class); @Resource private CommTerminalGeneralClient commTerminalGeneralClient; @Resource @@ -58,7 +63,8 @@ public class PollutionCalcImpl implements IPollutionCalc { */ @Override public void calcAllLineValue(CalculatedParam calculatedParam) { - System.out.println("当前执行监测点污染值算法++++++++++++++++++++++++++++++++++"); + MemorySizeUtil.getNowMemory(); + logger.info("{},{}污染值监测点算法开始=====》", LocalDateTime.now(),calculatedParam.getDataDate()); List list = new ArrayList<>(); List idList = calculatedParam.getIdList(); List overlimitList = commTerminalGeneralClient.getOverLimitDataByIds(idList).getData(); @@ -70,7 +76,6 @@ public class PollutionCalcImpl implements IPollutionCalc { String vHarmonicLimit = dictData.get(DicDataEnum.V_HARMONIC_LIMIT.getCode()); String iAllLimit = dictData.get(DicDataEnum.I_ALL_LIMIT.getCode()); if (CollUtil.isNotEmpty(idList)) { - System.out.println("总共" + idList.size() + "个监测点参与污染值计算，开始执行"); DataPollutionD dataPollutionD; LineCountEvaluateParam lineParam = new LineCountEvaluateParam(); lineParam.setStartTime(TimeUtils.getBeginOfDay(calculatedParam.getDataDate())); diff --git a/algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/serviceimpl/line/PollutionServiceImpl.java b/algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/serviceimpl/line/PollutionServiceImpl.java index ac0be54..4966dce 100644 --- a/algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/serviceimpl/line/PollutionServiceImpl.java +++ b/algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/serviceimpl/line/PollutionServiceImpl.java @@ -28,11 +28,14 @@ import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.collections4.ListUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import javax.annotation.Resource; import java.time.LocalDate; +import java.time.LocalDateTime; import java.util.*; import java.util.function.BinaryOperator; import java.util.function.Function; @@ -49,6 +52,7 @@ import java.util.stream.Stream; @RequiredArgsConstructor public class PollutionServiceImpl implements IPollutionService { + private static final Logger logger = LoggerFactory.getLogger(DataCleanServiceImpl.class); @Value("${line.num:10}") private Integer NUM; @@ -72,8 +76,8 @@ public class PollutionServiceImpl implements IPollutionService { @Override public void handleDay(CalculatedParam calculatedParam) { - System.out.println("当前执行污区监测点算法++++++++++++++++++++++++++++++++++"); - + MemorySizeUtil.getNowMemory(); + logger.info("{},{}污区监测点算法开始=====》", LocalDateTime.now(),calculatedParam.getDataDate()); List dictDataList = dicDataFeignClient.getDicDataByTypeCode(DicDataTypeEnum.POLLUTION_STATIS.getCode()).getData(); Map dictData = dictDataList.stream().collect(Collectors.toMap(DictData::getCode, Function.identity())); LocalDate local = LocalDateTimeUtil.parseDate(calculatedParam.getDataDate()); From edbf2606f6ae53d2b77fffe44c73f162b3bc5446 Mon Sep 17 00:00:00 2001 From: hzj <826100833@qq.com> Date: Wed, 22 Jul 2026 16:28:26 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=B6=88=E6=81=AF=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E8=BF=87=E6=BB=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/njcn/stat/messagedto/MessageHarmonicDataSet.java | 2 +- .../com/njcn/stat/service/impl/MessageAnalysisServiceImpl.java | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/analysis/stat/stat-api/src/main/java/com/njcn/stat/messagedto/MessageHarmonicDataSet.java b/analysis/stat/stat-api/src/main/java/com/njcn/stat/messagedto/MessageHarmonicDataSet.java index a5e6963..9503bf2 100644 --- a/analysis/stat/stat-api/src/main/java/com/njcn/stat/messagedto/MessageHarmonicDataSet.java +++ b/analysis/stat/stat-api/src/main/java/com/njcn/stat/messagedto/MessageHarmonicDataSet.java @@ -20,7 +20,7 @@ import java.time.LocalDateTime; @Data public class MessageHarmonicDataSet implements Serializable { private Integer FLAG; - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss.SSS") @JsonDeserialize(using = LocalDateTimeDeserializer.class) @JsonSerialize(using = LocalDateTimeSerializer.class) private LocalDateTime TIME; diff --git a/analysis/stat/stat-boot/src/main/java/com/njcn/stat/service/impl/MessageAnalysisServiceImpl.java b/analysis/stat/stat-boot/src/main/java/com/njcn/stat/service/impl/MessageAnalysisServiceImpl.java index 4c5fcca..cdd853a 100644 --- a/analysis/stat/stat-boot/src/main/java/com/njcn/stat/service/impl/MessageAnalysisServiceImpl.java +++ b/analysis/stat/stat-boot/src/main/java/com/njcn/stat/service/impl/MessageAnalysisServiceImpl.java @@ -25,6 +25,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.time.LocalDateTime; +import java.time.temporal.ChronoField; import java.util.ArrayList; import java.util.List; import java.util.Objects; @@ -93,7 +94,7 @@ public class MessageAnalysisServiceImpl implements MessageAnalysisService { MessageHarmonicDataSet messageHarmonicDataSet = JSONObject.parseObject(value, MessageHarmonicDataSet.class); LocalDateTime localDateTime = messageHarmonicDataSet.getTIME(); //排除上电下电等情况前置上送上不是整分的数据 - if(!(localDateTime.getSecond() == 0)){ + if((localDateTime.getSecond() != 0)||localDateTime.get(ChronoField.MILLI_OF_SECOND)!=0){ return; } Integer flag = messageHarmonicDataSet.getFLAG();