现场算法测试优化

algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/serviceimpl/line/DataCleanServiceImpl.java

@@ -72,8 +72,6 @@ public class DataCleanServiceImpl implements IDataCleanService {
     @Override
     public void dataVCleanHandler(CalculatedParam calculatedParam) {
        MemorySizeUtil.getNowMemory();
-
-
         logger.info("{},dataV表异常数据算法执行=====》", LocalDateTime.now());
         List<PqDataVerify> result = new ArrayList<>();
         //获取标准
@@ -105,6 +103,7 @@ public class DataCleanServiceImpl implements IDataCleanService {
             partList = null;
         });
         if (CollUtil.isNotEmpty(result)) {
+            logger.info("本次清洗数据量为>>>>>>>>>>>>:{}", result.size());
             pqDataVerifyFeignClient.insertData(result);
             result.clear();
         }
@@ -135,6 +134,7 @@ public class DataCleanServiceImpl implements IDataCleanService {
             lineParam.setLineId(list);
             List<DataIDto> partList = dataIFeignClient.getRawData(lineParam).getData();
             if (CollUtil.isNotEmpty(partList)) {
+                logger.info("{}数据清洗dataI集合大小为>>>>>>>>>>>>{}",lineParam.getStartTime(), MemorySizeUtil.getObjectSize(partList));
                 partList.forEach(item->{
                     //数据清洗
                     List<PqDataVerify> pqDataVerifies = judgeDataI(map, lineMap.get(item.getLineId()),item);
@@ -144,6 +144,7 @@ public class DataCleanServiceImpl implements IDataCleanService {
             partList = null;
         });
         if (CollUtil.isNotEmpty(result)) {
+            logger.info("本次清洗数据量为>>>>>>>>>>>>:{}", result.size());
             pqDataVerifyFeignClient.insertData(result);
             result.clear();
         }
@@ -168,6 +169,7 @@ public class DataCleanServiceImpl implements IDataCleanService {
             lineParam.setLineId(list);
             List<DataPltDto> partList = dataPltFeignClient.getRawData(lineParam).getData();
             if (CollUtil.isNotEmpty(partList)) {
+                logger.info("{}数据清洗dataPlt集合大小为>>>>>>>>>>>>{}",lineParam.getStartTime(), MemorySizeUtil.getObjectSize(partList));
                 partList.forEach(item->{
                     //数据清洗
                     List<PqDataVerify> pqDataVerifies = judgeDataPlt(map,item);
@@ -177,6 +179,7 @@ public class DataCleanServiceImpl implements IDataCleanService {
             partList = null;
         });
         if (CollUtil.isNotEmpty(result)) {
+            logger.info("本次清洗数据量为>>>>>>>>>>>>:{}", result.size());
             pqDataVerifyFeignClient.insertData(result);
             result.clear();
         }
@@ -201,6 +204,7 @@ public class DataCleanServiceImpl implements IDataCleanService {
             lineParam.setLineId(list);
             List<DataHarmDto> partList = dataInharmVFeignClient.getRawData(lineParam).getData();
             if (CollUtil.isNotEmpty(partList)) {
+                logger.info("{}数据清洗dataInHarmV集合大小为>>>>>>>>>>>>{}",lineParam.getStartTime(), MemorySizeUtil.getObjectSize(partList));
                 partList.forEach(item->{
                     //数据清洗
                     List<PqDataVerify> pqDataVerifies = judgeDataInHarmV(map,item);
@@ -210,6 +214,7 @@ public class DataCleanServiceImpl implements IDataCleanService {
             partList = null;
         });
         if (CollUtil.isNotEmpty(result)) {
+            logger.info("本次清洗数据量为>>>>>>>>>>>>:{}", result.size());
             pqDataVerifyFeignClient.insertData(result);
             result.clear();
         }
@@ -234,6 +239,7 @@ public class DataCleanServiceImpl implements IDataCleanService {
             lineParam.setLineId(list);
             List<DataHarmDto> partList = dataHarmRateVFeignClient.getRawData(lineParam).getData();
             if (CollUtil.isNotEmpty(partList)) {
+                logger.info("{}数据清洗dataHarmRateV集合大小为>>>>>>>>>>>>{}",lineParam.getStartTime(), MemorySizeUtil.getObjectSize(partList));
                 partList.forEach(item->{
                     //数据清洗
                     List<PqDataVerify> pqDataVerifies = judgeDataHarmRateV(map,item);
@@ -243,6 +249,7 @@ public class DataCleanServiceImpl implements IDataCleanService {
             partList = null;
         });
         if (CollUtil.isNotEmpty(result)) {
+            logger.info("本次清洗数据量为>>>>>>>>>>>>:{}", result.size());
             pqDataVerifyFeignClient.insertData(result);
             result.clear();
         }
@@ -267,6 +274,7 @@ public class DataCleanServiceImpl implements IDataCleanService {
             lineParam.setLineId(list);
             List<DataPowerPDto> partList = dataHarmpowerPFeignClient.getRawData(lineParam).getData();
             if (CollUtil.isNotEmpty(partList)) {
+                logger.info("{}数据清洗dataHarmPowerP集合大小为>>>>>>>>>>>>{}",lineParam.getStartTime(), MemorySizeUtil.getObjectSize(partList));
                 partList.forEach(item->{
                     //数据清洗
                     List<PqDataVerify> pqDataVerifies = judgeDataHarmPowerP(map,item);
@@ -276,6 +284,7 @@ public class DataCleanServiceImpl implements IDataCleanService {
             partList = null;
         });
         if (CollUtil.isNotEmpty(result)) {
+            logger.info("本次清洗数据量为>>>>>>>>>>>>:{}", result.size());
             pqDataVerifyFeignClient.insertData(result);
             result.clear();
         }
@@ -300,6 +309,7 @@ public class DataCleanServiceImpl implements IDataCleanService {
             lineParam.setLineId(list);
             List<DataHarmDto> partList = dataHarmphasicVFeignClient.getRawData(lineParam).getData();
             if (CollUtil.isNotEmpty(partList)) {
+                logger.info("{}数据清洗dataHarmPhasicV集合大小为>>>>>>>>>>>>{}",lineParam.getStartTime(), MemorySizeUtil.getObjectSize(partList));
                 partList.forEach(item->{
                     //数据清洗
                     List<PqDataVerify> pqDataVerifies = judgeDataHarmPhasicV(map,item);
@@ -309,6 +319,7 @@ public class DataCleanServiceImpl implements IDataCleanService {
             partList.clear();
         });
         if (CollUtil.isNotEmpty(result)) {
+            logger.info("本次清洗数据量为>>>>>>>>>>>>:{}", result.size());
             pqDataVerifyFeignClient.insertData(result);
             result.clear();
         }
@@ -333,6 +344,7 @@ public class DataCleanServiceImpl implements IDataCleanService {
             lineParam.setLineId(list);
             List<DataFlucDto> partList = dataFlucFeignClient.getRawData(lineParam).getData();
             if (CollUtil.isNotEmpty(partList)) {
+                logger.info("{}数据清洗dataFluc集合大小为>>>>>>>>>>>>{}",lineParam.getStartTime(), MemorySizeUtil.getObjectSize(partList));
                 partList.forEach(item->{
                     //数据清洗
                     List<PqDataVerify> pqDataVerifies = judgeDataFluc(map,item);
@@ -342,6 +354,7 @@ public class DataCleanServiceImpl implements IDataCleanService {
             partList = null;
         });
         if (CollUtil.isNotEmpty(result)) {
+            logger.info("本次清洗数据量为>>>>>>>>>>>>:{}", result.size());
             pqDataVerifyFeignClient.insertData(result);
             result.clear();
         }
@@ -366,6 +379,7 @@ public class DataCleanServiceImpl implements IDataCleanService {
             lineParam.setLineId(list);
             List<DataFlickerDto> partList = dataFlickerFeignClient.getRawData(lineParam).getData();
             if (CollUtil.isNotEmpty(partList)) {
+                logger.info("{}数据清洗dataFlicker集合大小为>>>>>>>>>>>>{}",lineParam.getStartTime(), MemorySizeUtil.getObjectSize(partList));
                 partList.forEach(item->{
                     //数据清洗
                     List<PqDataVerify> pqDataVerifies = judgeDataFlicker(map,item);
@@ -375,6 +389,7 @@ public class DataCleanServiceImpl implements IDataCleanService {
             partList = null;
         });
         if (CollUtil.isNotEmpty(result)) {
+            logger.info("本次清洗数据量为>>>>>>>>>>>>:{}", result.size());
             pqDataVerifyFeignClient.insertData(result);
             result.clear();
         }
@@ -469,25 +484,25 @@ public class DataCleanServiceImpl implements IDataCleanService {
         }
 
         //正序电压
-        pqReasonableRangeDto = map.get(DataCleanEnum.VPos.getCode());
+//        pqReasonableRangeDto = map.get(DataCleanEnum.VPos.getCode());
-        phaseList = Arrays.asList(pqReasonableRangeDto.getPhaseType().split(","));
+//        phaseList = Arrays.asList(pqReasonableRangeDto.getPhaseType().split(","));
-        if (phaseList.contains(dto.getPhasicType())) {
+//        if (phaseList.contains(dto.getPhasicType())) {
-            if (dto.getVPos() < (pqReasonableRangeDto.getMinValue()*DataCommonUtils.getVoltageData(line.getVoltageLevel()))
+//            if (dto.getVPos() < (pqReasonableRangeDto.getMinValue()*DataCommonUtils.getVoltageData(line.getVoltageLevel()))
-                    || dto.getVPos() > (pqReasonableRangeDto.getMaxValue()*DataCommonUtils.getVoltageData(line.getVoltageLevel()))) {
+//                    || dto.getVPos() > (pqReasonableRangeDto.getMaxValue()*DataCommonUtils.getVoltageData(line.getVoltageLevel()))) {
-                //log.info("dataV-正序电压数据异常,已清洗!数据值:{},数据时间:{}", dto.getVPos(), dto.getMinTime());
+//                //log.info("dataV-正序电压数据异常,已清洗!数据值:{},数据时间:{}", dto.getVPos(), dto.getMinTime());
-                PqDataVerify pqDataVerify = getPqDataVerify(dto.getLineId()
+//                PqDataVerify pqDataVerify = getPqDataVerify(dto.getLineId()
-                        ,dto.getMinTime()
+//                        ,dto.getMinTime()
-                        ,dto.getValueType()
+//                        ,dto.getValueType()
-                        ,dto.getPhasicType()
+//                        ,dto.getPhasicType()
-                        ,pqReasonableRangeDto.getIndexCode()
+//                        ,pqReasonableRangeDto.getIndexCode()
-                        ,pqReasonableRangeDto.getIndexName()
+//                        ,pqReasonableRangeDto.getIndexName()
-                        ,pqReasonableRangeDto.getInfluxdbTableName()
+//                        ,pqReasonableRangeDto.getInfluxdbTableName()
-                        ,dto.getVPos()
+//                        ,dto.getVPos()
-                        ,pqReasonableRangeDto.getMinValue()*DataCommonUtils.getVoltageData(line.getVoltageLevel())
+//                        ,pqReasonableRangeDto.getMinValue()*DataCommonUtils.getVoltageData(line.getVoltageLevel())
-                        ,pqReasonableRangeDto.getMaxValue()*DataCommonUtils.getVoltageData(line.getVoltageLevel()));
+//                        ,pqReasonableRangeDto.getMaxValue()*DataCommonUtils.getVoltageData(line.getVoltageLevel()));
-                list.add(pqDataVerify);
+//                list.add(pqDataVerify);
-            }
+//            }
-        }
+//        }
 
         //负序电压
         pqReasonableRangeDto = map.get(DataCleanEnum.VNeg.getCode());
@@ -554,7 +569,7 @@ public class DataCleanServiceImpl implements IDataCleanService {
         //线电压有效值
         pqReasonableRangeDto = map.get(DataCleanEnum.RmsLvr.getCode());
         phaseList = Arrays.asList(pqReasonableRangeDto.getPhaseType().split(","));
-        if (phaseList.contains(dto.getPhasicType())) {
+        if (phaseList.contains(dto.getPhasicType()) && ObjectUtil.isNotNull(dto.getRmsLvr())) {
             if (dto.getRmsLvr() < (pqReasonableRangeDto.getMinValue()*DataCommonUtils.getVoltageData(line.getVoltageLevel()))
                     || dto.getRmsLvr() > (pqReasonableRangeDto.getMaxValue()*DataCommonUtils.getVoltageData(line.getVoltageLevel()))) {
                 //log.info("dataV-线电压有效值数据异常,已清洗!数据值:{},数据时间:{}", dto.getRmsLvr(), dto.getMinTime());
@@ -706,11 +721,11 @@ public class DataCleanServiceImpl implements IDataCleanService {
         List<PqDataVerify> list = new ArrayList<>();
         PqReasonableRangeDto pqReasonableRangeDto;
         List<String> phaseList;
-        //线电压有效值
+        //电流有效值
         pqReasonableRangeDto = map.get(DataCleanEnum.RmsI.getCode());
         phaseList = Arrays.asList(pqReasonableRangeDto.getPhaseType().split(","));
         if (phaseList.contains(dto.getPhasicType())) {
-            if (dto.getRms() > line.getCT1()) {
+            if (dto.getRms() >= line.getCT1() * 1.2) {
                 PqDataVerify pqDataVerify = getPqDataVerify(dto.getLineId()
                         ,dto.getMinTime()
                         ,dto.getValueType()

algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/serviceimpl/line/DayDataServiceImpl.java

@@ -1597,6 +1597,11 @@ public class DayDataServiceImpl implements IDayDataService {
                     break;
             }
         }
+        //这里对数据进行判断，如果值过大，都超出数据库存储范围会报错，无法插入，所以这里设置门槛 上下限都为1千万
+        if (Objects.nonNull(result)) {
+            result = Math.min(Math.max(result, -9999999.0), 9999999.0);
+
+        }
         return result;
     }
 

algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/serviceimpl/line/IDataCrossingServiceImpl.java

@@ -82,6 +82,23 @@ public class IDataCrossingServiceImpl implements IDataCrossingService {
     @Override
     public void limitRateHandler(CalculatedParam calculatedParam) {
         MemorySizeUtil.getNowMemory();
+
+        Runtime runtime = Runtime.getRuntime();
+        // 获取 JVM 最大可用内存（以字节为单位）
+        long maxMemory = runtime.maxMemory();
+        // 获取 JVM 当前已分配的内存（以字节为单位）
+        long totalMemory = runtime.totalMemory();
+        // 获取 JVM 当前空闲内存（以字节为单位）
+        long freeMemory = runtime.freeMemory();
+        // 计算已使用的内存
+        long usedMemory = totalMemory - freeMemory;
+
+        System.out.println("最大可用内存: " + maxMemory / (1024 * 1024) + " MB");
+        System.out.println("当前已分配的内存: " + totalMemory / (1024 * 1024) + " MB");
+        System.out.println("当前空闲内存: " + freeMemory / (1024 * 1024) + " MB");
+        System.out.println("已使用的内存: " + usedMemory / (1024 * 1024) + " MB");
+        System.out.println("第一次分析结束-----------------------------------------");
+
         logger.info("{},limitRate表转r_stat_limit_rate_d算法开始=====》", LocalDateTime.now());
         List<DataLimitDetailDto> result = new ArrayList<>();
         //远程接口获取分钟数据

algorithm/algorithm-boot/src/main/resources/bootstrap.yml

@@ -13,6 +13,16 @@ server:
 feign:
   sentinel:
     enabled: true
+  compression:
+    request:
+      enabled: true
+      # 配置压缩支持的MIME TYPE
+      mime-types: text/xml,application/xml,application/json
+      # 配置压缩数据大小的下限
+      min-request-size: 1024
+    response:
+      # 配置响应GZIP压缩
+      enabled: true
 spring:
   application:
     name: @artifactId@

data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/util/DataCommonUtils.java

@@ -9,7 +9,7 @@ public class DataCommonUtils {
 
     /**
      * 传入字典类型的电压等级，获取可以计算的数据
-     * 例如 35kV->32.0
+     * 例如 35kV->35.0
      *     0.38kV->0.38
      */
     public static Double getVoltageData(String lineVoltage) {

data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/config/InsertDataConfiguration.java

@@ -0,0 +1,48 @@
+package com.njcn.dataProcess.config;
+
+import com.njcn.common.config.GeneralInfo;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.core.annotation.Order;
+import org.springframework.scheduling.annotation.EnableAsync;
+import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
+
+import java.util.concurrent.Executor;
+import java.util.concurrent.ThreadPoolExecutor;
+
+/**
+ * @author hongawen
+ * @version 1.0.0
+ * @date 2022年03月11日 09:32
+ */
+@Data
+@Order(100)
+@Configuration
+@EnableAsync
+@AllArgsConstructor
+public class InsertDataConfiguration {
+
+    private final GeneralInfo generalInfo;
+
+    @Bean("InsertDataConfiguration")
+    public Executor asyncExecutor() {
+        ThreadPoolTaskExecutor executor = new ThreadPoolTaskExecutor();
+        // 核心线程数：线程池创建时候初始化的线程数
+        executor.setCorePoolSize(generalInfo.getCorePoolSize());
+        // 最大线程数：线程池最大的线程数，只有在缓冲队列满了之后才会申请超过核心线程数的线程
+        executor.setMaxPoolSize(generalInfo.getMaxPoolSize());
+        // 缓冲队列：用来缓冲执行任务的队列
+        executor.setQueueCapacity(generalInfo.getQueueCapacity());
+        // 允许线程的空闲时间60秒：当超过了核心线程之外的线程在空闲时间到达之后会被销毁
+        executor.setKeepAliveSeconds(generalInfo.getKeepAliveSeconds());
+        // 线程池名的前缀：设置好了之后可以方便我们定位处理任务所在的线程池
+        executor.setThreadNamePrefix(generalInfo.getMicroServiceName());
+        // 缓冲队列满了之后的拒绝策略：由调用线程处理（一般是主线程）
+        executor.setRejectedExecutionHandler(new ThreadPoolExecutor.CallerRunsPolicy());
+        executor.initialize();
+        return executor;
+    }
+
+}

data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/relation/PqDataVerifyServiceImpl.java

@@ -7,6 +7,8 @@ import com.njcn.dataProcess.dao.relation.mapper.PqDataVerifyMapper;
 import com.njcn.dataProcess.param.LineCountEvaluateParam;
 import com.njcn.dataProcess.pojo.po.PqDataVerify;
 import com.njcn.dataProcess.service.IPqDataVerifyService;
+import org.junit.jupiter.api.condition.DisabledIfSystemProperties;
+import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -26,8 +28,9 @@ public class PqDataVerifyServiceImpl extends MppServiceImpl<PqDataVerifyMapper,
 
     @Override
     @Transactional(rollbackFor = Exception.class)
+    @Async("InsertDataConfiguration")
     public void insertData(List<PqDataVerify> list) {
-        this.saveOrUpdateBatchByMultiId(list,500);
+        this.saveOrUpdateBatchByMultiId(list,1000);
     }
 
     @Override

data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/relation/RelationDataComAssImpl.java

@@ -31,6 +31,6 @@ public class RelationDataComAssImpl extends MppServiceImpl<RStatDataComAssMapper
             BeanUtils.copyProperties(item, limitRate);
             result.add(limitRate);
         });
-        this.saveOrUpdateBatchByMultiId(result,500);
+        this.saveOrUpdateBatchByMultiId(result,1000);
     }
 }

data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/relation/RelationDataFlickerImpl.java

@@ -87,7 +87,7 @@ public class RelationDataFlickerImpl extends MppServiceImpl<RStatDataFlickerRela
             BeanUtils.copyProperties(item, data);
             result.add(data);
         });
-        dataFlicker.saveOrUpdateBatchByMultiId(result,500);
+        dataFlicker.saveOrUpdateBatchByMultiId(result,1000);
     }
 
     @Override

data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/relation/RelationDataFlucImpl.java

@@ -78,7 +78,7 @@ public class RelationDataFlucImpl extends MppServiceImpl<RStatDataFlucRelationMa
             BeanUtils.copyProperties(item, data);
             result.add(data);
         });
-        dataFluc.saveOrUpdateBatchByMultiId(result,500);
+        dataFluc.saveOrUpdateBatchByMultiId(result,1000);
     }
 
     ;

data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/relation/RelationDataHarmRateIImpl.java

@@ -43,6 +43,6 @@ public class RelationDataHarmRateIImpl extends MppServiceImpl<RStatDataHarmRateI
             BeanUtils.copyProperties(item, data);
             result.add(data);
         });
-        dataHarmRateI.saveOrUpdateBatchByMultiId(result,500);
+        dataHarmRateI.saveOrUpdateBatchByMultiId(result,1000);
     }
 }

data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/relation/RelationDataHarmRateVImpl.java

@@ -95,7 +95,7 @@ public class RelationDataHarmRateVImpl extends MppServiceImpl<RStatDataHarmRateV
             BeanUtils.copyProperties(item, data);
             result.add(data);
         });
-        dataHarmRateV.saveOrUpdateBatchByMultiId(result,500);
+        dataHarmRateV.saveOrUpdateBatchByMultiId(result,1000);
     }
 
     @Override

data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/relation/RelationDataHarmphasicIImpl.java

@@ -83,6 +83,6 @@ public class RelationDataHarmphasicIImpl extends MppServiceImpl<RStatDataHarmPha
             BeanUtils.copyProperties(item, data);
             result.add(data);
         });
-        dataHarmphasicI.saveOrUpdateBatchByMultiId(result,500);
+        dataHarmphasicI.saveOrUpdateBatchByMultiId(result,1000);
     }
 }

data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/relation/RelationDataHarmphasicVImpl.java

@@ -86,7 +86,7 @@ public class RelationDataHarmphasicVImpl extends MppServiceImpl<RStatDataHarmPha
             BeanUtils.copyProperties(item, data);
             result.add(data);
         });
-        dataHarmphasicV.saveOrUpdateBatchByMultiId(result,500);
+        dataHarmphasicV.saveOrUpdateBatchByMultiId(result,1000);
     }
 
 

data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/relation/RelationDataHarmpowerPImpl.java

@@ -87,6 +87,6 @@ public class RelationDataHarmpowerPImpl extends MppServiceImpl<RStatDataHarmPowe
             BeanUtils.copyProperties(item, data);
             result.add(data);
         });
-        dataHarmPowerP.saveOrUpdateBatchByMultiId(result,500);
+        dataHarmPowerP.saveOrUpdateBatchByMultiId(result,1000);
     }
 }

data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/relation/RelationDataHarmpowerQImpl.java

@@ -85,6 +85,6 @@ public class RelationDataHarmpowerQImpl extends MppServiceImpl<RStatDataHarmPowe
             BeanUtils.copyProperties(item, data);
             result.add(data);
         });
-        dataHarmpowerQ.saveOrUpdateBatchByMultiId(result,500);
+        dataHarmpowerQ.saveOrUpdateBatchByMultiId(result,1000);
     }
 }

data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/relation/RelationDataHarmpowerSImpl.java

@@ -80,6 +80,6 @@ public class RelationDataHarmpowerSImpl extends MppServiceImpl<RStatDataHarmPowe
             BeanUtils.copyProperties(item, data);
             result.add(data);
         });
-        dataHarmPowerS.saveOrUpdateBatchByMultiId(result,500);
+        dataHarmPowerS.saveOrUpdateBatchByMultiId(result,1000);
     }
 }

