Merge remote-tracking branch 'origin/master'

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<DataPollutionD> list = new ArrayList<>();
         List<String> idList = calculatedParam.getIdList();
         List<Overlimit> 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()));

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<String> calculatedParam) {
-        System.out.println("当前执行污区监测点算法++++++++++++++++++++++++++++++++++");
+        MemorySizeUtil.getNowMemory();
-
+        logger.info("{},{}污区监测点算法开始=====》", LocalDateTime.now(),calculatedParam.getDataDate());
         List<DictData> dictDataList = dicDataFeignClient.getDicDataByTypeCode(DicDataTypeEnum.POLLUTION_STATIS.getCode()).getData();
         Map<String, DictData> dictData = dictDataList.stream().collect(Collectors.toMap(DictData::getCode, Function.identity()));
         LocalDate local = LocalDateTimeUtil.parseDate(calculatedParam.getDataDate());