data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/relation/RelationDataIImpl.java

@@ -93,7 +93,7 @@ public class RelationDataIImpl extends MppServiceImpl<RStatDataIRelationMapper,
             BeanUtils.copyProperties(item, dataI);
             result.add(dataI);
         });
-        iDataI.saveOrUpdateBatchByMultiId(result,500);
+        iDataI.saveOrUpdateBatchByMultiId(result,1000);
     }
 
     @Override

data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/relation/RelationDataInharmIImpl.java

@@ -78,6 +78,6 @@ public class RelationDataInharmIImpl extends MppServiceImpl<RStatDataInHarmIRela
             BeanUtils.copyProperties(item, data);
             result.add(data);
         });
-        dataInharmI.saveOrUpdateBatchByMultiId(result,500);
+        dataInharmI.saveOrUpdateBatchByMultiId(result,1000);
     }
 }

data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/relation/RelationDataInharmVImpl.java

@@ -86,6 +86,6 @@ public class RelationDataInharmVImpl extends MppServiceImpl<RStatDataInHarmVRela
             BeanUtils.copyProperties(item, data);
             result.add(data);
         });
-        dataInHarmV.saveOrUpdateBatchByMultiId(result,500);
+        dataInHarmV.saveOrUpdateBatchByMultiId(result,1000);
     }
 }

data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/relation/RelationDataIntegrityImpl.java

@@ -35,7 +35,7 @@ public class RelationDataIntegrityImpl extends MppServiceImpl<RStatIntegrityDMap
             BeanUtils.copyProperties(item, onlineRate);
             result.add(onlineRate);
         });
-        this.saveOrUpdateBatchByMultiId(result,500);
+        this.saveOrUpdateBatchByMultiId(result,1000);
     }
 
     @Override

data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/relation/RelationDataLimitQualifiedImpl.java

@@ -34,7 +34,7 @@ public class RelationDataLimitQualifiedImpl extends MppServiceImpl<RStatLimitQua
             BeanUtils.copyProperties(item, limitRate);
             result.add(limitRate);
         });
-        this.saveOrUpdateBatchByMultiId(result,500);
+        this.saveOrUpdateBatchByMultiId(result,1000);
     }
 
     @Override

data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/relation/RelationDataLimitRateDetailImpl.java

@@ -110,7 +110,7 @@ public class RelationDataLimitRateDetailImpl extends MppServiceImpl<RStatLimitRa
             BeanUtils.copyProperties(item, limitRate);
             result.add(limitRate);
         });
-        this.saveOrUpdateBatchByMultiId(result,500);
+        this.saveOrUpdateBatchByMultiId(result,1000);
     }
 
     @Override

data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/relation/RelationDataLimitRateImpl.java

@@ -39,7 +39,7 @@ public class RelationDataLimitRateImpl extends MppServiceImpl<RStatLimitRateRela
             BeanUtils.copyProperties(item, limitRate);
             result.add(limitRate);
         });
-        this.saveOrUpdateBatchByMultiId(result,500);
+        this.saveOrUpdateBatchByMultiId(result,1000);
     }
 
     @Override

data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/relation/RelationDataLimitTargetImpl.java

@@ -42,7 +42,7 @@ public class RelationDataLimitTargetImpl extends MppServiceImpl<RStatLimitTarget
             BeanUtils.copyProperties(item, limitRate);
             result.add(limitRate);
         });
-        this.saveOrUpdateBatchByMultiId(result,500);
+        this.saveOrUpdateBatchByMultiId(result,1000);
     }
 
     @Override

data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/relation/RelationDataOnlineRateImpl.java

@@ -35,7 +35,7 @@ public class RelationDataOnlineRateImpl  extends MppServiceImpl<RStatOnlineRateD
             BeanUtils.copyProperties(item, onlineRate);
             result.add(onlineRate);
         });
-        this.saveOrUpdateBatchByMultiId(result,500);
+        this.saveOrUpdateBatchByMultiId(result,1000);
     }
 
     @Override

data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/relation/RelationDataOrgIntegrityImpl.java

@@ -35,7 +35,7 @@ public class RelationDataOrgIntegrityImpl extends MppServiceImpl<RStatOrgIntegri
             BeanUtils.copyProperties(item, onlineRate);
             result.add(onlineRate);
         });
-        this.saveOrUpdateBatchByMultiId(result,500);
+        this.saveOrUpdateBatchByMultiId(result,1000);
     }
 
     @Override

data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/relation/RelationDataPltImpl.java

@@ -91,7 +91,7 @@ public class RelationDataPltImpl extends MppServiceImpl<RStatDataPltRelationMapp
             BeanUtils.copyProperties(item, data);
             result.add(data);
         });
-        dataPlt.saveOrUpdateBatchByMultiId(result,500);
+        dataPlt.saveOrUpdateBatchByMultiId(result,1000);
     }
 
     @Override

data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/relation/RelationDataPollutionImpl.java

@@ -34,7 +34,7 @@ public class RelationDataPollutionImpl extends MppServiceImpl<RMpPollutionDMappe
             BeanUtils.copyProperties(item, limitRate);
             result.add(limitRate);
         });
-        this.saveOrUpdateBatchByMultiId(result,500);
+        this.saveOrUpdateBatchByMultiId(result,1000);
     }
 
     @Override

data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/relation/RelationDataPollutionOrgDImpl.java

@@ -34,7 +34,7 @@ public class RelationDataPollutionOrgDImpl extends MppServiceImpl<RStatPollution
             BeanUtils.copyProperties(item, limitRate);
             result.add(limitRate);
         });
-        this.saveOrUpdateBatchByMultiId(result,500);
+        this.saveOrUpdateBatchByMultiId(result,1000);
     }
 
     @Override

data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/relation/RelationDataPollutionOrgMImpl.java

@@ -34,7 +34,7 @@ public class RelationDataPollutionOrgMImpl extends MppServiceImpl<RStatPollution
             BeanUtils.copyProperties(item, limitRate);
             result.add(limitRate);
         });
-        this.saveOrUpdateBatchByMultiId(result,500);
+        this.saveOrUpdateBatchByMultiId(result,1000);
     }
 
     @Override

data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/relation/RelationDataPollutionOrgQImpl.java

@@ -34,7 +34,7 @@ public class RelationDataPollutionOrgQImpl extends MppServiceImpl<RStatPollution
             BeanUtils.copyProperties(item, limitRate);
             result.add(limitRate);
         });
-        this.saveOrUpdateBatchByMultiId(result,500);
+        this.saveOrUpdateBatchByMultiId(result,1000);
     }
 
     @Override

data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/relation/RelationDataPollutionOrgYImpl.java

@@ -34,7 +34,7 @@ public class RelationDataPollutionOrgYImpl extends MppServiceImpl<RStatPollution
             BeanUtils.copyProperties(item, limitRate);
             result.add(limitRate);
         });
-        this.saveOrUpdateBatchByMultiId(result,500);
+        this.saveOrUpdateBatchByMultiId(result,1000);
     }
 
     @Override

data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/relation/RelationDataPollutionSubstationDImpl.java

@@ -34,7 +34,7 @@ public class RelationDataPollutionSubstationDImpl extends MppServiceImpl<RStatPo
             BeanUtils.copyProperties(item, limitRate);
             result.add(limitRate);
         });
-        this.saveOrUpdateBatchByMultiId(result,500);
+        this.saveOrUpdateBatchByMultiId(result,1000);
     }
 
     @Override

data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/relation/RelationDataPollutionSubstationMImpl.java

@@ -34,7 +34,7 @@ public class RelationDataPollutionSubstationMImpl extends MppServiceImpl<RStatPo
             BeanUtils.copyProperties(item, limitRate);
             result.add(limitRate);
         });
-        this.saveOrUpdateBatchByMultiId(result,500);
+        this.saveOrUpdateBatchByMultiId(result,1000);
     }
 
     @Override

data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/relation/RelationDataPollutionSubstationQImpl.java

@@ -34,7 +34,7 @@ public class RelationDataPollutionSubstationQImpl extends MppServiceImpl<RStatPo
             BeanUtils.copyProperties(item, limitRate);
             result.add(limitRate);
         });
-        this.saveOrUpdateBatchByMultiId(result,500);
+        this.saveOrUpdateBatchByMultiId(result,1000);
     }
 
     @Override

data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/relation/RelationDataPollutionSubstationYImpl.java

@@ -34,7 +34,7 @@ public class RelationDataPollutionSubstationYImpl extends MppServiceImpl<RStatPo
             BeanUtils.copyProperties(item, limitRate);
             result.add(limitRate);
         });
-        this.saveOrUpdateBatchByMultiId(result,500);
+        this.saveOrUpdateBatchByMultiId(result,1000);
     }
 
     @Override

data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/relation/RelationDataVImpl.java

@@ -120,7 +120,7 @@ public class RelationDataVImpl extends MppServiceImpl<RStatDataVRelationMapper,
             BeanUtils.copyProperties(item, dataV);
             result.add(dataV);
         });
-        iDataV.saveOrUpdateBatchByMultiId(result,500);
+        iDataV.saveOrUpdateBatchByMultiId(result,1000);
     }
 
     @Override

data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/relation/RelationRActivePowerRangeServiceImpl.java

@@ -32,6 +32,6 @@ public class RelationRActivePowerRangeServiceImpl extends MppServiceImpl<RActive
             powerRange.setState(1);
             result.add(powerRange);
         });
-        this.saveOrUpdateBatchByMultiId(result,500);
+        this.saveOrUpdateBatchByMultiId(result,1000);
     }
 }

data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/relation/RelationRmpEventDetailDImpl.java

@@ -33,7 +33,7 @@ public class RelationRmpEventDetailDImpl extends MppServiceImpl<RMpEventDetailDM
             BeanUtils.copyProperties(item, limitRate);
             result.add(limitRate);
         });
-        this.saveOrUpdateBatchByMultiId(result,500);
+        this.saveOrUpdateBatchByMultiId(result,1000);
     }
 
     @Override

data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/relation/RelationRmpEventDetailMImpl.java

@@ -33,7 +33,7 @@ public class RelationRmpEventDetailMImpl extends MppServiceImpl<RMpEventDetailMM
             BeanUtils.copyProperties(item, limitRate);
             result.add(limitRate);
         });
-        this.saveOrUpdateBatchByMultiId(result,500);
+        this.saveOrUpdateBatchByMultiId(result,1000);
     }
 
     @Override

data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/relation/RelationRmpEventDetailQImpl.java

@@ -33,7 +33,7 @@ public class RelationRmpEventDetailQImpl extends MppServiceImpl<RMpEventDetailQM
             BeanUtils.copyProperties(item, limitRate);
             result.add(limitRate);
         });
-        this.saveOrUpdateBatchByMultiId(result,500);
+        this.saveOrUpdateBatchByMultiId(result,1000);
     }
 
     @Override

data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/relation/RelationRmpEventDetailYImpl.java

@@ -30,6 +30,6 @@ public class RelationRmpEventDetailYImpl extends MppServiceImpl<RMpEventDetailYM
             BeanUtils.copyProperties(item, limitRate);
             result.add(limitRate);
         });
-        this.saveOrUpdateBatchByMultiId(result,500);
+        this.saveOrUpdateBatchByMultiId(result,1000);
     }
 }

data-processing/data-processing-boot/src/main/resources/bootstrap.yml

@@ -9,6 +9,10 @@ microservice:
     url: @gateway.url@
 server:
   port: 10405
+  compression:
+    enabled: true
+    mime-types: application/json,application/xml,text/html,text/xml,text/plain
+    min-response-size: 1024
 #feign接口开启服务熔断降级处理
 feign:
   sentinel:

migration-influxdb/migration-influxdb-insert-boot/src/main/resources/bootstrap.yml

@@ -46,7 +46,7 @@ spring:
 logging:
   config: http://@nacos.url@/nacos/v1/cs/configs?tenant=@nacos.namespace@&group=DEFAULT_GROUP&dataId=logback.xml
   level:
-    root: info
+    root: debug
 
 
 mqtt:

migration-influxdb/migration-influxdb-read-boot/src/main/resources/bootstrap.yml

@@ -46,7 +46,7 @@ spring:
 logging:
   config: http://@nacos.url@/nacos/v1/cs/configs?tenant=@nacos.namespace@&group=DEFAULT_GROUP&dataId=logback.xml
   level:
-    root: info
+    root: debug
 
 
 mqtt: