refactor(data): 统一数据库字段命名规范并更新查询逻辑

- 将DataHarmpowerP类中的totPf、totDf、totP等字段的@Column注解名称规范化为下划线格式
- 将DataHarmpowerP类中的totP1-totP50字段名统一调整为tot_tp_1-tot_tp_50格式
- 将DataHarmpowerQ类中的totQ字段名调整为tot_q，totQ1-totQ50调整为tot_tq_1-tot_tq_50格式
- 将DataHarmpowerS类中的totS字段名调整为tot_s，totS1-totS50调整为tot_ts_1-tot_ts_50格式
- 在InfluxdbDataHarmpowerPImpl服务中添加tot_tp_1-tot_tp_50字段的查询条件配置
- 在InfluxdbDataHarmpowerPImpl服务中增加TotP、TotDf、TotPf字段的选择查询
- 在InfluxdbDataHarmpowerQImpl服务中添加tot_tq_1-tot_tq_50字段的查询条件配置
- 在InfluxdbDataHarmpowerQImpl服务中增加TotQ字段的选择查询
- 在InfluxdbDataHarmpowerSImpl服务中添加tot_ts_1-tot_ts_50字段的查询条件配置
- 在InfluxdbDataHarmpowerSImpl服务中增加TotS字段的选择查询

algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/api/PqReasonableRangeFeignClient.java

@@ -1,10 +1,18 @@
-package com.njcn.dataProcess.api;
+package com.njcn.algorithm.pojo.api;
 
+/**
+ * Description:
+ * Date: 2026/05/21  下午 2:41【需求编号】
+ *
+ * @author clam
+ * @version V1.0.0
+ */
+
+import com.njcn.algorithm.pojo.api.fallback.PqReasonableRangeFeignClientFallbackFactory;
+import com.njcn.algorithm.pojo.dto.PqReasonableRangeDto;
+import com.njcn.algorithm.pojo.param.DataCleanParam;
 import com.njcn.common.pojo.constant.ServerInfo;
 import com.njcn.common.pojo.response.HttpResult;
-import com.njcn.dataProcess.api.fallback.PqReasonableRangeFeignClientFallbackFactory;
-import com.njcn.dataProcess.param.DataCleanParam;
-import com.njcn.dataProcess.pojo.dto.PqReasonableRangeDto;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -17,7 +25,7 @@ import java.util.List;
  * @version 1.0.0
  * @date 2025年02月13日 20:11
  */
-@FeignClient(value =  ServerInfo.PLATFORM_DATA_PROCESSING_BOOT, path = "/pqReasonableRange", fallbackFactory = PqReasonableRangeFeignClientFallbackFactory.class, contextId = "pqReasonableRange")
+@FeignClient(value =  ServerInfo.ALGORITHM_BOOT, path = "/pqReasonableRange", fallbackFactory = PqReasonableRangeFeignClientFallbackFactory.class, contextId = "pqReasonableRange")
 public interface PqReasonableRangeFeignClient {
 
     @PostMapping("/getData")
@@ -25,3 +33,4 @@ public interface PqReasonableRangeFeignClient {
     HttpResult<List<PqReasonableRangeDto>> getData(@RequestBody DataCleanParam param);
 
 }
+

algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/api/fallback/PqReasonableRangeFeignClientFallbackFactory.java

@@ -1,12 +1,12 @@
-package com.njcn.dataProcess.api.fallback;
+package com.njcn.algorithm.pojo.api.fallback;
 
+import com.njcn.algorithm.pojo.api.PqReasonableRangeFeignClient;
+import com.njcn.algorithm.pojo.dto.PqReasonableRangeDto;
+import com.njcn.algorithm.pojo.param.DataCleanParam;
+import com.njcn.algorithm.pojo.util.PrepareEnumUtil;
 import com.njcn.common.pojo.enums.response.CommonResponseEnum;
 import com.njcn.common.pojo.exception.BusinessException;
 import com.njcn.common.pojo.response.HttpResult;
-import com.njcn.dataProcess.api.PqReasonableRangeFeignClient;
-import com.njcn.dataProcess.param.DataCleanParam;
-import com.njcn.dataProcess.pojo.dto.PqReasonableRangeDto;
-import com.njcn.dataProcess.util.DataProcessingEnumUtil;
 import feign.hystrix.FallbackFactory;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
@@ -14,9 +14,11 @@ import org.springframework.stereotype.Component;
 import java.util.List;
 
 /**
- * @author xy
- * @version 1.0.0
- * @date 2025年02月13日 20:13
+ * Description:
+ * Date: 2026/05/21  下午 2:42【需求编号】
+ *
+ * @author clam
+ * @version V1.0.0
  */
 @Slf4j
 @Component
@@ -32,7 +34,7 @@ public class PqReasonableRangeFeignClientFallbackFactory implements FallbackFact
         Enum<?> exceptionEnum = CommonResponseEnum.SERVICE_FALLBACK;
         if(cause.getCause() instanceof BusinessException){
             BusinessException businessException = (BusinessException) cause.getCause();
-            exceptionEnum = DataProcessingEnumUtil.getExceptionEnum(businessException.getResult());
+            exceptionEnum = PrepareEnumUtil.getExceptionEnum(businessException.getResult());
         }
         Enum<?> finalExceptionEnum = exceptionEnum;
         return new PqReasonableRangeFeignClient() {
@@ -45,3 +47,4 @@ public class PqReasonableRangeFeignClientFallbackFactory implements FallbackFact
         };
     }
 }
+

algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/dto/PqReasonableRangeDto.java

@@ -1,4 +1,4 @@
-package com.njcn.dataProcess.pojo.dto;
+package com.njcn.algorithm.pojo.dto;
 
 import lombok.Data;
 

algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/param/DataCleanParam.java

@@ -1,4 +1,4 @@
-package com.njcn.dataProcess.param;
+package com.njcn.algorithm.pojo.param;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

algorithm/algorithm-api/src/main/java/com/njcn/algorithm/pojo/po/PqReasonableRange.java

@@ -1,4 +1,4 @@
-package com.njcn.dataProcess.pojo.po;
+package com.njcn.algorithm.pojo.po;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.njcn.db.bo.BaseEntity;

algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/ExecutionCenter.java

@@ -16,6 +16,7 @@ import com.njcn.common.pojo.annotation.OperateInfo;
 import com.njcn.common.pojo.enums.common.LogEnum;
 import com.njcn.common.pojo.exception.BusinessException;
 import com.njcn.csdevice.api.CsLineFeignClient;
+import com.njcn.csdevice.pojo.dto.CsLineDTO;
 import com.njcn.device.biz.commApi.CommTerminalGeneralClient;
 import com.njcn.device.biz.pojo.dto.DeptGetChildrenMoreDTO;
 import com.njcn.device.biz.pojo.dto.DeptGetDeviceDTO;
@@ -23,6 +24,7 @@ import com.njcn.device.biz.pojo.dto.DeptGetSubStationDTO;
 import com.njcn.device.biz.pojo.dto.LineDevGetDTO;
 import com.njcn.device.biz.pojo.param.DeptGetLineParam;
 import com.njcn.device.pq.api.DeptLineFeignClient;
+import com.njcn.redis.utils.RedisUtil;
 import com.njcn.user.api.DeptFeignClient;
 import com.njcn.user.pojo.po.Dept;
 import com.njcn.web.controller.BaseController;
@@ -73,6 +75,8 @@ public class ExecutionCenter extends BaseController {
     private CsLineFeignClient csLineFeignClient;
     @Resource
     private FlowAsyncService flowService;
+    @Resource
+    private RedisUtil redisUtil;
 
     /***
      * 1、校验非全链执行时，tagNames节点标签集合必须为非空，否则提示---无可执行节点
@@ -143,9 +147,27 @@ public class ExecutionCenter extends BaseController {
         String methodDescribe = getMethodDescribe("wlMeasurementPointExecutor");
         //手动判断参数是否合法,
         CalculatedParam calculatedParam = judgeExecuteParam(baseParam);
+        //缓存监测点、接线方式数据
+        List<CsLineDTO> csLineDTOList = csLineFeignClient.getAllLineDetail().getData();
+        List<String> lineIdList = new ArrayList<>();
+        Map<String, Integer> lineConTypeMap = new HashMap<>();
+        if (CollectionUtils.isNotEmpty(csLineDTOList)) {
+            lineIdList = csLineDTOList.stream().map(CsLineDTO::getLineId).collect(Collectors.toList());
+            //接线方式(0-星型 1-角型 2-V型)
+            lineConTypeMap = csLineDTOList.stream()
+                    .filter(dto -> dto.getLineId() != null)
+                    .collect(Collectors.toMap(
+                            CsLineDTO::getLineId,
+                            dto -> dto.getConType() != null ? dto.getConType() : 0,
+                            (v1, v2) -> v1
+                    ));
+            redisUtil.saveByKeyWithExpire("wlLineDetail", lineConTypeMap, 3600L*3);
+        }
         // 测点索引
         if (CollectionUtils.isEmpty(calculatedParam.getIdList())) {
-            calculatedParam.setIdList(csLineFeignClient.getAllLine().getData());
+            calculatedParam.setIdList(lineIdList);
+        } else {
+            calculatedParam.setIdList(calculatedParam.getIdList());
         }
         LiteflowResponse liteflowResponse;
         if (baseParam.isRepair()) {

algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/controller/PqReasonableRangeController.java

@@ -0,0 +1,91 @@
+package com.njcn.algorithm.controller;
+
+
+import com.njcn.algorithm.pojo.dto.PqReasonableRangeDto;
+import com.njcn.algorithm.pojo.param.DataCleanParam;
+import com.njcn.algorithm.service.line.IPqReasonableRangeService;
+import com.njcn.common.pojo.annotation.OperateInfo;
+import com.njcn.common.pojo.constant.OperateType;
+import com.njcn.common.pojo.enums.common.LogEnum;
+import com.njcn.common.pojo.enums.response.CommonResponseEnum;
+import com.njcn.common.pojo.response.HttpResult;
+import com.njcn.common.utils.HttpResultUtil;
+import com.njcn.csdevice.enums.DeviceOperate;
+import com.njcn.web.advice.DeviceLog;
+import com.njcn.web.controller.BaseController;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Controller;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author xy
+ * @since 2025-02-13
+ */
+@Validated
+@Slf4j
+@Controller
+@RestController
+@RequestMapping("/pqReasonableRange")
+@Api(tags = "数据清洗标准库")
+public class PqReasonableRangeController extends BaseController {
+
+    @Resource
+    private IPqReasonableRangeService pqReasonableRangeService;
+
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON,operateType = OperateType.QUERY)
+    @PostMapping("/getData")
+    @ApiOperation("按条件获取数据合理范围")
+    public HttpResult<List<PqReasonableRangeDto>> getData(@RequestBody DataCleanParam param) {
+        String methodDescribe = getMethodDescribe("getData");
+        List<PqReasonableRangeDto> list = pqReasonableRangeService.getReasonableRangeList(param);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe);
+    }
+
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON,operateType = OperateType.ADD)
+    @PostMapping("/save")
+    @ApiOperation("新增数据合理范围")
+    public HttpResult<String> save(@RequestBody @Validated PqReasonableRangeDto dto) {
+        String methodDescribe = getMethodDescribe("save");
+        boolean result = pqReasonableRangeService.savePqReasonableRange(dto);
+        if (result) {
+            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, "新增成功", methodDescribe);
+        }
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, "新增失败", methodDescribe);
+    }
+
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON,operateType = OperateType.UPDATE)
+    @PostMapping("/update")
+    @ApiOperation("更新数据合理范围")
+    public HttpResult<String> update(@RequestBody @Validated PqReasonableRangeDto dto) {
+        String methodDescribe = getMethodDescribe("update");
+        boolean result = pqReasonableRangeService.updatePqReasonableRange(dto);
+        if (result) {
+            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, "更新成功", methodDescribe);
+        }
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, "更新失败", methodDescribe);
+    }
+
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/delete")
+    @ApiOperation("删除数据合理范围")
+    @DeviceLog(operateType = DeviceOperate.DELETE)
+    public HttpResult<String> delete(@RequestParam("id") String id) {
+        String methodDescribe = getMethodDescribe("delete");
+        boolean result = pqReasonableRangeService.deletePqReasonableRange(id);
+        if (result) {
+            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, "删除成功", methodDescribe);
+        }
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, "删除失败", methodDescribe);
+    }
+}
+

algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/mapper/PqReasonableRangeMapper.java

@@ -1,10 +1,7 @@
-package com.njcn.dataProcess.dao.relation.mapper;
+package com.njcn.algorithm.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.njcn.dataProcess.pojo.dto.PqReasonableRangeDto;
-import com.njcn.dataProcess.pojo.po.PqReasonableRange;
-
-import java.util.List;
+import com.njcn.algorithm.pojo.po.PqReasonableRange;
 
 /**
  * <p>

algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/service/line/FlowAsyncService.java

@@ -1,7 +1,7 @@
 package com.njcn.algorithm.service.line;
 
 import com.njcn.algorithm.pojo.bo.CalculatedParam;
-import com.njcn.dataProcess.pojo.dto.PqReasonableRangeDto;
+import com.njcn.algorithm.pojo.dto.PqReasonableRangeDto;
 import com.njcn.device.pq.pojo.vo.LineDetailVO;
 import com.njcn.system.pojo.po.DictData;
 

algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/service/line/IDataCleanService.java

@@ -2,7 +2,6 @@ package com.njcn.algorithm.service.line;
 
 import com.njcn.algorithm.pojo.bo.CalculatedParam;
 
-import java.util.concurrent.CompletableFuture;
 
 /**
  * @author xy

algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/service/line/IDataLimitRateAsync.java

@@ -4,26 +4,29 @@ import com.njcn.device.biz.pojo.po.Overlimit;
 
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.CompletableFuture;
 
 public interface IDataLimitRateAsync {
 
     /**
      * limit_rate多线程算法
+     *
      * @param dataDate
      * @param list
      * @param phase
      * @param overLimitMap
      * @param size
      * @param i
-     * @param type 系统类型
+     * @param type         系统类型
+     * @return
      * @Author: wr
      * @Date: 2025/12/17 12:16
      */
-    void lineDataRate(String dataDate,
-                      List<String> list,
-                      List<String> phase,
-                      Map<String, Overlimit> overLimitMap,
-                      int size,
-                      int i,
-                      int type);
+    CompletableFuture<Void> lineDataRate(String dataDate,
+                                         List<String> list,
+                                         List<String> phase,
+                                         Map<String, Overlimit> overLimitMap,
+                                         int size,
+                                         int i,
+                                         int type);
 }

algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/service/line/IPqReasonableRangeService.java

@@ -1,9 +1,9 @@
-package com.njcn.dataProcess.service;
+package com.njcn.algorithm.service.line;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.njcn.dataProcess.param.DataCleanParam;
-import com.njcn.dataProcess.pojo.dto.PqReasonableRangeDto;
-import com.njcn.dataProcess.pojo.po.PqReasonableRange;
+import com.njcn.algorithm.pojo.dto.PqReasonableRangeDto;
+import com.njcn.algorithm.pojo.param.DataCleanParam;
+import com.njcn.algorithm.pojo.po.PqReasonableRange;
 
 import java.util.List;
 
@@ -24,4 +24,10 @@ public interface IPqReasonableRangeService extends IService<PqReasonableRange> {
      */
     List<PqReasonableRangeDto> getReasonableRangeList(DataCleanParam param);
 
+    boolean savePqReasonableRange(PqReasonableRangeDto dto);
+
+    boolean updatePqReasonableRange(PqReasonableRangeDto dto);
+
+    boolean deletePqReasonableRange(String id);
+
 }

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

@@ -3,13 +3,15 @@ package com.njcn.algorithm.serviceimpl.line;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.njcn.algorithm.pojo.bo.CalculatedParam;
+import com.njcn.algorithm.pojo.dto.PqReasonableRangeDto;
+import com.njcn.algorithm.pojo.param.DataCleanParam;
 import com.njcn.algorithm.service.line.FlowAsyncService;
 import com.njcn.algorithm.service.line.IDataCleanService;
+import com.njcn.algorithm.service.line.IPqReasonableRangeService;
 import com.njcn.algorithm.utils.MemorySizeUtil;
 import com.njcn.dataProcess.api.*;
 import com.njcn.dataProcess.dto.RmpEventDetailDTO;
 import com.njcn.dataProcess.enums.DataCleanEnum;
-import com.njcn.dataProcess.param.DataCleanParam;
 import com.njcn.dataProcess.param.LineCountEvaluateParam;
 import com.njcn.dataProcess.pojo.dto.*;
 import com.njcn.dataProcess.pojo.po.PqDataVerify;
@@ -33,7 +35,9 @@ import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
 import java.lang.reflect.Method;
-import java.time.*;
+import java.time.Instant;
+import java.time.LocalDateTime;
+import java.time.ZoneId;
 import java.time.format.DateTimeFormatter;
 import java.util.*;
 import java.util.function.Function;
@@ -48,8 +52,8 @@ public class DataCleanServiceImpl implements IDataCleanService {
 
     private static final Logger logger = LoggerFactory.getLogger(DataCleanServiceImpl.class);
 
-    @Value("${line.num}")
-    private Integer NUM = 100;
+    @Value("${line.num:10}")
+    private Integer NUM;
 
     @Resource
     private DataVFeignClient dataVFeignClient;
@@ -80,7 +84,7 @@ public class DataCleanServiceImpl implements IDataCleanService {
     @Resource
     private PqDataVerifyFeignClient pqDataVerifyFeignClient;
     @Resource
-    private PqReasonableRangeFeignClient pqReasonableRangeFeignClient;
+    private IPqReasonableRangeService pqReasonableRangeService;
     @Resource
     private LineFeignClient lineFeignClient;
     @Resource
@@ -97,7 +101,7 @@ public class DataCleanServiceImpl implements IDataCleanService {
     public void dataQualityCleanHandler(CalculatedParam calculatedParam) {
         MemorySizeUtil.getNowMemory();
         DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SSS");
-        logger.info("{},数据质量清洗算法执行=====》", LocalDateTime.now());
+        logger.info("{},{}数据质量清洗算法执行=====》", LocalDateTime.now(),calculatedParam.getDataDate());
         //获取监测点的统计间隔
         List<String> listOfString = (List<String>) (List<?>) calculatedParam.getIdList();
         List<LineDetailDataVO> lineDetailDataVOS = lineFeignClient.getLineDetailList(listOfString).getData();
@@ -286,7 +290,7 @@ public class DataCleanServiceImpl implements IDataCleanService {
         DictData dip = dicDataFeignClient.getDicDataByCodeAndType(DicDataEnum.VOLTAGE_DIP.getCode(), DicDataTypeEnum.EVENT_STATIS.getCode()).getData();
         DictData rise = dicDataFeignClient.getDicDataByCodeAndType(DicDataEnum.VOLTAGE_RISE.getCode(), DicDataTypeEnum.EVENT_STATIS.getCode()).getData();
         MemorySizeUtil.getNowMemory();
-        logger.info("{},原始表数据清洗=====》", LocalDateTime.now());
+        logger.info("{},{}原始表数据清洗=====》", LocalDateTime.now(),calculatedParam.getDataDate());
         //获取标准
         Map<String, List<PqReasonableRangeDto>> map = getStandardData();
         //获取监测点台账信息
@@ -300,7 +304,7 @@ public class DataCleanServiceImpl implements IDataCleanService {
         lineParam.setStartTime(TimeUtils.getBeginOfDay(calculatedParam.getDataDate()));
         lineParam.setEndTime(TimeUtils.getEndOfDay(calculatedParam.getDataDate()));
         for (int i = 0; i < lineDetail.size(); i++) {
-            logger.info( calculatedParam.getDataDate()+"总数据：" + lineDetail.size() + "=====》当前第" + (i + 1));
+//            logger.info( calculatedParam.getDataDate()+"总数据：" + lineDetail.size() + "=====》当前第" + (i + 1));
             LineDetailVO.Detail item = lineDetail.get(i);
             flowService.lineDataClean(item, map, calculatedParam.getDataDate(), dip, rise,lineDetail.size(),(i + 1));
         }
@@ -644,7 +648,7 @@ public class DataCleanServiceImpl implements IDataCleanService {
         DataCleanParam param = new DataCleanParam();
         param.setSystemType(DataCleanEnum.Pqs.getCode());
         // param.setDataSource(DataCleanEnum.InfluxDB.getCode());
-        List<PqReasonableRangeDto> list = pqReasonableRangeFeignClient.getData(param).getData();
+        List<PqReasonableRangeDto> list = pqReasonableRangeService.getReasonableRangeList(param);
         if (CollUtil.isNotEmpty(list)) {
             pqReasonableRangeDtoMap = list.stream().collect(Collectors.groupingBy(PqReasonableRangeDto::getInfluxdbTableName));
         }
@@ -662,7 +666,7 @@ public class DataCleanServiceImpl implements IDataCleanService {
         if (ObjectUtil.isNotNull(tableName)) {
             param.setTableName(tableName);
         }
-        List<PqReasonableRangeDto> list = pqReasonableRangeFeignClient.getData(param).getData();
+        List<PqReasonableRangeDto> list = pqReasonableRangeService.getReasonableRangeList(param);
         if (CollUtil.isNotEmpty(list)) {
             pqReasonableRangeDtoMap = list.stream().collect(Collectors.toMap(PqReasonableRangeDto::getIndexCode, Function.identity()));
         }

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

@@ -3,6 +3,7 @@ package com.njcn.algorithm.serviceimpl.line;
 import cn.hutool.core.collection.CollUtil;
 import com.njcn.algorithm.pojo.bo.CalculatedParam;
 import com.njcn.algorithm.service.line.IDataComAssService;
+import com.njcn.algorithm.utils.MemorySizeUtil;
 import com.njcn.dataProcess.api.DataComAssFeignClient;
 import com.njcn.dataProcess.api.DataFlickerFeignClient;
 import com.njcn.dataProcess.api.DataVFeignClient;
@@ -38,8 +39,8 @@ import java.util.stream.Collectors;
 public class DataComAssServiceImpl implements IDataComAssService {
 
     private static final Logger logger = LoggerFactory.getLogger(DayDataServiceImpl.class);
-    @Value("${line.num}")
-    private Integer NUM = 100;
+
+
     @Resource
     private DataVFeignClient dataVFeignClient;
 
@@ -50,10 +51,17 @@ public class DataComAssServiceImpl implements IDataComAssService {
     @Resource
     private PqDataVerifyFeignClient pqDataVerifyFeignClient;
 
+    /**
+     * 查询配置 辽宁版本比较特殊，没有CP95值，采用平均值进行判断
+     */
+    @Value("${version.used:master}")
+    private String versionUsed;
+
     @Override
     public void dataComAssHandler(CalculatedParam calculatedParam) {
         List<DataComassesDPO> list = new ArrayList<>();
-        logger.info("{},r_stat_comasses_d算法开始=====》", LocalDateTime.now());
+        MemorySizeUtil.getNowMemory();
+        logger.info("{},{}r_stat_comasses_d算法开始=====》", LocalDateTime.now(),calculatedParam.getDataDate());
         LineCountEvaluateParam lineParam = new LineCountEvaluateParam();
         lineParam.setStartTime(TimeUtils.getBeginOfDay(calculatedParam.getDataDate()));
         lineParam.setEndTime(TimeUtils.getEndOfDay(calculatedParam.getDataDate()));
@@ -136,7 +144,7 @@ public class DataComAssServiceImpl implements IDataComAssService {
         BigDecimal hundred = BigDecimal.valueOf(100);
         //************************************电压偏差********************************************
         lineParam.setPhasicType(Arrays.asList("A", "B", "C"));
-        lineParam.setValueType(Arrays.asList("AVG"));
+        lineParam.setValueType(Collections.singletonList("AVG"));
         lineParam.setColumnName("vu_dev");
         lineParam.setGe("10");
         Integer vuDev1 = dataVFeignClient.getColumnNameCountRawData(lineParam).getData();
@@ -167,6 +175,7 @@ public class DataComAssServiceImpl implements IDataComAssService {
         //************************************频率偏差********************************************
         lineParam.setColumnName("freq_dev");
         lineParam.setGe("0.3");
+        lineParam.setGe(null);
         Integer freqDev1 = dataVFeignClient.getColumnNameCountRawData(lineParam).getData();
 
         lineParam.setGe("0.2");
@@ -194,8 +203,15 @@ public class DataComAssServiceImpl implements IDataComAssService {
         }
         //************************************谐波畸变率********************************************
         lineParam.setColumnName("v_thd");
-        lineParam.setValueType(Arrays.asList("CP95"));
+
+        if("liaoning".equals(versionUsed)){
+            lineParam.setValueType(Collections.singletonList("AVG"));
+        }else {
+            lineParam.setValueType(Collections.singletonList("CP95"));
+        }
+
         lineParam.setGe("6");
+        lineParam.setLt(null);
         Integer vThd1 = dataVFeignClient.getColumnNameCountRawData(lineParam).getData();
 
         lineParam.setGe("4");
@@ -224,7 +240,12 @@ public class DataComAssServiceImpl implements IDataComAssService {
 
         //************************************三相电压不平衡度********************************************
         lineParam.setColumnName("v_unbalance");
+        if("liaoning".equals(versionUsed)){
+            lineParam.setValueType(Collections.singletonList("MAX"));
+        }
+        lineParam.setPhasicType(Collections.singletonList("T"));
         lineParam.setGe("4");
+        lineParam.setLt(null);
         Integer vUnbalance1 = dataVFeignClient.getColumnNameCountRawData(lineParam).getData();
 
         lineParam.setGe("2");
@@ -253,7 +274,9 @@ public class DataComAssServiceImpl implements IDataComAssService {
         //************************************电压波动（短时闪变）********************************************
         lineParam.setColumnName("pst");
         lineParam.setValueType(null);
+        lineParam.setPhasicType(Arrays.asList("A", "B", "C"));
         lineParam.setGe("0.8");
+        lineParam.setLt("1");
         Integer plt1 = dataFlickerFeignClient.getColumnNameCountRawData(lineParam).getData();
 
         lineParam.setGe("0.6");
@@ -273,11 +296,11 @@ public class DataComAssServiceImpl implements IDataComAssService {
         Integer plt5 = dataFlickerFeignClient.getColumnNameCountRawData(lineParam).getData();
         BigDecimal pltAll = BigDecimal.valueOf(plt1 + plt2 + plt3 + plt4 + plt5);
         if (pltAll.compareTo(BigDecimal.ZERO) != 0) {
-            outMap.put("data_plt1", BigDecimal.valueOf(plt1).multiply(hundred).divide(pltAll, 3, RoundingMode.HALF_UP));
-            outMap.put("data_plt2", BigDecimal.valueOf(plt2).multiply(hundred).divide(pltAll, 3, RoundingMode.HALF_UP));
-            outMap.put("data_plt3", BigDecimal.valueOf(plt3).multiply(hundred).divide(pltAll, 3, RoundingMode.HALF_UP));
-            outMap.put("data_plt4", BigDecimal.valueOf(plt4).multiply(hundred).divide(pltAll, 3, RoundingMode.HALF_UP));
-            outMap.put("data_plt5", BigDecimal.valueOf(plt5).multiply(hundred).divide(pltAll, 3, RoundingMode.HALF_UP));
+            outMap.put("data_pst1", BigDecimal.valueOf(plt1).multiply(hundred).divide(pltAll, 3, RoundingMode.HALF_UP));
+            outMap.put("data_pst2", BigDecimal.valueOf(plt2).multiply(hundred).divide(pltAll, 3, RoundingMode.HALF_UP));
+            outMap.put("data_pst3", BigDecimal.valueOf(plt3).multiply(hundred).divide(pltAll, 3, RoundingMode.HALF_UP));
+            outMap.put("data_pst4", BigDecimal.valueOf(plt4).multiply(hundred).divide(pltAll, 3, RoundingMode.HALF_UP));
+            outMap.put("data_pst5", BigDecimal.valueOf(plt5).multiply(hundred).divide(pltAll, 3, RoundingMode.HALF_UP));
         }
 
         if (!CollUtil.isEmpty(outMap)) {

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

@@ -22,6 +22,7 @@ import org.springframework.stereotype.Component;
 import javax.annotation.Resource;
 import java.time.LocalDateTime;
 import java.util.*;
+import java.util.concurrent.atomic.AtomicReference;
 import java.util.stream.Collectors;
 
 /**
@@ -34,8 +35,9 @@ public class DayDataServiceImpl implements IDayDataService {
 
     private static final Logger logger = LoggerFactory.getLogger(DayDataServiceImpl.class);
 
-    @Value("${line.num}")
-    private Integer NUM = 100;
+    @Value("${line.num:10}")
+    private Integer NUM;
+
     @Resource
     private DataVFeignClient dataVFeignClient;
     @Resource
@@ -64,13 +66,18 @@ public class DayDataServiceImpl implements IDayDataService {
     private DataInharmVFeignClient dataInharmVFeignClient;
     @Resource
     private DataPltFeignClient dataPltFeignClient;
-
     @Resource
     private PqDataVerifyFeignClient pqDataVerifyFeignClient;
+    /**
+     * 查询配置 辽宁版本比较特殊，没有CP95值，采用平均值进行判断
+     */
+    @Value("${version.used:master}")
+    private String versionUsed;
 
     @Override
     public void dataVHandler(CalculatedParam calculatedParam) {
-        logger.info("{},dataV表转r_stat_data_v_d算法开始=====》", LocalDateTime.now());
+        MemorySizeUtil.getNowMemory();
+        logger.info("{},{}dataV表转r_stat_data_v_d算法开始=====》", LocalDateTime.now(),calculatedParam.getDataDate());
         List<DataVDto> result = new ArrayList<>();
         //远程接口获取分钟数据
         LineCountEvaluateParam lineParam = new LineCountEvaluateParam();
@@ -86,7 +93,6 @@ public class DayDataServiceImpl implements IDayDataService {
             //获取原始数据
             List<CommonMinuteDto> partList = dataVFeignClient.getBaseData(lineParam).getData();
             if (CollUtil.isNotEmpty(partList)) {
-                logger.info("{}dataV集合大小为>>>>>>>>>>>>{}",lineParam.getStartTime(),MemorySizeUtil.getObjectSize(partList));
                 partList.forEach(item->{
                     //相别
                     List<CommonMinuteDto.PhasicType> phasicTypeList = item.getPhasicTypeList();
@@ -102,7 +108,8 @@ public class DayDataServiceImpl implements IDayDataService {
                             dto.setPhasicType(item2.getPhasicType());
                             dto.setValueType(item3.getValueType().toUpperCase());
                             dto.setQualityFlag(Objects.equals(item.getQualityFlag(),"null") ? "0" : item.getQualityFlag());
-                            channelDataVHandler(item3,valueTypes,dto,true);
+                            //默认CP95值取 CP95的最大值；如果有特殊要求，可以根据平均值的数据取CP95
+                            channelDataVHandler(item3,valueTypes,dto,!Objects.equals(versionUsed, "liaoning"));
                             result.add(dto);
                         });
                     });
@@ -119,7 +126,8 @@ public class DayDataServiceImpl implements IDayDataService {
 
     @Override
     public void dataIHandler(CalculatedParam calculatedParam) {
-        logger.info("{},dataI表转r_stat_data_i_d算法开始=====》", LocalDateTime.now());
+        MemorySizeUtil.getNowMemory();
+        logger.info("{},{}dataI表转r_stat_data_i_d算法开始=====》", LocalDateTime.now(),calculatedParam.getDataDate());
         List<DataIDto> result = new ArrayList<>();
         //远程接口获取分钟数据
         LineCountEvaluateParam lineParam = new LineCountEvaluateParam();
@@ -150,7 +158,7 @@ public class DayDataServiceImpl implements IDayDataService {
                             dto.setPhasicType(item2.getPhasicType());
                             dto.setValueType(item3.getValueType().toUpperCase());
                             dto.setQualityFlag(Objects.equals(item.getQualityFlag(),"null") ? "0" : item.getQualityFlag());
-                            channelDataIHandler(item3,valueTypes,dto,true);
+                            channelDataIHandler(item3,valueTypes,dto,!Objects.equals(versionUsed, "liaoning"));
                             result.add(dto);
                         });
                     });
@@ -167,7 +175,8 @@ public class DayDataServiceImpl implements IDayDataService {
 
     @Override
     public void dataFlickerHandler(CalculatedParam calculatedParam) {
-        logger.info("{},dataFlicker表转r_stat_data_flicker_d算法开始=====》", LocalDateTime.now());
+        MemorySizeUtil.getNowMemory();
+        logger.info("{},{}dataFlicker表转r_stat_data_flicker_d算法开始=====》", LocalDateTime.now(),calculatedParam.getDataDate());
         List<String> valueList = Arrays.asList("AVG","MAX","MIN","CP95");
         List<DataFlickerDto> result = new ArrayList<>();
         //远程接口获取分钟数据
@@ -198,7 +207,7 @@ public class DayDataServiceImpl implements IDayDataService {
                                 dto.setPhasicType(item2.getPhasicType());
                                 dto.setValueType(item4.toUpperCase());
                                 dto.setQualityFlag(Objects.equals(item.getQualityFlag(),"null") ? "0" : item.getQualityFlag());
-                                channelDataFlickerHandler(item3,dto,item4,true);
+                                channelDataFlickerHandler(item3,dto,item4,!Objects.equals(versionUsed, "liaoning"));
                                 result.add(dto);
                             });
                         });
@@ -216,7 +225,8 @@ public class DayDataServiceImpl implements IDayDataService {
 
     @Override
     public void dataFlucHandler(CalculatedParam calculatedParam) {
-        logger.info("{},dataFluc表转r_stat_data_fluc_d算法开始=====》", LocalDateTime.now());
+        MemorySizeUtil.getNowMemory();
+        logger.info("{},{}dataFluc表转r_stat_data_fluc_d算法开始=====》", LocalDateTime.now(),calculatedParam.getDataDate());
         List<String> valueList = Arrays.asList("AVG","MAX","MIN","CP95");
         List<DataFlucDto> result = new ArrayList<>();
         //远程接口获取分钟数据
@@ -247,7 +257,7 @@ public class DayDataServiceImpl implements IDayDataService {
                                 dto.setPhasicType(item2.getPhasicType());
                                 dto.setValueType(item4.toUpperCase());
                                 dto.setQualityFlag(Objects.equals(item.getQualityFlag(),"null") ? "0" : item.getQualityFlag());
-                                channelDataFlucHandler(item3,dto,item4,true);
+                                channelDataFlucHandler(item3,dto,item4,!Objects.equals(versionUsed, "liaoning"));
                                 result.add(dto);
                             });
                         });
@@ -265,7 +275,8 @@ public class DayDataServiceImpl implements IDayDataService {
 
     @Override
     public void dataHarmPhasicIHandler(CalculatedParam calculatedParam) {
-        logger.info("{},dataHarmPhasicI表转r_stat_data_harmphasic_i_d算法开始=====》", LocalDateTime.now());
+        MemorySizeUtil.getNowMemory();
+        logger.info("{},{}dataHarmPhasicI表转r_stat_data_harmphasic_i_d算法开始=====》", LocalDateTime.now(),calculatedParam.getDataDate());
         List<DataHarmPhasicIDto> result = new ArrayList<>();
         //远程接口获取分钟数据
         LineCountEvaluateParam lineParam = new LineCountEvaluateParam();
@@ -296,7 +307,7 @@ public class DayDataServiceImpl implements IDayDataService {
                             dto.setPhasicType(item2.getPhasicType());
                             dto.setValueType(item3.getValueType().toUpperCase());
                             dto.setQualityFlag(Objects.equals(item.getQualityFlag(),"null") ? "0" : item.getQualityFlag());
-                            channelDataHarmPhasicIHandler(item3,valueTypes,dto,true);
+                            channelDataHarmPhasicIHandler(item3,valueTypes,dto,!Objects.equals(versionUsed, "liaoning"));
                             result.add(dto);
                         });
                     });
@@ -313,7 +324,8 @@ public class DayDataServiceImpl implements IDayDataService {
 
     @Override
     public void dataHarmPhasicVHandler(CalculatedParam calculatedParam) {
-        logger.info("{},dataHarmPhasicV表转r_stat_data_harmphasic_v_d算法开始=====》", LocalDateTime.now());
+        MemorySizeUtil.getNowMemory();
+        logger.info("{},{}dataHarmPhasicV表转r_stat_data_harmphasic_v_d算法开始=====》", LocalDateTime.now(),calculatedParam.getDataDate());
         List<DataHarmPhasicVDto> result = new ArrayList<>();
         //远程接口获取分钟数据
         LineCountEvaluateParam lineParam = new LineCountEvaluateParam();
@@ -344,7 +356,7 @@ public class DayDataServiceImpl implements IDayDataService {
                             dto.setPhasicType(item2.getPhasicType());
                             dto.setValueType(item3.getValueType().toUpperCase());
                             dto.setQualityFlag(Objects.equals(item.getQualityFlag(),"null") ? "0" : item.getQualityFlag());
-                            channelDataHarmPhasicVHandler(item3,valueTypes,dto,true);
+                            channelDataHarmPhasicVHandler(item3,valueTypes,dto,!Objects.equals(versionUsed, "liaoning"));
                             result.add(dto);
                         });
                     });
@@ -361,7 +373,8 @@ public class DayDataServiceImpl implements IDayDataService {
 
     @Override
     public void dataHarmPowerPHandler(CalculatedParam calculatedParam) {
-        logger.info("{},dataHarmPowerP表转r_stat_data_harmpower_p_d算法开始=====》", LocalDateTime.now());
+        MemorySizeUtil.getNowMemory();
+        logger.info("{},{}dataHarmPowerP表转r_stat_data_harmpower_p_d算法开始=====》", LocalDateTime.now(),calculatedParam.getDataDate());
         List<DataHarmPowerPDto> result = new ArrayList<>();
         //远程接口获取分钟数据
         LineCountEvaluateParam lineParam = new LineCountEvaluateParam();
@@ -392,7 +405,7 @@ public class DayDataServiceImpl implements IDayDataService {
                             dto.setPhasicType(item2.getPhasicType());
                             dto.setValueType(item3.getValueType().toUpperCase());
                             dto.setQualityFlag(Objects.equals(item.getQualityFlag(),"null") ? "0" : item.getQualityFlag());
-                            channelDataHarmPowerPHandler(item3,valueTypes,dto,true);
+                            channelDataHarmPowerPHandler(item3,valueTypes,dto,!Objects.equals(versionUsed, "liaoning"));
                             result.add(dto);
                         });
                     });
@@ -409,7 +422,8 @@ public class DayDataServiceImpl implements IDayDataService {
 
     @Override
     public void dataHarmPowerQHandler(CalculatedParam calculatedParam) {
-        logger.info("{},dataHarmPowerQ表转r_stat_data_harmpower_q_d算法开始=====》", LocalDateTime.now());
+        MemorySizeUtil.getNowMemory();
+        logger.info("{},{}dataHarmPowerQ表转r_stat_data_harmpower_q_d算法开始=====》", LocalDateTime.now(),calculatedParam.getDataDate());
         List<DataHarmPowerQDto> result = new ArrayList<>();
         //远程接口获取分钟数据
         LineCountEvaluateParam lineParam = new LineCountEvaluateParam();
@@ -440,7 +454,7 @@ public class DayDataServiceImpl implements IDayDataService {
                             dto.setPhasicType(item2.getPhasicType());
                             dto.setValueType(item3.getValueType().toUpperCase());
                             dto.setQualityFlag(Objects.equals(item.getQualityFlag(),"null") ? "0" : item.getQualityFlag());
-                            channelDataHarmPowerQHandler(item3,valueTypes,dto,true);
+                            channelDataHarmPowerQHandler(item3,valueTypes,dto,!Objects.equals(versionUsed, "liaoning"));
                             result.add(dto);
                         });
                     });
@@ -457,7 +471,8 @@ public class DayDataServiceImpl implements IDayDataService {
 
     @Override
     public void dataHarmPowerSHandler(CalculatedParam calculatedParam) {
-        logger.info("{},dataHarmPowerS表转r_stat_data_harmpower_s_d算法开始=====》", LocalDateTime.now());
+        MemorySizeUtil.getNowMemory();
+        logger.info("{},{}dataHarmPowerS表转r_stat_data_harmpower_s_d算法开始=====》", LocalDateTime.now(),calculatedParam.getDataDate());
         List<DataHarmPowerSDto> result = new ArrayList<>();
         //远程接口获取分钟数据
         LineCountEvaluateParam lineParam = new LineCountEvaluateParam();
@@ -488,7 +503,7 @@ public class DayDataServiceImpl implements IDayDataService {
                             dto.setPhasicType(item2.getPhasicType());
                             dto.setValueType(item3.getValueType().toUpperCase());
                             dto.setQualityFlag(Objects.equals(item.getQualityFlag(),"null") ? "0" : item.getQualityFlag());
-                            channelDataHarmPowerSHandler(item3,valueTypes,dto,true);
+                            channelDataHarmPowerSHandler(item3,valueTypes,dto,!Objects.equals(versionUsed, "liaoning"));
                             result.add(dto);
                         });
                     });
@@ -505,7 +520,8 @@ public class DayDataServiceImpl implements IDayDataService {
 
     @Override
     public void dataHarmRateIHandler(CalculatedParam calculatedParam) {
-        logger.info("{},dataHarmRateI表转r_stat_data_harmRate_i_d算法开始=====》", LocalDateTime.now());
+        MemorySizeUtil.getNowMemory();
+        logger.info("{},{}dataHarmRateI表转r_stat_data_harmRate_i_d算法开始=====》", LocalDateTime.now(),calculatedParam.getDataDate());
         List<DataHarmRateIDto> result = new ArrayList<>();
         //远程接口获取分钟数据
         LineCountEvaluateParam lineParam = new LineCountEvaluateParam();
@@ -536,7 +552,7 @@ public class DayDataServiceImpl implements IDayDataService {
                             dto.setPhasicType(item2.getPhasicType());
                             dto.setValueType(item3.getValueType().toUpperCase());
                             dto.setQualityFlag(Objects.equals(item.getQualityFlag(),"null") ? "0" : item.getQualityFlag());
-                            channelDataHarmRateIHandler(item3,valueTypes,dto,true);
+                            channelDataHarmRateIHandler(item3,valueTypes,dto,!Objects.equals(versionUsed, "liaoning"));
                             result.add(dto);
                         });
                     });
@@ -553,7 +569,8 @@ public class DayDataServiceImpl implements IDayDataService {
 
     @Override
     public void dataHarmRateVHandler(CalculatedParam calculatedParam) {
-        logger.info("{},dataHarmRateV表转r_stat_data_harmRate_v_d算法开始=====》", LocalDateTime.now());
+        MemorySizeUtil.getNowMemory();
+        logger.info("{},{}dataHarmRateV表转r_stat_data_harmRate_v_d算法开始=====》", LocalDateTime.now(),calculatedParam.getDataDate());
         List<DataHarmRateVDto> result = new ArrayList<>();
         //远程接口获取分钟数据
         LineCountEvaluateParam lineParam = new LineCountEvaluateParam();
@@ -584,7 +601,7 @@ public class DayDataServiceImpl implements IDayDataService {
                             dto.setPhasicType(item2.getPhasicType());
                             dto.setValueType(item3.getValueType().toUpperCase());
                             dto.setQualityFlag(Objects.equals(item.getQualityFlag(),"null") ? "0" : item.getQualityFlag());
-                            channelDataHarmRateVHandler(item3,valueTypes,dto,true);
+                            channelDataHarmRateVHandler(item3,valueTypes,dto,!Objects.equals(versionUsed, "liaoning"));
                             result.add(dto);
                         });
                     });
@@ -601,7 +618,8 @@ public class DayDataServiceImpl implements IDayDataService {
 
     @Override
     public void dataInHarmIHandler(CalculatedParam calculatedParam) {
-        logger.info("{},dataInHarmI表转r_stat_data_inharm_i_d算法开始=====》", LocalDateTime.now());
+        MemorySizeUtil.getNowMemory();
+        logger.info("{},{}dataInHarmI表转r_stat_data_inharm_i_d算法开始=====》", LocalDateTime.now(),calculatedParam.getDataDate());
         List<DataInHarmIDto> result = new ArrayList<>();
         //远程接口获取分钟数据
         LineCountEvaluateParam lineParam = new LineCountEvaluateParam();
@@ -632,7 +650,7 @@ public class DayDataServiceImpl implements IDayDataService {
                             dto.setPhasicType(item2.getPhasicType());
                             dto.setValueType(item3.getValueType().toUpperCase());
                             dto.setQualityFlag(Objects.equals(item.getQualityFlag(),"null") ? "0" : item.getQualityFlag());
-                            channelDataInHarmIHandler(item3,valueTypes,dto,true);
+                            channelDataInHarmIHandler(item3,valueTypes,dto,!Objects.equals(versionUsed, "liaoning"));
                             result.add(dto);
                         });
                     });
@@ -649,7 +667,8 @@ public class DayDataServiceImpl implements IDayDataService {
 
     @Override
     public void dataInHarmVHandler(CalculatedParam calculatedParam) {
-        logger.info("{},dataInHarmV表转r_stat_data_inharm_v_d算法开始=====》", LocalDateTime.now());
+        MemorySizeUtil.getNowMemory();
+        logger.info("{},{}dataInHarmV表转r_stat_data_inharm_v_d算法开始=====》", LocalDateTime.now(),calculatedParam.getDataDate());
         List<DataInHarmVDto> result = new ArrayList<>();
         //远程接口获取分钟数据
         LineCountEvaluateParam lineParam = new LineCountEvaluateParam();
@@ -680,7 +699,7 @@ public class DayDataServiceImpl implements IDayDataService {
                             dto.setPhasicType(item2.getPhasicType());
                             dto.setValueType(item3.getValueType().toUpperCase());
                             dto.setQualityFlag(Objects.equals(item.getQualityFlag(),"null") ? "0" : item.getQualityFlag());
-                            channelDataInHarmVHandler(item3,valueTypes,dto,true);
+                            channelDataInHarmVHandler(item3,valueTypes,dto,!Objects.equals(versionUsed, "liaoning"));
                             result.add(dto);
                         });
                     });
@@ -697,7 +716,8 @@ public class DayDataServiceImpl implements IDayDataService {
 
     @Override
     public void dataPltHandler(CalculatedParam calculatedParam) {
-        logger.info("{},dataPlt表转r_stat_data_plt_d算法开始=====》", LocalDateTime.now());
+        MemorySizeUtil.getNowMemory();
+        logger.info("{},{}dataPlt表转r_stat_data_plt_d算法开始=====》", LocalDateTime.now(),calculatedParam.getDataDate());
         List<DataPltDto> result = new ArrayList<>();
         List<String> valueList = Arrays.asList("AVG","MAX","MIN","CP95");
         //远程接口获取分钟数据
@@ -728,7 +748,7 @@ public class DayDataServiceImpl implements IDayDataService {
                                 dto.setPhasicType(item2.getPhasicType());
                                 dto.setValueType(item4.toUpperCase());
                                 dto.setQualityFlag(Objects.equals(item.getQualityFlag(),"null") ? "0" : item.getQualityFlag());
-                                channelDataPltHandler(item3,dto,item4,true);
+                                channelDataPltHandler(item3,dto,item4,!Objects.equals(versionUsed, "liaoning"));
                                 result.add(dto);
                             });
                         });
@@ -1549,23 +1569,20 @@ public class DayDataServiceImpl implements IDayDataService {
         valueType = valueType.toUpperCase();
         if (scheme) {
             switch (valueType) {
-                case InfluxDbSqlConstant.MAX:
-                case InfluxDbSqlConstant.CP95:
+                case "MAX":
+                case "CP95":
                     Optional<Double> max = list.stream().filter(Objects::nonNull).max(Double::compare);
-//                    result = max.orElse(null);
                     result = max.orElse(0.0);
                     break;
-                case InfluxDbSqlConstant.MIN:
+                case "MIN":
                     Optional<Double> min = list.stream().filter(Objects::nonNull).min(Double::compare);
-//                    result = min.orElse(null);
                     result = min.orElse(0.0);
                     break;
-                case InfluxDbSqlConstant.AVG_WEB:
+                case "AVG":
                     OptionalDouble average = list.stream()
                             .filter(Objects::nonNull)
                             .mapToDouble(Double::doubleValue)
                             .average();
-//                    result = average.isPresent() ? average.getAsDouble() : null;
                     result = average.isPresent() ? average.getAsDouble() : 0.0;
                     break;
                 default:
@@ -1573,29 +1590,42 @@ public class DayDataServiceImpl implements IDayDataService {
             }
         } else {
             switch (valueType) {
-                case InfluxDbSqlConstant.MAX:
+                case "MAX":
                     Optional<Double> max = list.stream().filter(Objects::nonNull).max(Double::compare);
-//                    result = max.orElse(null);
                     result = max.orElse(0.0);
                     break;
-                case InfluxDbSqlConstant.MIN:
+                case "MIN":
                     Optional<Double> min = list.stream().filter(Objects::nonNull).min(Double::compare);
-//                    result = min.orElse(null);
                     result = min.orElse(0.0);
                     break;
-                case InfluxDbSqlConstant.AVG_WEB:
+                case "AVG":
                     OptionalDouble average = list.stream()
                             .filter(Objects::nonNull)
                             .mapToDouble(Double::doubleValue)
                             .average();
-//                    result = average.isPresent() ? average.getAsDouble() : null;
                     result = average.isPresent() ? average.getAsDouble() : 0.0;
                     break;
-                case InfluxDbSqlConstant.CP95:
-                    list.sort(Collections.reverseOrder());
-                    int discardCount = (int) Math.ceil(list.size() * 0.05);
-                    List<Double> remainingList = list.subList(discardCount, list.size());
-//                    result = remainingList.isEmpty() ? null : remainingList.get(0);
+                case "CP95":
+                    if (list == null || list.isEmpty()) {
+                        result = 0.0;
+                        break;
+                    }
+                    // 过滤掉 null 元素
+                    List<Double> filteredList = list.stream()
+                            .filter(Objects::nonNull)
+                            .collect(Collectors.toList());
+
+                    if (filteredList.isEmpty()) {
+                        result = 0.0;
+                        break;
+                    }
+                    filteredList.sort(Collections.reverseOrder());
+                    int discardCount = (int) Math.ceil(filteredList.size() * 0.05);
+                    if (discardCount >= filteredList.size()) {
+                        result = 0.0;
+                        break;
+                    }
+                    List<Double> remainingList = filteredList.subList(discardCount, filteredList.size());
                     result = remainingList.isEmpty() ? 0.0 : remainingList.get(0);
                     break;
                 default:
@@ -1610,4 +1640,28 @@ public class DayDataServiceImpl implements IDayDataService {
         return result;
     }
 
+    /**
+     * 将平均值赋值给 CP95
+     */
+    public void putCP95ByAvg(List<CommonMinuteDto> list) {
+        list.forEach(po1->{
+            List<CommonMinuteDto.PhasicType> phasicTypeList = po1.getPhasicTypeList();
+            phasicTypeList.forEach(po2 -> {
+                List<CommonMinuteDto.ValueType> valueTypeList = po2.getValueTypeList();
+                AtomicReference<List<List<Double>>> valueList = new AtomicReference<>(new ArrayList<>());
+                valueTypeList.forEach(po3 -> {
+                    if (po3.getValueType().equals(InfluxDbSqlConstant.AVG_WEB)) {
+                        valueList.set(po3.getValueList());
+                    }
+                    if (po3.getValueType().equals(InfluxDbSqlConstant.CP95)) {
+                        po3.setValueList((List<List<Double>>) valueList);
+                    }
+                });
+            });
+        });
+    }
+
+
+
+
 }

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

@@ -7,6 +7,7 @@ import cn.hutool.core.util.CharsetUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.nacos.shaded.com.google.gson.Gson;
 import com.njcn.algorithm.pojo.bo.CalculatedParam;
+import com.njcn.algorithm.pojo.dto.PqReasonableRangeDto;
 import com.njcn.algorithm.service.line.FlowAsyncService;
 import com.njcn.dataProcess.api.*;
 import com.njcn.dataProcess.dto.DataCleanJsonDTO;
@@ -92,7 +93,7 @@ public class FlowAsyncServiceImpl implements FlowAsyncService {
 
     @Override
     @Async("asyncExecutor")
-    public void lineDataClean(LineDetailVO.Detail line, Map<String, List<PqReasonableRangeDto>> map, String dataDate,DictData dip,DictData rise,int size,int i) {
+    public void lineDataClean(LineDetailVO.Detail line, Map<String, List<PqReasonableRangeDto>> map, String dataDate, DictData dip, DictData rise, int size, int i) {
         LineDetailVO.Detail item = line;
         List<Map<String, Object>> resultData = new ArrayList<>();
         Set<String> allTimeSet = new HashSet<>();
@@ -389,16 +390,16 @@ public class FlowAsyncServiceImpl implements FlowAsyncService {
             bak.setState(1);
             //存储文件
             InputStream reportStream = IoUtil.toStream(new Gson().toJson(resultData), CharsetUtil.UTF_8);
+            String[] date = dataDate.split("-");
             String fileName = fileStorageUtil.uploadStreamSpecifyName(
                     reportStream
-                    , OssPath.DATA_CLEAN + dataDate + "/"
+                    , OssPath.DATA_CLEAN + date[0] + "/"+ date[1] + "/"+ date[2] + "/"
                     , item.getLineId() + ".txt");
             //存储数据
             bak.setFilePath(fileName);
         }
         pqDataVerifyNewFeignClient.insertData(bak);
         resultData=null;
-        logger.info( dataDate+"总数据：" + size + "=====》当前第" + i+"已完成！");
         System.gc();
     }
 

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

@@ -5,6 +5,7 @@ import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.collection.ListUtil;
 import cn.hutool.core.date.DatePattern;
 import cn.hutool.core.date.LocalDateTimeUtil;
+import cn.hutool.core.util.ArrayUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.njcn.algorithm.pojo.bo.CalculatedParam;
 import com.njcn.algorithm.service.line.IDataCrossingService;
@@ -42,10 +43,8 @@ import java.lang.reflect.Method;
 import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.time.LocalDateTime;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
+import java.util.*;
+import java.util.concurrent.CompletableFuture;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
@@ -60,7 +59,7 @@ import java.util.stream.Collectors;
 public class IDataCrossingServiceImpl implements IDataCrossingService {
 
     private static final Logger logger = LoggerFactory.getLogger(DayDataServiceImpl.class);
-    @Value("${line.num}")
+    @Value("${line.num:10}")
     private Integer NUM;
 
     @Resource
@@ -105,14 +104,28 @@ public class IDataCrossingServiceImpl implements IDataCrossingService {
         }
         Map<String, Overlimit> overLimitMap = overLimitList.stream().collect(Collectors.toMap(Overlimit::getId, Function.identity()));
         //以100个监测点分片处理
-        List<List<String>> pendingIds = ListUtils.partition(lineIds, 1);
-        ArrayList<String> phase = ListUtil.toList(PhaseType.PHASE_A, PhaseType.PHASE_B, PhaseType.PHASE_C);
         MemorySizeUtil.getNowMemory();
-        for (int i = 0; i < pendingIds.size(); i++) {
-            logger.info(calculatedParam.getDataDate()+" 总分区数据：" + pendingIds.size() + "=====》当前第"+(i + 1)+"小分区");
-            List<String> list = pendingIds.get(i);
-            dataLimitRateAsync.lineDataRate(calculatedParam.getDataDate(), list, phase, overLimitMap, pendingIds.size(), (i + 1), lineParam.getType());
+        List<List<String>> pendingIds = ListUtils.partition(lineIds, 20);
+        ArrayList<String> phase = ListUtil.toList(PhaseType.PHASE_A, PhaseType.PHASE_B, PhaseType.PHASE_C);
+
+        for (List<String> pendingId : pendingIds) {
+            List<CompletableFuture<Void>> futures = new ArrayList<>();
+            for (String s : pendingId) {
+                CompletableFuture<Void> future = dataLimitRateAsync.lineDataRate(
+                        calculatedParam.getDataDate(),
+                        Arrays.asList(s),
+                        phase,
+                        overLimitMap,
+                        pendingId.size(),
+                        pendingId.size(),
+                        lineParam.getType()
+                );
+                futures.add(future);
+            }
+            CompletableFuture.allOf(futures.toArray(new CompletableFuture[0])).join();
         }
+        // 等待所有任务完成
+        System.err.println("limitRate表转r_stat_limit_rate_d算法开始，执行日期为{}，执行完成=====》"+calculatedParam.getDataDate());
         System.gc();
     }
 
@@ -153,7 +166,8 @@ public class IDataCrossingServiceImpl implements IDataCrossingService {
 
     @Override
     public void limitQualifiedDayHandler(CalculatedParam calculatedParam) {
-        logger.info("{},r_stat_limit_qualified_d算法开始=====》", LocalDateTime.now());
+        MemorySizeUtil.getNowMemory();
+        logger.info("{},{}r_stat_limit_qualified_d算法开始=====》", LocalDateTime.now(),calculatedParam.getDataDate());
         LineCountEvaluateParam lineParam = new LineCountEvaluateParam();
         lineParam.setStartTime(TimeUtils.getBeginOfDay(calculatedParam.getDataDate()));
         lineParam.setEndTime(TimeUtils.getEndOfDay(calculatedParam.getDataDate()));

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

@@ -5,6 +5,7 @@ import cn.hutool.core.date.DatePattern;
 import cn.hutool.core.date.LocalDateTimeUtil;
 import com.njcn.algorithm.pojo.bo.CalculatedParam;
 import com.njcn.algorithm.service.line.IDataIntegrityService;
+import com.njcn.algorithm.utils.MemorySizeUtil;
 import com.njcn.dataProcess.api.DataIntegrityFeignClient;
 import com.njcn.dataProcess.api.DataVFeignClient;
 import com.njcn.dataProcess.dto.MeasurementCountDTO;
@@ -42,8 +43,8 @@ public class IDataIntegrityServiceImpl implements IDataIntegrityService {
 
     private static final Logger logger = LoggerFactory.getLogger(IDataIntegrityServiceImpl.class);
 
-    @Value("${line.num}")
-    private  Integer NUM = 100;
+    @Value("${line.num:10}")
+    private  Integer NUM;
     @Resource
     private CommTerminalGeneralClient commTerminalGeneralClient;
     @Resource
@@ -54,7 +55,8 @@ public class IDataIntegrityServiceImpl implements IDataIntegrityService {
 
     @Override
     public void dataIntegrity(CalculatedParam<String> calculatedParam) {
-        logger.info("{},integrity表转r_stat_integrity_d算法开始=====》", LocalDateTime.now());
+        MemorySizeUtil.getNowMemory();
+        logger.info("{},{}integrity表转r_stat_integrity_d算法开始=====》", LocalDateTime.now(),calculatedParam.getDataDate());
         List<DataIntegrityDto> poList = new ArrayList<>();
         List<String> lineIds = calculatedParam.getIdList();
         String beginDay = LocalDateTimeUtil.format(

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

@@ -18,6 +18,7 @@ import com.njcn.influx.pojo.constant.InfluxDBTableConstant;
 import lombok.extern.slf4j.Slf4j;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
@@ -25,6 +26,7 @@ import org.springframework.util.CollectionUtils;
 import javax.annotation.Resource;
 import java.lang.reflect.Method;
 import java.util.*;
+import java.util.concurrent.CompletableFuture;
 import java.util.stream.Collectors;
 
 /**
@@ -52,17 +54,22 @@ public class IDataLimitRateAsyncImpl implements IDataLimitRateAsync {
     private DataLimitRateFeignClient dataLimitRateFeignClient;
     @Resource
     private DataLimitRateDetailFeignClient dataLimitRateDetailFeignClient;
+    /**
+     * 查询配置 辽宁版本比较特殊，没有CP95值，采用平均值进行判断
+     */
+    @Value("${version.used:master}")
+    private String versionUsed;
 
 
     @Override
     @Async("asyncExecutor")
-    public void lineDataRate(String dataDate,
-                             List<String> list,
-                             List<String> phase,
-                             Map<String, Overlimit> overLimitMap,
-                             int size,
-                             int i,
-                             int type) {
+    public CompletableFuture<Void> lineDataRate(String dataDate,
+                                                List<String> list,
+                                                List<String> phase,
+                                                Map<String, Overlimit> overLimitMap,
+                                                int size,
+                                                int i,
+                                                int type) {
         List<DataLimitDetailDto> result = new ArrayList<>();
         LineCountEvaluateParam lineParam = new LineCountEvaluateParam();
         lineParam.setStartTime(TimeUtils.getBeginOfDay(dataDate));
@@ -79,6 +86,7 @@ public class IDataLimitRateAsyncImpl implements IDataLimitRateAsync {
         List<DataHarmDto> dataVInHarmList = dataInharmVFeignClient.getRawData(lineParam).getData();
         //电流数据
         List<DataIDto> dataIList = dataIFeignClient.getRawData(lineParam).getData();
+
         /**
          * 功能描述:获取influxDB -> data_v ->
          *              总计算次数(用data_v中phasic_type=A,value_type=avg,quality_flag=0来参与统计)
@@ -121,53 +129,108 @@ public class IDataLimitRateAsyncImpl implements IDataLimitRateAsync {
          *功能描述:获取influxDB -> data_harmrate_v ->
          *              2-25次谐波电压含有率 -> A相||B相||C相的日95%概率值
          */
-        Map<String, List<DataHarmDto>> harmRateV = dataVHarmList.stream()
-                .filter(x -> phase.contains(x.getPhasicType()))
-                .filter(x -> InfluxDBTableConstant.CP95.equalsIgnoreCase(x.getValueType()))
-                .collect(Collectors.groupingBy(DataHarmDto::getLineId));
+        Map<String, List<DataHarmDto>> harmRateV;
+        if (Objects.equals(versionUsed, "liaoning")) {
+            harmRateV = dataVHarmList.stream()
+                    .filter(x -> phase.contains(x.getPhasicType()))
+                    .filter(x -> InfluxDBTableConstant.AVG.equalsIgnoreCase(x.getValueType()))
+                    .peek(x -> x.setValueType(InfluxDBTableConstant.CP95))
+                    .collect(Collectors.groupingBy(DataHarmDto::getLineId));
+        } else {
+            harmRateV = dataVHarmList.stream()
+                    .filter(x -> phase.contains(x.getPhasicType()))
+                    .filter(x -> InfluxDBTableConstant.CP95.equalsIgnoreCase(x.getValueType()))
+                    .collect(Collectors.groupingBy(DataHarmDto::getLineId));
+        }
 
         /**
          * 功能描述:获取influxDB -> data_i -> 2-25次谐波电流 -> 日95%概率值
          */
-        Map<String, List<DataIDto>> dataI = dataIList.stream()
-                .filter(x -> phase.contains(x.getPhasicType()))
-                .filter(x -> InfluxDBTableConstant.CP95.equalsIgnoreCase(x.getValueType()))
-                .collect(Collectors.groupingBy(DataIDto::getLineId));
-
+        Map<String, List<DataIDto>> dataI;
+        if (Objects.equals(versionUsed, "liaoning")) {
+            dataI = dataIList.stream()
+                    .filter(x -> phase.contains(x.getPhasicType()))
+                    .filter(x -> InfluxDBTableConstant.AVG.equalsIgnoreCase(x.getValueType()))
+                    .peek(x -> x.setValueType(InfluxDBTableConstant.CP95))
+                    .collect(Collectors.groupingBy(DataIDto::getLineId));
+        } else {
+            dataI = dataIList.stream()
+                    .filter(x -> phase.contains(x.getPhasicType()))
+                    .filter(x -> InfluxDBTableConstant.CP95.equalsIgnoreCase(x.getValueType()))
+                    .collect(Collectors.groupingBy(DataIDto::getLineId));
+        }
 
         /**
          * 功能描述:获取influxDB -> data_inharm_v -> 0.5-15.5次间谐波电压含有率 -> 日95%概率值
          */
-        Map<String, List<DataHarmDto>> inHarmV = dataVInHarmList.stream()
-                .filter(x -> phase.contains(x.getPhasicType()))
-                .filter(x -> InfluxDBTableConstant.CP95.equalsIgnoreCase(x.getValueType()))
-                .collect(Collectors.groupingBy(DataHarmDto::getLineId));
+        Map<String, List<DataHarmDto>> inHarmV;
+        if (Objects.equals(versionUsed, "liaoning")) {
+            inHarmV = dataVInHarmList.stream()
+                    .filter(x -> phase.contains(x.getPhasicType()))
+                    .filter(x -> InfluxDBTableConstant.AVG.equalsIgnoreCase(x.getValueType()))
+                    .peek(x -> x.setValueType(InfluxDBTableConstant.CP95))
+                    .collect(Collectors.groupingBy(DataHarmDto::getLineId));
+        } else {
+            inHarmV = dataVInHarmList.stream()
+                    .filter(x -> phase.contains(x.getPhasicType()))
+                    .filter(x -> InfluxDBTableConstant.CP95.equalsIgnoreCase(x.getValueType()))
+                    .collect(Collectors.groupingBy(DataHarmDto::getLineId));
+        }
 
         /**
          * 功能描述:获取influxDB -> data_v -> 电压总谐波畸变率 -> 日95%概率值
          */
-        Map<String, List<DataVDto>> dataVThd = dataVAllTime.stream()
-                .filter(x -> phase.contains(x.getPhasicType()))
-                .filter(x -> InfluxDBTableConstant.CP95.equalsIgnoreCase(x.getValueType()))
-                .collect(Collectors.groupingBy(DataVDto::getLineId));
+        Map<String, List<DataVDto>> dataVThd;
+        if (Objects.equals(versionUsed, "liaoning")) {
+            dataVThd = dataVAllTime.stream()
+                    .filter(x -> phase.contains(x.getPhasicType()))
+                    .filter(x -> InfluxDBTableConstant.AVG.equalsIgnoreCase(x.getValueType()))
+                    .peek(x -> x.setValueType(InfluxDBTableConstant.CP95))
+                    .collect(Collectors.groupingBy(DataVDto::getLineId));
+        } else {
+            dataVThd = dataVAllTime.stream()
+                    .filter(x -> phase.contains(x.getPhasicType()))
+                    .filter(x -> InfluxDBTableConstant.CP95.equalsIgnoreCase(x.getValueType()))
+                    .collect(Collectors.groupingBy(DataVDto::getLineId));
+        }
 
         /**
          * 功能描述:获取influxDB -> data_v -> 负序电压不平衡度 -> 最大值 && 日95%概率值
          */
-        Map<String, List<DataVDto>> dataVUnbalance = dataVAllTime.stream()
-                .filter(x -> InfluxDBTableConstant.PHASE_TYPE_T.equalsIgnoreCase(x.getPhasicType()))
-                .filter(x -> InfluxDBTableConstant.CP95.equalsIgnoreCase(x.getValueType()) ||
-                        InfluxDBTableConstant.MAX.equalsIgnoreCase(x.getValueType()))
-                .collect(Collectors.groupingBy(DataVDto::getLineId));
+        Map<String, List<DataVDto>> dataVUnbalance;
+        if (Objects.equals(versionUsed, "liaoning")) {
+            dataVUnbalance = dataVAllTime.stream()
+                    .filter(x -> InfluxDBTableConstant.PHASE_TYPE_T.equalsIgnoreCase(x.getPhasicType()))
+                    .filter(x -> InfluxDBTableConstant.AVG.equalsIgnoreCase(x.getValueType()) ||
+                            InfluxDBTableConstant.MAX.equalsIgnoreCase(x.getValueType()))
+//                    .peek(x -> x.setValueType(InfluxDBTableConstant.CP95))
+                    .collect(Collectors.groupingBy(DataVDto::getLineId));
+        } else {
+            dataVUnbalance = dataVAllTime.stream()
+                    .filter(x -> InfluxDBTableConstant.PHASE_TYPE_T.equalsIgnoreCase(x.getPhasicType()))
+                    .filter(x -> InfluxDBTableConstant.CP95.equalsIgnoreCase(x.getValueType()) ||
+                            InfluxDBTableConstant.MAX.equalsIgnoreCase(x.getValueType()))
+                    .collect(Collectors.groupingBy(DataVDto::getLineId));
+        }
 
         /**
          * 功能描述:获取influxDB -> data_i -> 负序电流 -> 最大值 && 日95%概率值
          */
-        Map<String, List<DataIDto>> dataINeg = dataIList.stream()
-                .filter(x -> InfluxDBTableConstant.PHASE_TYPE_T.equalsIgnoreCase(x.getPhasicType()))
-                .filter(x -> InfluxDBTableConstant.CP95.equalsIgnoreCase(x.getValueType()) ||
-                        InfluxDBTableConstant.MAX.equalsIgnoreCase(x.getValueType()))
-                .collect(Collectors.groupingBy(DataIDto::getLineId));
+        Map<String, List<DataIDto>> dataINeg;
+        if (Objects.equals(versionUsed, "liaoning")) {
+            dataINeg = dataIList.stream()
+                    .filter(x -> InfluxDBTableConstant.PHASE_TYPE_T.equalsIgnoreCase(x.getPhasicType()))
+                    .filter(x -> InfluxDBTableConstant.AVG.equalsIgnoreCase(x.getValueType()) ||
+                            InfluxDBTableConstant.MAX.equalsIgnoreCase(x.getValueType()))
+                    .peek(x -> x.setValueType(InfluxDBTableConstant.CP95))
+                    .collect(Collectors.groupingBy(DataIDto::getLineId));
+        } else {
+            dataINeg = dataIList.stream()
+                    .filter(x -> InfluxDBTableConstant.PHASE_TYPE_T.equalsIgnoreCase(x.getPhasicType()))
+                    .filter(x -> InfluxDBTableConstant.CP95.equalsIgnoreCase(x.getValueType()) ||
+                            InfluxDBTableConstant.MAX.equalsIgnoreCase(x.getValueType()))
+                    .collect(Collectors.groupingBy(DataIDto::getLineId));
+        }
 
         /**
          * 功能描述:获取influxDB -> data_v -> 频率偏差 -> 最大值 && 最小值
@@ -231,12 +294,14 @@ public class IDataLimitRateAsyncImpl implements IDataLimitRateAsync {
                 dataLimitRateDetailFeignClient.batchInsertion(detail);
             }
         }
-        logger.info(dataDate + " 总分区数据：" + size + "=====》当前第" + i + "小分区已完成！");
+//        logger.info(dataDate + " 总分区数据：" + size + "=====》当前第" + i + "小分区已完成！");
         result = null;
-        if(i==size){
-            MemorySizeUtil.getNowMemory();
-        }
+//        if(i==size){
+//            MemorySizeUtil.getNowMemory();
+//        }
         System.gc();
+
+        return CompletableFuture.completedFuture(null);
     }
 
     /**
@@ -304,9 +369,6 @@ public class IDataLimitRateAsyncImpl implements IDataLimitRateAsync {
         result.add(c);
         result.add(t);
 
-
-
-
         return result;
     }
 
@@ -579,12 +641,20 @@ public class IDataLimitRateAsyncImpl implements IDataLimitRateAsync {
                 }
             }
         }
-        //三相电压不平衡度
+        //  三相电压不平衡度
+        //  短时（对应测量值日统计的最大值）4%
+        //  一般（对应测量值日统计的95%概率大值）2%
         if (!CollectionUtils.isEmpty(dataVPOUnbalanceList)) {
             for (DataVDto item : dataVPOUnbalanceList) {
                 if (ObjectUtil.isNotNull(item.getVUnbalance())) {
-                    if (item.getVUnbalance() > overlimit.getUbalance()) {
-                        addAbnormalData(sx, item.getPhasicType(), item.getValueType(), item.getMinTime(), item.getVUnbalance(), overlimit.getUbalance());
+                    if (InfluxDBTableConstant.MAX.equalsIgnoreCase(item.getValueType())) {
+                        if (item.getVUnbalance() > 4.0) {
+                            addAbnormalData(sx, item.getPhasicType(), item.getValueType(), item.getMinTime(), item.getVUnbalance(), 4.0f);
+                        }
+                    } else {
+                        if (item.getVUnbalance() > 2.0) {
+                            addAbnormalData(sx, item.getPhasicType(), "CP95", item.getMinTime(), item.getVUnbalance(), 2.0f);
+                        }
                     }
                 }
             }

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

@@ -9,6 +9,7 @@ import cn.hutool.core.util.NumberUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.njcn.algorithm.pojo.bo.CalculatedParam;
 import com.njcn.algorithm.service.line.IDataOnlineRateService;
+import com.njcn.algorithm.utils.MemorySizeUtil;
 import com.njcn.dataProcess.api.DataIntegrityFeignClient;
 import com.njcn.dataProcess.api.DataOnlineRateFeignClient;
 import com.njcn.dataProcess.api.DataVFeignClient;
@@ -48,8 +49,8 @@ public class IDataOnlineRateServiceImpl implements IDataOnlineRateService {
 
     private static final Logger logger = LoggerFactory.getLogger(IDataOnlineRateServiceImpl.class);
 
-    @Value("${line.num}")
-    private Integer NUM = 100;
+    @Value("${line.num:10}")
+    private Integer NUM;
 
     private final Integer online = 1;
     private final Integer offline = 0;
@@ -69,7 +70,8 @@ public class IDataOnlineRateServiceImpl implements IDataOnlineRateService {
 
     @Override
     public void dataOnlineRate(CalculatedParam calculatedParam) {
-        logger.info("{},onlineRate表转r_stat_onlinerate_d算法开始=====》", LocalDateTime.now());
+        MemorySizeUtil.getNowMemory();
+        logger.info("{},{}onlineRate表转r_stat_onlinerate_d算法开始=====》", LocalDateTime.now(),calculatedParam.getDataDate());
         LineCountEvaluateParam lineParam = new LineCountEvaluateParam();
         lineParam.setStartTime(TimeUtils.getBeginOfDay(calculatedParam.getDataDate()));
         lineParam.setEndTime(TimeUtils.getEndOfDay(calculatedParam.getDataDate()));
@@ -247,6 +249,8 @@ public class IDataOnlineRateServiceImpl implements IDataOnlineRateService {
                 long differ = DateUtil.between(date, newDate, DateUnit.MINUTE);
                 if (online.equals(type)) {
                     minute = InfluxDBPublicParam.DAY_MINUTE - (int) differ;
+                }else{
+                    minute = (int) differ;
                 }
             } else {
                 List<PqsCommunicateDto> communicateDataOld = communicateFeignClient.getRawDataEnd(lineParam).getData();

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

@@ -7,6 +7,7 @@ import cn.hutool.core.date.LocalDateTimeUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.njcn.algorithm.pojo.bo.CalculatedParam;
 import com.njcn.algorithm.service.line.IEventDetailService;
+import com.njcn.algorithm.utils.MemorySizeUtil;
 import com.njcn.dataProcess.api.EventDetailFeignClient;
 import com.njcn.dataProcess.api.RmpEventDetailFeignClient;
 import com.njcn.dataProcess.dto.RmpEventDetailDTO;
@@ -44,8 +45,8 @@ import java.util.stream.Collectors;
 @RequiredArgsConstructor
 public class IEventDetailServiceImpl implements IEventDetailService {
     private static final Logger logger = LoggerFactory.getLogger(IDataOnlineRateServiceImpl.class);
-    @Value("${line.num}")
-    private Integer NUM = 10;
+    @Value("${line.num:10}")
+    private Integer NUM;
     @Resource
     private RmpEventDetailFeignClient eventDetailFeignClient;
     @Resource
@@ -55,7 +56,8 @@ public class IEventDetailServiceImpl implements IEventDetailService {
 
     @Override
     public void dataDayHandle(CalculatedParam<String> calculatedParam) {
-        logger.info("{},r_mp_event_detail_d算法开始=====》", LocalDateTime.now());
+        MemorySizeUtil.getNowMemory();
+        logger.info("{},{}r_mp_event_detail_d算法开始=====》", LocalDateTime.now(),calculatedParam.getDataDate());
         List<DataEventDetailDto> result = new ArrayList<>();
         //远程接口获取分钟数据
         LineCountEvaluateParam lineParam = new LineCountEvaluateParam();
@@ -106,7 +108,8 @@ public class IEventDetailServiceImpl implements IEventDetailService {
 
     @Override
     public void dataMonthHandle(CalculatedParam<String> calculatedParam) {
-        logger.info("{},r_mp_event_detail_m算法开始=====》", LocalDateTime.now());
+        MemorySizeUtil.getNowMemory();
+        logger.info("{},{}r_mp_event_detail_m算法开始=====》", LocalDateTime.now(),calculatedParam.getDataDate());
         List<DataEventDetailDto> result = new ArrayList<>();
         //远程接口获取分钟数据
         LineCountEvaluateParam lineParam = new LineCountEvaluateParam();
@@ -139,7 +142,8 @@ public class IEventDetailServiceImpl implements IEventDetailService {
 
     @Override
     public void dataQuarterHandle(CalculatedParam<String> calculatedParam) {
-        logger.info("{},r_mp_event_detail_q算法开始=====》", LocalDateTime.now());
+        MemorySizeUtil.getNowMemory();
+        logger.info("{},{}r_mp_event_detail_q算法开始=====》", LocalDateTime.now(),calculatedParam.getDataDate());
         List<DataEventDetailDto> result = new ArrayList<>();
         //远程接口获取分钟数据
         LineCountEvaluateParam lineParam = new LineCountEvaluateParam();
@@ -172,7 +176,8 @@ public class IEventDetailServiceImpl implements IEventDetailService {
 
     @Override
     public void dataYearHandle(CalculatedParam<String> calculatedParam) {
-        logger.info("{},r_mp_event_detail_y算法开始=====》", LocalDateTime.now());
+        MemorySizeUtil.getNowMemory();
+        logger.info("{},{}r_mp_event_detail_y算法开始=====》", LocalDateTime.now(),calculatedParam.getDataDate());
         List<DataEventDetailDto> result = new ArrayList<>();
         //远程接口获取分钟数据
         LineCountEvaluateParam lineParam = new LineCountEvaluateParam();

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

@@ -49,8 +49,8 @@ import java.util.stream.Stream;
 @RequiredArgsConstructor
 public class PollutionServiceImpl implements IPollutionService {
 
-    @Value("${line.num}")
-    private Integer NUM = 100;
+    @Value("${line.num:10}")
+    private Integer NUM;
 
     @Resource
     private PqDataVerifyFeignClient pqDataVerifyFeignClient;
@@ -101,7 +101,7 @@ public class PollutionServiceImpl implements IPollutionService {
             Map<String, DataPollutionD> interHarmonicVoltageList = getInterharmonicVoltage(lineCountEvaluateParam, limitMap);
             Map<String, DataPollutionD> voltageFlickerList = getVoltageFlicker(lineCountEvaluateParam, limitMap);
 
-            List<DataPollutionD> pollutionList = processPollutionList(local, idList, dictData, harmonicVoltageList, harmonicCurrentList, frequencyDeviationList, voltageDeviationList,
+            List<DataPollutionD> pollutionList = processPollutionList(local, list, dictData, harmonicVoltageList, harmonicCurrentList, frequencyDeviationList, voltageDeviationList,
                     threePhaseVoltageList, negativeSequenceList, interHarmonicVoltageList, voltageFlickerList);
 
             if (CollUtil.isNotEmpty(pollutionList)) {

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

@@ -1,14 +1,16 @@
-package com.njcn.dataProcess.service.impl.relation;
+package com.njcn.algorithm.serviceimpl.line;
 
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.njcn.dataProcess.dao.relation.mapper.PqReasonableRangeMapper;
-import com.njcn.dataProcess.param.DataCleanParam;
-import com.njcn.dataProcess.pojo.dto.PqReasonableRangeDto;
-import com.njcn.dataProcess.pojo.po.PqReasonableRange;
-import com.njcn.dataProcess.service.IPqReasonableRangeService;
+import com.njcn.algorithm.mapper.PqReasonableRangeMapper;
+import com.njcn.algorithm.pojo.dto.PqReasonableRangeDto;
+import com.njcn.algorithm.pojo.param.DataCleanParam;
+import com.njcn.algorithm.pojo.po.PqReasonableRange;
+import com.njcn.algorithm.service.line.IPqReasonableRangeService;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 
@@ -23,14 +25,18 @@ import java.util.List;
  * @author xy
  * @since 2025-02-13
  */
+@Slf4j
 @Service
+@RequiredArgsConstructor
 public class PqReasonableRangeServiceImpl extends ServiceImpl<PqReasonableRangeMapper, PqReasonableRange> implements IPqReasonableRangeService {
 
     @Override
     public List<PqReasonableRangeDto> getReasonableRangeList(DataCleanParam param) {
         List<PqReasonableRangeDto> result = new ArrayList<>();
         LambdaQueryWrapper<PqReasonableRange> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.eq(PqReasonableRange::getBelongingSystem,param.getSystemType());
+        if (StrUtil.isNotBlank(param.getSystemType())) {
+            queryWrapper.eq(PqReasonableRange::getBelongingSystem,param.getSystemType());
+        }
         if(StrUtil.isNotBlank(param.getDataSource())){
             queryWrapper.eq(PqReasonableRange::getDataSource,param.getDataSource());
         }
@@ -48,4 +54,29 @@ public class PqReasonableRangeServiceImpl extends ServiceImpl<PqReasonableRangeM
         }
         return result;
     }
+
+    @Override
+    public boolean savePqReasonableRange(PqReasonableRangeDto dto) {
+        PqReasonableRange entity = new PqReasonableRange();
+        BeanUtils.copyProperties(dto, entity);
+        entity.setState(1);
+        return this.save(entity);
+    }
+
+    @Override
+    public boolean updatePqReasonableRange(PqReasonableRangeDto dto) {
+        PqReasonableRange entity = new PqReasonableRange();
+        BeanUtils.copyProperties(dto, entity);
+        return this.updateById(entity);
+    }
+
+    @Override
+    public boolean deletePqReasonableRange(String id) {
+        PqReasonableRange entity = this.getById(id);
+        if (entity != null) {
+            entity.setState(0);
+            return this.updateById(entity);
+        }
+        return false;
+    }
 }

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

@@ -21,13 +21,14 @@ import com.njcn.device.biz.commApi.CommLineClient;
 import com.njcn.device.biz.pojo.dto.LineDTO;
 import com.njcn.device.pms.pojo.param.MonitorTerminalParam;
 import com.njcn.device.pq.api.LineFeignClient;
+import com.njcn.device.pq.api.UserLedgerFeignClient;
 import com.njcn.device.pq.pojo.vo.LineDetailDataVO;
 import com.njcn.event.api.EventDetailFeignClient;
 import com.njcn.event.api.TransientFeignClient;
 import com.njcn.event.file.pojo.dto.WaveDataDTO;
 import com.njcn.event.pojo.param.EventCountParam;
 import com.njcn.event.pojo.po.RmpEventDetailPO;
-import com.njcn.supervision.api.UserLedgerFeignClient;
+import com.njcn.supervision.api.UserLedgerOldFeignClient;
 import com.njcn.supervision.pojo.vo.user.NewUserReportVO;
 import com.njcn.system.api.DicDataFeignClient;
 import com.njcn.system.api.DictTreeFeignClient;
@@ -65,8 +66,8 @@ import java.util.stream.Collectors;
 @RequiredArgsConstructor
 public class SpecialAnalysisServiceImpl implements ISpecialAnalysisService {
 
-
-    private Integer NUM=10;
+    @Value("${line.num:10}")
+    private Integer NUM;
     @Resource
     private EventDetailFeignClient eventDetailFeignClient;
     @Resource

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

@@ -0,0 +1,76 @@
+#当前服务的基本信息
+microservice:
+  ename: @artifactId@
+  name: '@name@'
+  version: @version@
+  sentinel:
+    url: @sentinel.url@
+  gateway:
+    url: @gateway.url@
+server:
+  port: 10401
+#feign接口开启服务熔断降级处理
+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@
+  cloud:
+    nacos:
+      discovery:
+        server-addr: @nacos.url@
+        namespace: @nacos.namespace@
+      config:
+        username: @nacos.username@
+        password: @nacos.password@
+        server-addr: @nacos.url@
+        namespace: @nacos.namespace@
+        file-extension: yaml
+        shared-configs:
+          - data-id: share-config.yaml
+            refresh: true
+          - data-id: share-config-datasource-db.yaml
+            refresh: true
+  main:
+    allow-bean-definition-overriding: true
+
+liteflow:
+  rule-source-ext-data-map:
+    serverAddr: @nacos.url@
+    dataId: prepare_liteflow
+    group: DEFAULT_GROUP
+    namespace: @nacos.namespace@
+    username: @nacos.username@
+    password: @nacos.password@
+  when-max-wait-time: 3600000
+  print-banner: false
+
+
+#项目日志的配置
+logging:
+  config: http://@nacos.url@/nacos/v1/cs/configs?tenant=@nacos.namespace@&group=DEFAULT_GROUP&dataId=logback.xml
+  level:
+    root: info
+    com.alibaba.nacos.client: INFO
+
+
+#mybatis配置信息
+mybatis-plus:
+  #别名扫描
+  type-aliases-package: com.njcn.harmonic.pojo
+line:
+  num: 20
+
+mqtt:
+  client-id: @artifactId@${random.value}

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

@@ -0,0 +1,79 @@
+#当前服务的基本信息
+microservice:
+  ename: @artifactId@
+  name: '@name@'
+  version: @version@
+  sentinel:
+    url: @sentinel.url@
+  gateway:
+    url: @gateway.url@
+server:
+  port: 10401
+#feign接口开启服务熔断降级处理
+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@
+  cloud:
+    nacos:
+      discovery:
+        ip: @service.server.url@
+        server-addr: @nacos.url@
+        namespace: @nacos.namespace@
+        username: @nacos.username@
+        password: @nacos.password@
+      config:
+        server-addr: @nacos.url@
+        namespace: @nacos.namespace@
+        username: @nacos.username@
+        password: @nacos.password@
+        file-extension: yaml
+        shared-configs:
+          - data-id: share-config.yaml
+            refresh: true
+          - data-Id: share-config-datasource-db.yaml
+            refresh: true
+  main:
+    allow-bean-definition-overriding: true
+
+liteflow:
+  rule-source-ext-data-map:
+    serverAddr: @nacos.url@
+    dataId: prepare_liteflow
+    group: DEFAULT_GROUP
+    namespace: @nacos.namespace@
+    username: @nacos.username@
+    password: @nacos.password@
+  when-max-wait-time: 3600000
+  print-banner: false
+
+
+#项目日志的配置
+logging:
+  #config: http://@nacos.url@/nacos/v1/cs/configs?tenant=@nacos.namespace@&group=DEFAULT_GROUP&dataId=logback.xml
+  level:
+    root: info
+    com.alibaba.nacos.client: INFO
+
+
+#mybatis配置信息
+mybatis-plus:
+  #别名扫描
+  type-aliases-package: com.njcn.harmonic.pojo
+line:
+  num: 20
+
+#mqtt:
+#  client-id: @artifactId@${random.value}

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

@@ -1,72 +1,3 @@
-#当前服务的基本信息
-microservice:
-  ename: @artifactId@
-  name: '@name@'
-  version: @version@
-  sentinel:
-    url: @sentinel.url@
-  gateway:
-    url: @gateway.url@
-server:
-  port: 10401
-#feign接口开启服务熔断降级处理
-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@
-  cloud:
-    nacos:
-      discovery:
-        ip: @service.server.url@
-        server-addr: @nacos.url@
-        namespace: @nacos.namespace@
-      config:
-        server-addr: @nacos.url@
-        namespace: @nacos.namespace@
-        file-extension: yaml
-        shared-configs:
-          - data-id: share-config.yaml
-            refresh: true
-          - data-Id: share-config-datasource-db.yaml
-            refresh: true
-  main:
-    allow-bean-definition-overriding: true
-
-liteflow:
-  rule-source-ext-data-map:
-    serverAddr: @nacos.url@
-    dataId: prepare_liteflow
-    group: DEFAULT_GROUP
-    namespace: @nacos.namespace@
-  when-max-wait-time: 600000
-  print-banner: false
-
-
-#项目日志的配置
-logging:
-  config: http://@nacos.url@/nacos/v1/cs/configs?tenant=@nacos.namespace@&group=DEFAULT_GROUP&dataId=logback.xml
-  level:
-    root: error
-
-
-#mybatis配置信息
-mybatis-plus:
-  #别名扫描
-  type-aliases-package: com.njcn.harmonic.pojo
-line:
-  num: 10
-
-mqtt:
-  client-id: @artifactId@${random.value}
+  profiles:
+    active: @spring.profiles.active@

analysis/stat/stat-api/src/main/java/com/njcn/stat/utils/BeanIConverter.java

@@ -18,6 +18,28 @@ import java.util.Objects;
  * @version V1.0.0
  */
 public class BeanIConverter {
+    /**
+     * 角度相关常量
+     */
+    private static final double ANGLE_180 = 180.0;
+    private static final double ANGLE_360 = 360.0;
+    private static final double ANGLE_MINUS_180 = -180.0;
+
+    public static Double adjustPhase(Double phase) {
+        if (phase == null) {
+            return null;
+        }
+        // 使用模运算将角度标准化到[-180, 180]范围
+        double normalizedPhase = phase % ANGLE_360;
+        // 处理超出[-180, 180]范围的情况
+        if (normalizedPhase > ANGLE_180) {
+            normalizedPhase -= ANGLE_360;
+        } else if (normalizedPhase < ANGLE_MINUS_180) {
+            normalizedPhase += ANGLE_360;
+        }
+
+        return normalizedPhase;
+    }
     //A,B,C三项
     public static DataIDTO messageDataITODataI(MessageDataI messageDataI){
         DataIDTO dataI = new DataIDTO();
@@ -283,209 +305,209 @@ public class BeanIConverter {
     public static DataHarmphasicIDTO messageDataITODataHarmphasicI(MessageDataI messageDataI){
         DataHarmphasicIDTO dataHarmphasicI = new DataHarmphasicIDTO();
         if(Objects.nonNull(messageDataI)){
-            dataHarmphasicI.setI1(messageDataI.getIfundAngle());
-            dataHarmphasicI.setI2(messageDataI.getIa2());
-            dataHarmphasicI.setI3(messageDataI.getIa3());
-            dataHarmphasicI.setI4(messageDataI.getIa4());
-            dataHarmphasicI.setI5(messageDataI.getIa5());
-            dataHarmphasicI.setI6(messageDataI.getIa6());
-            dataHarmphasicI.setI7(messageDataI.getIa7());
-            dataHarmphasicI.setI8(messageDataI.getIa8());
-            dataHarmphasicI.setI9(messageDataI.getIa9());
-            dataHarmphasicI.setI10(messageDataI.getIa10());
-            dataHarmphasicI.setI11(messageDataI.getIa11());
-            dataHarmphasicI.setI12(messageDataI.getIa12());
-            dataHarmphasicI.setI13(messageDataI.getIa13());
-            dataHarmphasicI.setI14(messageDataI.getIa14());
-            dataHarmphasicI.setI15(messageDataI.getIa15());
-            dataHarmphasicI.setI16(messageDataI.getIa16());
-            dataHarmphasicI.setI17(messageDataI.getIa17());
-            dataHarmphasicI.setI18(messageDataI.getIa18());
-            dataHarmphasicI.setI19(messageDataI.getIa19());
-            dataHarmphasicI.setI20(messageDataI.getIa20());
-            dataHarmphasicI.setI21(messageDataI.getIa21());
-            dataHarmphasicI.setI22(messageDataI.getIa22());
-            dataHarmphasicI.setI23(messageDataI.getIa23());
-            dataHarmphasicI.setI24(messageDataI.getIa24());
-            dataHarmphasicI.setI25(messageDataI.getIa25());
-            dataHarmphasicI.setI26(messageDataI.getIa26());
-            dataHarmphasicI.setI27(messageDataI.getIa27());
-            dataHarmphasicI.setI28(messageDataI.getIa28());
-            dataHarmphasicI.setI29(messageDataI.getIa29());
-            dataHarmphasicI.setI30(messageDataI.getIa30());
-            dataHarmphasicI.setI31(messageDataI.getIa31());
-            dataHarmphasicI.setI32(messageDataI.getIa32());
-            dataHarmphasicI.setI33(messageDataI.getIa33());
-            dataHarmphasicI.setI34(messageDataI.getIa34());
-            dataHarmphasicI.setI35(messageDataI.getIa35());
-            dataHarmphasicI.setI36(messageDataI.getIa36());
-            dataHarmphasicI.setI37(messageDataI.getIa37());
-            dataHarmphasicI.setI38(messageDataI.getIa38());
-            dataHarmphasicI.setI39(messageDataI.getIa39());
-            dataHarmphasicI.setI40(messageDataI.getIa40());
-            dataHarmphasicI.setI41(messageDataI.getIa41());
-            dataHarmphasicI.setI42(messageDataI.getIa42());
-            dataHarmphasicI.setI43(messageDataI.getIa43());
-            dataHarmphasicI.setI44(messageDataI.getIa44());
-            dataHarmphasicI.setI45(messageDataI.getIa45());
-            dataHarmphasicI.setI46(messageDataI.getIa46());
-            dataHarmphasicI.setI47(messageDataI.getIa47());
-            dataHarmphasicI.setI48(messageDataI.getIa48());
-            dataHarmphasicI.setI49(messageDataI.getIa49());
-            dataHarmphasicI.setI50(messageDataI.getIa50());
+            dataHarmphasicI.setI1(adjustPhase(messageDataI.getIfundAngle()));
+            dataHarmphasicI.setI2(adjustPhase(messageDataI.getIa2()));
+            dataHarmphasicI.setI3(adjustPhase(messageDataI.getIa3()));
+            dataHarmphasicI.setI4(adjustPhase(messageDataI.getIa4()));
+            dataHarmphasicI.setI5(adjustPhase(messageDataI.getIa5()));
+            dataHarmphasicI.setI6(adjustPhase(messageDataI.getIa6()));
+            dataHarmphasicI.setI7(adjustPhase(messageDataI.getIa7()));
+            dataHarmphasicI.setI8(adjustPhase(messageDataI.getIa8()));
+            dataHarmphasicI.setI9(adjustPhase(messageDataI.getIa9()));
+            dataHarmphasicI.setI10(adjustPhase(messageDataI.getIa10()));
+            dataHarmphasicI.setI11(adjustPhase(messageDataI.getIa11()));
+            dataHarmphasicI.setI12(adjustPhase(messageDataI.getIa12()));
+            dataHarmphasicI.setI13(adjustPhase(messageDataI.getIa13()));
+            dataHarmphasicI.setI14(adjustPhase(messageDataI.getIa14()));
+            dataHarmphasicI.setI15(adjustPhase(messageDataI.getIa15()));
+            dataHarmphasicI.setI16(adjustPhase(messageDataI.getIa16()));
+            dataHarmphasicI.setI17(adjustPhase(messageDataI.getIa17()));
+            dataHarmphasicI.setI18(adjustPhase(messageDataI.getIa18()));
+            dataHarmphasicI.setI19(adjustPhase(messageDataI.getIa19()));
+            dataHarmphasicI.setI20(adjustPhase(messageDataI.getIa20()));
+            dataHarmphasicI.setI21(adjustPhase(messageDataI.getIa21()));
+            dataHarmphasicI.setI22(adjustPhase(messageDataI.getIa22()));
+            dataHarmphasicI.setI23(adjustPhase(messageDataI.getIa23()));
+            dataHarmphasicI.setI24(adjustPhase(messageDataI.getIa24()));
+            dataHarmphasicI.setI25(adjustPhase(messageDataI.getIa25()));
+            dataHarmphasicI.setI26(adjustPhase(messageDataI.getIa26()));
+            dataHarmphasicI.setI27(adjustPhase(messageDataI.getIa27()));
+            dataHarmphasicI.setI28(adjustPhase(messageDataI.getIa28()));
+            dataHarmphasicI.setI29(adjustPhase(messageDataI.getIa29()));
+            dataHarmphasicI.setI30(adjustPhase(messageDataI.getIa30()));
+            dataHarmphasicI.setI31(adjustPhase(messageDataI.getIa31()));
+            dataHarmphasicI.setI32(adjustPhase(messageDataI.getIa32()));
+            dataHarmphasicI.setI33(adjustPhase(messageDataI.getIa33()));
+            dataHarmphasicI.setI34(adjustPhase(messageDataI.getIa34()));
+            dataHarmphasicI.setI35(adjustPhase(messageDataI.getIa35()));
+            dataHarmphasicI.setI36(adjustPhase(messageDataI.getIa36()));
+            dataHarmphasicI.setI37(adjustPhase(messageDataI.getIa37()));
+            dataHarmphasicI.setI38(adjustPhase(messageDataI.getIa38()));
+            dataHarmphasicI.setI39(adjustPhase(messageDataI.getIa39()));
+            dataHarmphasicI.setI40(adjustPhase(messageDataI.getIa40()));
+            dataHarmphasicI.setI41(adjustPhase(messageDataI.getIa41()));
+            dataHarmphasicI.setI42(adjustPhase(messageDataI.getIa42()));
+            dataHarmphasicI.setI43(adjustPhase(messageDataI.getIa43()));
+            dataHarmphasicI.setI44(adjustPhase(messageDataI.getIa44()));
+            dataHarmphasicI.setI45(adjustPhase(messageDataI.getIa45()));
+            dataHarmphasicI.setI46(adjustPhase(messageDataI.getIa46()));
+            dataHarmphasicI.setI47(adjustPhase(messageDataI.getIa47()));
+            dataHarmphasicI.setI48(adjustPhase(messageDataI.getIa48()));
+            dataHarmphasicI.setI49(adjustPhase(messageDataI.getIa49()));
+            dataHarmphasicI.setI50(adjustPhase(messageDataI.getIa50()));
 
-            dataHarmphasicI.setI1Max( messageDataI.getMaxIfundAngle());
-            dataHarmphasicI.setI2Max(messageDataI.getMaxIa2());
-            dataHarmphasicI.setI3Max(messageDataI.getMaxIa3());
-            dataHarmphasicI.setI4Max(messageDataI.getMaxIa4());
-            dataHarmphasicI.setI5Max(messageDataI.getMaxIa5());
-            dataHarmphasicI.setI6Max(messageDataI.getMaxIa6());
-            dataHarmphasicI.setI7Max(messageDataI.getMaxIa7());
-            dataHarmphasicI.setI8Max(messageDataI.getMaxIa8());
-            dataHarmphasicI.setI9Max(messageDataI.getMaxIa9());
-            dataHarmphasicI.setI10Max(messageDataI.getMaxIa10());
-            dataHarmphasicI.setI11Max(messageDataI.getMaxIa11());
-            dataHarmphasicI.setI12Max(messageDataI.getMaxIa12());
-            dataHarmphasicI.setI13Max(messageDataI.getMaxIa13());
-            dataHarmphasicI.setI14Max(messageDataI.getMaxIa14());
-            dataHarmphasicI.setI15Max(messageDataI.getMaxIa15());
-            dataHarmphasicI.setI16Max(messageDataI.getMaxIa16());
-            dataHarmphasicI.setI17Max(messageDataI.getMaxIa17());
-            dataHarmphasicI.setI18Max(messageDataI.getMaxIa18());
-            dataHarmphasicI.setI19Max(messageDataI.getMaxIa19());
-            dataHarmphasicI.setI20Max(messageDataI.getMaxIa20());
-            dataHarmphasicI.setI21Max(messageDataI.getMaxIa21());
-            dataHarmphasicI.setI22Max(messageDataI.getMaxIa22());
-            dataHarmphasicI.setI23Max(messageDataI.getMaxIa23());
-            dataHarmphasicI.setI24Max(messageDataI.getMaxIa24());
-            dataHarmphasicI.setI25Max(messageDataI.getMaxIa25());
-            dataHarmphasicI.setI26Max(messageDataI.getMaxIa26());
-            dataHarmphasicI.setI27Max(messageDataI.getMaxIa27());
-            dataHarmphasicI.setI28Max(messageDataI.getMaxIa28());
-            dataHarmphasicI.setI29Max(messageDataI.getMaxIa29());
-            dataHarmphasicI.setI30Max(messageDataI.getMaxIa30());
-            dataHarmphasicI.setI31Max(messageDataI.getMaxIa31());
-            dataHarmphasicI.setI32Max(messageDataI.getMaxIa32());
-            dataHarmphasicI.setI33Max(messageDataI.getMaxIa33());
-            dataHarmphasicI.setI34Max(messageDataI.getMaxIa34());
-            dataHarmphasicI.setI35Max(messageDataI.getMaxIa35());
-            dataHarmphasicI.setI36Max(messageDataI.getMaxIa36());
-            dataHarmphasicI.setI37Max(messageDataI.getMaxIa37());
-            dataHarmphasicI.setI38Max(messageDataI.getMaxIa38());
-            dataHarmphasicI.setI39Max(messageDataI.getMaxIa39());
-            dataHarmphasicI.setI40Max(messageDataI.getMaxIa40());
-            dataHarmphasicI.setI41Max(messageDataI.getMaxIa41());
-            dataHarmphasicI.setI42Max(messageDataI.getMaxIa42());
-            dataHarmphasicI.setI43Max(messageDataI.getMaxIa43());
-            dataHarmphasicI.setI44Max(messageDataI.getMaxIa44());
-            dataHarmphasicI.setI45Max(messageDataI.getMaxIa45());
-            dataHarmphasicI.setI46Max(messageDataI.getMaxIa46());
-            dataHarmphasicI.setI47Max(messageDataI.getMaxIa47());
-            dataHarmphasicI.setI48Max(messageDataI.getMaxIa48());
-            dataHarmphasicI.setI49Max(messageDataI.getMaxIa49());
-            dataHarmphasicI.setI50Max(messageDataI.getMaxIa50());
+            dataHarmphasicI.setI1Max( adjustPhase(messageDataI.getMaxIfundAngle()));
+            dataHarmphasicI.setI2Max(adjustPhase(messageDataI.getMaxIa2()));
+            dataHarmphasicI.setI3Max(adjustPhase(messageDataI.getMaxIa3()));
+            dataHarmphasicI.setI4Max(adjustPhase(messageDataI.getMaxIa4()));
+            dataHarmphasicI.setI5Max(adjustPhase(messageDataI.getMaxIa5()));
+            dataHarmphasicI.setI6Max(adjustPhase(messageDataI.getMaxIa6()));
+            dataHarmphasicI.setI7Max(adjustPhase(messageDataI.getMaxIa7()));
+            dataHarmphasicI.setI8Max(adjustPhase(messageDataI.getMaxIa8()));
+            dataHarmphasicI.setI9Max(adjustPhase(messageDataI.getMaxIa9()));
+            dataHarmphasicI.setI10Max(adjustPhase(messageDataI.getMaxIa10()));
+            dataHarmphasicI.setI11Max(adjustPhase(messageDataI.getMaxIa11()));
+            dataHarmphasicI.setI12Max(adjustPhase(messageDataI.getMaxIa12()));
+            dataHarmphasicI.setI13Max(adjustPhase(messageDataI.getMaxIa13()));
+            dataHarmphasicI.setI14Max(adjustPhase(messageDataI.getMaxIa14()));
+            dataHarmphasicI.setI15Max(adjustPhase(messageDataI.getMaxIa15()));
+            dataHarmphasicI.setI16Max(adjustPhase(messageDataI.getMaxIa16()));
+            dataHarmphasicI.setI17Max(adjustPhase(messageDataI.getMaxIa17()));
+            dataHarmphasicI.setI18Max(adjustPhase(messageDataI.getMaxIa18()));
+            dataHarmphasicI.setI19Max(adjustPhase(messageDataI.getMaxIa19()));
+            dataHarmphasicI.setI20Max(adjustPhase(messageDataI.getMaxIa20()));
+            dataHarmphasicI.setI21Max(adjustPhase(messageDataI.getMaxIa21()));
+            dataHarmphasicI.setI22Max(adjustPhase(messageDataI.getMaxIa22()));
+            dataHarmphasicI.setI23Max(adjustPhase(messageDataI.getMaxIa23()));
+            dataHarmphasicI.setI24Max(adjustPhase(messageDataI.getMaxIa24()));
+            dataHarmphasicI.setI25Max(adjustPhase(messageDataI.getMaxIa25()));
+            dataHarmphasicI.setI26Max(adjustPhase(messageDataI.getMaxIa26()));
+            dataHarmphasicI.setI27Max(adjustPhase(messageDataI.getMaxIa27()));
+            dataHarmphasicI.setI28Max(adjustPhase(messageDataI.getMaxIa28()));
+            dataHarmphasicI.setI29Max(adjustPhase(messageDataI.getMaxIa29()));
+            dataHarmphasicI.setI30Max(adjustPhase(messageDataI.getMaxIa30()));
+            dataHarmphasicI.setI31Max(adjustPhase(messageDataI.getMaxIa31()));
+            dataHarmphasicI.setI32Max(adjustPhase(messageDataI.getMaxIa32()));
+            dataHarmphasicI.setI33Max(adjustPhase(messageDataI.getMaxIa33()));
+            dataHarmphasicI.setI34Max(adjustPhase(messageDataI.getMaxIa34()));
+            dataHarmphasicI.setI35Max(adjustPhase(messageDataI.getMaxIa35()));
+            dataHarmphasicI.setI36Max(adjustPhase(messageDataI.getMaxIa36()));
+            dataHarmphasicI.setI37Max(adjustPhase(messageDataI.getMaxIa37()));
+            dataHarmphasicI.setI38Max(adjustPhase(messageDataI.getMaxIa38()));
+            dataHarmphasicI.setI39Max(adjustPhase(messageDataI.getMaxIa39()));
+            dataHarmphasicI.setI40Max(adjustPhase(messageDataI.getMaxIa40()));
+            dataHarmphasicI.setI41Max(adjustPhase(messageDataI.getMaxIa41()));
+            dataHarmphasicI.setI42Max(adjustPhase(messageDataI.getMaxIa42()));
+            dataHarmphasicI.setI43Max(adjustPhase(messageDataI.getMaxIa43()));
+            dataHarmphasicI.setI44Max(adjustPhase(messageDataI.getMaxIa44()));
+            dataHarmphasicI.setI45Max(adjustPhase(messageDataI.getMaxIa45()));
+            dataHarmphasicI.setI46Max(adjustPhase(messageDataI.getMaxIa46()));
+            dataHarmphasicI.setI47Max(adjustPhase(messageDataI.getMaxIa47()));
+            dataHarmphasicI.setI48Max(adjustPhase(messageDataI.getMaxIa48()));
+            dataHarmphasicI.setI49Max(adjustPhase(messageDataI.getMaxIa49()));
+            dataHarmphasicI.setI50Max(adjustPhase(messageDataI.getMaxIa50()));
 
-            dataHarmphasicI.setI1Min(messageDataI.getMinIfundAngle());
-            dataHarmphasicI.setI2Min(messageDataI.getMinIa2());
-            dataHarmphasicI.setI3Min(messageDataI.getMinIa3());
-            dataHarmphasicI.setI4Min(messageDataI.getMinIa4());
-            dataHarmphasicI.setI5Min(messageDataI.getMinIa5());
-            dataHarmphasicI.setI6Min(messageDataI.getMinIa6());
-            dataHarmphasicI.setI7Min(messageDataI.getMinIa7());
-            dataHarmphasicI.setI8Min(messageDataI.getMinIa8());
-            dataHarmphasicI.setI9Min(messageDataI.getMinIa9());
-            dataHarmphasicI.setI10Min(messageDataI.getMinIa10());
-            dataHarmphasicI.setI11Min(messageDataI.getMinIa11());
-            dataHarmphasicI.setI12Min(messageDataI.getMinIa12());
-            dataHarmphasicI.setI13Min(messageDataI.getMinIa13());
-            dataHarmphasicI.setI14Min(messageDataI.getMinIa14());
-            dataHarmphasicI.setI15Min(messageDataI.getMinIa15());
-            dataHarmphasicI.setI16Min(messageDataI.getMinIa16());
-            dataHarmphasicI.setI17Min(messageDataI.getMinIa17());
-            dataHarmphasicI.setI18Min(messageDataI.getMinIa18());
-            dataHarmphasicI.setI19Min(messageDataI.getMinIa19());
-            dataHarmphasicI.setI20Min(messageDataI.getMinIa20());
-            dataHarmphasicI.setI21Min(messageDataI.getMinIa21());
-            dataHarmphasicI.setI22Min(messageDataI.getMinIa22());
-            dataHarmphasicI.setI23Min(messageDataI.getMinIa23());
-            dataHarmphasicI.setI24Min(messageDataI.getMinIa24());
-            dataHarmphasicI.setI25Min(messageDataI.getMinIa25());
-            dataHarmphasicI.setI26Min(messageDataI.getMinIa26());
-            dataHarmphasicI.setI27Min(messageDataI.getMinIa27());
-            dataHarmphasicI.setI28Min(messageDataI.getMinIa28());
-            dataHarmphasicI.setI29Min(messageDataI.getMinIa29());
-            dataHarmphasicI.setI30Min(messageDataI.getMinIa30());
-            dataHarmphasicI.setI31Min(messageDataI.getMinIa31());
-            dataHarmphasicI.setI32Min(messageDataI.getMinIa32());
-            dataHarmphasicI.setI33Min(messageDataI.getMinIa33());
-            dataHarmphasicI.setI34Min(messageDataI.getMinIa34());
-            dataHarmphasicI.setI35Min(messageDataI.getMinIa35());
-            dataHarmphasicI.setI36Min(messageDataI.getMinIa36());
-            dataHarmphasicI.setI37Min(messageDataI.getMinIa37());
-            dataHarmphasicI.setI38Min(messageDataI.getMinIa38());
-            dataHarmphasicI.setI39Min(messageDataI.getMinIa39());
-            dataHarmphasicI.setI40Min(messageDataI.getMinIa40());
-            dataHarmphasicI.setI41Min(messageDataI.getMinIa41());
-            dataHarmphasicI.setI42Min(messageDataI.getMinIa42());
-            dataHarmphasicI.setI43Min(messageDataI.getMinIa43());
-            dataHarmphasicI.setI44Min(messageDataI.getMinIa44());
-            dataHarmphasicI.setI45Min(messageDataI.getMinIa45());
-            dataHarmphasicI.setI46Min(messageDataI.getMinIa46());
-            dataHarmphasicI.setI47Min(messageDataI.getMinIa47());
-            dataHarmphasicI.setI48Min(messageDataI.getMinIa48());
-            dataHarmphasicI.setI49Min(messageDataI.getMinIa49());
-            dataHarmphasicI.setI50Min(messageDataI.getMinIa50());
+            dataHarmphasicI.setI1Min(adjustPhase(messageDataI.getMinIfundAngle()));
+            dataHarmphasicI.setI2Min(adjustPhase(messageDataI.getMinIa2()));
+            dataHarmphasicI.setI3Min(adjustPhase(messageDataI.getMinIa3()));
+            dataHarmphasicI.setI4Min(adjustPhase(messageDataI.getMinIa4()));
+            dataHarmphasicI.setI5Min(adjustPhase(messageDataI.getMinIa5()));
+            dataHarmphasicI.setI6Min(adjustPhase(messageDataI.getMinIa6()));
+            dataHarmphasicI.setI7Min(adjustPhase(messageDataI.getMinIa7()));
+            dataHarmphasicI.setI8Min(adjustPhase(messageDataI.getMinIa8()));
+            dataHarmphasicI.setI9Min(adjustPhase(messageDataI.getMinIa9()));
+            dataHarmphasicI.setI10Min(adjustPhase(messageDataI.getMinIa10()));
+            dataHarmphasicI.setI11Min(adjustPhase(messageDataI.getMinIa11()));
+            dataHarmphasicI.setI12Min(adjustPhase(messageDataI.getMinIa12()));
+            dataHarmphasicI.setI13Min(adjustPhase(messageDataI.getMinIa13()));
+            dataHarmphasicI.setI14Min(adjustPhase(messageDataI.getMinIa14()));
+            dataHarmphasicI.setI15Min(adjustPhase(messageDataI.getMinIa15()));
+            dataHarmphasicI.setI16Min(adjustPhase(messageDataI.getMinIa16()));
+            dataHarmphasicI.setI17Min(adjustPhase(messageDataI.getMinIa17()));
+            dataHarmphasicI.setI18Min(adjustPhase(messageDataI.getMinIa18()));
+            dataHarmphasicI.setI19Min(adjustPhase(messageDataI.getMinIa19()));
+            dataHarmphasicI.setI20Min(adjustPhase(messageDataI.getMinIa20()));
+            dataHarmphasicI.setI21Min(adjustPhase(messageDataI.getMinIa21()));
+            dataHarmphasicI.setI22Min(adjustPhase(messageDataI.getMinIa22()));
+            dataHarmphasicI.setI23Min(adjustPhase(messageDataI.getMinIa23()));
+            dataHarmphasicI.setI24Min(adjustPhase(messageDataI.getMinIa24()));
+            dataHarmphasicI.setI25Min(adjustPhase(messageDataI.getMinIa25()));
+            dataHarmphasicI.setI26Min(adjustPhase(messageDataI.getMinIa26()));
+            dataHarmphasicI.setI27Min(adjustPhase(messageDataI.getMinIa27()));
+            dataHarmphasicI.setI28Min(adjustPhase(messageDataI.getMinIa28()));
+            dataHarmphasicI.setI29Min(adjustPhase(messageDataI.getMinIa29()));
+            dataHarmphasicI.setI30Min(adjustPhase(messageDataI.getMinIa30()));
+            dataHarmphasicI.setI31Min(adjustPhase(messageDataI.getMinIa31()));
+            dataHarmphasicI.setI32Min(adjustPhase(messageDataI.getMinIa32()));
+            dataHarmphasicI.setI33Min(adjustPhase(messageDataI.getMinIa33()));
+            dataHarmphasicI.setI34Min(adjustPhase(messageDataI.getMinIa34()));
+            dataHarmphasicI.setI35Min(adjustPhase(messageDataI.getMinIa35()));
+            dataHarmphasicI.setI36Min(adjustPhase(messageDataI.getMinIa36()));
+            dataHarmphasicI.setI37Min(adjustPhase(messageDataI.getMinIa37()));
+            dataHarmphasicI.setI38Min(adjustPhase(messageDataI.getMinIa38()));
+            dataHarmphasicI.setI39Min(adjustPhase(messageDataI.getMinIa39()));
+            dataHarmphasicI.setI40Min(adjustPhase(messageDataI.getMinIa40()));
+            dataHarmphasicI.setI41Min(adjustPhase(messageDataI.getMinIa41()));
+            dataHarmphasicI.setI42Min(adjustPhase(messageDataI.getMinIa42()));
+            dataHarmphasicI.setI43Min(adjustPhase(messageDataI.getMinIa43()));
+            dataHarmphasicI.setI44Min(adjustPhase(messageDataI.getMinIa44()));
+            dataHarmphasicI.setI45Min(adjustPhase(messageDataI.getMinIa45()));
+            dataHarmphasicI.setI46Min(adjustPhase(messageDataI.getMinIa46()));
+            dataHarmphasicI.setI47Min(adjustPhase(messageDataI.getMinIa47()));
+            dataHarmphasicI.setI48Min(adjustPhase(messageDataI.getMinIa48()));
+            dataHarmphasicI.setI49Min(adjustPhase(messageDataI.getMinIa49()));
+            dataHarmphasicI.setI50Min(adjustPhase(messageDataI.getMinIa50()));
 
-            dataHarmphasicI.setI1Cp95(messageDataI.getGIfundAngle());
-            dataHarmphasicI.setI2Cp95(messageDataI.getGIa2());
-            dataHarmphasicI.setI3Cp95(messageDataI.getGIa3());
-            dataHarmphasicI.setI4Cp95(messageDataI.getGIa4());
-            dataHarmphasicI.setI5Cp95(messageDataI.getGIa5());
-            dataHarmphasicI.setI6Cp95(messageDataI.getGIa6());
-            dataHarmphasicI.setI7Cp95(messageDataI.getGIa7());
-            dataHarmphasicI.setI8Cp95(messageDataI.getGIa8());
-            dataHarmphasicI.setI9Cp95(messageDataI.getGIa9());
-            dataHarmphasicI.setI10Cp95(messageDataI.getGIa10());
-            dataHarmphasicI.setI11Cp95(messageDataI.getGIa11());
-            dataHarmphasicI.setI12Cp95(messageDataI.getGIa12());
-            dataHarmphasicI.setI13Cp95(messageDataI.getGIa13());
-            dataHarmphasicI.setI14Cp95(messageDataI.getGIa14());
-            dataHarmphasicI.setI15Cp95(messageDataI.getGIa15());
-            dataHarmphasicI.setI16Cp95(messageDataI.getGIa16());
-            dataHarmphasicI.setI17Cp95(messageDataI.getGIa17());
-            dataHarmphasicI.setI18Cp95(messageDataI.getGIa18());
-            dataHarmphasicI.setI19Cp95(messageDataI.getGIa19());
-            dataHarmphasicI.setI20Cp95(messageDataI.getGIa20());
-            dataHarmphasicI.setI21Cp95(messageDataI.getGIa21());
-            dataHarmphasicI.setI22Cp95(messageDataI.getGIa22());
-            dataHarmphasicI.setI23Cp95(messageDataI.getGIa23());
-            dataHarmphasicI.setI24Cp95(messageDataI.getGIa24());
-            dataHarmphasicI.setI25Cp95(messageDataI.getGIa25());
-            dataHarmphasicI.setI26Cp95(messageDataI.getGIa26());
-            dataHarmphasicI.setI27Cp95(messageDataI.getGIa27());
-            dataHarmphasicI.setI28Cp95(messageDataI.getGIa28());
-            dataHarmphasicI.setI29Cp95(messageDataI.getGIa29());
-            dataHarmphasicI.setI30Cp95(messageDataI.getGIa30());
-            dataHarmphasicI.setI31Cp95(messageDataI.getGIa31());
-            dataHarmphasicI.setI32Cp95(messageDataI.getGIa32());
-            dataHarmphasicI.setI33Cp95(messageDataI.getGIa33());
-            dataHarmphasicI.setI34Cp95(messageDataI.getGIa34());
-            dataHarmphasicI.setI35Cp95(messageDataI.getGIa35());
-            dataHarmphasicI.setI36Cp95(messageDataI.getGIa36());
-            dataHarmphasicI.setI37Cp95(messageDataI.getGIa37());
-            dataHarmphasicI.setI38Cp95(messageDataI.getGIa38());
-            dataHarmphasicI.setI39Cp95(messageDataI.getGIa39());
-            dataHarmphasicI.setI40Cp95(messageDataI.getGIa40());
-            dataHarmphasicI.setI41Cp95(messageDataI.getGIa41());
-            dataHarmphasicI.setI42Cp95(messageDataI.getGIa42());
-            dataHarmphasicI.setI43Cp95(messageDataI.getGIa43());
-            dataHarmphasicI.setI44Cp95(messageDataI.getGIa44());
-            dataHarmphasicI.setI45Cp95(messageDataI.getGIa45());
-            dataHarmphasicI.setI46Cp95(messageDataI.getGIa46());
-            dataHarmphasicI.setI47Cp95(messageDataI.getGIa47());
-            dataHarmphasicI.setI48Cp95(messageDataI.getGIa48());
-            dataHarmphasicI.setI49Cp95(messageDataI.getGIa49());
-            dataHarmphasicI.setI50Cp95(messageDataI.getGIa50());
+            dataHarmphasicI.setI1Cp95(adjustPhase(messageDataI.getGIfundAngle()));
+            dataHarmphasicI.setI2Cp95(adjustPhase(messageDataI.getGIa2()));
+            dataHarmphasicI.setI3Cp95(adjustPhase(messageDataI.getGIa3()));
+            dataHarmphasicI.setI4Cp95(adjustPhase(messageDataI.getGIa4()));
+            dataHarmphasicI.setI5Cp95(adjustPhase(messageDataI.getGIa5()));
+            dataHarmphasicI.setI6Cp95(adjustPhase(messageDataI.getGIa6()));
+            dataHarmphasicI.setI7Cp95(adjustPhase(messageDataI.getGIa7()));
+            dataHarmphasicI.setI8Cp95(adjustPhase(messageDataI.getGIa8()));
+            dataHarmphasicI.setI9Cp95(adjustPhase(messageDataI.getGIa9()));
+            dataHarmphasicI.setI10Cp95(adjustPhase(messageDataI.getGIa10()));
+            dataHarmphasicI.setI11Cp95(adjustPhase(messageDataI.getGIa11()));
+            dataHarmphasicI.setI12Cp95(adjustPhase(messageDataI.getGIa12()));
+            dataHarmphasicI.setI13Cp95(adjustPhase(messageDataI.getGIa13()));
+            dataHarmphasicI.setI14Cp95(adjustPhase(messageDataI.getGIa14()));
+            dataHarmphasicI.setI15Cp95(adjustPhase(messageDataI.getGIa15()));
+            dataHarmphasicI.setI16Cp95(adjustPhase(messageDataI.getGIa16()));
+            dataHarmphasicI.setI17Cp95(adjustPhase(messageDataI.getGIa17()));
+            dataHarmphasicI.setI18Cp95(adjustPhase(messageDataI.getGIa18()));
+            dataHarmphasicI.setI19Cp95(adjustPhase(messageDataI.getGIa19()));
+            dataHarmphasicI.setI20Cp95(adjustPhase(messageDataI.getGIa20()));
+            dataHarmphasicI.setI21Cp95(adjustPhase(messageDataI.getGIa21()));
+            dataHarmphasicI.setI22Cp95(adjustPhase(messageDataI.getGIa22()));
+            dataHarmphasicI.setI23Cp95(adjustPhase(messageDataI.getGIa23()));
+            dataHarmphasicI.setI24Cp95(adjustPhase(messageDataI.getGIa24()));
+            dataHarmphasicI.setI25Cp95(adjustPhase(messageDataI.getGIa25()));
+            dataHarmphasicI.setI26Cp95(adjustPhase(messageDataI.getGIa26()));
+            dataHarmphasicI.setI27Cp95(adjustPhase(messageDataI.getGIa27()));
+            dataHarmphasicI.setI28Cp95(adjustPhase(messageDataI.getGIa28()));
+            dataHarmphasicI.setI29Cp95(adjustPhase(messageDataI.getGIa29()));
+            dataHarmphasicI.setI30Cp95(adjustPhase(messageDataI.getGIa30()));
+            dataHarmphasicI.setI31Cp95(adjustPhase(messageDataI.getGIa31()));
+            dataHarmphasicI.setI32Cp95(adjustPhase(messageDataI.getGIa32()));
+            dataHarmphasicI.setI33Cp95(adjustPhase(messageDataI.getGIa33()));
+            dataHarmphasicI.setI34Cp95(adjustPhase(messageDataI.getGIa34()));
+            dataHarmphasicI.setI35Cp95(adjustPhase(messageDataI.getGIa35()));
+            dataHarmphasicI.setI36Cp95(adjustPhase(messageDataI.getGIa36()));
+            dataHarmphasicI.setI37Cp95(adjustPhase(messageDataI.getGIa37()));
+            dataHarmphasicI.setI38Cp95(adjustPhase(messageDataI.getGIa38()));
+            dataHarmphasicI.setI39Cp95(adjustPhase(messageDataI.getGIa39()));
+            dataHarmphasicI.setI40Cp95(adjustPhase(messageDataI.getGIa40()));
+            dataHarmphasicI.setI41Cp95(adjustPhase(messageDataI.getGIa41()));
+            dataHarmphasicI.setI42Cp95(adjustPhase(messageDataI.getGIa42()));
+            dataHarmphasicI.setI43Cp95(adjustPhase(messageDataI.getGIa43()));
+            dataHarmphasicI.setI44Cp95(adjustPhase(messageDataI.getGIa44()));
+            dataHarmphasicI.setI45Cp95(adjustPhase(messageDataI.getGIa45()));
+            dataHarmphasicI.setI46Cp95(adjustPhase(messageDataI.getGIa46()));
+            dataHarmphasicI.setI47Cp95(adjustPhase(messageDataI.getGIa47()));
+            dataHarmphasicI.setI48Cp95(adjustPhase(messageDataI.getGIa48()));
+            dataHarmphasicI.setI49Cp95(adjustPhase(messageDataI.getGIa49()));
+            dataHarmphasicI.setI50Cp95(adjustPhase(messageDataI.getGIa50()));
 
         }
         return dataHarmphasicI;

analysis/stat/stat-api/src/main/java/com/njcn/stat/utils/BeanVConverter.java

@@ -19,6 +19,28 @@ import java.util.Objects;
  * @version V1.0.0
  */
 public class BeanVConverter {
+    /**
+     * 角度相关常量
+     */
+    private static final double ANGLE_180 = 180.0;
+    private static final double ANGLE_360 = 360.0;
+    private static final double ANGLE_MINUS_180 = -180.0;
+
+    public static Double adjustPhase(Double phase) {
+        if (phase == null) {
+            return null;
+        }
+        // 使用模运算将角度标准化到[-180, 180]范围
+        double normalizedPhase = phase % ANGLE_360;
+        // 处理超出[-180, 180]范围的情况
+        if (normalizedPhase > ANGLE_180) {
+            normalizedPhase -= ANGLE_360;
+        } else if (normalizedPhase < ANGLE_MINUS_180) {
+            normalizedPhase += ANGLE_360;
+        }
+
+        return normalizedPhase;
+    }
     //A,B,C三项
     public static DataVDTO messageDataVTODataV(MessageDataV messageDataV){
         DataVDTO dataVRelation = new DataVDTO();
@@ -561,209 +583,209 @@ public class BeanVConverter {
     public static DataHarmphasicVDTO messageDataVTODataHarmphasicV(MessageDataV messageDataV){
         DataHarmphasicVDTO dataHarmphasicV = new DataHarmphasicVDTO();
         if (Objects.nonNull(messageDataV)){
-            dataHarmphasicV.setV1(messageDataV.getVfundAngle());
-            dataHarmphasicV.setV2(messageDataV.getVa2());
-            dataHarmphasicV.setV3(messageDataV.getVa3());
-            dataHarmphasicV.setV4(messageDataV.getVa4());
-            dataHarmphasicV.setV5(messageDataV.getVa5());
-            dataHarmphasicV.setV6(messageDataV.getVa6());
-            dataHarmphasicV.setV7(messageDataV.getVa7());
-            dataHarmphasicV.setV8(messageDataV.getVa8());
-            dataHarmphasicV.setV9(messageDataV.getVa9());
-            dataHarmphasicV.setV10(messageDataV.getVa10());
-            dataHarmphasicV.setV11(messageDataV.getVa11());
-            dataHarmphasicV.setV12(messageDataV.getVa12());
-            dataHarmphasicV.setV13(messageDataV.getVa13());
-            dataHarmphasicV.setV14(messageDataV.getVa14());
-            dataHarmphasicV.setV15(messageDataV.getVa15());
-            dataHarmphasicV.setV16(messageDataV.getVa16());
-            dataHarmphasicV.setV17(messageDataV.getVa17());
-            dataHarmphasicV.setV18(messageDataV.getVa18());
-            dataHarmphasicV.setV19(messageDataV.getVa19());
-            dataHarmphasicV.setV20(messageDataV.getVa20());
-            dataHarmphasicV.setV21(messageDataV.getVa21());
-            dataHarmphasicV.setV22(messageDataV.getVa22());
-            dataHarmphasicV.setV23(messageDataV.getVa23());
-            dataHarmphasicV.setV24(messageDataV.getVa24());
-            dataHarmphasicV.setV25(messageDataV.getVa25());
-            dataHarmphasicV.setV26(messageDataV.getVa26());
-            dataHarmphasicV.setV27(messageDataV.getVa27());
-            dataHarmphasicV.setV28(messageDataV.getVa28());
-            dataHarmphasicV.setV29(messageDataV.getVa29());
-            dataHarmphasicV.setV30(messageDataV.getVa30());
-            dataHarmphasicV.setV31(messageDataV.getVa31());
-            dataHarmphasicV.setV32(messageDataV.getVa32());
-            dataHarmphasicV.setV33(messageDataV.getVa33());
-            dataHarmphasicV.setV34(messageDataV.getVa34());
-            dataHarmphasicV.setV35(messageDataV.getVa35());
-            dataHarmphasicV.setV36(messageDataV.getVa36());
-            dataHarmphasicV.setV37(messageDataV.getVa37());
-            dataHarmphasicV.setV38(messageDataV.getVa38());
-            dataHarmphasicV.setV39(messageDataV.getVa39());
-            dataHarmphasicV.setV40(messageDataV.getVa40());
-            dataHarmphasicV.setV41(messageDataV.getVa41());
-            dataHarmphasicV.setV42(messageDataV.getVa42());
-            dataHarmphasicV.setV43(messageDataV.getVa43());
-            dataHarmphasicV.setV44(messageDataV.getVa44());
-            dataHarmphasicV.setV45(messageDataV.getVa45());
-            dataHarmphasicV.setV46(messageDataV.getVa46());
-            dataHarmphasicV.setV47(messageDataV.getVa47());
-            dataHarmphasicV.setV48(messageDataV.getVa48());
-            dataHarmphasicV.setV49(messageDataV.getVa49());
-            dataHarmphasicV.setV50(messageDataV.getVa50());
+            dataHarmphasicV.setV1(adjustPhase(messageDataV.getVfundAngle()));
+            dataHarmphasicV.setV2(adjustPhase(messageDataV.getVa2()));
+            dataHarmphasicV.setV3(adjustPhase(messageDataV.getVa3()));
+            dataHarmphasicV.setV4(adjustPhase(messageDataV.getVa4()));
+            dataHarmphasicV.setV5(adjustPhase(messageDataV.getVa5()));
+            dataHarmphasicV.setV6(adjustPhase(messageDataV.getVa6()));
+            dataHarmphasicV.setV7(adjustPhase(messageDataV.getVa7()));
+            dataHarmphasicV.setV8(adjustPhase(messageDataV.getVa8()));
+            dataHarmphasicV.setV9(adjustPhase(messageDataV.getVa9()));
+            dataHarmphasicV.setV10(adjustPhase(messageDataV.getVa10()));
+            dataHarmphasicV.setV11(adjustPhase(messageDataV.getVa11()));
+            dataHarmphasicV.setV12(adjustPhase(messageDataV.getVa12()));
+            dataHarmphasicV.setV13(adjustPhase(messageDataV.getVa13()));
+            dataHarmphasicV.setV14(adjustPhase(messageDataV.getVa14()));
+            dataHarmphasicV.setV15(adjustPhase(messageDataV.getVa15()));
+            dataHarmphasicV.setV16(adjustPhase(messageDataV.getVa16()));
+            dataHarmphasicV.setV17(adjustPhase(messageDataV.getVa17()));
+            dataHarmphasicV.setV18(adjustPhase(messageDataV.getVa18()));
+            dataHarmphasicV.setV19(adjustPhase(messageDataV.getVa19()));
+            dataHarmphasicV.setV20(adjustPhase(messageDataV.getVa20()));
+            dataHarmphasicV.setV21(adjustPhase(messageDataV.getVa21()));
+            dataHarmphasicV.setV22(adjustPhase(messageDataV.getVa22()));
+            dataHarmphasicV.setV23(adjustPhase(messageDataV.getVa23()));
+            dataHarmphasicV.setV24(adjustPhase(messageDataV.getVa24()));
+            dataHarmphasicV.setV25(adjustPhase(messageDataV.getVa25()));
+            dataHarmphasicV.setV26(adjustPhase(messageDataV.getVa26()));
+            dataHarmphasicV.setV27(adjustPhase(messageDataV.getVa27()));
+            dataHarmphasicV.setV28(adjustPhase(messageDataV.getVa28()));
+            dataHarmphasicV.setV29(adjustPhase(messageDataV.getVa29()));
+            dataHarmphasicV.setV30(adjustPhase(messageDataV.getVa30()));
+            dataHarmphasicV.setV31(adjustPhase(messageDataV.getVa31()));
+            dataHarmphasicV.setV32(adjustPhase(messageDataV.getVa32()));
+            dataHarmphasicV.setV33(adjustPhase(messageDataV.getVa33()));
+            dataHarmphasicV.setV34(adjustPhase(messageDataV.getVa34()));
+            dataHarmphasicV.setV35(adjustPhase(messageDataV.getVa35()));
+            dataHarmphasicV.setV36(adjustPhase(messageDataV.getVa36()));
+            dataHarmphasicV.setV37(adjustPhase(messageDataV.getVa37()));
+            dataHarmphasicV.setV38(adjustPhase(messageDataV.getVa38()));
+            dataHarmphasicV.setV39(adjustPhase(messageDataV.getVa39()));
+            dataHarmphasicV.setV40(adjustPhase(messageDataV.getVa40()));
+            dataHarmphasicV.setV41(adjustPhase(messageDataV.getVa41()));
+            dataHarmphasicV.setV42(adjustPhase(messageDataV.getVa42()));
+            dataHarmphasicV.setV43(adjustPhase(messageDataV.getVa43()));
+            dataHarmphasicV.setV44(adjustPhase(messageDataV.getVa44()));
+            dataHarmphasicV.setV45(adjustPhase(messageDataV.getVa45()));
+            dataHarmphasicV.setV46(adjustPhase(messageDataV.getVa46()));
+            dataHarmphasicV.setV47(adjustPhase(messageDataV.getVa47()));
+            dataHarmphasicV.setV48(adjustPhase(messageDataV.getVa48()));
+            dataHarmphasicV.setV49(adjustPhase(messageDataV.getVa49()));
+            dataHarmphasicV.setV50(adjustPhase(messageDataV.getVa50()));
 
-            dataHarmphasicV.setV1Max(messageDataV.getMaxVfundAngle());
-            dataHarmphasicV.setV2Max(messageDataV.getMaxVa2());
-            dataHarmphasicV.setV3Max(messageDataV.getMaxVa3());
-            dataHarmphasicV.setV4Max(messageDataV.getMaxVa4());
-            dataHarmphasicV.setV5Max(messageDataV.getMaxVa5());
-            dataHarmphasicV.setV6Max(messageDataV.getMaxVa6());
-            dataHarmphasicV.setV7Max(messageDataV.getMaxVa7());
-            dataHarmphasicV.setV8Max(messageDataV.getMaxVa8());
-            dataHarmphasicV.setV9Max(messageDataV.getMaxVa9());
-            dataHarmphasicV.setV10Max(messageDataV.getMaxVa10());
-            dataHarmphasicV.setV11Max(messageDataV.getMaxVa11());
-            dataHarmphasicV.setV12Max(messageDataV.getMaxVa12());
-            dataHarmphasicV.setV13Max(messageDataV.getMaxVa13());
-            dataHarmphasicV.setV14Max(messageDataV.getMaxVa14());
-            dataHarmphasicV.setV15Max(messageDataV.getMaxVa15());
-            dataHarmphasicV.setV16Max(messageDataV.getMaxVa16());
-            dataHarmphasicV.setV17Max(messageDataV.getMaxVa17());
-            dataHarmphasicV.setV18Max(messageDataV.getMaxVa18());
-            dataHarmphasicV.setV19Max(messageDataV.getMaxVa19());
-            dataHarmphasicV.setV20Max(messageDataV.getMaxVa20());
-            dataHarmphasicV.setV21Max(messageDataV.getMaxVa21());
-            dataHarmphasicV.setV22Max(messageDataV.getMaxVa22());
-            dataHarmphasicV.setV23Max(messageDataV.getMaxVa23());
-            dataHarmphasicV.setV24Max(messageDataV.getMaxVa24());
-            dataHarmphasicV.setV25Max(messageDataV.getMaxVa25());
-            dataHarmphasicV.setV26Max(messageDataV.getMaxVa26());
-            dataHarmphasicV.setV27Max(messageDataV.getMaxVa27());
-            dataHarmphasicV.setV28Max(messageDataV.getMaxVa28());
-            dataHarmphasicV.setV29Max(messageDataV.getMaxVa29());
-            dataHarmphasicV.setV30Max(messageDataV.getMaxVa30());
-            dataHarmphasicV.setV31Max(messageDataV.getMaxVa31());
-            dataHarmphasicV.setV32Max(messageDataV.getMaxVa32());
-            dataHarmphasicV.setV33Max(messageDataV.getMaxVa33());
-            dataHarmphasicV.setV34Max(messageDataV.getMaxVa34());
-            dataHarmphasicV.setV35Max(messageDataV.getMaxVa35());
-            dataHarmphasicV.setV36Max(messageDataV.getMaxVa36());
-            dataHarmphasicV.setV37Max(messageDataV.getMaxVa37());
-            dataHarmphasicV.setV38Max(messageDataV.getMaxVa38());
-            dataHarmphasicV.setV39Max(messageDataV.getMaxVa39());
-            dataHarmphasicV.setV40Max(messageDataV.getMaxVa40());
-            dataHarmphasicV.setV41Max(messageDataV.getMaxVa41());
-            dataHarmphasicV.setV42Max(messageDataV.getMaxVa42());
-            dataHarmphasicV.setV43Max(messageDataV.getMaxVa43());
-            dataHarmphasicV.setV44Max(messageDataV.getMaxVa44());
-            dataHarmphasicV.setV45Max(messageDataV.getMaxVa45());
-            dataHarmphasicV.setV46Max(messageDataV.getMaxVa46());
-            dataHarmphasicV.setV47Max(messageDataV.getMaxVa47());
-            dataHarmphasicV.setV48Max(messageDataV.getMaxVa48());
-            dataHarmphasicV.setV49Max(messageDataV.getMaxVa49());
-            dataHarmphasicV.setV50Max(messageDataV.getMaxVa50());
+            dataHarmphasicV.setV1Max(adjustPhase(messageDataV.getMaxVfundAngle()));
+            dataHarmphasicV.setV2Max(adjustPhase(messageDataV.getMaxVa2()));
+            dataHarmphasicV.setV3Max(adjustPhase(messageDataV.getMaxVa3()));
+            dataHarmphasicV.setV4Max(adjustPhase(messageDataV.getMaxVa4()));
+            dataHarmphasicV.setV5Max(adjustPhase(messageDataV.getMaxVa5()));
+            dataHarmphasicV.setV6Max(adjustPhase(messageDataV.getMaxVa6()));
+            dataHarmphasicV.setV7Max(adjustPhase(messageDataV.getMaxVa7()));
+            dataHarmphasicV.setV8Max(adjustPhase(messageDataV.getMaxVa8()));
+            dataHarmphasicV.setV9Max(adjustPhase(messageDataV.getMaxVa9()));
+            dataHarmphasicV.setV10Max(adjustPhase(messageDataV.getMaxVa10()));
+            dataHarmphasicV.setV11Max(adjustPhase(messageDataV.getMaxVa11()));
+            dataHarmphasicV.setV12Max(adjustPhase(messageDataV.getMaxVa12()));
+            dataHarmphasicV.setV13Max(adjustPhase(messageDataV.getMaxVa13()));
+            dataHarmphasicV.setV14Max(adjustPhase(messageDataV.getMaxVa14()));
+            dataHarmphasicV.setV15Max(adjustPhase(messageDataV.getMaxVa15()));
+            dataHarmphasicV.setV16Max(adjustPhase(messageDataV.getMaxVa16()));
+            dataHarmphasicV.setV17Max(adjustPhase(messageDataV.getMaxVa17()));
+            dataHarmphasicV.setV18Max(adjustPhase(messageDataV.getMaxVa18()));
+            dataHarmphasicV.setV19Max(adjustPhase(messageDataV.getMaxVa19()));
+            dataHarmphasicV.setV20Max(adjustPhase(messageDataV.getMaxVa20()));
+            dataHarmphasicV.setV21Max(adjustPhase(messageDataV.getMaxVa21()));
+            dataHarmphasicV.setV22Max(adjustPhase(messageDataV.getMaxVa22()));
+            dataHarmphasicV.setV23Max(adjustPhase(messageDataV.getMaxVa23()));
+            dataHarmphasicV.setV24Max(adjustPhase(messageDataV.getMaxVa24()));
+            dataHarmphasicV.setV25Max(adjustPhase(messageDataV.getMaxVa25()));
+            dataHarmphasicV.setV26Max(adjustPhase(messageDataV.getMaxVa26()));
+            dataHarmphasicV.setV27Max(adjustPhase(messageDataV.getMaxVa27()));
+            dataHarmphasicV.setV28Max(adjustPhase(messageDataV.getMaxVa28()));
+            dataHarmphasicV.setV29Max(adjustPhase(messageDataV.getMaxVa29()));
+            dataHarmphasicV.setV30Max(adjustPhase(messageDataV.getMaxVa30()));
+            dataHarmphasicV.setV31Max(adjustPhase(messageDataV.getMaxVa31()));
+            dataHarmphasicV.setV32Max(adjustPhase(messageDataV.getMaxVa32()));
+            dataHarmphasicV.setV33Max(adjustPhase(messageDataV.getMaxVa33()));
+            dataHarmphasicV.setV34Max(adjustPhase(messageDataV.getMaxVa34()));
+            dataHarmphasicV.setV35Max(adjustPhase(messageDataV.getMaxVa35()));
+            dataHarmphasicV.setV36Max(adjustPhase(messageDataV.getMaxVa36()));
+            dataHarmphasicV.setV37Max(adjustPhase(messageDataV.getMaxVa37()));
+            dataHarmphasicV.setV38Max(adjustPhase(messageDataV.getMaxVa38()));
+            dataHarmphasicV.setV39Max(adjustPhase(messageDataV.getMaxVa39()));
+            dataHarmphasicV.setV40Max(adjustPhase(messageDataV.getMaxVa40()));
+            dataHarmphasicV.setV41Max(adjustPhase(messageDataV.getMaxVa41()));
+            dataHarmphasicV.setV42Max(adjustPhase(messageDataV.getMaxVa42()));
+            dataHarmphasicV.setV43Max(adjustPhase(messageDataV.getMaxVa43()));
+            dataHarmphasicV.setV44Max(adjustPhase(messageDataV.getMaxVa44()));
+            dataHarmphasicV.setV45Max(adjustPhase(messageDataV.getMaxVa45()));
+            dataHarmphasicV.setV46Max(adjustPhase(messageDataV.getMaxVa46()));
+            dataHarmphasicV.setV47Max(adjustPhase(messageDataV.getMaxVa47()));
+            dataHarmphasicV.setV48Max(adjustPhase(messageDataV.getMaxVa48()));
+            dataHarmphasicV.setV49Max(adjustPhase(messageDataV.getMaxVa49()));
+            dataHarmphasicV.setV50Max(adjustPhase(messageDataV.getMaxVa50()));
 
-            dataHarmphasicV.setV1Min(messageDataV.getMinVfundAngle());
-            dataHarmphasicV.setV2Min(messageDataV.getMinVa2());
-            dataHarmphasicV.setV3Min(messageDataV.getMinVa3());
-            dataHarmphasicV.setV4Min(messageDataV.getMinVa4());
-            dataHarmphasicV.setV5Min(messageDataV.getMinVa5());
-            dataHarmphasicV.setV6Min(messageDataV.getMinVa6());
-            dataHarmphasicV.setV7Min(messageDataV.getMinVa7());
-            dataHarmphasicV.setV8Min(messageDataV.getMinVa8());
-            dataHarmphasicV.setV9Min(messageDataV.getMinVa9());
-            dataHarmphasicV.setV10Min(messageDataV.getMinVa10());
-            dataHarmphasicV.setV11Min(messageDataV.getMinVa11());
-            dataHarmphasicV.setV12Min(messageDataV.getMinVa12());
-            dataHarmphasicV.setV13Min(messageDataV.getMinVa13());
-            dataHarmphasicV.setV14Min(messageDataV.getMinVa14());
-            dataHarmphasicV.setV15Min(messageDataV.getMinVa15());
-            dataHarmphasicV.setV16Min(messageDataV.getMinVa16());
-            dataHarmphasicV.setV17Min(messageDataV.getMinVa17());
-            dataHarmphasicV.setV18Min(messageDataV.getMinVa18());
-            dataHarmphasicV.setV19Min(messageDataV.getMinVa19());
-            dataHarmphasicV.setV20Min(messageDataV.getMinVa20());
-            dataHarmphasicV.setV21Min(messageDataV.getMinVa21());
-            dataHarmphasicV.setV22Min(messageDataV.getMinVa22());
-            dataHarmphasicV.setV23Min(messageDataV.getMinVa23());
-            dataHarmphasicV.setV24Min(messageDataV.getMinVa24());
-            dataHarmphasicV.setV25Min(messageDataV.getMinVa25());
-            dataHarmphasicV.setV26Min(messageDataV.getMinVa26());
-            dataHarmphasicV.setV27Min(messageDataV.getMinVa27());
-            dataHarmphasicV.setV28Min(messageDataV.getMinVa28());
-            dataHarmphasicV.setV29Min(messageDataV.getMinVa29());
-            dataHarmphasicV.setV30Min(messageDataV.getMinVa30());
-            dataHarmphasicV.setV31Min(messageDataV.getMinVa31());
-            dataHarmphasicV.setV32Min(messageDataV.getMinVa32());
-            dataHarmphasicV.setV33Min(messageDataV.getMinVa33());
-            dataHarmphasicV.setV34Min(messageDataV.getMinVa34());
-            dataHarmphasicV.setV35Min(messageDataV.getMinVa35());
-            dataHarmphasicV.setV36Min(messageDataV.getMinVa36());
-            dataHarmphasicV.setV37Min(messageDataV.getMinVa37());
-            dataHarmphasicV.setV38Min(messageDataV.getMinVa38());
-            dataHarmphasicV.setV39Min(messageDataV.getMinVa39());
-            dataHarmphasicV.setV40Min(messageDataV.getMinVa40());
-            dataHarmphasicV.setV41Min(messageDataV.getMinVa41());
-            dataHarmphasicV.setV42Min(messageDataV.getMinVa42());
-            dataHarmphasicV.setV43Min(messageDataV.getMinVa43());
-            dataHarmphasicV.setV44Min(messageDataV.getMinVa44());
-            dataHarmphasicV.setV45Min(messageDataV.getMinVa45());
-            dataHarmphasicV.setV46Min(messageDataV.getMinVa46());
-            dataHarmphasicV.setV47Min(messageDataV.getMinVa47());
-            dataHarmphasicV.setV48Min(messageDataV.getMinVa48());
-            dataHarmphasicV.setV49Min(messageDataV.getMinVa49());
-            dataHarmphasicV.setV50Min(messageDataV.getMinVa50());
+            dataHarmphasicV.setV1Min(adjustPhase(messageDataV.getMinVfundAngle()));
+            dataHarmphasicV.setV2Min(adjustPhase(messageDataV.getMinVa2()));
+            dataHarmphasicV.setV3Min(adjustPhase(messageDataV.getMinVa3()));
+            dataHarmphasicV.setV4Min(adjustPhase(messageDataV.getMinVa4()));
+            dataHarmphasicV.setV5Min(adjustPhase(messageDataV.getMinVa5()));
+            dataHarmphasicV.setV6Min(adjustPhase(messageDataV.getMinVa6()));
+            dataHarmphasicV.setV7Min(adjustPhase(messageDataV.getMinVa7()));
+            dataHarmphasicV.setV8Min(adjustPhase(messageDataV.getMinVa8()));
+            dataHarmphasicV.setV9Min(adjustPhase(messageDataV.getMinVa9()));
+            dataHarmphasicV.setV10Min(adjustPhase(messageDataV.getMinVa10()));
+            dataHarmphasicV.setV11Min(adjustPhase(messageDataV.getMinVa11()));
+            dataHarmphasicV.setV12Min(adjustPhase(messageDataV.getMinVa12()));
+            dataHarmphasicV.setV13Min(adjustPhase(messageDataV.getMinVa13()));
+            dataHarmphasicV.setV14Min(adjustPhase(messageDataV.getMinVa14()));
+            dataHarmphasicV.setV15Min(adjustPhase(messageDataV.getMinVa15()));
+            dataHarmphasicV.setV16Min(adjustPhase(messageDataV.getMinVa16()));
+            dataHarmphasicV.setV17Min(adjustPhase(messageDataV.getMinVa17()));
+            dataHarmphasicV.setV18Min(adjustPhase(messageDataV.getMinVa18()));
+            dataHarmphasicV.setV19Min(adjustPhase(messageDataV.getMinVa19()));
+            dataHarmphasicV.setV20Min(adjustPhase(messageDataV.getMinVa20()));
+            dataHarmphasicV.setV21Min(adjustPhase(messageDataV.getMinVa21()));
+            dataHarmphasicV.setV22Min(adjustPhase(messageDataV.getMinVa22()));
+            dataHarmphasicV.setV23Min(adjustPhase(messageDataV.getMinVa23()));
+            dataHarmphasicV.setV24Min(adjustPhase(messageDataV.getMinVa24()));
+            dataHarmphasicV.setV25Min(adjustPhase(messageDataV.getMinVa25()));
+            dataHarmphasicV.setV26Min(adjustPhase(messageDataV.getMinVa26()));
+            dataHarmphasicV.setV27Min(adjustPhase(messageDataV.getMinVa27()));
+            dataHarmphasicV.setV28Min(adjustPhase(messageDataV.getMinVa28()));
+            dataHarmphasicV.setV29Min(adjustPhase(messageDataV.getMinVa29()));
+            dataHarmphasicV.setV30Min(adjustPhase(messageDataV.getMinVa30()));
+            dataHarmphasicV.setV31Min(adjustPhase(messageDataV.getMinVa31()));
+            dataHarmphasicV.setV32Min(adjustPhase(messageDataV.getMinVa32()));
+            dataHarmphasicV.setV33Min(adjustPhase(messageDataV.getMinVa33()));
+            dataHarmphasicV.setV34Min(adjustPhase(messageDataV.getMinVa34()));
+            dataHarmphasicV.setV35Min(adjustPhase(messageDataV.getMinVa35()));
+            dataHarmphasicV.setV36Min(adjustPhase(messageDataV.getMinVa36()));
+            dataHarmphasicV.setV37Min(adjustPhase(messageDataV.getMinVa37()));
+            dataHarmphasicV.setV38Min(adjustPhase(messageDataV.getMinVa38()));
+            dataHarmphasicV.setV39Min(adjustPhase(messageDataV.getMinVa39()));
+            dataHarmphasicV.setV40Min(adjustPhase(messageDataV.getMinVa40()));
+            dataHarmphasicV.setV41Min(adjustPhase(messageDataV.getMinVa41()));
+            dataHarmphasicV.setV42Min(adjustPhase(messageDataV.getMinVa42()));
+            dataHarmphasicV.setV43Min(adjustPhase(messageDataV.getMinVa43()));
+            dataHarmphasicV.setV44Min(adjustPhase(messageDataV.getMinVa44()));
+            dataHarmphasicV.setV45Min(adjustPhase(messageDataV.getMinVa45()));
+            dataHarmphasicV.setV46Min(adjustPhase(messageDataV.getMinVa46()));
+            dataHarmphasicV.setV47Min(adjustPhase(messageDataV.getMinVa47()));
+            dataHarmphasicV.setV48Min(adjustPhase(messageDataV.getMinVa48()));
+            dataHarmphasicV.setV49Min(adjustPhase(messageDataV.getMinVa49()));
+            dataHarmphasicV.setV50Min(adjustPhase(messageDataV.getMinVa50()));
 
-            dataHarmphasicV.setV1Cp95(messageDataV.getGVfundAngle());
-            dataHarmphasicV.setV2Cp95(messageDataV.getGVa2());
-            dataHarmphasicV.setV3Cp95(messageDataV.getGVa3());
-            dataHarmphasicV.setV4Cp95(messageDataV.getGVa4());
-            dataHarmphasicV.setV5Cp95(messageDataV.getGVa5());
-            dataHarmphasicV.setV6Cp95(messageDataV.getGVa6());
-            dataHarmphasicV.setV7Cp95(messageDataV.getGVa7());
-            dataHarmphasicV.setV8Cp95(messageDataV.getGVa8());
-            dataHarmphasicV.setV9Cp95(messageDataV.getGVa9());
-            dataHarmphasicV.setV10Cp95(messageDataV.getGVa10());
-            dataHarmphasicV.setV11Cp95(messageDataV.getGVa11());
-            dataHarmphasicV.setV12Cp95(messageDataV.getGVa12());
-            dataHarmphasicV.setV13Cp95(messageDataV.getGVa13());
-            dataHarmphasicV.setV14Cp95(messageDataV.getGVa14());
-            dataHarmphasicV.setV15Cp95(messageDataV.getGVa15());
-            dataHarmphasicV.setV16Cp95(messageDataV.getGVa16());
-            dataHarmphasicV.setV17Cp95(messageDataV.getGVa17());
-            dataHarmphasicV.setV18Cp95(messageDataV.getGVa18());
-            dataHarmphasicV.setV19Cp95(messageDataV.getGVa19());
-            dataHarmphasicV.setV20Cp95(messageDataV.getGVa20());
-            dataHarmphasicV.setV21Cp95(messageDataV.getGVa21());
-            dataHarmphasicV.setV22Cp95(messageDataV.getGVa22());
-            dataHarmphasicV.setV23Cp95(messageDataV.getGVa23());
-            dataHarmphasicV.setV24Cp95(messageDataV.getGVa24());
-            dataHarmphasicV.setV25Cp95(messageDataV.getGVa25());
-            dataHarmphasicV.setV26Cp95(messageDataV.getGVa26());
-            dataHarmphasicV.setV27Cp95(messageDataV.getGVa27());
-            dataHarmphasicV.setV28Cp95(messageDataV.getGVa28());
-            dataHarmphasicV.setV29Cp95(messageDataV.getGVa29());
-            dataHarmphasicV.setV30Cp95(messageDataV.getGVa30());
-            dataHarmphasicV.setV31Cp95(messageDataV.getGVa31());
-            dataHarmphasicV.setV32Cp95(messageDataV.getGVa32());
-            dataHarmphasicV.setV33Cp95(messageDataV.getGVa33());
-            dataHarmphasicV.setV34Cp95(messageDataV.getGVa34());
-            dataHarmphasicV.setV35Cp95(messageDataV.getGVa35());
-            dataHarmphasicV.setV36Cp95(messageDataV.getGVa36());
-            dataHarmphasicV.setV37Cp95(messageDataV.getGVa37());
-            dataHarmphasicV.setV38Cp95(messageDataV.getGVa38());
-            dataHarmphasicV.setV39Cp95(messageDataV.getGVa39());
-            dataHarmphasicV.setV40Cp95(messageDataV.getGVa40());
-            dataHarmphasicV.setV41Cp95(messageDataV.getGVa41());
-            dataHarmphasicV.setV42Cp95(messageDataV.getGVa42());
-            dataHarmphasicV.setV43Cp95(messageDataV.getGVa43());
-            dataHarmphasicV.setV44Cp95(messageDataV.getGVa44());
-            dataHarmphasicV.setV45Cp95(messageDataV.getGVa45());
-            dataHarmphasicV.setV46Cp95(messageDataV.getGVa46());
-            dataHarmphasicV.setV47Cp95(messageDataV.getGVa47());
-            dataHarmphasicV.setV48Cp95(messageDataV.getGVa48());
-            dataHarmphasicV.setV49Cp95(messageDataV.getGVa49());
-            dataHarmphasicV.setV50Cp95(messageDataV.getGVa50());
+            dataHarmphasicV.setV1Cp95(adjustPhase(messageDataV.getGVfundAngle()));
+            dataHarmphasicV.setV2Cp95(adjustPhase(messageDataV.getGVa2()));
+            dataHarmphasicV.setV3Cp95(adjustPhase(messageDataV.getGVa3()));
+            dataHarmphasicV.setV4Cp95(adjustPhase(messageDataV.getGVa4()));
+            dataHarmphasicV.setV5Cp95(adjustPhase(messageDataV.getGVa5()));
+            dataHarmphasicV.setV6Cp95(adjustPhase(messageDataV.getGVa6()));
+            dataHarmphasicV.setV7Cp95(adjustPhase(messageDataV.getGVa7()));
+            dataHarmphasicV.setV8Cp95(adjustPhase(messageDataV.getGVa8()));
+            dataHarmphasicV.setV9Cp95(adjustPhase(messageDataV.getGVa9()));
+            dataHarmphasicV.setV10Cp95(adjustPhase(messageDataV.getGVa10()));
+            dataHarmphasicV.setV11Cp95(adjustPhase(messageDataV.getGVa11()));
+            dataHarmphasicV.setV12Cp95(adjustPhase(messageDataV.getGVa12()));
+            dataHarmphasicV.setV13Cp95(adjustPhase(messageDataV.getGVa13()));
+            dataHarmphasicV.setV14Cp95(adjustPhase(messageDataV.getGVa14()));
+            dataHarmphasicV.setV15Cp95(adjustPhase(messageDataV.getGVa15()));
+            dataHarmphasicV.setV16Cp95(adjustPhase(messageDataV.getGVa16()));
+            dataHarmphasicV.setV17Cp95(adjustPhase(messageDataV.getGVa17()));
+            dataHarmphasicV.setV18Cp95(adjustPhase(messageDataV.getGVa18()));
+            dataHarmphasicV.setV19Cp95(adjustPhase(messageDataV.getGVa19()));
+            dataHarmphasicV.setV20Cp95(adjustPhase(messageDataV.getGVa20()));
+            dataHarmphasicV.setV21Cp95(adjustPhase(messageDataV.getGVa21()));
+            dataHarmphasicV.setV22Cp95(adjustPhase(messageDataV.getGVa22()));
+            dataHarmphasicV.setV23Cp95(adjustPhase(messageDataV.getGVa23()));
+            dataHarmphasicV.setV24Cp95(adjustPhase(messageDataV.getGVa24()));
+            dataHarmphasicV.setV25Cp95(adjustPhase(messageDataV.getGVa25()));
+            dataHarmphasicV.setV26Cp95(adjustPhase(messageDataV.getGVa26()));
+            dataHarmphasicV.setV27Cp95(adjustPhase(messageDataV.getGVa27()));
+            dataHarmphasicV.setV28Cp95(adjustPhase(messageDataV.getGVa28()));
+            dataHarmphasicV.setV29Cp95(adjustPhase(messageDataV.getGVa29()));
+            dataHarmphasicV.setV30Cp95(adjustPhase(messageDataV.getGVa30()));
+            dataHarmphasicV.setV31Cp95(adjustPhase(messageDataV.getGVa31()));
+            dataHarmphasicV.setV32Cp95(adjustPhase(messageDataV.getGVa32()));
+            dataHarmphasicV.setV33Cp95(adjustPhase(messageDataV.getGVa33()));
+            dataHarmphasicV.setV34Cp95(adjustPhase(messageDataV.getGVa34()));
+            dataHarmphasicV.setV35Cp95(adjustPhase(messageDataV.getGVa35()));
+            dataHarmphasicV.setV36Cp95(adjustPhase(messageDataV.getGVa36()));
+            dataHarmphasicV.setV37Cp95(adjustPhase(messageDataV.getGVa37()));
+            dataHarmphasicV.setV38Cp95(adjustPhase(messageDataV.getGVa38()));
+            dataHarmphasicV.setV39Cp95(adjustPhase(messageDataV.getGVa39()));
+            dataHarmphasicV.setV40Cp95(adjustPhase(messageDataV.getGVa40()));
+            dataHarmphasicV.setV41Cp95(adjustPhase(messageDataV.getGVa41()));
+            dataHarmphasicV.setV42Cp95(adjustPhase(messageDataV.getGVa42()));
+            dataHarmphasicV.setV43Cp95(adjustPhase(messageDataV.getGVa43()));
+            dataHarmphasicV.setV44Cp95(adjustPhase(messageDataV.getGVa44()));
+            dataHarmphasicV.setV45Cp95(adjustPhase(messageDataV.getGVa45()));
+            dataHarmphasicV.setV46Cp95(adjustPhase(messageDataV.getGVa46()));
+            dataHarmphasicV.setV47Cp95(adjustPhase(messageDataV.getGVa47()));
+            dataHarmphasicV.setV48Cp95(adjustPhase(messageDataV.getGVa48()));
+            dataHarmphasicV.setV49Cp95(adjustPhase(messageDataV.getGVa49()));
+            dataHarmphasicV.setV50Cp95(adjustPhase(messageDataV.getGVa50()));
 
         }
 
@@ -980,4 +1002,5 @@ public class BeanVConverter {
 
         return dataHarmrateVDTO;
     }
+
 }

analysis/stat/stat-boot/src/main/resources/bootstrap-jb.yml

@@ -0,0 +1,52 @@
+#当前服务的基本信息
+microservice:
+  ename: @artifactId@
+  name: '@name@'
+  version: @version@
+  sentinel:
+    url: @sentinel.url@
+  gateway:
+    url: @gateway.url@
+server:
+  port: 10404
+#feign接口开启服务熔断降级处理
+feign:
+  sentinel:
+    enabled: true
+spring:
+  application:
+    name: @artifactId@
+  cloud:
+    nacos:
+      discovery:
+        server-addr: @nacos.url@
+        namespace: @nacos.namespace@
+      config:
+        username: @nacos.username@
+        password: @nacos.password@
+        server-addr: @nacos.url@
+        namespace: @nacos.namespace@
+        file-extension: yaml
+        shared-configs:
+          - data-id: share-config.yaml
+            refresh: true
+          - data-id: share-config-datasource-db.yaml
+            refresh: true
+  main:
+    allow-bean-definition-overriding: true
+
+
+#项目日志的配置
+logging:
+  #config: http://@nacos.url@/nacos/v1/cs/configs?tenant=@nacos.namespace@&group=DEFAULT_GROUP&dataId=logback.xml
+  level:
+    root: info
+
+
+#mybatis配置信息
+mybatis-plus:
+  #别名扫描
+  type-aliases-package: com.njcn.harmonic.pojo
+
+mqtt:
+  client-id: @artifactId@${random.value}

analysis/stat/stat-boot/src/main/resources/bootstrap-sjzx.yml

@@ -0,0 +1,57 @@
+#当前服务的基本信息
+microservice:
+  ename: @artifactId@
+  name: '@name@'
+  version: @version@
+  sentinel:
+    url: @sentinel.url@
+  gateway:
+    url: @gateway.url@
+server:
+  port: 10404
+#feign接口开启服务熔断降级处理
+feign:
+  sentinel:
+    enabled: true
+spring:
+  application:
+    name: @artifactId@
+  cloud:
+    nacos:
+      discovery:
+        ip: @service.server.url@
+        server-addr: @nacos.url@
+        namespace: @nacos.namespace@
+        username: @nacos.username@
+        password: @nacos.password@
+      config:
+        server-addr: @nacos.url@
+        namespace: @nacos.namespace@
+        username: @nacos.username@
+        password: @nacos.password@
+        file-extension: yaml
+        shared-configs:
+          - data-id: share-config.yaml
+            refresh: true
+          - data-id: share-config-datasource-db.yaml
+            refresh: true
+          - data-id: data-platform.yaml
+            refresh: true
+  main:
+    allow-bean-definition-overriding: true
+
+
+#项目日志的配置
+logging:
+  #config: http://@nacos.url@/nacos/v1/cs/configs?tenant=@nacos.namespace@&group=DEFAULT_GROUP&dataId=logback.xml
+  level:
+    root: info
+
+
+#mybatis配置信息
+mybatis-plus:
+  #别名扫描
+  type-aliases-package: com.njcn.harmonic.pojo
+
+mqtt:
+  client-id: @artifactId@${random.value}

analysis/stat/stat-boot/src/main/resources/bootstrap.yml

@@ -1,53 +1,3 @@
-#当前服务的基本信息
-microservice:
-  ename: @artifactId@
-  name: '@name@'
-  version: @version@
-  sentinel:
-    url: @sentinel.url@
-  gateway:
-    url: @gateway.url@
-server:
-  port: 10404
-#feign接口开启服务熔断降级处理
-feign:
-  sentinel:
-    enabled: true
 spring:
-  application:
-    name: @artifactId@
-  cloud:
-    nacos:
-      discovery:
-        ip: @service.server.url@
-        server-addr: @nacos.url@
-        namespace: @nacos.namespace@
-      config:
-        server-addr: @nacos.url@
-        namespace: @nacos.namespace@
-        file-extension: yaml
-        shared-configs:
-          - data-id: share-config.yaml
-            refresh: true
-          - data-Id: share-config-datasource-db.yaml
-            refresh: true
-          - data-Id: data-platform.yaml
-            refresh: true
-  main:
-    allow-bean-definition-overriding: true
-
-
-#项目日志的配置
-logging:
-  config: http://@nacos.url@/nacos/v1/cs/configs?tenant=@nacos.namespace@&group=DEFAULT_GROUP&dataId=logback.xml
-  level:
-    root: info
-
-
-#mybatis配置信息
-mybatis-plus:
-  #别名扫描
-  type-aliases-package: com.njcn.harmonic.pojo
-
-mqtt:
-  client-id: @artifactId@${random.value}
+  profiles:
+    active: @spring.profiles.active@

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

@@ -2,10 +2,7 @@ package com.njcn.dataProcess.api;
 
 import com.njcn.common.pojo.constant.ServerInfo;
 import com.njcn.common.pojo.response.HttpResult;
-import com.njcn.dataProcess.api.fallback.RmpEventFeignClientFallbackFactory;
 import com.njcn.dataProcess.api.fallback.SpThroughFeignClientFallbackFactory;
-import com.njcn.dataProcess.dto.RmpEventDetailDTO;
-import com.njcn.dataProcess.param.LineCountEvaluateParam;
 import com.njcn.dataProcess.pojo.dto.RActivePowerRangeDto;
 import com.njcn.dataProcess.pojo.dto.SpThroughDto;
 import org.springframework.cloud.openfeign.FeignClient;

data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/constant/InfluxDBTableConstant.java

@@ -196,5 +196,8 @@ public interface InfluxDBTableConstant {
     String NORMAL = "0";
     String UN_NORMAL = "1";
 
-
+    /**
+     * 数据清洗标志 0:正常 1:异常
+     */
+    String ABNORMAL_FLAG = "abnormal_flag";
 }

data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/dto/DataVDTO.java

@@ -23,6 +23,7 @@ public class DataVDTO {
     @JsonDeserialize(using = LocalDateTimeDeserializer.class)
     @JsonSerialize(using = LocalDateTimeSerializer.class)
     private LocalDateTime timeid;
+    private String devId;
     private String lineid;
     private String phasicType;
     private Double rms;

data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/po/influx/DataHarmpowerP.java

@@ -214,111 +214,111 @@ public class DataHarmpowerP {
     private Double p50;
 
     //在线监测添加的字段
-    @Column(name = "totPf")
-    private Double totPf;
-    @Column(name = "totDf")
-    private Double totDf;
-    @Column(name = "totP")
+    @Column(name = "tot_p")
     private Double totP;
-    @Column(name = "totP1")
+    @Column(name = "tot_df")
+    private Double totDf;
+    @Column(name = "tot_pf")
+    private Double totPf;
+    @Column(name = "tot_tp_1")
     private Double totP1;
-    @Column(name = "totP2")
+    @Column(name = "tot_tp_2")
     private Double totP2;
-    @Column(name = "totP3")
+    @Column(name = "tot_tp_3")
     private Double totP3;
-    @Column(name = "totP4")
+    @Column(name = "tot_tp_4")
     private Double totP4;
-    @Column(name = "totP5")
+    @Column(name = "tot_tp_5")
     private Double totP5;
-    @Column(name = "totP6")
+    @Column(name = "tot_tp_6")
     private Double totP6;
-    @Column(name = "totP7")
+    @Column(name = "tot_tp_7")
     private Double totP7;
-    @Column(name = "totP8")
+    @Column(name = "tot_tp_8")
     private Double totP8;
-    @Column(name = "totP9")
+    @Column(name = "tot_tp_9")
     private Double totP9;
-    @Column(name = "totP10")
+    @Column(name = "tot_tp_10")
     private Double totP10;
-    @Column(name = "totP11")
+    @Column(name = "tot_tp_11")
     private Double totP11;
-    @Column(name = "totP12")
+    @Column(name = "tot_tp_12")
     private Double totP12;
-    @Column(name = "totP13")
+    @Column(name = "tot_tp_13")
     private Double totP13;
-    @Column(name = "totP14")
+    @Column(name = "tot_tp_14")
     private Double totP14;
-    @Column(name = "totP15")
+    @Column(name = "tot_tp_15")
     private Double totP15;
-    @Column(name = "totP16")
+    @Column(name = "tot_tp_16")
     private Double totP16;
-    @Column(name = "totP17")
+    @Column(name = "tot_tp_17")
     private Double totP17;
-    @Column(name = "totP18")
+    @Column(name = "tot_tp_18")
     private Double totP18;
-    @Column(name = "totP19")
+    @Column(name = "tot_tp_19")
     private Double totP19;
-    @Column(name = "totP20")
+    @Column(name = "tot_tp_20")
     private Double totP20;
-    @Column(name = "totP21")
+    @Column(name = "tot_tp_21")
     private Double totP21;
-    @Column(name = "totP22")
+    @Column(name = "tot_tp_22")
     private Double totP22;
-    @Column(name = "totP23")
+    @Column(name = "tot_tp_23")
     private Double totP23;
-    @Column(name = "totP24")
+    @Column(name = "tot_tp_24")
     private Double totP24;
-    @Column(name = "totP25")
+    @Column(name = "tot_tp_25")
     private Double totP25;
-    @Column(name = "totP26")
+    @Column(name = "tot_tp_26")
     private Double totP26;
-    @Column(name = "totP27")
+    @Column(name = "tot_tp_27")
     private Double totP27;
-    @Column(name = "totP28")
+    @Column(name = "tot_tp_28")
     private Double totP28;
-    @Column(name = "totP29")
+    @Column(name = "tot_tp_29")
     private Double totP29;
-    @Column(name = "totP30")
+    @Column(name = "tot_tp_30")
     private Double totP30;
-    @Column(name = "totP31")
+    @Column(name = "tot_tp_31")
     private Double totP31;
-    @Column(name = "totP32")
+    @Column(name = "tot_tp_32")
     private Double totP32;
-    @Column(name = "totP33")
+    @Column(name = "tot_tp_33")
     private Double totP33;
-    @Column(name = "totP34")
+    @Column(name = "tot_tp_34")
     private Double totP34;
-    @Column(name = "totP35")
+    @Column(name = "tot_tp_35")
     private Double totP35;
-    @Column(name = "totP36")
+    @Column(name = "tot_tp_36")
     private Double totP36;
-    @Column(name = "totP37")
+    @Column(name = "tot_tp_37")
     private Double totP37;
-    @Column(name = "totP38")
+    @Column(name = "tot_tp_38")
     private Double totP38;
-    @Column(name = "totP39")
+    @Column(name = "tot_tp_39")
     private Double totP39;
-    @Column(name = "totP40")
+    @Column(name = "tot_tp_40")
     private Double totP40;
-    @Column(name = "totP41")
+    @Column(name = "tot_tp_41")
     private Double totP41;
-    @Column(name = "totP42")
+    @Column(name = "tot_tp_42")
     private Double totP42;
-    @Column(name = "totP43")
+    @Column(name = "tot_tp_43")
     private Double totP43;
-    @Column(name = "totP44")
+    @Column(name = "tot_tp_44")
     private Double totP44;
-    @Column(name = "totP45")
+    @Column(name = "tot_tp_45")
     private Double totP45;
-    @Column(name = "totP46")
+    @Column(name = "tot_tp_46")
     private Double totP46;
-    @Column(name = "totP47")
+    @Column(name = "tot_tp_47")
     private Double totP47;
-    @Column(name = "totP49")
+    @Column(name = "tot_tp_49")
     private Double totP48;
-    @Column(name = "totP49")
+    @Column(name = "tot_tp_49")
     private Double totP49;
-    @Column(name = "totP50")
+    @Column(name = "tot_tp_50")
     private Double totP50;
 
 

data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/po/influx/DataHarmpowerQ.java

@@ -208,107 +208,107 @@ public class DataHarmpowerQ {
     private Double q50;
 
     //在线监测添加的字段
-    @Column(name = "totQ")
+    @Column(name = "tot_q")
     private Double totQ;
-    @Column(name = "totQ1")
+    @Column(name = "tot_tq_1")
     private Double totQ1;
-    @Column(name = "totQ2")
+    @Column(name = "tot_tq_2")
     private Double totQ2;
-    @Column(name = "totQ3")
+    @Column(name = "tot_tq_3")
     private Double totQ3;
-    @Column(name = "totQ4")
+    @Column(name = "tot_tq_4")
     private Double totQ4;
-    @Column(name = "totQ5")
+    @Column(name = "tot_tq_5")
     private Double totQ5;
-    @Column(name = "totQ6")
+    @Column(name = "tot_tq_6")
     private Double totQ6;
-    @Column(name = "totQ7")
+    @Column(name = "tot_tq_7")
     private Double totQ7;
-    @Column(name = "totQ8")
+    @Column(name = "tot_tq_8")
     private Double totQ8;
-    @Column(name = "totQ9")
+    @Column(name = "tot_tq_9")
     private Double totQ9;
-    @Column(name = "totQ10")
+    @Column(name = "tot_tq_10")
     private Double totQ10;
-    @Column(name = "totQ11")
+    @Column(name = "tot_tq_11")
     private Double totQ11;
-    @Column(name = "totQ12")
+    @Column(name = "tot_tq_12")
     private Double totQ12;
-    @Column(name = "totQ13")
+    @Column(name = "tot_tq_13")
     private Double totQ13;
-    @Column(name = "totQ14")
+    @Column(name = "tot_tq_14")
     private Double totQ14;
-    @Column(name = "totQ15")
+    @Column(name = "tot_tq_15")
     private Double totQ15;
-    @Column(name = "totQ16")
+    @Column(name = "tot_tq_16")
     private Double totQ16;
-    @Column(name = "totQ17")
+    @Column(name = "tot_tq_17")
     private Double totQ17;
-    @Column(name = "totQ18")
+    @Column(name = "tot_tq_18")
     private Double totQ18;
-    @Column(name = "totQ19")
+    @Column(name = "tot_tq_19")
     private Double totQ19;
-    @Column(name = "totQ20")
+    @Column(name = "tot_tq_20")
     private Double totQ20;
-    @Column(name = "totQ21")
+    @Column(name = "tot_tq_21")
     private Double totQ21;
-    @Column(name = "totQ22")
+    @Column(name = "tot_tq_22")
     private Double totQ22;
-    @Column(name = "totQ23")
+    @Column(name = "tot_tq_23")
     private Double totQ23;
-    @Column(name = "totQ24")
+    @Column(name = "tot_tq_24")
     private Double totQ24;
-    @Column(name = "totQ25")
+    @Column(name = "tot_tq_25")
     private Double totQ25;
-    @Column(name = "totQ26")
+    @Column(name = "tot_tq_26")
     private Double totQ26;
-    @Column(name = "totQ27")
+    @Column(name = "tot_tq_27")
     private Double totQ27;
-    @Column(name = "totQ28")
+    @Column(name = "tot_tq_28")
     private Double totQ28;
-    @Column(name = "totQ29")
+    @Column(name = "tot_tq_29")
     private Double totQ29;
-    @Column(name = "totQ30")
+    @Column(name = "tot_tq_30")
     private Double totQ30;
-    @Column(name = "totQ31")
+    @Column(name = "tot_tq_31")
     private Double totQ31;
-    @Column(name = "totQ32")
+    @Column(name = "tot_tq_32")
     private Double totQ32;
-    @Column(name = "totQ33")
+    @Column(name = "tot_tq_33")
     private Double totQ33;
-    @Column(name = "totQ34")
+    @Column(name = "tot_tq_34")
     private Double totQ34;
-    @Column(name = "totQ35")
+    @Column(name = "tot_tq_35")
     private Double totQ35;
-    @Column(name = "totQ36")
+    @Column(name = "tot_tq_36")
     private Double totQ36;
-    @Column(name = "totQ37")
+    @Column(name = "tot_tq_37")
     private Double totQ37;
-    @Column(name = "totQ38")
+    @Column(name = "tot_tq_38")
     private Double totQ38;
-    @Column(name = "totQ39")
+    @Column(name = "tot_tq_39")
     private Double totQ39;
-    @Column(name = "totQ40")
+    @Column(name = "tot_tq_40")
     private Double totQ40;
-    @Column(name = "totQ41")
+    @Column(name = "tot_tq_41")
     private Double totQ41;
-    @Column(name = "totQ42")
+    @Column(name = "tot_tq_42")
     private Double totQ42;
-    @Column(name = "totQ43")
+    @Column(name = "tot_tq_43")
     private Double totQ43;
-    @Column(name = "totQ44")
+    @Column(name = "tot_tq_44")
     private Double totQ44;
-    @Column(name = "totQ45")
+    @Column(name = "tot_tq_45")
     private Double totQ45;
-    @Column(name = "totQ46")
+    @Column(name = "tot_tq_46")
     private Double totQ46;
-    @Column(name = "totQ47")
+    @Column(name = "tot_tq_47")
     private Double totQ47;
-    @Column(name = "totQ49")
+    @Column(name = "tot_tq_49")
     private Double totQ48;
-    @Column(name = "totQ49")
+    @Column(name = "tot_tq_49")
     private Double totQ49;
-    @Column(name = "totQ50")
+    @Column(name = "tot_tq_50")
     private Double totQ50;
 
 

data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/po/influx/DataHarmpowerS.java

@@ -208,107 +208,107 @@ public class DataHarmpowerS {
     private Double s50;
 
     //在线监测添加的字段
-    @Column(name = "totS")
+    @Column(name = "tot_s")
     private Double totS;
-    @Column(name = "totS1")
+    @Column(name = "tot_ts_1")
     private Double totS1;
-    @Column(name = "totS2")
+    @Column(name = "tot_ts_2")
     private Double totS2;
-    @Column(name = "totS3")
+    @Column(name = "tot_ts_3")
     private Double totS3;
-    @Column(name = "totS4")
+    @Column(name = "tot_ts_4")
     private Double totS4;
-    @Column(name = "totS5")
+    @Column(name = "tot_ts_5")
     private Double totS5;
-    @Column(name = "totS6")
+    @Column(name = "tot_ts_6")
     private Double totS6;
-    @Column(name = "totS7")
+    @Column(name = "tot_ts_7")
     private Double totS7;
-    @Column(name = "totS8")
+    @Column(name = "tot_ts_8")
     private Double totS8;
-    @Column(name = "totS9")
+    @Column(name = "tot_ts_9")
     private Double totS9;
-    @Column(name = "totS10")
+    @Column(name = "tot_ts_10")
     private Double totS10;
-    @Column(name = "totS11")
+    @Column(name = "tot_ts_11")
     private Double totS11;
-    @Column(name = "totS12")
+    @Column(name = "tot_ts_12")
     private Double totS12;
-    @Column(name = "totS13")
+    @Column(name = "tot_ts_13")
     private Double totS13;
-    @Column(name = "totS14")
+    @Column(name = "tot_ts_14")
     private Double totS14;
-    @Column(name = "totS15")
+    @Column(name = "tot_ts_15")
     private Double totS15;
-    @Column(name = "totS16")
+    @Column(name = "tot_ts_16")
     private Double totS16;
-    @Column(name = "totS17")
+    @Column(name = "tot_ts_17")
     private Double totS17;
-    @Column(name = "totS18")
+    @Column(name = "tot_ts_18")
     private Double totS18;
-    @Column(name = "totS19")
+    @Column(name = "tot_ts_19")
     private Double totS19;
-    @Column(name = "totS20")
+    @Column(name = "tot_ts_20")
     private Double totS20;
-    @Column(name = "totS21")
+    @Column(name = "tot_ts_21")
     private Double totS21;
-    @Column(name = "totS22")
+    @Column(name = "tot_ts_22")
     private Double totS22;
-    @Column(name = "totS23")
+    @Column(name = "tot_ts_23")
     private Double totS23;
-    @Column(name = "totS24")
+    @Column(name = "tot_ts_24")
     private Double totS24;
-    @Column(name = "totS25")
+    @Column(name = "tot_ts_25")
     private Double totS25;
-    @Column(name = "totS26")
+    @Column(name = "tot_ts_26")
     private Double totS26;
-    @Column(name = "totS27")
+    @Column(name = "tot_ts_27")
     private Double totS27;
-    @Column(name = "totS28")
+    @Column(name = "tot_ts_28")
     private Double totS28;
-    @Column(name = "totS29")
+    @Column(name = "tot_ts_29")
     private Double totS29;
-    @Column(name = "totS30")
+    @Column(name = "tot_ts_30")
     private Double totS30;
-    @Column(name = "totS31")
+    @Column(name = "tot_ts_31")
     private Double totS31;
-    @Column(name = "totS32")
+    @Column(name = "tot_ts_32")
     private Double totS32;
-    @Column(name = "totS33")
+    @Column(name = "tot_ts_33")
     private Double totS33;
-    @Column(name = "totS34")
+    @Column(name = "tot_ts_34")
     private Double totS34;
-    @Column(name = "totS35")
+    @Column(name = "tot_ts_35")
     private Double totS35;
-    @Column(name = "totS36")
+    @Column(name = "tot_ts_36")
     private Double totS36;
-    @Column(name = "totS37")
+    @Column(name = "tot_ts_37")
     private Double totS37;
-    @Column(name = "totS38")
+    @Column(name = "tot_ts_38")
     private Double totS38;
-    @Column(name = "totS39")
+    @Column(name = "tot_ts_39")
     private Double totS39;
-    @Column(name = "totS40")
+    @Column(name = "tot_ts_40")
     private Double totS40;
-    @Column(name = "totS41")
+    @Column(name = "tot_ts_41")
     private Double totS41;
-    @Column(name = "totS42")
+    @Column(name = "tot_ts_42")
     private Double totS42;
-    @Column(name = "totS43")
+    @Column(name = "tot_ts_43")
     private Double totS43;
-    @Column(name = "totS44")
+    @Column(name = "tot_ts_44")
     private Double totS44;
-    @Column(name = "totS45")
+    @Column(name = "tot_ts_45")
     private Double totS45;
-    @Column(name = "totS46")
+    @Column(name = "tot_ts_46")
     private Double totS46;
-    @Column(name = "totS47")
+    @Column(name = "tot_ts_47")
     private Double totS47;
-    @Column(name = "totS49")
+    @Column(name = "tot_ts_49")
     private Double totS48;
-    @Column(name = "totS49")
+    @Column(name = "tot_ts_49")
     private Double totS49;
-    @Column(name = "totS50")
+    @Column(name = "tot_ts_50")
     private Double totS50;
 
 

data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/pojo/dto/PqsCommunicateDto.java

@@ -20,6 +20,9 @@ public class PqsCommunicateDto {
     private Integer type;
     //是否更新updateTime标志；数据上送更新1，状态翻转不更新0
     private Integer flag=0;
+    //是否更新、pqs_communicate标志，0更新，1不更新
+
+    private Integer updateCommunicateFlag=0;
 
 
 }

data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/controller/DataRecallController.java

@@ -343,7 +343,7 @@ public class DataRecallController extends BaseController {
                     }
 
                     if(recallType ==3){
-                        return;
+//                        return;
                     }else if(recallType ==2){
                         Integer timeInterval = data.getTimeInterval();
                         List<LocalDateTime> localDateTimeList = generateTimeIntervals(finalCurrentDate, timeInterval);
@@ -353,7 +353,7 @@ public class DataRecallController extends BaseController {
                             List<String> timePeriod = mergeTimeIntervals(localDateTimeList, timeInterval);
                             //最大时间段为300
                             if(timePeriod.size()<300){
-                                RecallMessage.RecallDTO recallDTO = new RecallMessage.RecallDTO();
+                                RecallMessage.RecallDTO recallDTO = new  RecallMessage.RecallDTO();
                                 recallDTO.setDataType("0");
                                 recallDTO.setMonitorId(Stream.of(temp).collect(Collectors.toList()));
                                 recallDTO.setTimeInterval(timePeriod);

data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/controller/PqReasonableRangeController.java

@@ -1,56 +0,0 @@
-package com.njcn.dataProcess.controller;
-
-
-import com.njcn.common.pojo.annotation.OperateInfo;
-import com.njcn.common.pojo.constant.OperateType;
-import com.njcn.common.pojo.enums.common.LogEnum;
-import com.njcn.common.pojo.enums.response.CommonResponseEnum;
-import com.njcn.common.pojo.response.HttpResult;
-import com.njcn.common.utils.HttpResultUtil;
-import com.njcn.dataProcess.param.DataCleanParam;
-import com.njcn.dataProcess.pojo.dto.PqReasonableRangeDto;
-import com.njcn.dataProcess.service.IPqReasonableRangeService;
-import com.njcn.web.controller.BaseController;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Controller;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-/**
- * <p>
- *  前端控制器
- * </p>
- *
- * @author xy
- * @since 2025-02-13
- */
-@Validated
-@Slf4j
-@Controller
-@RestController
-@RequestMapping("/pqReasonableRange")
-@Api(tags = "数据清洗标准库")
-public class PqReasonableRangeController extends BaseController {
-
-    @Resource
-    private IPqReasonableRangeService pqReasonableRangeService;
-
-    @OperateInfo(info = LogEnum.BUSINESS_COMMON,operateType = OperateType.QUERY)
-    @PostMapping("/getData")
-    @ApiOperation("按条件获取数据合理范围")
-    public HttpResult<List<PqReasonableRangeDto>> getData(@RequestBody DataCleanParam param) {
-        String methodDescribe = getMethodDescribe("getData");
-        List<PqReasonableRangeDto> list = pqReasonableRangeService.getReasonableRangeList(param);
-        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe);
-    }
-
-}
-

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

@@ -12,13 +12,16 @@ import com.njcn.device.pq.api.DeviceFeignClient;
 import com.njcn.device.pq.api.LineFeignClient;
 import com.njcn.device.pq.pojo.dto.DevComFlagDTO;
 import com.njcn.device.pq.pojo.vo.LineDeviceStateVO;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 
+import javax.annotation.Resource;
 import java.time.LocalDateTime;
-import java.util.Comparator;
-import java.util.List;
+import java.util.*;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.Executor;
 import java.util.stream.Collectors;
 
 /**
@@ -29,6 +32,7 @@ import java.util.stream.Collectors;
  * @version V1.0.0
  */
 @Service("RelationLnDataDealServiceImpl")
+@Slf4j
 public class LnDataDealServiceImpl implements LnDataDealService {
     @QueryBean
     private IDataFlicker dataFlickerQuery;
@@ -65,43 +69,75 @@ public class LnDataDealServiceImpl implements LnDataDealService {
     private LineFeignClient lineFeignClient;
     @QueryBean
     private IPqsCommunicate iPqsCommunicate;
-
+    @Resource(name="asyncExecutor")
+    private Executor executor;
     @Override
     public void batchInsertion(LnDataDTO lnDataDTO) {
-        dataVService.batchInsertion(lnDataDTO.getDataVList());
-        dataHarmrateVQuery.batchInsertion(lnDataDTO.getDataHarmrateVDTOList());
-        dataFlickerQuery.batchInsertion(lnDataDTO.getDataFlickerDTOList());
-        dataFlucQuery.batchInsertion(lnDataDTO.getDataFlucDTOList());
-        dataHarmphasicIQuery.batchInsertion(lnDataDTO.getDataHarmphasicIDTOList());
-        dataHarmphasicVQuery.batchInsertion(lnDataDTO.getDataHarmphasicVDTOList());
-        dataHarmpowerPService.batchInsertion(lnDataDTO.getDataHarmpowerPDTOList());
-        dataHarmpowerQService.batchInsertion(lnDataDTO.getDataHarmpowerQDTOList());
-        dataHarmpowerSService.batchInsertion(lnDataDTO.getDataHarmpowerSDTOList());
-        dataIService.batchInsertion(lnDataDTO.getDataIDTOList());
-        dataInharmIService.batchInsertion(lnDataDTO.getDataInharmIDTOList());
-        dataInharmVService.batchInsertion(lnDataDTO.getDataInharmVDTOList());
-        dataPltService.batchInsertion(lnDataDTO.getDataPltDTOList());
+
+
+        List<CompletableFuture<Void>> futures = new ArrayList<>();
+        // 提交每个批量插入任务
+        futures.add(CompletableFuture.runAsync(() -> dataVService.batchInsertion(lnDataDTO.getDataVList()), executor));
+        futures.add(CompletableFuture.runAsync(() -> dataHarmrateVQuery.batchInsertion(lnDataDTO.getDataHarmrateVDTOList()), executor));
+        futures.add(CompletableFuture.runAsync(() -> dataFlickerQuery.batchInsertion(lnDataDTO.getDataFlickerDTOList()), executor));
+        futures.add(CompletableFuture.runAsync(() -> dataFlucQuery.batchInsertion(lnDataDTO.getDataFlucDTOList()), executor));
+        futures.add(CompletableFuture.runAsync(() -> dataHarmphasicIQuery.batchInsertion(lnDataDTO.getDataHarmphasicIDTOList()), executor));
+        futures.add(CompletableFuture.runAsync(() -> dataHarmphasicVQuery.batchInsertion(lnDataDTO.getDataHarmphasicVDTOList()), executor));
+        futures.add(CompletableFuture.runAsync(() -> dataHarmpowerPService.batchInsertion(lnDataDTO.getDataHarmpowerPDTOList()), executor));
+        futures.add(CompletableFuture.runAsync(() -> dataHarmpowerQService.batchInsertion(lnDataDTO.getDataHarmpowerQDTOList()), executor));
+        futures.add(CompletableFuture.runAsync(() -> dataHarmpowerSService.batchInsertion(lnDataDTO.getDataHarmpowerSDTOList()), executor));
+        futures.add(CompletableFuture.runAsync(() -> dataIService.batchInsertion(lnDataDTO.getDataIDTOList()), executor));
+        futures.add(CompletableFuture.runAsync(() -> dataInharmIService.batchInsertion(lnDataDTO.getDataInharmIDTOList()), executor));
+        futures.add(CompletableFuture.runAsync(() -> dataInharmVService.batchInsertion(lnDataDTO.getDataInharmVDTOList()), executor));
+        futures.add(CompletableFuture.runAsync(() -> dataPltService.batchInsertion(lnDataDTO.getDataPltDTOList()), executor));
+
+        // 等待所有任务完成，如果任一任务抛出异常，这里会重新抛出
+        CompletableFuture.allOf(futures.toArray(new CompletableFuture[0])).join();
+
+
+
+//        dataVService.batchInsertion(lnDataDTO.getDataVList());
+//        dataHarmrateVQuery.batchInsertion(lnDataDTO.getDataHarmrateVDTOList());
+//        dataFlickerQuery.batchInsertion(lnDataDTO.getDataFlickerDTOList());
+//        dataFlucQuery.batchInsertion(lnDataDTO.getDataFlucDTOList());
+//        dataHarmphasicIQuery.batchInsertion(lnDataDTO.getDataHarmphasicIDTOList());
+//        dataHarmphasicVQuery.batchInsertion(lnDataDTO.getDataHarmphasicVDTOList());
+//        dataHarmpowerPService.batchInsertion(lnDataDTO.getDataHarmpowerPDTOList());
+//        dataHarmpowerQService.batchInsertion(lnDataDTO.getDataHarmpowerQDTOList());
+//        dataHarmpowerSService.batchInsertion(lnDataDTO.getDataHarmpowerSDTOList());
+//        dataIService.batchInsertion(lnDataDTO.getDataIDTOList());
+//        dataInharmIService.batchInsertion(lnDataDTO.getDataInharmIDTOList());
+//        dataInharmVService.batchInsertion(lnDataDTO.getDataInharmVDTOList());
+//        dataPltService.batchInsertion(lnDataDTO.getDataPltDTOList());
         //更新mysqldevice表最新数据时间
 
         if(!CollectionUtils.isEmpty(lnDataDTO.getDataVList())){
-            DataVDTO dataVDTO =lnDataDTO.getDataVList().stream().max(Comparator.comparing(DataVDTO::getTimeid)).get();
+
             List<String> lineIdList = lnDataDTO.getDataVList().stream().map(DataVDTO::getLineid).distinct().collect(Collectors.toList());
             List<LineDeviceStateVO> data = lineFeignClient.getAllLine(lineIdList).getData();
-            //获取所有设备id并去重
-            List<String> devIds = data.stream().map(temp -> {
-                return temp.getPids().split(",")[4];
-            }).distinct().collect(Collectors.toList());
 
-            devIds.forEach(temp->{
+
+            Map<String, String> map = data.stream().collect(Collectors.toMap(LineDeviceStateVO::getId, temp -> temp.getPids().split(",")[4]));
+            lnDataDTO.getDataVList().forEach(temp->{
+                temp.setDevId(map.get(temp.getLineid()));
+            });
+            Map<String, List<DataVDTO>> collect = lnDataDTO.getDataVList().stream().collect(Collectors.groupingBy(DataVDTO::getDevId));
+            List<CompletableFuture<Void>>  updatefutures = new ArrayList<>();
+
+            collect.forEach((temp,dataVDTOList)->{
                 PqsCommunicateDto pqsCommunicateDto = new PqsCommunicateDto();
+                DataVDTO dataVDTO =dataVDTOList.stream().max(Comparator.comparing(DataVDTO::getTimeid)).get();
+
                 pqsCommunicateDto.setTime(LocalDateTimeUtil.format(dataVDTO.getTimeid(), DatePattern.NORM_DATETIME_PATTERN));
                 pqsCommunicateDto.setDevId(temp);
                 pqsCommunicateDto.setType(1);
                 pqsCommunicateDto.setFlag(1);
+                pqsCommunicateDto.setUpdateCommunicateFlag(1);
+                updatefutures.add(CompletableFuture.runAsync(() -> iPqsCommunicate.insertion(pqsCommunicateDto), executor));
+
 
-                iPqsCommunicate.insertion(pqsCommunicateDto);
             });
-
+            CompletableFuture.allOf(updatefutures.toArray(new CompletableFuture[0])).join();
 
 
         }

data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/influxdb/InfluxdbDataFlickerImpl.java

@@ -3,11 +3,9 @@ package com.njcn.dataProcess.service.impl.influxdb;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.ObjectUtil;
+import com.alibaba.nacos.shaded.com.google.common.reflect.TypeToken;
+import com.alibaba.nacos.shaded.com.google.gson.Gson;
 import com.github.jeffreyning.mybatisplus.service.MppServiceImpl;
-import com.njcn.csdevice.api.CsLineFeignClient;
-import com.njcn.csdevice.api.EquipmentFeignClient;
-import com.njcn.csdevice.pojo.dto.CsEquipmentDeliveryDTO;
-import com.njcn.csdevice.pojo.po.CsLinePO;
 import com.njcn.dataProcess.dao.imapper.DataFlickerMapper;
 import com.njcn.dataProcess.dao.relation.mapper.RStatDataFlickerRelationMapper;
 import com.njcn.dataProcess.dto.DataFlickerDTO;
@@ -19,17 +17,18 @@ import com.njcn.dataProcess.pojo.po.RStatDataFlickerD;
 import com.njcn.dataProcess.service.IDataFlicker;
 import com.njcn.dataProcess.util.TimeUtils;
 import com.njcn.influx.query.InfluxQueryWrapper;
+import com.njcn.redis.utils.RedisUtil;
 import lombok.RequiredArgsConstructor;
 import org.apache.commons.collections4.ListUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.lang.reflect.Type;
 import java.time.LocalDateTime;
 import java.time.ZoneId;
 import java.time.format.DateTimeFormatter;
 import java.util.*;
-import java.util.function.Function;
 import java.util.stream.Collectors;
 
 /**
@@ -44,19 +43,19 @@ import java.util.stream.Collectors;
 public class InfluxdbDataFlickerImpl extends MppServiceImpl<RStatDataFlickerRelationMapper, RStatDataFlickerD> implements IDataFlicker {
 
     private final DateTimeFormatter DATE_TIME_FORMATTER = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss").withZone(ZoneId.systemDefault());
-
     private final DataFlickerMapper dataFlickerMapper;
-
-    @Resource
-    private CsLineFeignClient csLineFeignClient;
-    @Resource
-    private EquipmentFeignClient equipmentFeignClient;
     private static final Map<String, String> PHASE_MAPPING = new HashMap<String, String>() {{
         put("AB", "A");
         put("BC", "B");
         put("CA", "C");
         put("M", "T");
     }};
+    @Resource
+    private RedisUtil redisUtil;
+    private static final Set<String> LINE_VOLTAGE_TYPES =
+            Collections.unmodifiableSet(new HashSet<>(Arrays.asList("AB", "BC", "CA", "T")));
+    private static final Set<String> PHASE_VOLTAGE_TYPES =
+            Collections.unmodifiableSet(new HashSet<>(Arrays.asList("A", "B", "C", "T")));
 
 
     @Override
@@ -80,12 +79,7 @@ public class InfluxdbDataFlickerImpl extends MppServiceImpl<RStatDataFlickerRela
     @Override
     public List<DataFlickerDto> getRawData(LineCountEvaluateParam lineParam) {
         List<DataFlickerDto> result = new ArrayList<>();
-        List<DataFlicker> list;
-        if (Objects.equals(lineParam.getType(), 2)) {
-            list = getWlMinuteData(lineParam);
-        } else {
-            list = getMinuteData(lineParam);
-        }
+        List<DataFlicker> list = getMinuteData(lineParam);
         list.forEach(item -> {
             DataFlickerDto dto = new DataFlickerDto();
             BeanUtils.copyProperties(item, dto);
@@ -98,12 +92,7 @@ public class InfluxdbDataFlickerImpl extends MppServiceImpl<RStatDataFlickerRela
     @Override
     public List<CommonMinuteDto> getBaseData(LineCountEvaluateParam lineParam) {
         List<CommonMinuteDto> result = new ArrayList<>();
-        List<DataFlicker> dataIList;
-        if (Objects.equals(lineParam.getType(), 2)) {
-            dataIList = getWlMinuteData(lineParam);
-        } else {
-            dataIList = getMinuteData(lineParam);
-        }
+        List<DataFlicker> dataIList = getMinuteData(lineParam);
         if (CollectionUtil.isNotEmpty(dataIList)) {
             String time = TimeUtils.StringTimeToString(lineParam.getStartTime());
             //以监测点分组
@@ -249,6 +238,13 @@ public class InfluxdbDataFlickerImpl extends MppServiceImpl<RStatDataFlickerRela
      */
     public List<DataFlicker> getMinuteData(LineCountEvaluateParam lineParam) {
         List<DataFlicker> result = new ArrayList<>();
+        List<DataFlicker> data = new ArrayList<>();
+        //获取监测点、接线方式数据
+        Type type = new TypeToken<Map<String, Integer>>(){}.getType();
+        Map<String, Integer> map = new Gson().fromJson(
+                String.valueOf(redisUtil.getObjectByKey("wlLineDetail")),
+                type
+        );
         InfluxQueryWrapper influxQueryWrapper = new InfluxQueryWrapper(DataFlicker.class);
         influxQueryWrapper.regular(DataFlicker::getLineId, lineParam.getLineId())
                 .select(DataFlicker::getLineId)
@@ -261,58 +257,24 @@ public class InfluxdbDataFlickerImpl extends MppServiceImpl<RStatDataFlickerRela
                 .between(DataFlicker::getTime, lineParam.getStartTime(), lineParam.getEndTime())
                 .eq(DataFlicker::getQualityFlag, "0");
         quality(result, influxQueryWrapper, lineParam);
-        return result;
-    }
-
-    public List<DataFlicker> getWlMinuteData(LineCountEvaluateParam lineParam) {
-        List<DataFlicker> result = new ArrayList<>();
-        if (CollectionUtil.isNotEmpty(lineParam.getLineId())) {
-            //获取监测点信息
-            List<CsLinePO> line = csLineFeignClient.queryLineById(lineParam.getLineId()).getData();
-            Map<String, CsLinePO> lineMap = line.stream().collect(Collectors.toMap(CsLinePO::getLineId, Function.identity()));
-            //获取设备信息
-            List<String> devList = line.stream().map(CsLinePO::getDeviceId).distinct().collect(Collectors.toList());
-            List<CsEquipmentDeliveryDTO> dev = equipmentFeignClient.queryDeviceById(devList).getData();
-            Map<String, CsEquipmentDeliveryDTO> devsMap = dev.stream().collect(Collectors.toMap(CsEquipmentDeliveryDTO::getId, Function.identity()));
-
-            lineParam.getLineId().forEach(lineId -> {
-                String devId = lineMap.get(lineId).getDeviceId();
-                CsLinePO po = lineMap.get(lineId);
-                InfluxQueryWrapper influxQueryWrapper = new InfluxQueryWrapper(DataFlicker.class);
-                influxQueryWrapper.eq(DataFlicker::getLineId, lineId)
-                        .eq(DataFlicker::getProcess,Integer.toString(devsMap.get(devId).getProcess()))
-                        .select(DataFlicker::getLineId)
-                        .select(DataFlicker::getPhasicType)
-                        .between(DataFlicker::getTime, lineParam.getStartTime(), lineParam.getEndTime())
-                        .eq(DataFlicker::getQualityFlag, "0");
-                if (CollUtil.isNotEmpty(lineParam.getPhasicType())) {
-                    influxQueryWrapper.regular(DataFlicker::getPhasicType, lineParam.getPhasicType());
-                }
-                if (Objects.isNull(po.getLineNo())) {
-                    influxQueryWrapper.eq(DataFlicker::getCldid,Integer.toString(po.getClDid()));
-                } else {
-                    influxQueryWrapper.eq(DataFlicker::getCldid,Integer.toString(po.getLineNo()));
-                }
-                //判断接线方式 (0-星型 1-角型 2-V型) 星型是相电压  角型或者v型是线电压
-                if (Objects.equals(po.getConType(),0)) {
-                    //相电压电压变动幅度
-                    influxQueryWrapper.select("Pq_Fluct","fluc");
-                    //相电压长时闪变
-                    influxQueryWrapper.select("Pq_Plt","plt");
-                    //相电压短时闪变
-                    influxQueryWrapper.select("Pq_Pst","pst");
-                } else {
-                    //线电压电压变动幅度
-                    influxQueryWrapper.select("Pq_LFluct","fluc");
-                    //相电压长时闪变
-                    influxQueryWrapper.select("Pq_LPlt","plt");
-                    //相电压短时闪变
-                    influxQueryWrapper.select("Pq_LPst","pst");
-                }
-                result.addAll(dataFlickerMapper.selectByQueryWrapper(influxQueryWrapper));
-            });
-            if (CollectionUtil.isNotEmpty(result)) {
-                result.forEach(item -> {
+        if (CollectionUtil.isNotEmpty(result)) {
+            if (!Objects.isNull(map)) {
+                //现根据监测点分组，然后根据接线方式排除多于数据，在修改相别
+                Map<String, List<DataFlicker>> lineMap = result.stream().collect(Collectors.groupingBy(DataFlicker::getLineId));
+                lineMap.forEach((k,v)->{
+                    if (Objects.isNull(map.get(k))) {
+                        return;
+                    }
+                    Integer conType = map.get(k);
+                    Set<String> validPhasicTypes = (conType != 0) ? LINE_VOLTAGE_TYPES : PHASE_VOLTAGE_TYPES;
+                    List<DataFlicker> result2 = v.stream().filter(item -> validPhasicTypes.contains(item.getPhasicType())).collect(Collectors.toList());
+                    data.addAll(result2);
+                });
+            } else {
+                data.addAll(result);
+            }
+            if (CollectionUtil.isNotEmpty(data)) {
+                data.forEach(item -> {
                     String newType = PHASE_MAPPING.get(item.getPhasicType());
                     if (newType != null) {
                         item.setPhasicType(newType);
@@ -320,6 +282,6 @@ public class InfluxdbDataFlickerImpl extends MppServiceImpl<RStatDataFlickerRela
                 });
             }
         }
-        return result;
+        return data;
     }
 }

data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/influxdb/InfluxdbDataFlucImpl.java

@@ -1,11 +1,9 @@
 package com.njcn.dataProcess.service.impl.influxdb;
 
 import cn.hutool.core.collection.CollectionUtil;
+import com.alibaba.nacos.shaded.com.google.common.reflect.TypeToken;
+import com.alibaba.nacos.shaded.com.google.gson.Gson;
 import com.github.jeffreyning.mybatisplus.service.MppServiceImpl;
-import com.njcn.csdevice.api.CsLineFeignClient;
-import com.njcn.csdevice.api.EquipmentFeignClient;
-import com.njcn.csdevice.pojo.dto.CsEquipmentDeliveryDTO;
-import com.njcn.csdevice.pojo.po.CsLinePO;
 import com.njcn.dataProcess.dao.imapper.DataFlucMapper;
 import com.njcn.dataProcess.dao.relation.mapper.RStatDataFlucRelationMapper;
 import com.njcn.dataProcess.dto.DataFlucDTO;
@@ -17,17 +15,18 @@ import com.njcn.dataProcess.pojo.po.RStatDataFlucD;
 import com.njcn.dataProcess.service.IDataFluc;
 import com.njcn.dataProcess.util.TimeUtils;
 import com.njcn.influx.query.InfluxQueryWrapper;
+import com.njcn.redis.utils.RedisUtil;
 import lombok.RequiredArgsConstructor;
 import org.apache.commons.collections4.ListUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.lang.reflect.Type;
 import java.time.LocalDateTime;
 import java.time.ZoneId;
 import java.time.format.DateTimeFormatter;
 import java.util.*;
-import java.util.function.Function;
 import java.util.stream.Collectors;
 
 /**
@@ -42,20 +41,19 @@ import java.util.stream.Collectors;
 public class InfluxdbDataFlucImpl extends MppServiceImpl<RStatDataFlucRelationMapper, RStatDataFlucD> implements IDataFluc {
 
     private final DateTimeFormatter DATE_TIME_FORMATTER = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss").withZone(ZoneId.systemDefault());
-
     private final DataFlucMapper dataFlucMapper;
-
-    @Resource
-    private CsLineFeignClient csLineFeignClient;
-    @Resource
-    private EquipmentFeignClient equipmentFeignClient;
-
     private static final Map<String, String> PHASE_MAPPING = new HashMap<String, String>() {{
         put("AB", "A");
         put("BC", "B");
         put("CA", "C");
         put("M", "T");
     }};
+    @Resource
+    private RedisUtil redisUtil;
+    private static final Set<String> LINE_VOLTAGE_TYPES =
+            Collections.unmodifiableSet(new HashSet<>(Arrays.asList("AB", "BC", "CA", "T")));
+    private static final Set<String> PHASE_VOLTAGE_TYPES =
+            Collections.unmodifiableSet(new HashSet<>(Arrays.asList("A", "B", "C", "T")));
 
     @Override
     public void batchInsertion(List<DataFlucDTO> dataFlucDTOList) {
@@ -78,12 +76,7 @@ public class InfluxdbDataFlucImpl extends MppServiceImpl<RStatDataFlucRelationMa
     @Override
     public List<DataFlucDto> getRawData(LineCountEvaluateParam lineParam) {
         List<DataFlucDto> result = new ArrayList<>();
-        List<DataFluc> list;
-        if (Objects.equals(lineParam.getType(), 2)) {
-            list = getWlMinuteData(lineParam.getLineId(), lineParam.getStartTime(), lineParam.getEndTime(), lineParam.getAbnormalTime(),lineParam.getDataType());
-        } else {
-            list = getMinuteData(lineParam.getLineId(), lineParam.getStartTime(), lineParam.getEndTime(), lineParam.getAbnormalTime(),lineParam.getDataType());
-        }
+        List<DataFluc> list = getMinuteData(lineParam.getLineId(), lineParam.getStartTime(), lineParam.getEndTime(), lineParam.getAbnormalTime(),lineParam.getDataType());
         list.forEach(item->{
             DataFlucDto dto = new DataFlucDto();
             BeanUtils.copyProperties(item,dto);
@@ -96,12 +89,7 @@ public class InfluxdbDataFlucImpl extends MppServiceImpl<RStatDataFlucRelationMa
     @Override
     public List<CommonMinuteDto> getBaseData(LineCountEvaluateParam lineParam) {
         List<CommonMinuteDto> result = new ArrayList<>();
-        List<DataFluc> dataIList;
-        if (Objects.equals(lineParam.getType(), 2)) {
-            dataIList = getWlMinuteData(lineParam.getLineId(), lineParam.getStartTime(), lineParam.getEndTime(), lineParam.getAbnormalTime(),lineParam.getDataType());
-        } else {
-            dataIList = getMinuteData(lineParam.getLineId(), lineParam.getStartTime(), lineParam.getEndTime(), lineParam.getAbnormalTime(),lineParam.getDataType());
-        }
+        List<DataFluc> dataIList = getMinuteData(lineParam.getLineId(), lineParam.getStartTime(), lineParam.getEndTime(), lineParam.getAbnormalTime(),lineParam.getDataType());
         if (CollectionUtil.isNotEmpty(dataIList)) {
             String time = TimeUtils.StringTimeToString(lineParam.getStartTime());
             //以监测点分组
@@ -168,6 +156,13 @@ public class InfluxdbDataFlucImpl extends MppServiceImpl<RStatDataFlucRelationMa
     public List<DataFluc> getMinuteData(List<String> lineList, String startTime, String endTime, Map<String,List<String>> timeMap, Boolean dataType) {
         List<DataFluc> dataList;
         List<DataFluc> result = new ArrayList<>();
+        List<DataFluc> data = new ArrayList<>();
+        //获取监测点、接线方式数据
+        Type type = new TypeToken<Map<String, Integer>>(){}.getType();
+        Map<String, Integer> map = new Gson().fromJson(
+                String.valueOf(redisUtil.getObjectByKey("wlLineDetail")),
+                type
+        );
         InfluxQueryWrapper influxQueryWrapper = new InfluxQueryWrapper(DataFluc.class);
         influxQueryWrapper.regular(DataFluc::getLineId, lineList)
                 .select(DataFluc::getLineId)
@@ -215,47 +210,24 @@ public class InfluxdbDataFlucImpl extends MppServiceImpl<RStatDataFlucRelationMa
                 result.addAll(dataList);
             }
         }
-        return result;
-    }
-
-    public List<DataFluc> getWlMinuteData(List<String> lineList, String startTime, String endTime, Map<String,List<String>> timeMap, Boolean dataType) {
-        //todo FLUCCF电压波动频度原先oracle表存储的是0，写死的，这边暂不取值
-        List<DataFluc> result = new ArrayList<>();
-        if (CollectionUtil.isNotEmpty(lineList)) {
-            //获取监测点信息
-            List<CsLinePO> line = csLineFeignClient.queryLineById(lineList).getData();
-            Map<String, CsLinePO> lineMap = line.stream().collect(Collectors.toMap(CsLinePO::getLineId, Function.identity()));
-            //获取设备信息
-            List<String> devList = line.stream().map(CsLinePO::getDeviceId).distinct().collect(Collectors.toList());
-            List<CsEquipmentDeliveryDTO> dev = equipmentFeignClient.queryDeviceById(devList).getData();
-            Map<String, CsEquipmentDeliveryDTO> devsMap = dev.stream().collect(Collectors.toMap(CsEquipmentDeliveryDTO::getId, Function.identity()));
-            lineList.forEach(lineId -> {
-                String devId = lineMap.get(lineId).getDeviceId();
-                CsLinePO po = lineMap.get(lineId);
-                InfluxQueryWrapper influxQueryWrapper = new InfluxQueryWrapper(DataFluc.class);
-                influxQueryWrapper.eq(DataFluc::getLineId, lineId)
-                        .eq(DataFluc::getProcess,Integer.toString(devsMap.get(devId).getProcess()))
-                        .select(DataFluc::getLineId)
-                        .select(DataFluc::getPhasicType)
-                        .between(DataFluc::getTime, startTime, endTime)
-                        .eq(DataFluc::getQualityFlag, "0");
-                if (Objects.isNull(po.getLineNo())) {
-                    influxQueryWrapper.eq(DataFluc::getCldid,Integer.toString(po.getClDid()));
-                } else {
-                    influxQueryWrapper.eq(DataFluc::getCldid,Integer.toString(po.getLineNo()));
-                }
-                //判断接线方式 (0-星型 1-角型 2-V型) 星型是相电压  角型或者v型是线电压
-                if (Objects.equals(po.getConType(),0)) {
-                    //相电压电压变动幅度
-                    influxQueryWrapper.select("Pq_Fluct","fluc");
-                } else {
-                    //线电压电压变动幅度
-                    influxQueryWrapper.select("Pq_LFluct","fluc");
-                }
-                result.addAll(dataFlucMapper.selectByQueryWrapper(influxQueryWrapper));
-            });
-            if (CollectionUtil.isNotEmpty(result)) {
-                result.forEach(item -> {
+        if (CollectionUtil.isNotEmpty(result)) {
+            if (!Objects.isNull(map)) {
+                //现根据监测点分组，然后根据接线方式排除多于数据，在修改相别
+                Map<String, List<DataFluc>> lineMap = result.stream().collect(Collectors.groupingBy(DataFluc::getLineId));
+                lineMap.forEach((k,v)->{
+                    if (Objects.isNull(map.get(k))) {
+                        return;
+                    }
+                    Integer conType = map.get(k);
+                    Set<String> validPhasicTypes = (conType != 0) ? LINE_VOLTAGE_TYPES : PHASE_VOLTAGE_TYPES;
+                    List<DataFluc> result2 = v.stream().filter(item -> validPhasicTypes.contains(item.getPhasicType())).collect(Collectors.toList());
+                    data.addAll(result2);
+                });
+            } else {
+                data.addAll(result);
+            }
+            if (CollectionUtil.isNotEmpty(data)) {
+                data.forEach(item -> {
                     String newType = PHASE_MAPPING.get(item.getPhasicType());
                     if (newType != null) {
                         item.setPhasicType(newType);
@@ -263,7 +235,7 @@ public class InfluxdbDataFlucImpl extends MppServiceImpl<RStatDataFlucRelationMa
                 });
             }
         }
-        return result;
+        return data;
     }
 
 }

data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/influxdb/InfluxdbDataHarmRateIImpl.java

@@ -4,10 +4,6 @@ import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.collection.CollectionUtil;
 import com.github.jeffreyning.mybatisplus.service.MppServiceImpl;
 import com.njcn.common.utils.HarmonicTimesUtil;
-import com.njcn.csdevice.api.CsLineFeignClient;
-import com.njcn.csdevice.api.EquipmentFeignClient;
-import com.njcn.csdevice.pojo.dto.CsEquipmentDeliveryDTO;
-import com.njcn.csdevice.pojo.po.CsLinePO;
 import com.njcn.dataProcess.dao.imapper.DataHarmRateIMapper;
 import com.njcn.dataProcess.dao.relation.mapper.RStatDataHarmRateIRelationMapper;
 import com.njcn.dataProcess.param.LineCountEvaluateParam;
@@ -28,7 +24,6 @@ import java.time.LocalDateTime;
 import java.time.ZoneId;
 import java.time.format.DateTimeFormatter;
 import java.util.*;
-import java.util.function.Function;
 import java.util.stream.Collectors;
 
 /**
@@ -40,10 +35,6 @@ public class InfluxdbDataHarmRateIImpl extends MppServiceImpl<RStatDataHarmRateI
     private final DateTimeFormatter DATE_TIME_FORMATTER = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss").withZone(ZoneId.systemDefault());
     @Resource
     private DataHarmRateIMapper dataHarmRateIMapper;
-    @Resource
-    private CsLineFeignClient csLineFeignClient;
-    @Resource
-    private EquipmentFeignClient equipmentFeignClient;
 
     private static final Map<String, String> PHASE_MAPPING = new HashMap<String, String>() {{
         put("AB", "A");
@@ -55,12 +46,7 @@ public class InfluxdbDataHarmRateIImpl extends MppServiceImpl<RStatDataHarmRateI
     @Override
     public List<DataHarmRateIDto> getRawData(LineCountEvaluateParam lineParam) {
         List<DataHarmRateIDto> result = new ArrayList<>();
-        List<DataHarmrateI> list;
-        if (Objects.equals(lineParam.getType(), 2)) {
-            list = getWlMinuteData(lineParam.getLineId(), lineParam.getStartTime(), lineParam.getEndTime(), lineParam.getAbnormalTime(),lineParam.getDataType());
-        } else {
-            list = getMinuteData(lineParam.getLineId(), lineParam.getStartTime(), lineParam.getEndTime(), lineParam.getAbnormalTime(),lineParam.getDataType());
-        }
+        List<DataHarmrateI> list = getMinuteData(lineParam.getLineId(), lineParam.getStartTime(), lineParam.getEndTime(), lineParam.getAbnormalTime(),lineParam.getDataType());
         list.forEach(item->{
             DataHarmRateIDto dto = new DataHarmRateIDto();
             BeanUtils.copyProperties(item,dto);
@@ -73,12 +59,7 @@ public class InfluxdbDataHarmRateIImpl extends MppServiceImpl<RStatDataHarmRateI
     @Override
     public List<CommonMinuteDto> getBaseData(LineCountEvaluateParam lineParam) {
         List<CommonMinuteDto> result = new ArrayList<>();
-        List<DataHarmrateI> data;
-        if (Objects.equals(lineParam.getType(), 2)) {
-            data = getWlMinuteData(lineParam.getLineId(), lineParam.getStartTime(), lineParam.getEndTime(), lineParam.getAbnormalTime(),lineParam.getDataType());
-        } else {
-            data = getMinuteData(lineParam.getLineId(), lineParam.getStartTime(), lineParam.getEndTime(), lineParam.getAbnormalTime(),lineParam.getDataType());
-        }
+        List<DataHarmrateI>  data = getMinuteData(lineParam.getLineId(), lineParam.getStartTime(), lineParam.getEndTime(), lineParam.getAbnormalTime(),lineParam.getDataType());
         if (CollectionUtil.isNotEmpty(data)) {
             String time = TimeUtils.StringTimeToString(lineParam.getStartTime());
             //以监测点分组
@@ -246,48 +227,13 @@ public class InfluxdbDataHarmRateIImpl extends MppServiceImpl<RStatDataHarmRateI
                 result.addAll(dataList);
             }
         }
-        return result;
-    }
-
-    public List<DataHarmrateI> getWlMinuteData(List<String> lineList, String startTime, String endTime, Map<String,List<String>> timeMap, Boolean dataType) {
-        List<DataHarmrateI> result = new ArrayList<>();
-        if (CollectionUtil.isNotEmpty(lineList)) {
-            //获取监测点信息
-            List<CsLinePO> line = csLineFeignClient.queryLineById(lineList).getData();
-            Map<String, CsLinePO> lineMap = line.stream().collect(Collectors.toMap(CsLinePO::getLineId, Function.identity()));
-            //获取设备信息
-            List<String> devList = line.stream().map(CsLinePO::getDeviceId).distinct().collect(Collectors.toList());
-            List<CsEquipmentDeliveryDTO> dev = equipmentFeignClient.queryDeviceById(devList).getData();
-            Map<String, CsEquipmentDeliveryDTO> devsMap = dev.stream().collect(Collectors.toMap(CsEquipmentDeliveryDTO::getId, Function.identity()));
-            lineList.forEach(lineId -> {
-                String devId = lineMap.get(lineId).getDeviceId();
-                CsLinePO po = lineMap.get(lineId);
-                InfluxQueryWrapper influxQueryWrapper = new InfluxQueryWrapper(DataHarmrateI.class);
-                influxQueryWrapper.samePrefixAndSuffix("Pq_HarmRI_", "i_", HarmonicTimesUtil.harmonicTimesList(2, 50, 1));
-                influxQueryWrapper.eq(DataHarmrateI::getLineId, lineId)
-                        .eq(DataHarmrateI::getProcess,Integer.toString(devsMap.get(devId).getProcess()))
-                        .select(DataHarmrateI::getLineId)
-                        .select(DataHarmrateI::getPhasicType)
-                        .select(DataHarmrateI::getValueType)
-                        //电流基波有效值
-                        .select("Pq_RmsFundI_","i_1")
-                        .between(DataHarmrateI::getTime, startTime, endTime)
-                        .eq(DataHarmrateI::getQualityFlag, "0");
-                if (Objects.isNull(po.getLineNo())) {
-                    influxQueryWrapper.eq(DataHarmrateI::getCldid,Integer.toString(po.getClDid()));
-                } else {
-                    influxQueryWrapper.eq(DataHarmrateI::getCldid,Integer.toString(po.getLineNo()));
+        if (CollectionUtil.isNotEmpty(result)) {
+            result.forEach(item -> {
+                String newType = PHASE_MAPPING.get(item.getPhasicType());
+                if (newType != null) {
+                    item.setPhasicType(newType);
                 }
-                result.addAll(dataHarmRateIMapper.selectByQueryWrapper(influxQueryWrapper));
             });
-            if (CollectionUtil.isNotEmpty(result)) {
-                result.forEach(item -> {
-                    String newType = PHASE_MAPPING.get(item.getPhasicType());
-                    if (newType != null) {
-                        item.setPhasicType(newType);
-                    }
-                });
-            }
         }
         return result;
     }

data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/influxdb/InfluxdbDataHarmRateVImpl.java

@@ -2,17 +2,16 @@ package com.njcn.dataProcess.service.impl.influxdb;
 
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.collection.CollectionUtil;
+import com.alibaba.nacos.shaded.com.google.common.reflect.TypeToken;
+import com.alibaba.nacos.shaded.com.google.gson.Gson;
 import com.github.jeffreyning.mybatisplus.service.MppServiceImpl;
 import com.njcn.common.utils.HarmonicTimesUtil;
-import com.njcn.csdevice.api.CsLineFeignClient;
-import com.njcn.csdevice.api.EquipmentFeignClient;
-import com.njcn.csdevice.pojo.dto.CsEquipmentDeliveryDTO;
-import com.njcn.csdevice.pojo.po.CsLinePO;
 import com.njcn.dataProcess.constant.InfluxDBTableConstant;
 import com.njcn.dataProcess.dao.imapper.DataHarmRateVMapper;
 import com.njcn.dataProcess.dao.relation.mapper.RStatDataHarmRateVRelationMapper;
 import com.njcn.dataProcess.dto.DataHarmrateVDTO;
 import com.njcn.dataProcess.param.LineCountEvaluateParam;
+import com.njcn.dataProcess.po.influx.DataFlicker;
 import com.njcn.dataProcess.po.influx.DataHarmrateV;
 import com.njcn.dataProcess.po.influx.DataV;
 import com.njcn.dataProcess.pojo.dto.CommonMinuteDto;
@@ -23,17 +22,18 @@ import com.njcn.dataProcess.service.IDataHarmRateV;
 import com.njcn.dataProcess.util.TimeUtils;
 import com.njcn.influx.constant.InfluxDbSqlConstant;
 import com.njcn.influx.query.InfluxQueryWrapper;
+import com.njcn.redis.utils.RedisUtil;
 import lombok.RequiredArgsConstructor;
 import org.apache.commons.collections4.ListUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.lang.reflect.Type;
 import java.time.LocalDateTime;
 import java.time.ZoneId;
 import java.time.format.DateTimeFormatter;
 import java.util.*;
-import java.util.function.Function;
 import java.util.stream.Collectors;
 
 /**
@@ -42,31 +42,25 @@ import java.util.stream.Collectors;
 @Service("InfluxdbDataHarmRateVImpl")
 @RequiredArgsConstructor
 public class InfluxdbDataHarmRateVImpl extends MppServiceImpl<RStatDataHarmRateVRelationMapper, RStatDataHarmRateVD> implements IDataHarmRateV {
-
     private final DateTimeFormatter DATE_TIME_FORMATTER = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss").withZone(ZoneId.systemDefault());
-
     private final DataHarmRateVMapper dataHarmRateVMapper;
-    @Resource
-    private CsLineFeignClient csLineFeignClient;
-    @Resource
-    private EquipmentFeignClient equipmentFeignClient;
-
     private static final Map<String, String> PHASE_MAPPING = new HashMap<String, String>() {{
         put("AB", "A");
         put("BC", "B");
         put("CA", "C");
         put("M", "T");
     }};
+    @Resource
+    private RedisUtil redisUtil;
+    private static final Set<String> LINE_VOLTAGE_TYPES =
+            Collections.unmodifiableSet(new HashSet<>(Arrays.asList("AB", "BC", "CA", "T")));
+    private static final Set<String> PHASE_VOLTAGE_TYPES =
+            Collections.unmodifiableSet(new HashSet<>(Arrays.asList("A", "B", "C", "T")));
 
     @Override
     public List<DataHarmDto> getRawData(LineCountEvaluateParam lineParam) {
         List<DataHarmDto> result = new ArrayList<>();
-        List<DataHarmrateV> list;
-        if (Objects.equals(lineParam.getType(), 2)) {
-            list = getWlMinuteData(lineParam);
-        } else {
-            list = getMinuteData(lineParam);;
-        }
+        List<DataHarmrateV> list = getMinuteData(lineParam);
         list.forEach(item->{
             DataHarmDto dto = new DataHarmDto();
             BeanUtils.copyProperties(item,dto);
@@ -97,12 +91,7 @@ public class InfluxdbDataHarmRateVImpl extends MppServiceImpl<RStatDataHarmRateV
     @Override
     public List<CommonMinuteDto> getBaseData(LineCountEvaluateParam lineParam) {
         List<CommonMinuteDto> result = new ArrayList<>();
-        List<DataHarmrateV> data;
-        if (Objects.equals(lineParam.getType(), 2)) {
-            data = getWlMinuteData(lineParam);
-        } else {
-            data = getMinuteData(lineParam);;
-        }
+        List<DataHarmrateV> data = getMinuteData(lineParam);
         if (CollectionUtil.isNotEmpty(data)) {
             String time = TimeUtils.StringTimeToString(lineParam.getStartTime());
             //以监测点分组
@@ -264,6 +253,13 @@ public class InfluxdbDataHarmRateVImpl extends MppServiceImpl<RStatDataHarmRateV
     public List<DataHarmrateV> getMinuteData(LineCountEvaluateParam lineParam) {
         List<DataHarmrateV> dataList;
         List<DataHarmrateV> result = new ArrayList<>();
+        List<DataHarmrateV> data = new ArrayList<>();
+        //获取监测点、接线方式数据
+        Type type = new TypeToken<Map<String, Integer>>(){}.getType();
+        Map<String, Integer> map = new Gson().fromJson(
+                String.valueOf(redisUtil.getObjectByKey("wlLineDetail")),
+                type
+        );
         InfluxQueryWrapper influxQueryWrapper = new InfluxQueryWrapper(DataHarmrateV.class);
         influxQueryWrapper.samePrefixAndSuffix(InfluxDbSqlConstant.V, InfluxDbSqlConstant.V, HarmonicTimesUtil.harmonicTimesList(1, 50, 1));
         influxQueryWrapper.regular(DataHarmrateV::getLineId, lineParam.getLineId())
@@ -314,51 +310,24 @@ public class InfluxdbDataHarmRateVImpl extends MppServiceImpl<RStatDataHarmRateV
                 result.addAll(dataList);
             }
         }
-        return result;
-    }
-
-    public List<DataHarmrateV> getWlMinuteData(LineCountEvaluateParam lineParam) {
-        List<DataHarmrateV> result = new ArrayList<>();
-        if (CollectionUtil.isNotEmpty(lineParam.getLineId())) {
-            //获取监测点信息
-            List<CsLinePO> line = csLineFeignClient.queryLineById(lineParam.getLineId()).getData();
-            Map<String, CsLinePO> lineMap = line.stream().collect(Collectors.toMap(CsLinePO::getLineId, Function.identity()));
-            //获取设备信息
-            List<String> devList = line.stream().map(CsLinePO::getDeviceId).distinct().collect(Collectors.toList());
-            List<CsEquipmentDeliveryDTO> dev = equipmentFeignClient.queryDeviceById(devList).getData();
-            Map<String, CsEquipmentDeliveryDTO> devsMap = dev.stream().collect(Collectors.toMap(CsEquipmentDeliveryDTO::getId, Function.identity()));
-            lineParam.getLineId().forEach(lineId -> {
-                String devId = lineMap.get(lineId).getDeviceId();
-                CsLinePO po = lineMap.get(lineId);
-                InfluxQueryWrapper influxQueryWrapper = new InfluxQueryWrapper(DataHarmrateV.class);
-                influxQueryWrapper.eq(DataHarmrateV::getLineId, lineId)
-                        .eq(DataHarmrateV::getProcess,Integer.toString(devsMap.get(devId).getProcess()))
-                        .select(DataHarmrateV::getLineId)
-                        .select(DataHarmrateV::getPhasicType)
-                        .select(DataHarmrateV::getValueType)
-                        .between(DataHarmrateV::getTime, lineParam.getStartTime(), lineParam.getEndTime())
-                        .eq(DataHarmrateV::getQualityFlag, "0");
-                if (Objects.isNull(po.getLineNo())) {
-                    influxQueryWrapper.eq(DataHarmrateV::getCldid,Integer.toString(po.getClDid()));
-                } else {
-                    influxQueryWrapper.eq(DataHarmrateV::getCldid,Integer.toString(po.getLineNo()));
-                }
-                //判断接线方式 (0-星型 1-角型 2-V型) 星型是相电压  角型或者v型是线电压
-                if (Objects.equals(po.getConType(),0)) {
-                    //相电压基波有效值
-                    influxQueryWrapper.select("Pq_RmsFundU_","v_1");
-                    //2-50次 相电压谐波含有率
-                    influxQueryWrapper.samePrefixAndSuffix("Pq_HarmU_", "v_", HarmonicTimesUtil.harmonicTimesList(2, 50, 1));
-                } else {
-                    //线电压基波有效值
-                    influxQueryWrapper.select("Pq_RmsFundLU_","v_1");
-                    //2-50次 线电压谐波含有率
-                    influxQueryWrapper.samePrefixAndSuffix("Pq_HarmLU_", "v_", HarmonicTimesUtil.harmonicTimesList(2, 50, 1));
-                }
-                result.addAll(dataHarmRateVMapper.selectByQueryWrapper(influxQueryWrapper));
-            });
-            if (CollectionUtil.isNotEmpty(result)) {
-                result.forEach(item -> {
+        if (CollectionUtil.isNotEmpty(result)) {
+            if (!Objects.isNull(map)) {
+                //现根据监测点分组，然后根据接线方式排除多于数据，在修改相别
+                Map<String, List<DataHarmrateV>> lineMap = result.stream().collect(Collectors.groupingBy(DataHarmrateV::getLineId));
+                lineMap.forEach((k,v)->{
+                    if (Objects.isNull(map.get(k))) {
+                        return;
+                    }
+                    Integer conType = map.get(k);
+                    Set<String> validPhasicTypes = (conType != 0) ? LINE_VOLTAGE_TYPES : PHASE_VOLTAGE_TYPES;
+                    List<DataHarmrateV> result2 = v.stream().filter(item -> validPhasicTypes.contains(item.getPhasicType())).collect(Collectors.toList());
+                    data.addAll(result2);
+                });
+            } else {
+                data.addAll(result);
+            }
+            if (CollectionUtil.isNotEmpty(data)) {
+                data.forEach(item -> {
                     String newType = PHASE_MAPPING.get(item.getPhasicType());
                     if (newType != null) {
                         item.setPhasicType(newType);
@@ -366,7 +335,6 @@ public class InfluxdbDataHarmRateVImpl extends MppServiceImpl<RStatDataHarmRateV
                 });
             }
         }
-        return result;
+        return data;
     }
-
 }

data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/influxdb/InfluxdbDataHarmphasicIImpl.java

@@ -4,10 +4,6 @@ import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.collection.CollectionUtil;
 import com.github.jeffreyning.mybatisplus.service.MppServiceImpl;
 import com.njcn.common.utils.HarmonicTimesUtil;
-import com.njcn.csdevice.api.CsLineFeignClient;
-import com.njcn.csdevice.api.EquipmentFeignClient;
-import com.njcn.csdevice.pojo.dto.CsEquipmentDeliveryDTO;
-import com.njcn.csdevice.pojo.po.CsLinePO;
 import com.njcn.dataProcess.dao.imapper.DataHarmphasicIMapper;
 import com.njcn.dataProcess.dao.relation.mapper.RStatDataHarmPhasicIRelationMapper;
 import com.njcn.dataProcess.dto.DataHarmphasicIDTO;
@@ -25,12 +21,10 @@ import org.apache.commons.collections4.ListUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 
-import javax.annotation.Resource;
 import java.time.LocalDateTime;
 import java.time.ZoneId;
 import java.time.format.DateTimeFormatter;
 import java.util.*;
-import java.util.function.Function;
 import java.util.stream.Collectors;
 
 /**
@@ -46,10 +40,6 @@ public class InfluxdbDataHarmphasicIImpl extends MppServiceImpl<RStatDataHarmPha
 
     private final DateTimeFormatter DATE_TIME_FORMATTER = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss").withZone(ZoneId.systemDefault());
     private final DataHarmphasicIMapper dataHarmphasicIMapper;
-    @Resource
-    private CsLineFeignClient csLineFeignClient;
-    @Resource
-    private EquipmentFeignClient equipmentFeignClient;
 
     private static final Map<String, String> PHASE_MAPPING = new HashMap<String, String>() {{
         put("AB", "A");
@@ -78,12 +68,7 @@ public class InfluxdbDataHarmphasicIImpl extends MppServiceImpl<RStatDataHarmPha
     @Override
     public List<DataHarmPhasicIDto> getRawData(LineCountEvaluateParam lineParam) {
         List<DataHarmPhasicIDto> result = new ArrayList<>();
-        List<DataHarmphasicI> list;
-        if (Objects.equals(lineParam.getType(), 2)) {
-            list = getWlMinuteData(lineParam.getLineId(), lineParam.getStartTime(), lineParam.getEndTime(), lineParam.getAbnormalTime(),lineParam.getDataType());
-        } else {
-            list = getMinuteData(lineParam.getLineId(), lineParam.getStartTime(), lineParam.getEndTime(), lineParam.getAbnormalTime(),lineParam.getDataType());
-        }
+        List<DataHarmphasicI> list = getMinuteData(lineParam.getLineId(), lineParam.getStartTime(), lineParam.getEndTime(), lineParam.getAbnormalTime(),lineParam.getDataType());
         list.forEach(item->{
             DataHarmPhasicIDto dto = new DataHarmPhasicIDto();
             BeanUtils.copyProperties(item,dto);
@@ -96,12 +81,7 @@ public class InfluxdbDataHarmphasicIImpl extends MppServiceImpl<RStatDataHarmPha
     @Override
     public List<CommonMinuteDto> getBaseData(LineCountEvaluateParam lineParam) {
         List<CommonMinuteDto> result = new ArrayList<>();
-        List<DataHarmphasicI> data;
-        if (Objects.equals(lineParam.getType(), 2)) {
-            data = getWlMinuteData(lineParam.getLineId(), lineParam.getStartTime(), lineParam.getEndTime(), lineParam.getAbnormalTime(),lineParam.getDataType());
-        } else {
-            data = getMinuteData(lineParam.getLineId(), lineParam.getStartTime(), lineParam.getEndTime(), lineParam.getAbnormalTime(),lineParam.getDataType());
-        }
+        List<DataHarmphasicI> data = getMinuteData(lineParam.getLineId(), lineParam.getStartTime(), lineParam.getEndTime(), lineParam.getAbnormalTime(),lineParam.getDataType());
         if (CollectionUtil.isNotEmpty(data)) {
             String time = TimeUtils.StringTimeToString(lineParam.getStartTime());
             //以监测点分组
@@ -269,50 +249,15 @@ public class InfluxdbDataHarmphasicIImpl extends MppServiceImpl<RStatDataHarmPha
                 result.addAll(dataList);
             }
         }
-        return result;
-    }
-
-    public List<DataHarmphasicI> getWlMinuteData(List<String> lineList, String startTime, String endTime, Map<String,List<String>> timeMap,Boolean dataType) {
-        List<DataHarmphasicI> result = new ArrayList<>();
-        if (CollectionUtil.isNotEmpty(lineList)) {
-            //获取监测点信息
-            List<CsLinePO> line = csLineFeignClient.queryLineById(lineList).getData();
-            Map<String, CsLinePO> lineMap = line.stream().collect(Collectors.toMap(CsLinePO::getLineId, Function.identity()));
-            //获取设备信息
-            List<String> devList = line.stream().map(CsLinePO::getDeviceId).distinct().collect(Collectors.toList());
-            List<CsEquipmentDeliveryDTO> dev = equipmentFeignClient.queryDeviceById(devList).getData();
-            Map<String, CsEquipmentDeliveryDTO> devsMap = dev.stream().collect(Collectors.toMap(CsEquipmentDeliveryDTO::getId, Function.identity()));
-            lineList.forEach(lineId -> {
-                String devId = lineMap.get(lineId).getDeviceId();
-                CsLinePO po = lineMap.get(lineId);
-                InfluxQueryWrapper influxQueryWrapper = new InfluxQueryWrapper(DataHarmphasicI.class);
-                //谐波电流幅值相角
-                influxQueryWrapper.samePrefixAndSuffix("Pq_HarmIAng_", "i_", HarmonicTimesUtil.harmonicTimesList(2, 50, 1));
-                influxQueryWrapper.eq(DataHarmphasicI::getLineId, lineId)
-                        .eq(DataHarmphasicI::getProcess,Integer.toString(devsMap.get(devId).getProcess()))
-                        .select(DataHarmphasicI::getLineId)
-                        .select(DataHarmphasicI::getPhasicType)
-                        .select(DataHarmphasicI::getValueType)
-                        //基波电流相角
-                        .select("Pq_FundIAng","i_1")
-                        .between(DataHarmphasicI::getTime, startTime, endTime)
-                        .eq(DataHarmphasicI::getQualityFlag, "0");
-                if (Objects.isNull(po.getLineNo())) {
-                    influxQueryWrapper.eq(DataHarmphasicI::getCldid,Integer.toString(po.getClDid()));
-                } else {
-                    influxQueryWrapper.eq(DataHarmphasicI::getCldid,Integer.toString(po.getLineNo()));
+        if (CollectionUtil.isNotEmpty(result)) {
+            result.forEach(item -> {
+                String newType = PHASE_MAPPING.get(item.getPhasicType());
+                if (newType != null) {
+                    item.setPhasicType(newType);
                 }
-                result.addAll(dataHarmphasicIMapper.selectByQueryWrapper(influxQueryWrapper));
             });
-            if (CollectionUtil.isNotEmpty(result)) {
-                result.forEach(item -> {
-                    String newType = PHASE_MAPPING.get(item.getPhasicType());
-                    if (newType != null) {
-                        item.setPhasicType(newType);
-                    }
-                });
-            }
         }
         return result;
     }
+
 }

data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/influxdb/InfluxdbDataHarmphasicVImpl.java

@@ -2,17 +2,14 @@ package com.njcn.dataProcess.service.impl.influxdb;
 
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.collection.CollectionUtil;
+import com.alibaba.nacos.shaded.com.google.common.reflect.TypeToken;
+import com.alibaba.nacos.shaded.com.google.gson.Gson;
 import com.github.jeffreyning.mybatisplus.service.MppServiceImpl;
 import com.njcn.common.utils.HarmonicTimesUtil;
-import com.njcn.csdevice.api.CsLineFeignClient;
-import com.njcn.csdevice.api.EquipmentFeignClient;
-import com.njcn.csdevice.pojo.dto.CsEquipmentDeliveryDTO;
-import com.njcn.csdevice.pojo.po.CsLinePO;
 import com.njcn.dataProcess.dao.imapper.DataHarmphasicVMapper;
 import com.njcn.dataProcess.dao.relation.mapper.RStatDataHarmPhasicVRelationMapper;
 import com.njcn.dataProcess.dto.DataHarmphasicVDTO;
 import com.njcn.dataProcess.param.LineCountEvaluateParam;
-import com.njcn.dataProcess.po.influx.DataHarmphasicI;
 import com.njcn.dataProcess.po.influx.DataHarmphasicV;
 import com.njcn.dataProcess.pojo.dto.CommonMinuteDto;
 import com.njcn.dataProcess.pojo.dto.DataHarmDto;
@@ -22,17 +19,18 @@ import com.njcn.dataProcess.service.IDataHarmphasicV;
 import com.njcn.dataProcess.util.TimeUtils;
 import com.njcn.influx.constant.InfluxDbSqlConstant;
 import com.njcn.influx.query.InfluxQueryWrapper;
+import com.njcn.redis.utils.RedisUtil;
 import lombok.RequiredArgsConstructor;
 import org.apache.commons.collections4.ListUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.lang.reflect.Type;
 import java.time.LocalDateTime;
 import java.time.ZoneId;
 import java.time.format.DateTimeFormatter;
 import java.util.*;
-import java.util.function.Function;
 import java.util.stream.Collectors;
 
 /**
@@ -47,19 +45,19 @@ import java.util.stream.Collectors;
 public class InfluxdbDataHarmphasicVImpl extends MppServiceImpl<RStatDataHarmPhasicVRelationMapper, RStatDataHarmPhasicVD> implements IDataHarmphasicV {
 
     private final DateTimeFormatter DATE_TIME_FORMATTER = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss").withZone(ZoneId.systemDefault());
-
     private final DataHarmphasicVMapper dataHarmphasicVMapper;
-    @Resource
-    private CsLineFeignClient csLineFeignClient;
-    @Resource
-    private EquipmentFeignClient equipmentFeignClient;
-
     private static final Map<String, String> PHASE_MAPPING = new HashMap<String, String>() {{
         put("AB", "A");
         put("BC", "B");
         put("CA", "C");
         put("M", "T");
     }};
+    @Resource
+    private RedisUtil redisUtil;
+    private static final Set<String> LINE_VOLTAGE_TYPES =
+            Collections.unmodifiableSet(new HashSet<>(Arrays.asList("AB", "BC", "CA", "T")));
+    private static final Set<String> PHASE_VOLTAGE_TYPES =
+            Collections.unmodifiableSet(new HashSet<>(Arrays.asList("A", "B", "C", "T")));
 
 
     @Override
@@ -83,12 +81,7 @@ public class InfluxdbDataHarmphasicVImpl extends MppServiceImpl<RStatDataHarmPha
     @Override
     public List<DataHarmDto> getRawData(LineCountEvaluateParam lineParam) {
         List<DataHarmDto> result = new ArrayList<>();
-        List<DataHarmphasicV> list;
-        if (Objects.equals(lineParam.getType(), 2)) {
-            list = getWlMinuteData(lineParam.getLineId(), lineParam.getStartTime(), lineParam.getEndTime(), lineParam.getAbnormalTime(),lineParam.getDataType());
-        } else {
-            list = getMinuteData(lineParam.getLineId(), lineParam.getStartTime(), lineParam.getEndTime(), lineParam.getAbnormalTime(),lineParam.getDataType());
-        }
+        List<DataHarmphasicV> list = getMinuteData(lineParam.getLineId(), lineParam.getStartTime(), lineParam.getEndTime(), lineParam.getAbnormalTime(),lineParam.getDataType());
         list.forEach(item->{
             DataHarmDto dto = new DataHarmDto();
             BeanUtils.copyProperties(item,dto);
@@ -101,12 +94,7 @@ public class InfluxdbDataHarmphasicVImpl extends MppServiceImpl<RStatDataHarmPha
     @Override
     public List<CommonMinuteDto> getBaseData(LineCountEvaluateParam lineParam) {
         List<CommonMinuteDto> result = new ArrayList<>();
-        List<DataHarmphasicV> data;
-        if (Objects.equals(lineParam.getType(), 2)) {
-            data = getWlMinuteData(lineParam.getLineId(), lineParam.getStartTime(), lineParam.getEndTime(), lineParam.getAbnormalTime(),lineParam.getDataType());
-        } else {
-            data = getMinuteData(lineParam.getLineId(), lineParam.getStartTime(), lineParam.getEndTime(), lineParam.getAbnormalTime(),lineParam.getDataType());
-        }
+        List<DataHarmphasicV> data = getMinuteData(lineParam.getLineId(), lineParam.getStartTime(), lineParam.getEndTime(), lineParam.getAbnormalTime(),lineParam.getDataType());
         if (CollectionUtil.isNotEmpty(data)) {
             String time = TimeUtils.StringTimeToString(lineParam.getStartTime());
             //以监测点分组
@@ -227,6 +215,13 @@ public class InfluxdbDataHarmphasicVImpl extends MppServiceImpl<RStatDataHarmPha
     public List<DataHarmphasicV> getMinuteData(List<String> lineList, String startTime, String endTime, Map<String,List<String>> timeMap, Boolean dataType) {
         List<DataHarmphasicV> dataList;
         List<DataHarmphasicV> result = new ArrayList<>();
+        List<DataHarmphasicV> data = new ArrayList<>();
+        //获取监测点、接线方式数据
+        Type type = new TypeToken<Map<String, Integer>>(){}.getType();
+        Map<String, Integer> map = new Gson().fromJson(
+                String.valueOf(redisUtil.getObjectByKey("wlLineDetail")),
+                type
+        );
         InfluxQueryWrapper influxQueryWrapper = new InfluxQueryWrapper(DataHarmphasicV.class);
         influxQueryWrapper.samePrefixAndSuffix(InfluxDbSqlConstant.V, InfluxDbSqlConstant.V, HarmonicTimesUtil.harmonicTimesList(1, 50, 1));
         influxQueryWrapper.regular(DataHarmphasicV::getLineId, lineList)
@@ -274,52 +269,24 @@ public class InfluxdbDataHarmphasicVImpl extends MppServiceImpl<RStatDataHarmPha
                 result.addAll(dataList);
             }
         }
-        return result;
-    }
-
-
-    public List<DataHarmphasicV> getWlMinuteData(List<String> lineList, String startTime, String endTime, Map<String,List<String>> timeMap, Boolean dataType) {
-        List<DataHarmphasicV> result = new ArrayList<>();
-        if (CollectionUtil.isNotEmpty(lineList)) {
-            //获取监测点信息
-            List<CsLinePO> line = csLineFeignClient.queryLineById(lineList).getData();
-            Map<String, CsLinePO> lineMap = line.stream().collect(Collectors.toMap(CsLinePO::getLineId, Function.identity()));
-            //获取设备信息
-            List<String> devList = line.stream().map(CsLinePO::getDeviceId).distinct().collect(Collectors.toList());
-            List<CsEquipmentDeliveryDTO> dev = equipmentFeignClient.queryDeviceById(devList).getData();
-            Map<String, CsEquipmentDeliveryDTO> devsMap = dev.stream().collect(Collectors.toMap(CsEquipmentDeliveryDTO::getId, Function.identity()));
-            lineList.forEach(lineId -> {
-                String devId = lineMap.get(lineId).getDeviceId();
-                CsLinePO po = lineMap.get(lineId);
-                InfluxQueryWrapper influxQueryWrapper = new InfluxQueryWrapper(DataHarmphasicV.class);
-                influxQueryWrapper.eq(DataHarmphasicV::getLineId, lineId)
-                        .eq(DataHarmphasicV::getProcess,Integer.toString(devsMap.get(devId).getProcess()))
-                        .select(DataHarmphasicV::getLineId)
-                        .select(DataHarmphasicV::getPhasicType)
-                        .select(DataHarmphasicV::getValueType)
-                        .between(DataHarmphasicV::getTime, startTime, endTime)
-                        .eq(DataHarmphasicV::getQualityFlag, "0");
-                if (Objects.isNull(po.getLineNo())) {
-                    influxQueryWrapper.eq(DataHarmphasicV::getCldid,Integer.toString(po.getClDid()));
-                } else {
-                    influxQueryWrapper.eq(DataHarmphasicV::getCldid,Integer.toString(po.getLineNo()));
-                }
-                //判断接线方式 (0-星型 1-角型 2-V型) 星型是相电压  角型或者v型是线电压
-                if (Objects.equals(po.getConType(),0)) {
-                    //相电压基波有效值相角
-                    influxQueryWrapper.select("Pq_FundUAng","v_1");
-                    //2-50次 相电压谐波相角
-                    influxQueryWrapper.samePrefixAndSuffix("Pq_HarmUAng_", "v_", HarmonicTimesUtil.harmonicTimesList(2, 50, 1));
-                } else {
-                    //线电压基波有效值相角
-                    influxQueryWrapper.select("Pq_FundLUAng","v_1");
-                    //2-50次 线电压谐波相角
-                    influxQueryWrapper.samePrefixAndSuffix("Pq_HarmLUAng_", "v_", HarmonicTimesUtil.harmonicTimesList(2, 50, 1));
-                }
-                result.addAll(dataHarmphasicVMapper.selectByQueryWrapper(influxQueryWrapper));
-            });
-            if (CollectionUtil.isNotEmpty(result)) {
-                result.forEach(item -> {
+        if (CollectionUtil.isNotEmpty(result)) {
+            if (!Objects.isNull(map)) {
+                //现根据监测点分组，然后根据接线方式排除多于数据，在修改相别
+                Map<String, List<DataHarmphasicV>> lineMap = result.stream().collect(Collectors.groupingBy(DataHarmphasicV::getLineId));
+                lineMap.forEach((k,v)->{
+                    if (Objects.isNull(map.get(k))) {
+                        return;
+                    }
+                    Integer conType = map.get(k);
+                    Set<String> validPhasicTypes = (conType != 0) ? LINE_VOLTAGE_TYPES : PHASE_VOLTAGE_TYPES;
+                    List<DataHarmphasicV> result2 = v.stream().filter(item -> validPhasicTypes.contains(item.getPhasicType())).collect(Collectors.toList());
+                    data.addAll(result2);
+                });
+            } else {
+                data.addAll(result);
+            }
+            if (CollectionUtil.isNotEmpty(data)) {
+                data.forEach(item -> {
                     String newType = PHASE_MAPPING.get(item.getPhasicType());
                     if (newType != null) {
                         item.setPhasicType(newType);
@@ -327,6 +294,6 @@ public class InfluxdbDataHarmphasicVImpl extends MppServiceImpl<RStatDataHarmPha
                 });
             }
         }
-        return result;
+        return data;
     }
 }

data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/influxdb/InfluxdbDataHarmpowerPImpl.java

@@ -4,10 +4,6 @@ import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.collection.CollectionUtil;
 import com.github.jeffreyning.mybatisplus.service.MppServiceImpl;
 import com.njcn.common.utils.HarmonicTimesUtil;
-import com.njcn.csdevice.api.CsLineFeignClient;
-import com.njcn.csdevice.api.EquipmentFeignClient;
-import com.njcn.csdevice.pojo.dto.CsEquipmentDeliveryDTO;
-import com.njcn.csdevice.pojo.po.CsLinePO;
 import com.njcn.dataProcess.dao.imapper.DataHarmpowerPMapper;
 import com.njcn.dataProcess.dao.relation.mapper.RStatDataHarmPowerPRelationMapper;
 import com.njcn.dataProcess.dto.DataHarmpowerPDTO;
@@ -26,13 +22,11 @@ import org.apache.commons.collections4.ListUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 
-import javax.annotation.Resource;
 import java.lang.reflect.Method;
 import java.time.LocalDateTime;
 import java.time.ZoneId;
 import java.time.format.DateTimeFormatter;
 import java.util.*;
-import java.util.function.Function;
 import java.util.stream.Collectors;
 
 /**
@@ -47,12 +41,7 @@ import java.util.stream.Collectors;
 public class InfluxdbDataHarmpowerPImpl extends MppServiceImpl<RStatDataHarmPowerPRelationMapper, RStatDataHarmPowerPD> implements IDataHarmpowerP {
 
     private final DateTimeFormatter DATE_TIME_FORMATTER = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss").withZone(ZoneId.systemDefault());
-
     private final DataHarmpowerPMapper dataHarmpowerPMapper;
-    @Resource
-    private CsLineFeignClient csLineFeignClient;
-    @Resource
-    private EquipmentFeignClient equipmentFeignClient;
 
     private static final Map<String, String> PHASE_MAPPING = new HashMap<String, String>() {{
         put("AB", "A");
@@ -82,12 +71,7 @@ public class InfluxdbDataHarmpowerPImpl extends MppServiceImpl<RStatDataHarmPowe
     @Override
     public List<DataPowerPDto> getRawData(LineCountEvaluateParam lineParam) {
         List<DataPowerPDto> result = new ArrayList<>();
-        List<DataHarmpowerP> list;
-        if (Objects.equals(lineParam.getType(), 2)) {
-            list = getWlMinuteData(lineParam.getLineId(), lineParam.getStartTime(), lineParam.getEndTime(), lineParam.getAbnormalTime(),lineParam.getDataType());
-        } else {
-            list = getMinuteData(lineParam.getLineId(), lineParam.getStartTime(), lineParam.getEndTime(), lineParam.getAbnormalTime(),lineParam.getDataType());
-        }
+        List<DataHarmpowerP> list = getMinuteData(lineParam.getLineId(), lineParam.getStartTime(), lineParam.getEndTime(), lineParam.getAbnormalTime(),lineParam.getDataType());
         list.forEach(item->{
             DataPowerPDto dto = new DataPowerPDto();
             BeanUtils.copyProperties(item,dto);
@@ -100,12 +84,7 @@ public class InfluxdbDataHarmpowerPImpl extends MppServiceImpl<RStatDataHarmPowe
     @Override
     public List<CommonMinuteDto> getBaseData(LineCountEvaluateParam lineParam) {
         List<CommonMinuteDto> result = new ArrayList<>();
-        List<DataHarmpowerP> data;
-        if (Objects.equals(lineParam.getType(), 2)) {
-            data = getWlMinuteData(lineParam.getLineId(), lineParam.getStartTime(), lineParam.getEndTime(), lineParam.getAbnormalTime(),lineParam.getDataType());
-        } else {
-            data = getMinuteData(lineParam.getLineId(), lineParam.getStartTime(), lineParam.getEndTime(), lineParam.getAbnormalTime(),lineParam.getDataType());
-        }
+        List<DataHarmpowerP> data = getMinuteData(lineParam.getLineId(), lineParam.getStartTime(), lineParam.getEndTime(), lineParam.getAbnormalTime(),lineParam.getDataType());
         if (CollectionUtil.isNotEmpty(data)) {
             String time = TimeUtils.StringTimeToString(lineParam.getStartTime());
             //以监测点分组
@@ -128,7 +107,7 @@ public class InfluxdbDataHarmpowerPImpl extends MppServiceImpl<RStatDataHarmPowe
                         CommonMinuteDto.ValueType value = new CommonMinuteDto.ValueType();
                         value.setValueType(valueType);
                         List<List<Double>> lists;
-                        if (Objects.equals(phasicType, "T")) {
+                        if (Objects.equals(phasicType, "T") && Objects.equals(lineParam.getType(), 2)) {
                             lists = extractDataLists(valueTypeList, "Tot");
                         } else {
                             lists = extractDataLists(valueTypeList, "");
@@ -213,6 +192,7 @@ public class InfluxdbDataHarmpowerPImpl extends MppServiceImpl<RStatDataHarmPowe
         List<DataHarmpowerP> result = new ArrayList<>();
         InfluxQueryWrapper influxQueryWrapper = new InfluxQueryWrapper(DataHarmpowerP.class);
         influxQueryWrapper.samePrefixAndSuffix(InfluxDbSqlConstant.P, InfluxDbSqlConstant.P, HarmonicTimesUtil.harmonicTimesList(1, 50, 1));
+        influxQueryWrapper.samePrefixAndSuffix("tot_tp_", "tot_tp_", HarmonicTimesUtil.harmonicTimesList(1, 50, 1));
         influxQueryWrapper.regular(DataHarmpowerP::getLineId, lineList)
                 .select(DataHarmpowerP::getLineId)
                 .select(DataHarmpowerP::getPhasicType)
@@ -220,6 +200,9 @@ public class InfluxdbDataHarmpowerPImpl extends MppServiceImpl<RStatDataHarmPowe
                 .select(DataHarmpowerP::getP)
                 .select(DataHarmpowerP::getDf)
                 .select(DataHarmpowerP::getPf)
+                .select(DataHarmpowerP::getTotP)
+                .select(DataHarmpowerP::getTotDf)
+                .select(DataHarmpowerP::getTotPf)
                 .select(DataHarmpowerP::getQualityFlag)
                 .select(DataHarmpowerP::getAbnormalFlag)
                 .between(DataHarmpowerP::getTime, startTime, endTime)
@@ -261,65 +244,13 @@ public class InfluxdbDataHarmpowerPImpl extends MppServiceImpl<RStatDataHarmPowe
                 result.addAll(dataList);
             }
         }
-        return result;
-    }
-
-    public List<DataHarmpowerP> getWlMinuteData(List<String> lineList, String startTime, String endTime, Map<String,List<String>> timeMap, Boolean dataType) {
-        List<DataHarmpowerP> result = new ArrayList<>();
-        if (CollectionUtil.isNotEmpty(lineList)) {
-            //获取监测点信息
-            List<CsLinePO> line = csLineFeignClient.queryLineById(lineList).getData();
-            Map<String, CsLinePO> lineMap = line.stream().collect(Collectors.toMap(CsLinePO::getLineId, Function.identity()));
-            //获取设备信息
-            List<String> devList = line.stream().map(CsLinePO::getDeviceId).distinct().collect(Collectors.toList());
-            List<CsEquipmentDeliveryDTO> dev = equipmentFeignClient.queryDeviceById(devList).getData();
-            Map<String, CsEquipmentDeliveryDTO> devsMap = dev.stream().collect(Collectors.toMap(CsEquipmentDeliveryDTO::getId, Function.identity()));
-            lineList.forEach(lineId -> {
-                String devId = lineMap.get(lineId).getDeviceId();
-                CsLinePO po = lineMap.get(lineId);
-                InfluxQueryWrapper influxQueryWrapper = new InfluxQueryWrapper(DataHarmpowerP.class);
-                //A、B、C谐波有功功率有效值
-                influxQueryWrapper.samePrefixAndSuffix("Pq_HarmP_", "p_", HarmonicTimesUtil.harmonicTimesList(2, 50, 1));
-                //三相总 谐波有功功率有效值
-                influxQueryWrapper.samePrefixAndSuffix("Pq_HarmTP_", "totP_", HarmonicTimesUtil.harmonicTimesList(2, 50, 1));
-                InfluxQueryWrapper eq = influxQueryWrapper.eq(DataHarmpowerP::getLineId, lineId)
-                        .eq(DataHarmpowerP::getProcess, Integer.toString(devsMap.get(devId).getProcess()))
-                        .select(DataHarmpowerP::getLineId)
-                        .select(DataHarmpowerP::getPhasicType)
-                        .select(DataHarmpowerP::getValueType)
-                        //位移功率因数
-                        .select("Pq_DF", "df")
-                        //视在功率因素
-                        .select("Pq_PF", "pf")
-                        //A、B、C三相有功功率
-                        .select("Pq_P", "p")
-                        //基波有功功率
-                        .select("Pq_FundP", "p_1")
-                        //三相总视在功率因数
-                        .select("Pq_TotPF", "totPf")
-                        //三相总位移功率因数
-                        .select("Pq_TotDF", "totDf")
-                        //三相总功率因数
-                        .select("Pq_TotP", "totP")
-                        //三相总基波有功功率
-                        .select("Pq_TotHarmP", "totP1")
-                        .between(DataHarmpowerP::getTime, startTime, endTime)
-                        .eq(DataHarmpowerP::getQualityFlag, "0");
-                if (Objects.isNull(po.getLineNo())) {
-                    influxQueryWrapper.eq(DataHarmpowerP::getCldid,Integer.toString(po.getClDid()));
-                } else {
-                    influxQueryWrapper.eq(DataHarmpowerP::getCldid,Integer.toString(po.getLineNo()));
+        if (CollectionUtil.isNotEmpty(result)) {
+            result.forEach(item -> {
+                String newType = PHASE_MAPPING.get(item.getPhasicType());
+                if (newType != null) {
+                    item.setPhasicType(newType);
                 }
-                result.addAll(dataHarmpowerPMapper.selectByQueryWrapper(influxQueryWrapper));
             });
-            if (CollectionUtil.isNotEmpty(result)) {
-                result.forEach(item -> {
-                    String newType = PHASE_MAPPING.get(item.getPhasicType());
-                    if (newType != null) {
-                        item.setPhasicType(newType);
-                    }
-                });
-            }
         }
         return result;
     }

data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/influxdb/InfluxdbDataHarmpowerQImpl.java

@@ -4,10 +4,6 @@ import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.collection.CollectionUtil;
 import com.github.jeffreyning.mybatisplus.service.MppServiceImpl;
 import com.njcn.common.utils.HarmonicTimesUtil;
-import com.njcn.csdevice.api.CsLineFeignClient;
-import com.njcn.csdevice.api.EquipmentFeignClient;
-import com.njcn.csdevice.pojo.dto.CsEquipmentDeliveryDTO;
-import com.njcn.csdevice.pojo.po.CsLinePO;
 import com.njcn.dataProcess.dao.imapper.DataHarmpowerQMapper;
 import com.njcn.dataProcess.dao.relation.mapper.RStatDataHarmPowerQRelationMapper;
 import com.njcn.dataProcess.dto.DataHarmpowerQDTO;
@@ -25,13 +21,11 @@ import org.apache.commons.collections4.ListUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 
-import javax.annotation.Resource;
 import java.lang.reflect.Method;
 import java.time.LocalDateTime;
 import java.time.ZoneId;
 import java.time.format.DateTimeFormatter;
 import java.util.*;
-import java.util.function.Function;
 import java.util.stream.Collectors;
 
 /**
@@ -47,10 +41,6 @@ public class InfluxdbDataHarmpowerQImpl extends MppServiceImpl<RStatDataHarmPowe
 
     private final DateTimeFormatter DATE_TIME_FORMATTER = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss").withZone(ZoneId.systemDefault());
     private final DataHarmpowerQMapper dataHarmpowerQMapper;
-    @Resource
-    private CsLineFeignClient csLineFeignClient;
-    @Resource
-    private EquipmentFeignClient equipmentFeignClient;
 
     private static final Map<String, String> PHASE_MAPPING = new HashMap<String, String>() {{
         put("AB", "A");
@@ -80,12 +70,7 @@ public class InfluxdbDataHarmpowerQImpl extends MppServiceImpl<RStatDataHarmPowe
     @Override
     public List<DataHarmPowerQDto> getRawData(LineCountEvaluateParam lineParam) {
         List<DataHarmPowerQDto> result = new ArrayList<>();
-        List<DataHarmpowerQ> list;
-        if (Objects.equals(lineParam.getType(), 2)) {
-            list = getWlMinuteData(lineParam.getLineId(), lineParam.getStartTime(), lineParam.getEndTime(), lineParam.getAbnormalTime(),lineParam.getDataType());
-        } else {
-            list = getMinuteData(lineParam.getLineId(), lineParam.getStartTime(), lineParam.getEndTime(), lineParam.getAbnormalTime(),lineParam.getDataType());
-        }
+        List<DataHarmpowerQ>  list = getMinuteData(lineParam.getLineId(), lineParam.getStartTime(), lineParam.getEndTime(), lineParam.getAbnormalTime(),lineParam.getDataType());
         list.forEach(item->{
             DataHarmPowerQDto dto = new DataHarmPowerQDto();
             BeanUtils.copyProperties(item,dto);
@@ -98,12 +83,7 @@ public class InfluxdbDataHarmpowerQImpl extends MppServiceImpl<RStatDataHarmPowe
     @Override
     public List<CommonMinuteDto> getBaseData(LineCountEvaluateParam lineParam) {
         List<CommonMinuteDto> result = new ArrayList<>();
-        List<DataHarmpowerQ> data;
-        if (Objects.equals(lineParam.getType(), 2)) {
-            data = getWlMinuteData(lineParam.getLineId(), lineParam.getStartTime(), lineParam.getEndTime(), lineParam.getAbnormalTime(),lineParam.getDataType());
-        } else {
-            data = getMinuteData(lineParam.getLineId(), lineParam.getStartTime(), lineParam.getEndTime(), lineParam.getAbnormalTime(),lineParam.getDataType());
-        }
+        List<DataHarmpowerQ>  data = getMinuteData(lineParam.getLineId(), lineParam.getStartTime(), lineParam.getEndTime(), lineParam.getAbnormalTime(),lineParam.getDataType());
         if (CollectionUtil.isNotEmpty(data)) {
             String time = TimeUtils.StringTimeToString(lineParam.getStartTime());
             //以监测点分组
@@ -125,9 +105,8 @@ public class InfluxdbDataHarmpowerQImpl extends MppServiceImpl<RStatDataHarmPowe
                     valueTypeMap.forEach((valueType,valueTypeList)->{
                         CommonMinuteDto.ValueType value = new CommonMinuteDto.ValueType();
                         value.setValueType(valueType);
-
                         List<List<Double>> lists;
-                        if (Objects.equals(phasicType, "T")) {
+                        if (Objects.equals(phasicType, "T") && Objects.equals(lineParam.getType(), 2)) {
                             lists = extractDataLists(valueTypeList, "Tot");
                         } else {
                             lists = extractDataLists(valueTypeList, "");
@@ -208,11 +187,13 @@ public class InfluxdbDataHarmpowerQImpl extends MppServiceImpl<RStatDataHarmPowe
         List<DataHarmpowerQ> result = new ArrayList<>();
         InfluxQueryWrapper influxQueryWrapper = new InfluxQueryWrapper(DataHarmpowerQ.class);
         influxQueryWrapper.samePrefixAndSuffix(InfluxDbSqlConstant.Q, InfluxDbSqlConstant.Q, HarmonicTimesUtil.harmonicTimesList(1, 50, 1));
+        influxQueryWrapper.samePrefixAndSuffix("tot_tq_", "tot_tq_", HarmonicTimesUtil.harmonicTimesList(1, 50, 1));
         influxQueryWrapper.regular(DataHarmpowerQ::getLineId, lineList)
                 .select(DataHarmpowerQ::getLineId)
                 .select(DataHarmpowerQ::getPhasicType)
                 .select(DataHarmpowerQ::getValueType)
                 .select(DataHarmpowerQ::getQ)
+                .select(DataHarmpowerQ::getTotQ)
                 .select(DataHarmpowerQ::getQualityFlag)
                 .select(DataHarmpowerQ::getAbnormalFlag)
                 .between(DataHarmpowerQ::getTime, startTime, endTime)
@@ -254,57 +235,13 @@ public class InfluxdbDataHarmpowerQImpl extends MppServiceImpl<RStatDataHarmPowe
                 result.addAll(dataList);
             }
         }
-        return result;
-    }
-
-    public List<DataHarmpowerQ> getWlMinuteData(List<String> lineList, String startTime, String endTime, Map<String,List<String>> timeMap, Boolean dataType) {
-        List<DataHarmpowerQ> result = new ArrayList<>();
-        if (CollectionUtil.isNotEmpty(lineList)) {
-            //获取监测点信息
-            List<CsLinePO> line = csLineFeignClient.queryLineById(lineList).getData();
-            Map<String, CsLinePO> lineMap = line.stream().collect(Collectors.toMap(CsLinePO::getLineId, Function.identity()));
-            //获取设备信息
-            List<String> devList = line.stream().map(CsLinePO::getDeviceId).distinct().collect(Collectors.toList());
-            List<CsEquipmentDeliveryDTO> dev = equipmentFeignClient.queryDeviceById(devList).getData();
-            Map<String, CsEquipmentDeliveryDTO> devsMap = dev.stream().collect(Collectors.toMap(CsEquipmentDeliveryDTO::getId, Function.identity()));
-            lineList.forEach(lineId -> {
-                String devId = lineMap.get(lineId).getDeviceId();
-                CsLinePO po = lineMap.get(lineId);
-                InfluxQueryWrapper influxQueryWrapper = new InfluxQueryWrapper(DataHarmpowerQ.class);
-                //A、B、C谐波无功功率有效值
-                influxQueryWrapper.samePrefixAndSuffix("Pq_HarmQ_", "q_", HarmonicTimesUtil.harmonicTimesList(2, 50, 1));
-                //三相总 谐波有功功率有效值
-                influxQueryWrapper.samePrefixAndSuffix("Pq_HarmTQ_", "totQ_", HarmonicTimesUtil.harmonicTimesList(2, 50, 1));
-                influxQueryWrapper.eq(DataHarmpowerQ::getLineId, lineId)
-                        .eq(DataHarmpowerQ::getProcess,Integer.toString(devsMap.get(devId).getProcess()))
-                        .select(DataHarmpowerQ::getLineId)
-                        .select(DataHarmpowerQ::getPhasicType)
-                        .select(DataHarmpowerQ::getValueType)
-                        //A、B、C三相无功功率
-                        .select("Pq_Q", "q")
-                        //基波无功功率
-                        .select("Pq_FundQ","q_1")
-                        //总无功功率
-                        .select("Pq_TotQ","totQ")
-                        //基波无功功率(T)
-                        .select("Pq_TotHarmQ","totQ1")
-                        .between(DataHarmpowerQ::getTime, startTime, endTime)
-                        .eq(DataHarmpowerQ::getQualityFlag, "0");
-                if (Objects.isNull(po.getLineNo())) {
-                    influxQueryWrapper.eq(DataHarmpowerQ::getCldid,Integer.toString(po.getClDid()));
-                } else {
-                    influxQueryWrapper.eq(DataHarmpowerQ::getCldid,Integer.toString(po.getLineNo()));
+        if (CollectionUtil.isNotEmpty(result)) {
+            result.forEach(item -> {
+                String newType = PHASE_MAPPING.get(item.getPhasicType());
+                if (newType != null) {
+                    item.setPhasicType(newType);
                 }
-                result.addAll(dataHarmpowerQMapper.selectByQueryWrapper(influxQueryWrapper));
             });
-            if (CollectionUtil.isNotEmpty(result)) {
-                result.forEach(item -> {
-                    String newType = PHASE_MAPPING.get(item.getPhasicType());
-                    if (newType != null) {
-                        item.setPhasicType(newType);
-                    }
-                });
-            }
         }
         return result;
     }

data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/influxdb/InfluxdbDataHarmpowerSImpl.java

@@ -4,10 +4,6 @@ import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.collection.CollectionUtil;
 import com.github.jeffreyning.mybatisplus.service.MppServiceImpl;
 import com.njcn.common.utils.HarmonicTimesUtil;
-import com.njcn.csdevice.api.CsLineFeignClient;
-import com.njcn.csdevice.api.EquipmentFeignClient;
-import com.njcn.csdevice.pojo.dto.CsEquipmentDeliveryDTO;
-import com.njcn.csdevice.pojo.po.CsLinePO;
 import com.njcn.dataProcess.dao.imapper.DataHarmpowerSMapper;
 import com.njcn.dataProcess.dao.relation.mapper.RStatDataHarmPowerSRelationMapper;
 import com.njcn.dataProcess.dto.DataHarmpowerSDTO;
@@ -25,13 +21,11 @@ import org.apache.commons.collections4.ListUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 
-import javax.annotation.Resource;
 import java.lang.reflect.Method;
 import java.time.LocalDateTime;
 import java.time.ZoneId;
 import java.time.format.DateTimeFormatter;
 import java.util.*;
-import java.util.function.Function;
 import java.util.stream.Collectors;
 
 /**
@@ -47,10 +41,6 @@ public class InfluxdbDataHarmpowerSImpl extends MppServiceImpl<RStatDataHarmPowe
 
     private final DateTimeFormatter DATE_TIME_FORMATTER = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss").withZone(ZoneId.systemDefault());
     private final DataHarmpowerSMapper dataHarmpowerSMapper;
-    @Resource
-    private CsLineFeignClient csLineFeignClient;
-    @Resource
-    private EquipmentFeignClient equipmentFeignClient;
 
     private static final Map<String, String> PHASE_MAPPING = new HashMap<String, String>() {{
         put("AB", "A");
@@ -80,12 +70,7 @@ public class InfluxdbDataHarmpowerSImpl extends MppServiceImpl<RStatDataHarmPowe
     @Override
     public List<DataHarmPowerSDto> getRawData(LineCountEvaluateParam lineParam) {
         List<DataHarmPowerSDto> result = new ArrayList<>();
-        List<DataHarmpowerS> list;
-        if (Objects.equals(lineParam.getType(), 2)) {
-            list = getWlMinuteData(lineParam.getLineId(), lineParam.getStartTime(), lineParam.getEndTime(), lineParam.getAbnormalTime(),lineParam.getDataType());
-        } else {
-            list = getMinuteData(lineParam.getLineId(), lineParam.getStartTime(), lineParam.getEndTime(), lineParam.getAbnormalTime(),lineParam.getDataType());
-        }
+        List<DataHarmpowerS> list = getMinuteData(lineParam.getLineId(), lineParam.getStartTime(), lineParam.getEndTime(), lineParam.getAbnormalTime(),lineParam.getDataType());
         list.forEach(item->{
             DataHarmPowerSDto dto = new DataHarmPowerSDto();
             BeanUtils.copyProperties(item,dto);
@@ -98,12 +83,7 @@ public class InfluxdbDataHarmpowerSImpl extends MppServiceImpl<RStatDataHarmPowe
     @Override
     public List<CommonMinuteDto> getBaseData(LineCountEvaluateParam lineParam) {
         List<CommonMinuteDto> result = new ArrayList<>();
-        List<DataHarmpowerS> data;
-        if (Objects.equals(lineParam.getType(), 2)) {
-            data = getWlMinuteData(lineParam.getLineId(), lineParam.getStartTime(), lineParam.getEndTime(), lineParam.getAbnormalTime(),lineParam.getDataType());
-        } else {
-            data = getMinuteData(lineParam.getLineId(), lineParam.getStartTime(), lineParam.getEndTime(), lineParam.getAbnormalTime(),lineParam.getDataType());
-        }
+        List<DataHarmpowerS>  data = getMinuteData(lineParam.getLineId(), lineParam.getStartTime(), lineParam.getEndTime(), lineParam.getAbnormalTime(),lineParam.getDataType());
         if (CollectionUtil.isNotEmpty(data)) {
             String time = TimeUtils.StringTimeToString(lineParam.getStartTime());
             //以监测点分组
@@ -126,7 +106,7 @@ public class InfluxdbDataHarmpowerSImpl extends MppServiceImpl<RStatDataHarmPowe
                         CommonMinuteDto.ValueType value = new CommonMinuteDto.ValueType();
                         value.setValueType(valueType);
                         List<List<Double>> lists;
-                        if (Objects.equals(phasicType, "T")) {
+                        if (Objects.equals(phasicType, "T") && Objects.equals(lineParam.getType(), 2)) {
                             lists = extractDataLists(valueTypeList, "Tot");
                         } else {
                             lists = extractDataLists(valueTypeList, "");
@@ -207,11 +187,13 @@ public class InfluxdbDataHarmpowerSImpl extends MppServiceImpl<RStatDataHarmPowe
         List<DataHarmpowerS> result = new ArrayList<>();
         InfluxQueryWrapper influxQueryWrapper = new InfluxQueryWrapper(DataHarmpowerS.class);
         influxQueryWrapper.samePrefixAndSuffix(InfluxDbSqlConstant.S, InfluxDbSqlConstant.S, HarmonicTimesUtil.harmonicTimesList(1, 50, 1));
+        influxQueryWrapper.samePrefixAndSuffix("tot_ts_", "tot_ts_", HarmonicTimesUtil.harmonicTimesList(1, 50, 1));
         influxQueryWrapper.regular(DataHarmpowerS::getLineId, lineList)
                 .select(DataHarmpowerS::getLineId)
                 .select(DataHarmpowerS::getPhasicType)
                 .select(DataHarmpowerS::getValueType)
                 .select(DataHarmpowerS::getS)
+                .select(DataHarmpowerS::getTotS)
                 .select(DataHarmpowerS::getQualityFlag)
                 .select(DataHarmpowerS::getAbnormalFlag)
                 .between(DataHarmpowerS::getTime, startTime, endTime)
@@ -253,59 +235,14 @@ public class InfluxdbDataHarmpowerSImpl extends MppServiceImpl<RStatDataHarmPowe
                 result.addAll(dataList);
             }
         }
-        return result;
-    }
-
-    public List<DataHarmpowerS> getWlMinuteData(List<String> lineList, String startTime, String endTime, Map<String,List<String>> timeMap,Boolean dataType) {
-        List<DataHarmpowerS> result = new ArrayList<>();
-        if (CollectionUtil.isNotEmpty(lineList)) {
-            //获取监测点信息
-            List<CsLinePO> line = csLineFeignClient.queryLineById(lineList).getData();
-            Map<String, CsLinePO> lineMap = line.stream().collect(Collectors.toMap(CsLinePO::getLineId, Function.identity()));
-            //获取设备信息
-            List<String> devList = line.stream().map(CsLinePO::getDeviceId).distinct().collect(Collectors.toList());
-            List<CsEquipmentDeliveryDTO> dev = equipmentFeignClient.queryDeviceById(devList).getData();
-            Map<String, CsEquipmentDeliveryDTO> devsMap = dev.stream().collect(Collectors.toMap(CsEquipmentDeliveryDTO::getId, Function.identity()));
-            lineList.forEach(lineId -> {
-                String devId = lineMap.get(lineId).getDeviceId();
-                CsLinePO po = lineMap.get(lineId);
-                InfluxQueryWrapper influxQueryWrapper = new InfluxQueryWrapper(DataHarmpowerS.class);
-                //A、B、C谐波视在功率有效值
-                influxQueryWrapper.samePrefixAndSuffix("Pq_HarmS_", "s_", HarmonicTimesUtil.harmonicTimesList(2, 50, 1));
-                //三相总 谐波视在功率有效值
-                influxQueryWrapper.samePrefixAndSuffix("Pq_HarmTS_", "totS_", HarmonicTimesUtil.harmonicTimesList(2, 50, 1));
-                influxQueryWrapper.eq(DataHarmpowerS::getLineId, lineId)
-                        .eq(DataHarmpowerS::getProcess,Integer.toString(devsMap.get(devId).getProcess()))
-                        .select(DataHarmpowerS::getLineId)
-                        .select(DataHarmpowerS::getPhasicType)
-                        .select(DataHarmpowerS::getValueType)
-                        //A、B、C视在功率
-                        .select("Pq_S","s")
-                        //基波视在功率
-                        .select("Pq_FundS","s_1")
-                        //总视在功率
-                        .select("Pq_TotS","totS")
-                        //基波视在功率（T）
-                        .select("Pq_TotHarmS","totS1")
-                        .between(DataHarmpowerS::getTime, startTime, endTime)
-                        .eq(DataHarmpowerS::getQualityFlag, "0");
-                if (Objects.isNull(po.getLineNo())) {
-                    influxQueryWrapper.eq(DataHarmpowerS::getCldid,Integer.toString(po.getClDid()));
-                } else {
-                    influxQueryWrapper.eq(DataHarmpowerS::getCldid,Integer.toString(po.getLineNo()));
+        if (CollectionUtil.isNotEmpty(result)) {
+            result.forEach(item -> {
+                String newType = PHASE_MAPPING.get(item.getPhasicType());
+                if (newType != null) {
+                    item.setPhasicType(newType);
                 }
-                result.addAll(dataHarmpowerSMapper.selectByQueryWrapper(influxQueryWrapper));
             });
-            if (CollectionUtil.isNotEmpty(result)) {
-                result.forEach(item -> {
-                    String newType = PHASE_MAPPING.get(item.getPhasicType());
-                    if (newType != null) {
-                        item.setPhasicType(newType);
-                    }
-                });
-            }
         }
         return result;
     }
-
 }

data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/influxdb/InfluxdbDataIImpl.java

@@ -4,10 +4,6 @@ import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.collection.CollectionUtil;
 import com.github.jeffreyning.mybatisplus.service.MppServiceImpl;
 import com.njcn.common.utils.HarmonicTimesUtil;
-import com.njcn.csdevice.api.CsLineFeignClient;
-import com.njcn.csdevice.api.EquipmentFeignClient;
-import com.njcn.csdevice.pojo.dto.CsEquipmentDeliveryDTO;
-import com.njcn.csdevice.pojo.po.CsLinePO;
 import com.njcn.dataProcess.constant.InfluxDBTableConstant;
 import com.njcn.dataProcess.dao.imapper.DataIMapper;
 import com.njcn.dataProcess.dao.relation.mapper.RStatDataIRelationMapper;
@@ -26,12 +22,10 @@ import org.apache.commons.collections4.ListUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 
-import javax.annotation.Resource;
 import java.time.LocalDateTime;
 import java.time.ZoneId;
 import java.time.format.DateTimeFormatter;
 import java.util.*;
-import java.util.function.Function;
 import java.util.stream.Collectors;
 
 /**
@@ -49,11 +43,6 @@ public class InfluxdbDataIImpl extends MppServiceImpl<RStatDataIRelationMapper,
 
     private final DataIMapper dataIMapper;
 
-    @Resource
-    private CsLineFeignClient csLineFeignClient;
-    @Resource
-    private EquipmentFeignClient equipmentFeignClient;
-
     private static final Map<String, String> PHASE_MAPPING = new HashMap<String, String>() {{
         put("AB", "A");
         put("BC", "B");
@@ -82,12 +71,7 @@ public class InfluxdbDataIImpl extends MppServiceImpl<RStatDataIRelationMapper,
     @Override
     public List<DataIDto> getRawData(LineCountEvaluateParam lineParam) {
         List<DataIDto> result = new ArrayList<>();
-        List<DataI> list;
-        if (Objects.equals(lineParam.getType(), 2)) {
-            list = getWlMinuteDataI(lineParam);
-        } else {
-            list = getMinuteDataI(lineParam);
-        }
+        List<DataI> list = getMinuteDataI(lineParam);;
         list.forEach(item->{
             DataIDto dto = new DataIDto();
             BeanUtils.copyProperties(item,dto);
@@ -100,12 +84,7 @@ public class InfluxdbDataIImpl extends MppServiceImpl<RStatDataIRelationMapper,
     @Override
     public List<CommonMinuteDto> getBaseData(LineCountEvaluateParam lineParam) {
         List<CommonMinuteDto> result = new ArrayList<>();
-        List<DataI> dataIList;
-        if (Objects.equals(lineParam.getType(), 2)) {
-            dataIList = getWlMinuteDataI(lineParam);
-        } else {
-            dataIList = getMinuteDataI(lineParam);
-        }
+        List<DataI> dataIList = getMinuteDataI(lineParam);
         if (CollectionUtil.isNotEmpty(dataIList)) {
             String time = TimeUtils.StringTimeToString(lineParam.getStartTime());
             //以监测点分组
@@ -314,65 +293,13 @@ public class InfluxdbDataIImpl extends MppServiceImpl<RStatDataIRelationMapper,
                 result.addAll(dataList);
             }
         }
-        return result;
-    }
-
-    public List<DataI> getWlMinuteDataI(LineCountEvaluateParam lineParam) {
-        List<DataI> result = new ArrayList<>();
-        if (CollectionUtil.isNotEmpty(lineParam.getLineId())) {
-            //获取监测点信息
-            List<CsLinePO> line = csLineFeignClient.queryLineById(lineParam.getLineId()).getData();
-            Map<String, CsLinePO> lineMap = line.stream().collect(Collectors.toMap(CsLinePO::getLineId, Function.identity()));
-            //获取设备信息
-            List<String> devList = line.stream().map(CsLinePO::getDeviceId).distinct().collect(Collectors.toList());
-            List<CsEquipmentDeliveryDTO> dev = equipmentFeignClient.queryDeviceById(devList).getData();
-            Map<String, CsEquipmentDeliveryDTO> devsMap = dev.stream().collect(Collectors.toMap(CsEquipmentDeliveryDTO::getId, Function.identity()));
-
-            lineParam.getLineId().forEach(lineId -> {
-                String devId = lineMap.get(lineId).getDeviceId();
-                CsLinePO po = lineMap.get(lineId);
-                InfluxQueryWrapper influxQueryWrapper = new InfluxQueryWrapper(DataI.class);
-                //2-50次 谐波电流有效值
-                influxQueryWrapper.samePrefixAndSuffix("Pq_HarmI_", "i_", HarmonicTimesUtil.harmonicTimesList(2, 50, 1));
-                influxQueryWrapper.eq(DataI::getLineId, lineId)
-                        .eq(DataI::getProcess,Integer.toString(devsMap.get(devId).getProcess()))
-                        .select(DataI::getLineId)
-                        .select(DataI::getPhasicType)
-                        .select(DataI::getValueType)
-                        //电流负序
-                        .select("Pq_SeqNegI","i_neg")
-                        //电流正序
-                        .select("Pq_SeqPosI","i_pos")
-                        //电流总谐波畸变率
-                        .select("Pq_ThdI","i_thd")
-                        //电流负序不平衡度
-                        .select("Pq_UnbalNegI","i_unbalance")
-                        //电流零序
-                        .select("Pq_SeqZeroI","i_zero")
-                        //电流总有效值
-                        .select("Pq_RmsI","rms")
-                        //电流基波有效值
-                        .select("Pq_RmsFundI","i_1")
-                        .between(DataI::getTime, lineParam.getStartTime(), lineParam.getEndTime())
-                        .eq(DataI::getQualityFlag, "0");
-                if (CollUtil.isNotEmpty(lineParam.getPhasicType())) {
-                    influxQueryWrapper.regular(DataI::getPhasicType, lineParam.getPhasicType());
+        if (CollectionUtil.isNotEmpty(result)) {
+            result.forEach(item -> {
+                String newType = PHASE_MAPPING.get(item.getPhasicType());
+                if (newType != null) {
+                    item.setPhasicType(newType);
                 }
-                if (Objects.isNull(po.getLineNo())) {
-                    influxQueryWrapper.eq(DataI::getCldid,Integer.toString(po.getClDid()));
-                } else {
-                    influxQueryWrapper.eq(DataI::getCldid,Integer.toString(po.getLineNo()));
-                }
-                result.addAll(dataIMapper.selectByQueryWrapper(influxQueryWrapper));
             });
-            if (CollectionUtil.isNotEmpty(result)) {
-                result.forEach(item -> {
-                    String newType = PHASE_MAPPING.get(item.getPhasicType());
-                    if (newType != null) {
-                        item.setPhasicType(newType);
-                    }
-                });
-            }
         }
         return result;
     }

data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/influxdb/InfluxdbDataInharmIImpl.java

@@ -4,10 +4,6 @@ import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.collection.CollectionUtil;
 import com.github.jeffreyning.mybatisplus.service.MppServiceImpl;
 import com.njcn.common.utils.HarmonicTimesUtil;
-import com.njcn.csdevice.api.CsLineFeignClient;
-import com.njcn.csdevice.api.EquipmentFeignClient;
-import com.njcn.csdevice.pojo.dto.CsEquipmentDeliveryDTO;
-import com.njcn.csdevice.pojo.po.CsLinePO;
 import com.njcn.dataProcess.dao.imapper.DataInharmIMapper;
 import com.njcn.dataProcess.dao.relation.mapper.RStatDataInHarmIRelationMapper;
 import com.njcn.dataProcess.dto.DataInharmIDTO;
@@ -25,12 +21,10 @@ import org.apache.commons.collections4.ListUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 
-import javax.annotation.Resource;
 import java.time.LocalDateTime;
 import java.time.ZoneId;
 import java.time.format.DateTimeFormatter;
 import java.util.*;
-import java.util.function.Function;
 import java.util.stream.Collectors;
 
 /**
@@ -46,10 +40,6 @@ public class InfluxdbDataInharmIImpl extends MppServiceImpl<RStatDataInHarmIRela
 
     private final DataInharmIMapper dataInharmIMapper;
     private final DateTimeFormatter DATE_TIME_FORMATTER = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss").withZone(ZoneId.systemDefault());
-    @Resource
-    private CsLineFeignClient csLineFeignClient;
-    @Resource
-    private EquipmentFeignClient equipmentFeignClient;
 
     private static final Map<String, String> PHASE_MAPPING = new HashMap<String, String>() {{
         put("AB", "A");
@@ -79,12 +69,7 @@ public class InfluxdbDataInharmIImpl extends MppServiceImpl<RStatDataInHarmIRela
     @Override
     public List<DataInHarmIDto> getRawData(LineCountEvaluateParam lineParam) {
         List<DataInHarmIDto> result = new ArrayList<>();
-        List<DataInharmI> list;
-        if (Objects.equals(lineParam.getType(), 2)) {
-            list = getWlMinuteData(lineParam.getLineId(), lineParam.getStartTime(), lineParam.getEndTime(),lineParam.getAbnormalTime(),lineParam.getDataType());
-        } else {
-            list = getMinuteData(lineParam.getLineId(), lineParam.getStartTime(), lineParam.getEndTime(),lineParam.getAbnormalTime(),lineParam.getDataType());
-        }
+        List<DataInharmI> list = getMinuteData(lineParam.getLineId(), lineParam.getStartTime(), lineParam.getEndTime(),lineParam.getAbnormalTime(),lineParam.getDataType());
         list.forEach(item->{
             DataInHarmIDto dto = new DataInHarmIDto();
             BeanUtils.copyProperties(item,dto);
@@ -97,12 +82,7 @@ public class InfluxdbDataInharmIImpl extends MppServiceImpl<RStatDataInHarmIRela
     @Override
     public List<CommonMinuteDto> getBaseData(LineCountEvaluateParam lineParam) {
         List<CommonMinuteDto> result = new ArrayList<>();
-        List<DataInharmI> data;
-        if (Objects.equals(lineParam.getType(), 2)) {
-            data = getWlMinuteData(lineParam.getLineId(), lineParam.getStartTime(), lineParam.getEndTime(),lineParam.getAbnormalTime(),lineParam.getDataType());
-        } else {
-            data = getMinuteData(lineParam.getLineId(), lineParam.getStartTime(), lineParam.getEndTime(),lineParam.getAbnormalTime(),lineParam.getDataType());
-        }
+        List<DataInharmI> data = getMinuteData(lineParam.getLineId(), lineParam.getStartTime(), lineParam.getEndTime(),lineParam.getAbnormalTime(),lineParam.getDataType());
         if (CollectionUtil.isNotEmpty(data)) {
             String time = TimeUtils.StringTimeToString(lineParam.getStartTime());
             //以监测点分组
@@ -270,49 +250,14 @@ public class InfluxdbDataInharmIImpl extends MppServiceImpl<RStatDataInHarmIRela
                 result.addAll(dataList);
             }
         }
-        return result;
-    }
-
-    public List<DataInharmI> getWlMinuteData(List<String> lineList, String startTime, String endTime, Map<String,List<String>> timeMap, Boolean dataType) {
-        List<DataInharmI> result = new ArrayList<>();
-        if (CollectionUtil.isNotEmpty(lineList)) {
-            //获取监测点信息
-            List<CsLinePO> line = csLineFeignClient.queryLineById(lineList).getData();
-            Map<String, CsLinePO> lineMap = line.stream().collect(Collectors.toMap(CsLinePO::getLineId, Function.identity()));
-            //获取设备信息
-            List<String> devList = line.stream().map(CsLinePO::getDeviceId).distinct().collect(Collectors.toList());
-            List<CsEquipmentDeliveryDTO> dev = equipmentFeignClient.queryDeviceById(devList).getData();
-            Map<String, CsEquipmentDeliveryDTO> devsMap = dev.stream().collect(Collectors.toMap(CsEquipmentDeliveryDTO::getId, Function.identity()));
-            lineList.forEach(lineId -> {
-                String devId = lineMap.get(lineId).getDeviceId();
-                CsLinePO po = lineMap.get(lineId);
-                InfluxQueryWrapper influxQueryWrapper = new InfluxQueryWrapper(DataInharmI.class);
-                //2-50次 间谐波电流有效值
-                influxQueryWrapper.samePrefixAndSuffix("Pq_InHarmIAmp_", "i_", HarmonicTimesUtil.harmonicTimesList(1, 50, 1));
-                influxQueryWrapper.eq(DataInharmI::getLineId, lineId)
-                        .eq(DataInharmI::getProcess,Integer.toString(devsMap.get(devId).getProcess()))
-                        .select(DataInharmI::getLineId)
-                        .select(DataInharmI::getPhasicType)
-                        .select(DataInharmI::getValueType)
-                        .between(DataInharmI::getTime, startTime, endTime)
-                        .eq(DataInharmI::getQualityFlag, "0");
-                if (Objects.isNull(po.getLineNo())) {
-                    influxQueryWrapper.eq(DataInharmI::getCldid,Integer.toString(po.getClDid()));
-                } else {
-                    influxQueryWrapper.eq(DataInharmI::getCldid,Integer.toString(po.getLineNo()));
+        if (CollectionUtil.isNotEmpty(result)) {
+            result.forEach(item -> {
+                String newType = PHASE_MAPPING.get(item.getPhasicType());
+                if (newType != null) {
+                    item.setPhasicType(newType);
                 }
-                result.addAll(dataInharmIMapper.selectByQueryWrapper(influxQueryWrapper));
             });
-            if (CollectionUtil.isNotEmpty(result)) {
-                result.forEach(item -> {
-                    String newType = PHASE_MAPPING.get(item.getPhasicType());
-                    if (newType != null) {
-                        item.setPhasicType(newType);
-                    }
-                });
-            }
         }
         return result;
     }
-
 }

data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/influxdb/InfluxdbDataInharmVImpl.java

@@ -4,10 +4,6 @@ import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.collection.CollectionUtil;
 import com.github.jeffreyning.mybatisplus.service.MppServiceImpl;
 import com.njcn.common.utils.HarmonicTimesUtil;
-import com.njcn.csdevice.api.CsLineFeignClient;
-import com.njcn.csdevice.api.EquipmentFeignClient;
-import com.njcn.csdevice.pojo.dto.CsEquipmentDeliveryDTO;
-import com.njcn.csdevice.pojo.po.CsLinePO;
 import com.njcn.dataProcess.dao.imapper.DataInharmVMapper;
 import com.njcn.dataProcess.dao.relation.mapper.RStatDataInHarmVRelationMapper;
 import com.njcn.dataProcess.dto.DataInharmVDTO;
@@ -26,12 +22,10 @@ import org.apache.commons.collections4.ListUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 
-import javax.annotation.Resource;
 import java.time.LocalDateTime;
 import java.time.ZoneId;
 import java.time.format.DateTimeFormatter;
 import java.util.*;
-import java.util.function.Function;
 import java.util.stream.Collectors;
 
 
@@ -47,12 +41,7 @@ import java.util.stream.Collectors;
 public class InfluxdbDataInharmVImpl extends MppServiceImpl<RStatDataInHarmVRelationMapper, RStatDataInHarmVD> implements IDataInharmV {
 
     private final DateTimeFormatter DATE_TIME_FORMATTER = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss").withZone(ZoneId.systemDefault());
-
     private final DataInharmVMapper dataInharmVMapper;
-    @Resource
-    private CsLineFeignClient csLineFeignClient;
-    @Resource
-    private EquipmentFeignClient equipmentFeignClient;
 
     private static final Map<String, String> PHASE_MAPPING = new HashMap<String, String>() {{
         put("AB", "A");
@@ -81,12 +70,7 @@ public class InfluxdbDataInharmVImpl extends MppServiceImpl<RStatDataInHarmVRela
     @Override
     public List<DataHarmDto> getRawData(LineCountEvaluateParam lineParam) {
         List<DataHarmDto> result = new ArrayList<>();
-        List<DataInharmV> list;
-        if (Objects.equals(lineParam.getType(), 2)) {
-            list = getWlMinuteData(lineParam);
-        } else {
-            list = getMinuteData(lineParam);
-        }
+        List<DataInharmV> list = getMinuteData(lineParam);
         list.forEach(item->{
             DataHarmDto dto = new DataHarmDto();
             BeanUtils.copyProperties(item,dto);
@@ -99,12 +83,7 @@ public class InfluxdbDataInharmVImpl extends MppServiceImpl<RStatDataInHarmVRela
     @Override
     public List<CommonMinuteDto> getBaseData(LineCountEvaluateParam lineParam) {
         List<CommonMinuteDto> result = new ArrayList<>();
-        List<DataInharmV> data;
-        if (Objects.equals(lineParam.getType(), 2)) {
-            data = getWlMinuteData(lineParam);
-        } else {
-            data = getMinuteData(lineParam);
-        }
+        List<DataInharmV> data = getMinuteData(lineParam);
         if (CollectionUtil.isNotEmpty(data)) {
             String time = TimeUtils.StringTimeToString(lineParam.getStartTime());
             //以监测点分组
@@ -275,56 +254,14 @@ public class InfluxdbDataInharmVImpl extends MppServiceImpl<RStatDataInHarmVRela
                 result.addAll(dataList);
             }
         }
-        return result;
-    }
-
-    public List<DataInharmV> getWlMinuteData(LineCountEvaluateParam lineParam) {
-        List<DataInharmV> result = new ArrayList<>();
-        if (CollectionUtil.isNotEmpty(lineParam.getLineId())) {
-            //获取监测点信息
-            List<CsLinePO> line = csLineFeignClient.queryLineById(lineParam.getLineId()).getData();
-            Map<String, CsLinePO> lineMap = line.stream().collect(Collectors.toMap(CsLinePO::getLineId, Function.identity()));
-            //获取设备信息
-            List<String> devList = line.stream().map(CsLinePO::getDeviceId).distinct().collect(Collectors.toList());
-            List<CsEquipmentDeliveryDTO> dev = equipmentFeignClient.queryDeviceById(devList).getData();
-            Map<String, CsEquipmentDeliveryDTO> devsMap = dev.stream().collect(Collectors.toMap(CsEquipmentDeliveryDTO::getId, Function.identity()));
-            lineParam.getLineId().forEach(lineId -> {
-                String devId = lineMap.get(lineId).getDeviceId();
-                CsLinePO po = lineMap.get(lineId);
-                InfluxQueryWrapper influxQueryWrapper = new InfluxQueryWrapper(DataInharmV.class);
-                //2-50次 间谐波电流有效值
-                influxQueryWrapper.eq(DataInharmV::getLineId, lineId)
-                        .eq(DataInharmV::getProcess,Integer.toString(devsMap.get(devId).getProcess()))
-                        .select(DataInharmV::getLineId)
-                        .select(DataInharmV::getPhasicType)
-                        .select(DataInharmV::getValueType)
-                        .between(DataInharmV::getTime, lineParam.getStartTime(), lineParam.getEndTime())
-                        .eq(DataInharmV::getQualityFlag, "0");
-                if (Objects.isNull(po.getLineNo())) {
-                    influxQueryWrapper.eq(DataInharmV::getCldid,Integer.toString(po.getClDid()));
-                } else {
-                    influxQueryWrapper.eq(DataInharmV::getCldid,Integer.toString(po.getLineNo()));
+        if (CollectionUtil.isNotEmpty(result)) {
+            result.forEach(item -> {
+                String newType = PHASE_MAPPING.get(item.getPhasicType());
+                if (newType != null) {
+                    item.setPhasicType(newType);
                 }
-                //判断接线方式 (0-星型 1-角型 2-V型) 星型是相电压  角型或者v型是线电压
-                if (Objects.equals(po.getConType(),0)) {
-                    //0.5-49.5次 间谐波相电压有效值
-                    influxQueryWrapper.samePrefixAndSuffix("Pq_InHarmURV_", "v_", HarmonicTimesUtil.harmonicTimesList(1, 50, 1));
-                } else {
-                    //0.5-49.5次 间谐波线电压有效值
-                    influxQueryWrapper.samePrefixAndSuffix("Pq_InHarmLURV_", "v_", HarmonicTimesUtil.harmonicTimesList(1, 50, 1));
-                }
-                result.addAll(dataInharmVMapper.selectByQueryWrapper(influxQueryWrapper));
             });
-            if (CollectionUtil.isNotEmpty(result)) {
-                result.forEach(item -> {
-                    String newType = PHASE_MAPPING.get(item.getPhasicType());
-                    if (newType != null) {
-                        item.setPhasicType(newType);
-                    }
-                });
-            }
         }
         return result;
     }
-
 }

data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/influxdb/InfluxdbDataPltImpl.java

@@ -2,11 +2,9 @@ package com.njcn.dataProcess.service.impl.influxdb;
 
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.collection.CollectionUtil;
+import com.alibaba.nacos.shaded.com.google.common.reflect.TypeToken;
+import com.alibaba.nacos.shaded.com.google.gson.Gson;
 import com.github.jeffreyning.mybatisplus.service.MppServiceImpl;
-import com.njcn.csdevice.api.CsLineFeignClient;
-import com.njcn.csdevice.api.EquipmentFeignClient;
-import com.njcn.csdevice.pojo.dto.CsEquipmentDeliveryDTO;
-import com.njcn.csdevice.pojo.po.CsLinePO;
 import com.njcn.dataProcess.dao.imapper.DataPltMapper;
 import com.njcn.dataProcess.dao.relation.mapper.RStatDataPltRelationMapper;
 import com.njcn.dataProcess.dto.DataPltDTO;
@@ -19,17 +17,18 @@ import com.njcn.dataProcess.pojo.po.RStatDataPltD;
 import com.njcn.dataProcess.service.IDataPlt;
 import com.njcn.dataProcess.util.TimeUtils;
 import com.njcn.influx.query.InfluxQueryWrapper;
+import com.njcn.redis.utils.RedisUtil;
 import lombok.RequiredArgsConstructor;
 import org.apache.commons.collections4.ListUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.lang.reflect.Type;
 import java.time.LocalDateTime;
 import java.time.ZoneId;
 import java.time.format.DateTimeFormatter;
 import java.util.*;
-import java.util.function.Function;
 import java.util.stream.Collectors;
 
 /**
@@ -44,19 +43,19 @@ import java.util.stream.Collectors;
 public class InfluxdbDataPltImpl extends MppServiceImpl<RStatDataPltRelationMapper, RStatDataPltD> implements IDataPlt {
 
     private final DateTimeFormatter DATE_TIME_FORMATTER = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss").withZone(ZoneId.systemDefault());
-
     private final DataPltMapper dataPltMapper;
-    @Resource
-    private CsLineFeignClient csLineFeignClient;
-    @Resource
-    private EquipmentFeignClient equipmentFeignClient;
-
     private static final Map<String, String> PHASE_MAPPING = new HashMap<String, String>() {{
         put("AB", "A");
         put("BC", "B");
         put("CA", "C");
         put("M", "T");
     }};
+    @Resource
+    private RedisUtil redisUtil;
+    private static final Set<String> LINE_VOLTAGE_TYPES =
+            Collections.unmodifiableSet(new HashSet<>(Arrays.asList("AB", "BC", "CA", "T")));
+    private static final Set<String> PHASE_VOLTAGE_TYPES =
+            Collections.unmodifiableSet(new HashSet<>(Arrays.asList("A", "B", "C", "T")));
 
     @Override
     public void batchInsertion(List<DataPltDTO> dataPltDTOList) {
@@ -79,12 +78,7 @@ public class InfluxdbDataPltImpl extends MppServiceImpl<RStatDataPltRelationMapp
     @Override
     public List<DataPltDto> getRawData(LineCountEvaluateParam lineParam) {
         List<DataPltDto> result = new ArrayList<>();
-        List<DataPlt> list;
-        if (Objects.equals(lineParam.getType(), 2)) {
-            list = getWlMinuteDataPlt(lineParam);
-        } else {
-            list = getMinuteDataPlt(lineParam);
-        }
+        List<DataPlt> list = getMinuteDataPlt(lineParam);
         list.forEach(item->{
             DataPltDto dto = new DataPltDto();
             BeanUtils.copyProperties(item,dto);
@@ -97,12 +91,7 @@ public class InfluxdbDataPltImpl extends MppServiceImpl<RStatDataPltRelationMapp
     @Override
     public List<CommonMinuteDto> getBaseData(LineCountEvaluateParam lineParam) {
         List<CommonMinuteDto> result = new ArrayList<>();
-        List<DataPlt> data;
-        if (Objects.equals(lineParam.getType(), 2)) {
-            data = getWlMinuteDataPlt(lineParam);
-        } else {
-            data = getMinuteDataPlt(lineParam);
-        }
+        List<DataPlt> data = getMinuteDataPlt(lineParam);
         if (CollectionUtil.isNotEmpty(data)) {
             String time = TimeUtils.StringTimeToString(lineParam.getStartTime());
             //以监测点分组
@@ -173,6 +162,13 @@ public class InfluxdbDataPltImpl extends MppServiceImpl<RStatDataPltRelationMapp
     public List<DataPlt> getMinuteDataPlt(LineCountEvaluateParam lineParam) {
         List<DataPlt> dataList;
         List<DataPlt> result = new ArrayList<>();
+        List<DataPlt> data = new ArrayList<>();
+        //获取监测点、接线方式数据
+        Type type = new TypeToken<Map<String, Integer>>(){}.getType();
+        Map<String, Integer> map = new Gson().fromJson(
+                String.valueOf(redisUtil.getObjectByKey("wlLineDetail")),
+                type
+        );
         InfluxQueryWrapper influxQueryWrapper = new InfluxQueryWrapper(DataPlt.class);
         influxQueryWrapper.regular(DataPlt::getLineId, lineParam.getLineId())
                 .select(DataPlt::getLineId)
@@ -222,51 +218,24 @@ public class InfluxdbDataPltImpl extends MppServiceImpl<RStatDataPltRelationMapp
                 result.addAll(dataList);
             }
         }
-        return result;
-    }
-
-    public List<DataPlt> getWlMinuteDataPlt(LineCountEvaluateParam lineParam) {
-        List<DataPlt> result = new ArrayList<>();
-        if (CollectionUtil.isNotEmpty(lineParam.getLineId())) {
-            //获取监测点信息
-            List<CsLinePO> line = csLineFeignClient.queryLineById(lineParam.getLineId()).getData();
-            Map<String, CsLinePO> lineMap = line.stream().collect(Collectors.toMap(CsLinePO::getLineId, Function.identity()));
-            //获取设备信息
-            List<String> devList = line.stream().map(CsLinePO::getDeviceId).distinct().collect(Collectors.toList());
-            List<CsEquipmentDeliveryDTO> dev = equipmentFeignClient.queryDeviceById(devList).getData();
-            Map<String, CsEquipmentDeliveryDTO> devsMap = dev.stream().collect(Collectors.toMap(CsEquipmentDeliveryDTO::getId, Function.identity()));
-
-            lineParam.getLineId().forEach(lineId -> {
-                String devId = lineMap.get(lineId).getDeviceId();
-                CsLinePO po = lineMap.get(lineId);
-                InfluxQueryWrapper influxQueryWrapper = new InfluxQueryWrapper(DataPlt.class);
-                influxQueryWrapper.eq(DataPlt::getLineId, lineId)
-                        .eq(DataPlt::getProcess,Integer.toString(devsMap.get(devId).getProcess()))
-                        .select(DataPlt::getLineId)
-                        .select(DataPlt::getPhasicType)
-                        .select(DataPlt::getValueType)
-                        .between(DataPlt::getTime, lineParam.getStartTime(), lineParam.getEndTime())
-                        .eq(DataPlt::getQualityFlag, "0");
-                if (CollUtil.isNotEmpty(lineParam.getPhasicType())) {
-                    influxQueryWrapper.regular(DataPlt::getPhasicType, lineParam.getPhasicType());
-                }
-                if (Objects.isNull(po.getLineNo())) {
-                    influxQueryWrapper.eq(DataPlt::getCldid,Integer.toString(po.getClDid()));
-                } else {
-                    influxQueryWrapper.eq(DataPlt::getCldid,Integer.toString(po.getLineNo()));
-                }
-                //判断接线方式 (0-星型 1-角型 2-V型) 星型是相电压  角型或者v型是线电压
-                if (Objects.equals(po.getConType(),0)) {
-                    //相电压长时闪变
-                    influxQueryWrapper.select("Pq_Plt","plt");
-                } else {
-                    //线电压长时闪变
-                    influxQueryWrapper.select("Pq_LPlt","plt");
-                }
-                result.addAll(dataPltMapper.selectByQueryWrapper(influxQueryWrapper));
-            });
-            if (CollectionUtil.isNotEmpty(result)) {
-                result.forEach(item -> {
+        if (CollectionUtil.isNotEmpty(result)) {
+            if (!Objects.isNull(map)) {
+                //现根据监测点分组，然后根据接线方式排除多于数据，在修改相别
+                Map<String, List<DataPlt>> lineMap = result.stream().collect(Collectors.groupingBy(DataPlt::getLineId));
+                lineMap.forEach((k,v)->{
+                    if (Objects.isNull(map.get(k))) {
+                        return;
+                    }
+                    Integer conType = map.get(k);
+                    Set<String> validPhasicTypes = (conType != 0) ? LINE_VOLTAGE_TYPES : PHASE_VOLTAGE_TYPES;
+                    List<DataPlt> result2 = v.stream().filter(item -> validPhasicTypes.contains(item.getPhasicType())).collect(Collectors.toList());
+                    data.addAll(result2);
+                });
+            } else {
+                data.addAll(result);
+            }
+            if (CollectionUtil.isNotEmpty(data)) {
+                data.forEach(item -> {
                     String newType = PHASE_MAPPING.get(item.getPhasicType());
                     if (newType != null) {
                         item.setPhasicType(newType);
@@ -274,7 +243,6 @@ public class InfluxdbDataPltImpl extends MppServiceImpl<RStatDataPltRelationMapp
                 });
             }
         }
-        return result;
+        return data;
     }
-
 }

data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/influxdb/InfluxdbDataVImpl.java

@@ -4,12 +4,10 @@ import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.collection.ListUtil;
 import cn.hutool.core.util.ObjectUtil;
+import com.alibaba.nacos.shaded.com.google.common.reflect.TypeToken;
+import com.alibaba.nacos.shaded.com.google.gson.Gson;
 import com.github.jeffreyning.mybatisplus.service.MppServiceImpl;
 import com.njcn.common.utils.HarmonicTimesUtil;
-import com.njcn.csdevice.api.CsLineFeignClient;
-import com.njcn.csdevice.api.EquipmentFeignClient;
-import com.njcn.csdevice.pojo.dto.CsEquipmentDeliveryDTO;
-import com.njcn.csdevice.pojo.po.CsLinePO;
 import com.njcn.dataProcess.constant.InfluxDBTableConstant;
 import com.njcn.dataProcess.constant.PhaseType;
 import com.njcn.dataProcess.dao.imapper.DataVMapper;
@@ -28,12 +26,14 @@ import com.njcn.dataProcess.service.IDataV;
 import com.njcn.dataProcess.util.TimeUtils;
 import com.njcn.influx.constant.InfluxDbSqlConstant;
 import com.njcn.influx.query.InfluxQueryWrapper;
+import com.njcn.redis.utils.RedisUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.ListUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.lang.reflect.Type;
 import java.time.LocalDateTime;
 import java.time.ZoneId;
 import java.time.format.DateTimeFormatter;
@@ -51,20 +51,20 @@ import java.util.stream.Collectors;
 public class InfluxdbDataVImpl extends MppServiceImpl<RStatDataVRelationMapper, RStatDataVD> implements IDataV {
 
     private final DateTimeFormatter DATE_TIME_FORMATTER = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss").withZone(ZoneId.systemDefault());
-    @Resource
-    private CsLineFeignClient csLineFeignClient;
-    @Resource
-    private EquipmentFeignClient equipmentFeignClient;
-
     private static final Map<String, String> PHASE_MAPPING = new HashMap<String, String>() {{
         put("AB", "A");
         put("BC", "B");
         put("CA", "C");
         put("M", "T");
     }};
-
     @Resource
     private DataVMapper dataVMapper;
+    @Resource
+    private RedisUtil redisUtil;
+    private static final Set<String> LINE_VOLTAGE_TYPES =
+            Collections.unmodifiableSet(new HashSet<>(Arrays.asList("AB", "BC", "CA", "T")));
+    private static final Set<String> PHASE_VOLTAGE_TYPES =
+            Collections.unmodifiableSet(new HashSet<>(Arrays.asList("A", "B", "C", "T")));
 
     /**
      * 注意：influxdb不推荐采用in函数的方式批量查询监测点的数据，效率很低，容易造成崩溃，故每次单测点查询
@@ -137,12 +137,7 @@ public class InfluxdbDataVImpl extends MppServiceImpl<RStatDataVRelationMapper,
     @Override
     public List<DataVDto> getRawData(LineCountEvaluateParam lineParam) {
         List<DataVDto> result = new ArrayList<>();
-        List<DataV> list;
-        if (Objects.equals(lineParam.getType(), 2)) {
-            list = getWlMinuteDataV(lineParam);
-        } else {
-            list = getMinuteDataV(lineParam);
-        }
+        List<DataV> list = getMinuteDataV(lineParam);
         if (CollectionUtil.isNotEmpty(list)) {
             list.forEach(item -> {
                 DataVDto dto = new DataVDto();
@@ -226,12 +221,7 @@ public class InfluxdbDataVImpl extends MppServiceImpl<RStatDataVRelationMapper,
     @Override
     public List<CommonMinuteDto> getBaseData(LineCountEvaluateParam lineParam) {
         List<CommonMinuteDto> result = new ArrayList<>();
-        List<DataV> dataVList;
-        if (Objects.equals(lineParam.getType(), 2)) {
-            dataVList = getWlMinuteDataV(lineParam);
-        } else {
-            dataVList = getMinuteDataV(lineParam);
-        }
+        List<DataV> dataVList = getMinuteDataV(lineParam);
         if (CollectionUtil.isNotEmpty(dataVList)) {
             String time = TimeUtils.StringTimeToString(lineParam.getStartTime());
             //以监测点分组
@@ -456,6 +446,13 @@ public class InfluxdbDataVImpl extends MppServiceImpl<RStatDataVRelationMapper,
      */
     public List<DataV> getMinuteDataV(LineCountEvaluateParam lineParam) {
         List<DataV> result = new ArrayList<>();
+        List<DataV> data = new ArrayList<>();
+        //获取监测点、接线方式数据
+        Type type = new TypeToken<Map<String, Integer>>(){}.getType();
+        Map<String, Integer> map = new Gson().fromJson(
+                String.valueOf(redisUtil.getObjectByKey("wlLineDetail")),
+                type
+        );
         InfluxQueryWrapper influxQueryWrapper = new InfluxQueryWrapper(DataV.class);
         influxQueryWrapper.samePrefixAndSuffix(InfluxDbSqlConstant.V, InfluxDbSqlConstant.V, HarmonicTimesUtil.harmonicTimesList(1, 50, 1));
         influxQueryWrapper.regular(DataV::getLineId, lineParam.getLineId())
@@ -481,83 +478,47 @@ public class InfluxdbDataVImpl extends MppServiceImpl<RStatDataVRelationMapper,
             influxQueryWrapper.regular(DataV::getPhasicType, lineParam.getPhasicType());
         }
         quality(result, influxQueryWrapper, lineParam);
-        return result;
-    }
-
-    /**
-     * 按监测点集合、时间条件获取dataV分钟数据
-     * timeMap参数来判断是否进行数据处理 timeMap为空则不进行数据处理
-     */
-    public List<DataV> getWlMinuteDataV(LineCountEvaluateParam lineParam) {
-        List<DataV> result = new ArrayList<>();
-        if (CollectionUtil.isNotEmpty(lineParam.getLineId())) {
-            //fixme 这边查询的数据可以缓存起来，因为日表计算时可以使用
-            //获取监测点信息
-            List<CsLinePO> line = csLineFeignClient.queryLineById(lineParam.getLineId()).getData();
-            Map<String, CsLinePO> lineMap = line.stream().collect(Collectors.toMap(CsLinePO::getLineId, Function.identity()));
-            //获取设备信息
-            List<String> devList = line.stream().map(CsLinePO::getDeviceId).distinct().collect(Collectors.toList());
-            List<CsEquipmentDeliveryDTO> dev = equipmentFeignClient.queryDeviceById(devList).getData();
-            Map<String, CsEquipmentDeliveryDTO> devsMap = dev.stream().collect(Collectors.toMap(CsEquipmentDeliveryDTO::getId, Function.identity()));
-            lineParam.getLineId().forEach(lineId -> {
-                String devId = lineMap.get(lineId).getDeviceId();
-                CsLinePO po = lineMap.get(lineId);
-                InfluxQueryWrapper influxQueryWrapper = new InfluxQueryWrapper(DataV.class);
-                influxQueryWrapper.eq(DataV::getLineId, lineId)
-                        .eq(DataV::getProcess, Integer.toString(devsMap.get(devId).getProcess()))
-                        .select(DataV::getLineId)
-                        .select(DataV::getPhasicType)
-                        .select(DataV::getValueType)
-                        //频率
-                        .select("Pq_Freq", "freq")
-                        //频率偏差
-                        .select("Pq_FreqDev", "freq_dev")
-                        //相电压有效值
-                        .select("Pq_RmsU", "rms")
-                        //线电压有效值
-                        .select("Pq_RmsLU", "rms_lvr")
-                        //电压负序
-                        .select("Pq_SeqNegU", "v_neg")
-                        //电压正序
-                        .select("Pq_SeqPosU", "v_pos")
-                        //电压零序
-                        .select("Pq_SeqZeroU", "v_zero")
-                        //电压负序不平衡度
-                        .select("Pq_UnbalNegU", "v_unbalance")
-                        .between(DataV::getTime, lineParam.getStartTime(), lineParam.getEndTime())
-                        .eq(DataV::getQualityFlag, "0");
-                if (CollUtil.isNotEmpty(lineParam.getPhasicType())) {
-                    influxQueryWrapper.regular(DataV::getPhasicType, lineParam.getPhasicType());
-                }
-                if (Objects.isNull(po.getLineNo())) {
-                    influxQueryWrapper.eq(DataV::getCldid, Integer.toString(po.getClDid()));
-                } else {
-                    influxQueryWrapper.eq(DataV::getCldid, Integer.toString(po.getLineNo()));
-                }
-                //判断接线方式 (0-星型 1-角型 2-V型) 星型是相电压  角型或者v型是线电压
-                if (Objects.equals(po.getConType(), 0)) {
-                    //相电压偏差
-                    influxQueryWrapper.select("Pq_UDev", "vu_dev");
-                    //相电压谐波总畸变率
-                    influxQueryWrapper.select("Pq_ThdU", "v_thd");
-                    //相电压基波有效值
-                    influxQueryWrapper.select("Pq_RmsFundU", "v_1");
-                    //2-50次 相电压谐波有效值
-                    influxQueryWrapper.samePrefixAndSuffix("Pq_HarmUV_", "v_", HarmonicTimesUtil.harmonicTimesList(2, 50, 1));
-                } else {
-                    //线电压偏差
-                    influxQueryWrapper.select("Pq_LUDev", "vu_dev");
-                    //线电压谐波总畸变率
-                    influxQueryWrapper.select("Pq_ThdLU", "v_thd");
-                    //线电压基波有效值
-                    influxQueryWrapper.select("Pq_RmsFundLU", "v_1");
-                    //2-50次 线电压谐波有效值
-                    influxQueryWrapper.samePrefixAndSuffix("Pq_HarmLUV_", "v_", HarmonicTimesUtil.harmonicTimesList(2, 50, 1));
-                }
-                result.addAll(dataVMapper.selectByQueryWrapper(influxQueryWrapper));
-            });
-            if (CollectionUtil.isNotEmpty(result)) {
-                result.forEach(item -> {
+        if (CollectionUtil.isNotEmpty(result)) {
+            if (!Objects.isNull(map)) {
+                //现根据监测点分组，然后根据接线方式排除多于数据，在修改相别
+                Map<String, List<DataV>> lineMap = result.stream().collect(Collectors.groupingBy(DataV::getLineId));
+                lineMap.forEach((k,v)->{
+                    if (Objects.isNull(map.get(k))) {
+                        return;
+                    }
+                    //这边需要特殊处理下，将线电压数据赋值
+                    Map<String, DataV> lineVoltageIndex = v.stream()
+                            .filter(d -> PHASE_MAPPING.containsKey(d.getPhasicType()))
+                            .filter(d -> d.getRmsLvr() != null)
+                            .collect(Collectors.toMap(
+                                    d -> buildKey(d.getTime(), d.getValueType(), d.getPhasicType()),
+                                    Function.identity(),
+                                    (existing, replacement) -> existing
+                            ));
+                    v.stream()
+                            .filter(d -> PHASE_VOLTAGE_TYPES.contains(d.getPhasicType()))
+                            .forEach(phaseData -> {
+                                // 根据当前相电压反查对应的线电压相别
+                                String targetLinePhasic = getReverseLinePhasic(phaseData.getPhasicType());
+                                if (targetLinePhasic == null) {
+                                    return;
+                                }
+                                String key = buildKey(phaseData.getTime(), phaseData.getValueType(), targetLinePhasic);
+                                DataV matchedLineData = lineVoltageIndex.get(key);
+                                if (matchedLineData != null && matchedLineData.getRmsLvr() != null) {
+                                    phaseData.setRmsLvr(matchedLineData.getRmsLvr());
+                                }
+                            });
+                    Integer conType = map.get(k);
+                    Set<String> validPhasicTypes = (conType != 0) ? LINE_VOLTAGE_TYPES : PHASE_VOLTAGE_TYPES;
+                    List<DataV> result2 = v.stream().filter(item -> validPhasicTypes.contains(item.getPhasicType())).collect(Collectors.toList());
+                    data.addAll(result2);
+                });
+            } else {
+                data.addAll(result);
+            }
+            if (CollectionUtil.isNotEmpty(data)) {
+                data.forEach(item -> {
                     String newType = PHASE_MAPPING.get(item.getPhasicType());
                     if (newType != null) {
                         item.setPhasicType(newType);
@@ -565,7 +526,27 @@ public class InfluxdbDataVImpl extends MppServiceImpl<RStatDataVRelationMapper,
                 });
             }
         }
-        return result;
+        return data;
+    }
+
+    private static String buildKey(Object time, Object valueType, Object phasicType) {
+        return time + "|" + valueType + "|" + phasicType;
+    }
+
+    private static String getReverseLinePhasic(String phaseType) {
+        if (phaseType == null) {
+            return null;
+        }
+        switch (phaseType) {
+            case "A":
+                return "AB";
+            case "B":
+                return "BC";
+            case "C":
+                return "CA";
+            default:
+                return null;
+        }
     }
 
     private void quality(List<DataV> result, InfluxQueryWrapper influxQueryWrapper, LineCountEvaluateParam lineParam) {

data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/influxdb/InfluxdbPqsCommunicateImpl.java

@@ -110,22 +110,32 @@ public class InfluxdbPqsCommunicateImpl implements IPqsCommunicate {
 
     @Override
     public void insertion(PqsCommunicateDto pqsCommunicateDto) {
-//        log.info("进出Influxdb实现类");
+
         //获取最新一条数据
-        PqsCommunicate dto = new PqsCommunicate();
-        InfluxQueryWrapper influxQueryWrapper = new InfluxQueryWrapper(PqsCommunicate.class);
-        influxQueryWrapper.eq(PqsCommunicate::getDevId,pqsCommunicateDto.getDevId()).timeDesc().limit(1);
-        List<PqsCommunicate> pqsCommunicates = pqsCommunicateMapper.selectByQueryWrapper(influxQueryWrapper);
+        if(Objects.equals(pqsCommunicateDto.getUpdateCommunicateFlag(),0)){
+
+
+            PqsCommunicate dto = new PqsCommunicate();
+            InfluxQueryWrapper influxQueryWrapper = new InfluxQueryWrapper(PqsCommunicate.class);
+            influxQueryWrapper.eq(PqsCommunicate::getDevId,pqsCommunicateDto.getDevId()).timeDesc().limit(1);
+            List<PqsCommunicate> pqsCommunicates = pqsCommunicateMapper.selectByQueryWrapper(influxQueryWrapper);
+
+            PqsCommunicate pqsCommunicate = new PqsCommunicate();
+            pqsCommunicate.setTime(LocalDateTime.parse(pqsCommunicateDto.getTime(), DATE_TIME_FORMATTER).atZone(ZoneId.systemDefault()).toInstant());
+            pqsCommunicate.setDevId(pqsCommunicateDto.getDevId());
+            pqsCommunicate.setType(pqsCommunicateDto.getType());
+            //如果不存数据或者状态不一样则插入数据
+            //可能存在掉线后最后一组数据还未入库，添加时间判断
+            if(CollectionUtils.isEmpty(pqsCommunicates)|| (!Objects.equals( pqsCommunicates.get(0).getType(),pqsCommunicateDto.getType())&&pqsCommunicates.get(0).getTime().isBefore(pqsCommunicate.getTime()))){
+                pqsCommunicateMapper.insertOne(pqsCommunicate);
+
+            }
+
+        }
+
+
 
-        PqsCommunicate pqsCommunicate = new PqsCommunicate();
-        pqsCommunicate.setTime(LocalDateTime.parse(pqsCommunicateDto.getTime(), DATE_TIME_FORMATTER).atZone(ZoneId.systemDefault()).toInstant());
-        pqsCommunicate.setDevId(pqsCommunicateDto.getDevId());
-        pqsCommunicate.setType(pqsCommunicateDto.getType());
-        //如果不存数据或者状态不一样则插入数据
-       if(CollectionUtils.isEmpty(pqsCommunicates)|| !Objects.equals( pqsCommunicates.get(0).getType(),pqsCommunicateDto.getType())){
-           pqsCommunicateMapper.insertOne(pqsCommunicate);
 
-       }
         //更新mysql数据
         DevComFlagDTO devComFlagDTO = new DevComFlagDTO();
         devComFlagDTO.setId(pqsCommunicateDto.getDevId());
@@ -135,6 +145,8 @@ public class InfluxdbPqsCommunicateImpl implements IPqsCommunicate {
         devComFlagDTO.setStatus(pqsCommunicateDto.getType());
 
         deviceFeignClient.updateDevComFlag(devComFlagDTO);
+
+
     }
 
 

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

@@ -0,0 +1,78 @@
+#当前服务的基本信息
+microservice:
+  ename: @artifactId@
+  name: '@name@'
+  version: @version@
+  sentinel:
+    url: @sentinel.url@
+  gateway:
+    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:
+    enabled: true
+spring:
+  application:
+    name: @artifactId@
+  #nacos注册中心以及配置中心的指定
+  cloud:
+    nacos:
+      discovery:
+        server-addr: @nacos.url@
+        namespace: @nacos.namespace@
+      config:
+        username: @nacos.username@
+        password: @nacos.password@
+        server-addr: @nacos.url@
+        namespace: @nacos.namespace@
+        file-extension: yaml
+        shared-configs:
+          - data-id: share-config.yaml
+            refresh: true
+          - data-id: share-config-datasource-db.yaml
+            refresh: true
+  main:
+    allow-bean-definition-overriding: true
+  servlet:
+    multipart:
+      max-file-size: 100MB
+      max-request-size: 100MB
+  jackson:
+    time-zone: GMT+8
+
+
+#项目日志的配置
+logging:
+  config: http://@nacos.url@/nacos/v1/cs/configs?tenant=@nacos.namespace@&group=DEFAULT_GROUP&dataId=logback.xml
+  level:
+    root: error
+
+
+mqtt:
+  client-id: @artifactId@${random.value}
+
+data:
+  source:
+    query: Influxdb
+#    insert: Influxdb
+    insert: Relation
+#mybatis配置信息
+mybatis-plus:
+  configuration:
+    #配置sql日志输出
+    log-impl: org.apache.ibatis.logging.nologging.NoLoggingImpl
+
+
+#  type-aliases-package: com.njcn.harmonic.pojo
+#  type-handlers-package: com.njcn.db.handler
+#  global-config:
+#    db-config:
+#      date-format: yyyy-MM-dd HH:mm:ss
+#  global-config:
+#    enable-sql-runner: true

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

@@ -0,0 +1,81 @@
+#当前服务的基本信息
+microservice:
+  ename: @artifactId@
+  name: '@name@'
+  version: @version@
+  sentinel:
+    url: @sentinel.url@
+  gateway:
+    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:
+    enabled: true
+spring:
+  application:
+    name: @artifactId@
+  #nacos注册中心以及配置中心的指定
+  cloud:
+    nacos:
+      discovery:
+        ip: @service.server.url@
+        server-addr: @nacos.url@
+        namespace: @nacos.namespace@
+        username: @nacos.username@
+        password: @nacos.password@
+      config:
+        server-addr: @nacos.url@
+        namespace: @nacos.namespace@
+        username: @nacos.username@
+        password: @nacos.password@
+        file-extension: yaml
+        shared-configs:
+          - data-id: share-config.yaml
+            refresh: true
+          - data-id: share-config-datasource-db.yaml
+            refresh: true
+  main:
+    allow-bean-definition-overriding: true
+  servlet:
+    multipart:
+      max-file-size: 100MB
+      max-request-size: 100MB
+  jackson:
+    time-zone: GMT+8
+
+
+#项目日志的配置
+logging:
+  #config: http://@nacos.url@/nacos/v1/cs/configs?tenant=@nacos.namespace@&group=DEFAULT_GROUP&dataId=logback.xml
+  level:
+    root: error
+
+
+#mqtt:
+#  client-id: @artifactId@${random.value}
+
+data:
+  source:
+    query: Influxdb
+#    insert: Influxdb
+    insert: Relation
+#mybatis配置信息
+mybatis-plus:
+  configuration:
+    #配置sql日志输出
+    log-impl: org.apache.ibatis.logging.nologging.NoLoggingImpl
+
+
+#  type-aliases-package: com.njcn.harmonic.pojo
+#  type-handlers-package: com.njcn.db.handler
+#  global-config:
+#    db-config:
+#      date-format: yyyy-MM-dd HH:mm:ss
+#  global-config:
+#    enable-sql-runner: true

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

@@ -1,77 +1,3 @@
-#当前服务的基本信息
-microservice:
-  ename: @artifactId@
-  name: '@name@'
-  version: @version@
-  sentinel:
-    url: @sentinel.url@
-  gateway:
-    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:
-    enabled: true
 spring:
-  application:
-    name: @artifactId@
-  #nacos注册中心以及配置中心的指定
-  cloud:
-    nacos:
-      discovery:
-        ip: @service.server.url@
-        server-addr: @nacos.url@
-        namespace: @nacos.namespace@
-      config:
-        server-addr: @nacos.url@
-        namespace: @nacos.namespace@
-        file-extension: yaml
-        shared-configs:
-          - data-id: share-config.yaml
-            refresh: true
-          - data-Id: share-config-datasource-db.yaml
-            refresh: true
-  main:
-    allow-bean-definition-overriding: true
-  servlet:
-    multipart:
-      max-file-size: 100MB
-      max-request-size: 100MB
-  jackson:
-    time-zone: GMT+8
-
-
-#项目日志的配置
-logging:
-  config: http://@nacos.url@/nacos/v1/cs/configs?tenant=@nacos.namespace@&group=DEFAULT_GROUP&dataId=logback.xml
-  level:
-    root: error
-
-
-mqtt:
-  client-id: @artifactId@${random.value}
-
-data:
-  source:
-    query: Influxdb
-#    insert: Influxdb
-    insert: Relation
-#mybatis配置信息
-mybatis-plus:
-  configuration:
-    #配置sql日志输出
-    log-impl: org.apache.ibatis.logging.nologging.NoLoggingImpl
-
-
-#  type-aliases-package: com.njcn.harmonic.pojo
-#  type-handlers-package: com.njcn.db.handler
-#  global-config:
-#    db-config:
-#      date-format: yyyy-MM-dd HH:mm:ss
-#  global-config:
-#    enable-sql-runner: true
+  profiles:
+    active: @spring.profiles.active@

message/message-api/src/main/java/com/njcn/message/api/ProduceFeignClient.java

@@ -6,6 +6,7 @@ import com.njcn.common.pojo.enums.common.LogEnum;
 import com.njcn.common.pojo.response.HttpResult;
 
 import com.njcn.message.api.fallback.ProduceFeignClientFallbackFactory;
+import com.njcn.message.message.AskFileSysMessage;
 import com.njcn.message.message.DeviceRebootMessage;
 import com.njcn.message.message.ProcessRebootMessage;
 import com.njcn.message.message.RecallMessage;
@@ -38,4 +39,7 @@ public interface ProduceFeignClient {
 
     public HttpResult<Boolean> askRestartProcess(@RequestBody ProcessRebootMessage message);
 
+    @PostMapping("/askFileSys")
+    public HttpResult<String> askFileSys(@RequestBody AskFileSysMessage message);
+
 }

message/message-api/src/main/java/com/njcn/message/api/fallback/ProduceFeignClientFallbackFactory.java

@@ -5,6 +5,7 @@ import com.njcn.common.pojo.exception.BusinessException;
 import com.njcn.common.pojo.response.HttpResult;
 
 import com.njcn.message.api.ProduceFeignClient;
+import com.njcn.message.message.AskFileSysMessage;
 import com.njcn.message.message.DeviceRebootMessage;
 import com.njcn.message.message.ProcessRebootMessage;
 import com.njcn.message.message.RecallMessage;
@@ -53,6 +54,12 @@ public class ProduceFeignClientFallbackFactory implements FallbackFactory<Produc
                 log.error("{}异常，降级处理，异常为：{}", "进程重启", throwable.toString());
                 throw new BusinessException(finalExceptionEnum);
             }
+
+            @Override
+            public HttpResult<String> askFileSys(AskFileSysMessage message) {
+                log.error("{}异常，降级处理，异常为：{}", "请求装置文件系统", throwable.toString());
+                throw new BusinessException(finalExceptionEnum);
+            }
         };
     }
 }

message/message-api/src/main/java/com/njcn/message/constant/BusinessTopic.java

@@ -37,6 +37,9 @@ public interface BusinessTopic {
     String ASK_REAL_DATA_TOPIC = "ask_real_data_topic";
     String RECALL_TOPIC = "recall_Topic";
 
+    String FILE_TOPIC = "File_Topic";
+
+
 
 
     /********************************数据中心*********************************/

message/message-api/src/main/java/com/njcn/message/message/AskFileSysMessage.java

@@ -0,0 +1,36 @@
+package com.njcn.message.message;
+
+import lombok.Data;
+
+/**
+ * Description:
+ * Date: 2024/12/13  10:15【需求编号】
+ *
+ * @author clam
+ * @version V1.0.0
+ */
+@Data
+public class AskFileSysMessage {
+
+
+    /**
+     * guid : sdghsfdhfdhdfhdfghd234234534534
+     * frontid : dhdfhdfghd2342
+     * ProcessNo : 1
+     * devid : 167456737637374567
+     * type : 2
+     * Path : /remote/vol1_stat.txt
+     * DevPath : /etc/vol1_stat.txt
+     */
+
+    private String guid;
+    private String nodeId;
+    private int processNo;
+    private String devId;
+    private int type;
+    private String path;
+    private String remotePath;
+
+
+}
+

message/message-api/src/main/java/com/njcn/message/messagedto/FileSysDTO.java

@@ -0,0 +1,26 @@
+package com.njcn.message.messagedto;
+
+import com.njcn.middle.rocket.domain.BaseMessage;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * Description:
+ * Date: 2026/04/29  下午 3:16【需求编号】
+ *
+ * @author clam
+ * @version V1.0.0
+ */
+@Data
+public class FileSysDTO<T> extends BaseMessage implements Serializable {
+    private String guid;
+    private String nodeId;
+    private int processNo;
+    private String devId;
+    private int type;
+    private String path;
+    private String devPath;
+    private int result;
+    private T detail;
+}

message/message-boot/pom.xml

@@ -100,12 +100,34 @@
             <artifactId>spring-boot-starter-websocket</artifactId>
             <version>2.7.12</version>
         </dependency>
+        <dependency>
+            <groupId>com.njcn</groupId>
+            <artifactId>mq-spring-boot-starter</artifactId>
+            <version>1.0.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+            <version>2.7.12</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.13.2</version>
+            <scope>test</scope>
+        </dependency>
 
     </dependencies>
 
     <build>
         <finalName>messageboot</finalName>
         <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <version>2.22.2</version>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>

message/message-boot/src/main/java/com/njcn/message/consumer/DeviceRunFlagDataConsumer.java

@@ -84,15 +84,19 @@ public class DeviceRunFlagDataConsumer extends EnhanceConsumerMessageHandler<Dev
     @Override
     protected void handleMessage(DevComFlagDTO message) {
         //获取之前设备状态
-        String devFalg =redisUtil.getStringByKey(RedisKeyPrefix.DEVICE_RUN_FLAG.concat(message.getId()));
+        //删除设备时前置会在连接一次通道但是DevId为空所以添加
+        if(StringUtils.isNoneBlank(message.getId())){
+            String devFalg =redisUtil.getStringByKey(RedisKeyPrefix.DEVICE_RUN_FLAG.concat(message.getId()));
 
-        if(StringUtils.isBlank(devFalg)||(!Objects.equals(Integer.valueOf(devFalg),message.getStatus()))){
-            //状态翻转
-            messAnalysisFeignClient.handleDevRunflag(message);
-            redisUtil.saveByKey(RedisKeyPrefix.DEVICE_RUN_FLAG.concat(message.getId()),message.getStatus()+"");
+            if(StringUtils.isBlank(devFalg)||(!Objects.equals(Integer.valueOf(devFalg),message.getStatus()))){
+                //状态翻转
+                messAnalysisFeignClient.handleDevRunflag(message);
+                redisUtil.saveByKey(RedisKeyPrefix.DEVICE_RUN_FLAG.concat(message.getId()),message.getStatus()+"");
 
+            }
         }
 
+
     }
 
 

message/message-boot/src/main/java/com/njcn/message/consumer/FileSysDataConsumer.java

@@ -0,0 +1,151 @@
+package com.njcn.message.consumer;
+
+import com.alibaba.fastjson.JSONObject;
+import com.njcn.message.constant.MessageStatus;
+import com.njcn.message.constant.RedisKeyPrefix;
+import com.njcn.message.messagedto.FileSysDTO;
+import com.njcn.message.messagedto.MessageDataDTO;
+import com.njcn.message.websocket.WebSocketServer;
+import com.njcn.middle.rocket.constant.EnhanceMessageConstant;
+import com.njcn.middle.rocket.handler.EnhanceConsumerMessageHandler;
+import com.njcn.redis.pojo.enums.RedisKeyEnum;
+import com.njcn.redis.utils.RedisUtil;
+import com.njcn.system.api.RocketMqLogFeignClient;
+import com.njcn.system.pojo.po.RocketmqMsgErrorLog;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.rocketmq.spring.annotation.RocketMQMessageListener;
+import org.apache.rocketmq.spring.core.RocketMQListener;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.data.redis.core.StringRedisTemplate;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+import java.util.Objects;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * Description:
+ * Date: 2024/12/13  10:06【需求编号】
+ *
+ * @author clam
+ * @version V1.0.0
+ */
+@Component
+@RocketMQMessageListener(
+        topic = "File_Reply_Topic",
+        consumerGroup = "file_sys_consumer",
+        consumeThreadNumber = 10,
+        enableMsgTrace = true
+)
+@Slf4j
+public class FileSysDataConsumer extends EnhanceConsumerMessageHandler<FileSysDTO> implements RocketMQListener<String> {
+
+    @Resource
+    private RedisUtil redisUtil;
+    @Resource
+    private StringRedisTemplate stringRedisTemplate;
+
+    @Resource
+    private RocketMqLogFeignClient rocketMqLogFeignClient;
+    @Override
+    public void onMessage(String message) {
+
+        FileSysDTO messageDataDTO = JSONObject.parseObject(message, FileSysDTO.class);
+        super.dispatchMessage(messageDataDTO);
+
+    }
+
+
+
+    /***
+     * 通过redis分布式锁判断当前消息所处状态
+     * 1、null 查不到该key的数据，属于第一次消费，放行
+     * 2、fail 上次消息消费时发生异常，放行
+     * 3、being processed 正在处理，打回去
+     * 4、success 最近72小时消费成功，避免重复消费，打回去
+     */
+    @Override
+    public boolean filter(FileSysDTO message) {
+        String keyStatus = redisUtil.getStringByKey(RedisKeyPrefix.REAL_TIME_DATA.concat(message.getKey()));
+        if (Objects.isNull(keyStatus) || keyStatus.equalsIgnoreCase(MessageStatus.FAIL)) {
+
+            redisUtil.saveByKeyWithExpire(RedisKeyPrefix.REAL_TIME_DATA.concat(message.getKey()), MessageStatus.BEING_PROCESSED, 30L);
+            return false;
+        }
+        return true;
+    }
+    /**
+     * 消费成功，缓存到redis5分钟，避免重复消费
+     */
+    @Override
+    protected void consumeSuccess(FileSysDTO message) {
+//        redisUtil.saveByKeyWithExpire(RedisKeyPrefix.REAL_TIME_DATA.concat(message.getKey()), MessageStatus.SUCCESS, 5*60L);
+    }
+
+
+    @Override
+    protected void handleMessage(FileSysDTO message) {
+
+        String msgId = message.getGuid();
+        // 1. 将结果存入 Redis，过期时间 60 秒（足够完成请求）
+        String key = "pending:" + msgId;
+        redisUtil.saveByKeyWithExpire(key, message, 60L);
+        // 2. 发布 Redis 通知，让等待的实例知道结果已就绪
+        stringRedisTemplate.convertAndSend("result_ready_channel", msgId);
+    }
+
+
+
+
+    /**
+     * 发生异常时，进行错误信息入库保存
+     * 默认没有实现类，子类可以实现该方法，调用feign接口进行入库保存
+     */
+    @Override
+    protected void saveExceptionMsgLog(FileSysDTO message, String identity, Exception exception) {
+        redisUtil.saveByKeyWithExpire(RedisKeyPrefix.REAL_TIME_DATA.concat(message.getKey()), MessageStatus.FAIL, RedisKeyEnum.ROCKET_MQ_KEY.getTime());
+        RocketmqMsgErrorLog rocketmqMsgErrorLog = new RocketmqMsgErrorLog();
+        rocketmqMsgErrorLog.setMsgKey(message.getKey());
+        rocketmqMsgErrorLog.setResource(message.getSource());
+        if (identity.equalsIgnoreCase(EnhanceMessageConstant.IDENTITY_SINGLE)) {
+            //数据库字段配置长度200，避免插入失败，大致分析异常原因
+            String exceptionMsg = exception.getMessage();
+            if(exceptionMsg.length() > 200){
+                exceptionMsg = exceptionMsg.substring(0,180);
+            }
+            rocketmqMsgErrorLog.setRecord(exceptionMsg);
+            //如果是当前消息重试的则略过
+            if(!message.getSource().startsWith(EnhanceMessageConstant.RETRY_PREFIX)){
+                //单次消费异常
+                rocketMqLogFeignClient.add(rocketmqMsgErrorLog);
+            }
+        } else {
+            rocketmqMsgErrorLog.setRecord("重试消费" + super.getMaxRetryTimes() + "次，依旧消费失败。");
+            //重试N次后，依然消费异常
+            rocketMqLogFeignClient.add(rocketmqMsgErrorLog);
+        }
+    }
+
+
+    /***
+     * 处理失败后，是否重试
+     * 一般开启
+     */
+    @Override
+    protected boolean isRetry() {
+        return true;
+    }
+
+
+    /***
+     * 消费失败是否抛出异常，抛出异常后就不再消费了
+     */
+    @Override
+    protected boolean throwException() {
+        return false;
+    }
+
+
+
+
+}

message/message-boot/src/main/java/com/njcn/message/consumer/FrontDataConsumer.java

@@ -39,6 +39,8 @@ import java.util.concurrent.TimeUnit;
  * @createTime 2023/8/11 15:32
  */
 @Component
+@org.springframework.boot.autoconfigure.condition.ConditionalOnProperty(
+        name = "mq.type", havingValue = "rocketmq", matchIfMissing = true)
 @RocketMQMessageListener(
         topic = "LN_Topic",
         consumerGroup = "ln_consumer",

message/message-boot/src/main/java/com/njcn/message/mq/FrontDataMqListener.java

@@ -0,0 +1,23 @@
+package com.njcn.message.mq;
+
+import com.njcn.message.messagedto.MessageDataDTO;
+import com.njcn.mq.annotation.MqListener;
+import com.njcn.stat.api.MessAnalysisFeignClient;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+import java.util.Collections;
+
+@Component
+@ConditionalOnProperty(name = "mq.type", havingValue = "redis-stream")
+public class FrontDataMqListener {
+
+    @Resource
+    private MessAnalysisFeignClient messAnalysisFeignClient;
+
+    @MqListener(topic = "LN_Topic", group = "ln_consumer")
+    public void onFrontData(MessageDataDTO msg) {
+        messAnalysisFeignClient.analysis(Collections.singletonList(msg));
+    }
+}

message/message-boot/src/main/java/com/njcn/message/mq/RecallMqSender.java

@@ -0,0 +1,19 @@
+package com.njcn.message.mq;
+
+import com.njcn.message.constant.BusinessTopic;
+import com.njcn.message.message.RecallMessage;
+import com.njcn.mq.core.MqTemplate;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+
+@Component
+public class RecallMqSender {
+
+    @Resource
+    private MqTemplate mqTemplate;
+
+    public void send(RecallMessage message, String nodeId) {
+        mqTemplate.send(nodeId + "_" + BusinessTopic.RECALL_TOPIC, message);
+    }
+}

message/message-boot/src/main/java/com/njcn/message/produce/ProduceController.java

@@ -7,9 +7,11 @@ import com.njcn.common.pojo.enums.response.CommonResponseEnum;
 import com.njcn.common.pojo.response.HttpResult;
 import com.njcn.common.utils.HttpResultUtil;
 
+import com.njcn.message.message.AskFileSysMessage;
 import com.njcn.message.message.DeviceRebootMessage;
 import com.njcn.message.message.ProcessRebootMessage;
 import com.njcn.message.message.RecallMessage;
+import com.njcn.message.produce.template.AskFileSysMessaggeTemplate;
 import com.njcn.message.produce.template.DeviceRebootMessageTemplate;
 import com.njcn.message.produce.template.ProcessRebootMessageTemplate;
 import com.njcn.message.produce.template.RecallMessaggeTemplate;
@@ -40,6 +42,7 @@ public class ProduceController extends BaseController {
 
     private final ProcessRebootMessageTemplate processRebootMessageTemplate;
 
+    private final AskFileSysMessaggeTemplate askFileSysMessaggeTemplate;
 
     @PostMapping("/recall")
     @OperateInfo(info = LogEnum.BUSINESS_COMMON)
@@ -76,4 +79,14 @@ public class ProduceController extends BaseController {
         processRebootMessageTemplate.sendMember(baseMessage,message.getNodeId());
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
     }
+
+    @PostMapping("/askFileSys")
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @ApiOperation("请求文件系统")
+    @ApiImplicitParam(name = "message", value = "参数", required = true)
+    public HttpResult<String> askFileSys(@RequestBody AskFileSysMessage message){
+        String methodDescribe = getMethodDescribe("askFileSys");
+        SendResult sendResult = askFileSysMessaggeTemplate.sendMember(message);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS,message.getGuid() , methodDescribe);
+    }
 }

message/message-boot/src/main/java/com/njcn/message/produce/template/AskFileSysMessaggeTemplate.java

@@ -0,0 +1,34 @@
+package com.njcn.message.produce.template;
+
+
+import com.alibaba.fastjson.JSONObject;
+import com.njcn.message.constant.BusinessResource;
+import com.njcn.message.constant.BusinessTopic;
+import com.njcn.message.message.AskFileSysMessage;
+import com.njcn.middle.rocket.domain.BaseMessage;
+import com.njcn.middle.rocket.template.RocketMQEnhanceTemplate;
+import org.apache.rocketmq.client.producer.SendResult;
+import org.apache.rocketmq.spring.core.RocketMQTemplate;
+import org.springframework.stereotype.Component;
+
+/**
+ * Description:
+ * Date: 2024/12/13  15:15【需求编号】
+ *
+ * @author clam
+ * @version V1.0.0
+ */
+@Component
+public class AskFileSysMessaggeTemplate extends RocketMQEnhanceTemplate {
+    public AskFileSysMessaggeTemplate(RocketMQTemplate template) {
+        super(template);
+    }
+
+    public SendResult sendMember(AskFileSysMessage askRealDataMessage) {
+        BaseMessage baseMessage = new BaseMessage();
+        baseMessage.setMessageBody(JSONObject.toJSONString(askRealDataMessage));
+        baseMessage.setSource(BusinessResource.WEB_RESOURCE);
+        baseMessage.setKey(askRealDataMessage.getGuid());
+        return send(BusinessTopic.FILE_TOPIC,askRealDataMessage.getNodeId() , baseMessage);
+    }
+}

message/message-boot/src/main/java/com/njcn/message/websocket/WebSocketServer.java

@@ -132,7 +132,7 @@ public class WebSocketServer  {
         baseMessage.setMessageBody(JSONObject.toJSONString(askRealDataMessage));
         // 发送消息到topic1
         askRealDataMessaggeTemplate.sendMember(baseMessage,data.getNodeId());
-        redisUtil.saveByKeyWithExpire(RedisKeyPrefix.ASK_REAL_DATA.concat(split[1]),RedisKeyPrefix.ASK_REAL_DATA.concat(split[1]),20L);
+        redisUtil.saveByKeyWithExpire(RedisKeyPrefix.ASK_REAL_DATA.concat(split[1]),RedisKeyPrefix.ASK_REAL_DATA.concat(split[1]),25L);
         log.info("监测点连接:" + userIdAndLineIdAndDevId + ",当前在线监测点数为:" + getOnlineCount());
 
     }

message/message-boot/src/main/resources/bootstrap-jb.yml

@@ -0,0 +1,57 @@
+#当前服务的基本信息
+microservice:
+  ename: @artifactId@
+  name: '@name@'
+  version: @version@
+  sentinel:
+    url: @sentinel.url@
+  gateway:
+    url: @gateway.url@
+server:
+  port: 10407
+#feign接口开启服务熔断降级处理
+feign:
+  sentinel:
+    enabled: true
+spring:
+  application:
+    name: @artifactId@
+  cloud:
+    nacos:
+      discovery:
+        ip: @service.server.url@
+        server-addr: @nacos.url@
+        namespace: @nacos.namespace@
+        username: @nacos.username@
+        password: @nacos.password@
+      config:
+        server-addr: @nacos.url@
+        namespace: @nacos.namespace@
+        username: @nacos.username@
+        password: @nacos.password@
+        file-extension: yaml
+        shared-configs:
+          - data-id: share-config.yaml
+            refresh: true
+          - data-id: share-config-datasource-db.yaml
+            refresh: true
+          - data-id: data-platform.yaml
+            refresh: true
+  main:
+    allow-bean-definition-overriding: true
+
+
+#项目日志的配置
+logging:
+  #config: http://@nacos.url@/nacos/v1/cs/configs?tenant=@nacos.namespace@&group=DEFAULT_GROUP&dataId=logback.xml
+  level:
+    root: info
+
+
+#mybatis配置信息
+mybatis-plus:
+  #别名扫描
+  type-aliases-package: com.njcn.harmonic.pojo
+
+mqtt:
+  client-id: @artifactId@${random.value}

message/message-boot/src/main/resources/bootstrap-sjzx.yml

@@ -0,0 +1,57 @@
+#当前服务的基本信息
+microservice:
+  ename: @artifactId@
+  name: '@name@'
+  version: @version@
+  sentinel:
+    url: @sentinel.url@
+  gateway:
+    url: @gateway.url@
+server:
+  port: 10407
+#feign接口开启服务熔断降级处理
+feign:
+  sentinel:
+    enabled: true
+spring:
+  application:
+    name: @artifactId@
+  cloud:
+    nacos:
+      discovery:
+        ip: @service.server.url@
+        server-addr: @nacos.url@
+        namespace: @nacos.namespace@
+        username: @nacos.username@
+        password: @nacos.password@
+      config:
+        server-addr: @nacos.url@
+        namespace: @nacos.namespace@
+        username: @nacos.username@
+        password: @nacos.password@
+        file-extension: yaml
+        shared-configs:
+          - data-id: share-config.yaml
+            refresh: true
+          - data-id: share-config-datasource-db.yaml
+            refresh: true
+          - data-id: data-platform.yaml
+            refresh: true
+  main:
+    allow-bean-definition-overriding: true
+
+
+#项目日志的配置
+logging:
+  #config: http://@nacos.url@/nacos/v1/cs/configs?tenant=@nacos.namespace@&group=DEFAULT_GROUP&dataId=logback.xml
+  level:
+    root: info
+
+
+#mybatis配置信息
+mybatis-plus:
+  #别名扫描
+  type-aliases-package: com.njcn.harmonic.pojo
+
+mqtt:
+  client-id: @artifactId@${random.value}

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

@@ -1,53 +1,3 @@
-#当前服务的基本信息
-microservice:
-  ename: @artifactId@
-  name: '@name@'
-  version: @version@
-  sentinel:
-    url: @sentinel.url@
-  gateway:
-    url: @gateway.url@
-server:
-  port: 10407
-#feign接口开启服务熔断降级处理
-feign:
-  sentinel:
-    enabled: true
 spring:
-  application:
-    name: @artifactId@
-  cloud:
-    nacos:
-      discovery:
-        ip: @service.server.url@
-        server-addr: @nacos.url@
-        namespace: @nacos.namespace@
-      config:
-        server-addr: @nacos.url@
-        namespace: @nacos.namespace@
-        file-extension: yaml
-        shared-configs:
-          - data-id: share-config.yaml
-            refresh: true
-          - data-Id: share-config-datasource-db.yaml
-            refresh: true
-          - data-Id: data-platform.yaml
-            refresh: true
-  main:
-    allow-bean-definition-overriding: true
-
-
-#项目日志的配置
-logging:
-  config: http://@nacos.url@/nacos/v1/cs/configs?tenant=@nacos.namespace@&group=DEFAULT_GROUP&dataId=logback.xml
-  level:
-    root: info
-
-
-#mybatis配置信息
-mybatis-plus:
-  #别名扫描
-  type-aliases-package: com.njcn.harmonic.pojo
-
-mqtt:
-  client-id: @artifactId@${random.value}
+  profiles:
+    active: @spring.profiles.active@

message/message-boot/src/test/java/com/njcn/message/mq/MqSliceWiringTest.java

@@ -0,0 +1,210 @@
+package com.njcn.message.mq;
+
+import com.alibaba.fastjson.JSON;
+import com.njcn.message.message.RecallMessage;
+import com.njcn.message.messagedto.MessageDataDTO;
+import com.njcn.middle.stream.autoconfig.RedisStreamAutoConfiguration;
+import com.njcn.mq.autoconfig.MqCoreAutoConfiguration;
+import com.njcn.mq.container.MqListenerRegistry;
+import com.njcn.mq.core.MqTemplate;
+import com.njcn.mq.driver.redis.RedisStreamMqDriver;
+import com.njcn.mq.driver.redis.RedisStreamMqDriverAutoConfiguration;
+import com.njcn.mq.driver.rocketmq.RocketMqDriver;
+import com.njcn.mq.driver.rocketmq.RocketMqDriverAutoConfiguration;
+import com.njcn.mq.spi.MqDriver;
+import com.njcn.stat.api.MessAnalysisFeignClient;
+import org.apache.rocketmq.spring.autoconfigure.RocketMQProperties;
+import org.apache.rocketmq.spring.core.RocketMQTemplate;
+import org.junit.jupiter.api.Assumptions;
+import org.junit.jupiter.api.Test;
+import org.springframework.boot.autoconfigure.AutoConfigurations;
+import org.springframework.boot.autoconfigure.data.redis.RedisAutoConfiguration;
+import org.springframework.boot.test.context.runner.ApplicationContextRunner;
+import org.springframework.data.redis.connection.stream.MapRecord;
+import org.springframework.data.redis.connection.stream.ReadOffset;
+import org.springframework.data.redis.connection.stream.StreamOffset;
+import org.springframework.data.redis.connection.stream.StreamReadOptions;
+import org.springframework.data.redis.connection.stream.StreamRecords;
+import org.springframework.data.redis.core.StringRedisTemplate;
+
+import java.net.InetSocketAddress;
+import java.net.Socket;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.ArgumentMatchers.anyList;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.timeout;
+import static org.mockito.Mockito.verify;
+
+/**
+ * MQ starter 切片接入验证测试（ApplicationContextRunner，不启动全应用）。
+ * 真实 Redis 要求：localhost:6379（docker redis-stream-it）；仅上/下行收发用例需要，
+ * 纯装配用例不需要（Lettuce 懒连接，不触发实际连接）。
+ *
+ * <p>装配一律用 {@code withConfiguration(AutoConfigurations.of(...))}，让 Spring 按
+ * <b>真实 autoconfig 顺序</b>（AutoConfigurationSorter）处理，与生产环境一致。以此
+ * 验证 {@link MqCoreAutoConfiguration} 的 {@code @ConditionalOnBean(MqDriver)} 能在
+ * 真实顺序下拿到 driver bean —— 这依赖 driver autoconfig 上的
+ * {@code @AutoConfigureBefore(MqCoreAutoConfiguration.class)}。若缺该保障，按类名字母序
+ * {@code com.njcn.mq.autoconfig.*} 先于 {@code com.njcn.mq.driver.*}，core 会在 driver
+ * bean 注册前求值条件失败，导致 MqTemplate / MqListenerRegistry 不装配。
+ */
+public class MqSliceWiringTest {
+
+    private static boolean redisAvailable() {
+        try {
+            Socket s = new Socket();
+            s.connect(new InetSocketAddress("localhost", 6379), 500);
+            s.close();
+            return true;
+        } catch (Exception e) {
+            return false;
+        }
+    }
+
+    /** redis-stream 模式：真实 autoconfig 顺序装 5 个 autoconfig + 业务 bean（上/下行用）。 */
+    private ApplicationContextRunner redisStreamRunner() {
+        return new ApplicationContextRunner()
+                .withConfiguration(AutoConfigurations.of(
+                        RedisAutoConfiguration.class,
+                        RedisStreamAutoConfiguration.class,
+                        RedisStreamMqDriverAutoConfiguration.class,
+                        RocketMqDriverAutoConfiguration.class,
+                        MqCoreAutoConfiguration.class))
+                .withUserConfiguration(FrontDataMqListener.class, RecallMqSender.class)
+                .withBean(MessAnalysisFeignClient.class,
+                        () -> mock(MessAnalysisFeignClient.class))
+                .withPropertyValues(
+                        "mq.type=redis-stream",
+                        "spring.redis.host=localhost",
+                        "spring.redis.port=6379");
+    }
+
+    // ------------------------------------------------------------------
+    // 1. 装配：mq.type 二选一 + core bean 在真实 autoconfig 顺序下装配
+    // ------------------------------------------------------------------
+
+    @Test
+    void testRedisStreamDriverSelected() {
+        // 纯装配检查，不依赖真实 Redis（Lettuce 懒连接）。
+        new ApplicationContextRunner()
+                .withConfiguration(AutoConfigurations.of(
+                        RedisAutoConfiguration.class,
+                        RedisStreamAutoConfiguration.class,
+                        RedisStreamMqDriverAutoConfiguration.class,
+                        RocketMqDriverAutoConfiguration.class,
+                        MqCoreAutoConfiguration.class))
+                .withPropertyValues(
+                        "mq.type=redis-stream",
+                        "spring.redis.host=localhost",
+                        "spring.redis.port=6379")
+                .run(ctx -> {
+                    assertThat(ctx).hasSingleBean(MqDriver.class);
+                    assertThat(ctx.getBean(MqDriver.class)).isInstanceOf(RedisStreamMqDriver.class);
+                    // 真实顺序下 core 的 @ConditionalOnBean(MqDriver) 必须命中
+                    assertThat(ctx).hasSingleBean(MqTemplate.class);
+                    assertThat(ctx).hasSingleBean(MqListenerRegistry.class);
+                });
+    }
+
+    @Test
+    void testRocketMqDriverSelected() {
+        // rocket 测试不依赖真实 Redis；不装 RedisAutoConfiguration，redis driver 因 mq.type 不匹配而 inactive。
+        new ApplicationContextRunner()
+                .withConfiguration(AutoConfigurations.of(
+                        RedisStreamMqDriverAutoConfiguration.class,
+                        RocketMqDriverAutoConfiguration.class,
+                        MqCoreAutoConfiguration.class))
+                .withBean(RocketMQTemplate.class, () -> mock(RocketMQTemplate.class))
+                .withBean(RocketMQProperties.class, RocketMQProperties::new)
+                .withPropertyValues("mq.type=rocketmq")
+                .run(ctx -> {
+                    assertThat(ctx).hasSingleBean(MqDriver.class);
+                    assertThat(ctx.getBean(MqDriver.class)).isInstanceOf(RocketMqDriver.class);
+                    assertThat(ctx).hasSingleBean(MqTemplate.class);
+                    assertThat(ctx).hasSingleBean(MqListenerRegistry.class);
+                });
+    }
+
+    // ------------------------------------------------------------------
+    // 2. 上行（需要真实 Redis）
+    //    向 LN_Topic stream XADD 一条消息，验证 FrontDataMqListener 触发了
+    //    messAnalysisFeignClient.analysis(...)
+    // ------------------------------------------------------------------
+
+    @Test
+    void testUpstreamFrontData() {
+        Assumptions.assumeTrue(redisAvailable(), "Redis not available at localhost:6379, skipping");
+        redisStreamRunner().run(ctx -> {
+            StringRedisTemplate redis = ctx.getBean(StringRedisTemplate.class);
+            MessAnalysisFeignClient mockClient = ctx.getBean(MessAnalysisFeignClient.class);
+
+            // 构造 RedisStreamMqDriver 消费时期望的字段格式
+            // enc=plain → body 即为原始 JSON（参见 MessageCodec.encodeBody(json, false)）
+            // stream key = StreamKeyBuilder.buildStream("LN_Topic") = "LN_Topic"
+            //             （默认 envIsolation=false，无 env 前缀）
+            MessageDataDTO dto = new MessageDataDTO();
+            dto.setDataType(1);
+            String json = JSON.toJSONString(dto);
+
+            Map<String, String> fields = new HashMap<String, String>();
+            fields.put("key", "test-key-upstream-1");
+            fields.put("tag", "");
+            fields.put("enc", "plain");
+            fields.put("body", json);
+            fields.put("ts", String.valueOf(System.currentTimeMillis()));
+
+            // XADD 到 LN_Topic（MqListenerRegistry.start() 已在 context 启动时订阅该 stream）
+            redis.opsForStream().add(
+                    StreamRecords.newRecord().in("LN_Topic").ofMap(fields)
+            );
+
+            // 等待消费线程处理（blockMs 默认 2000ms，timeout=5000ms 足够）
+            verify(mockClient, timeout(5000)).analysis(anyList());
+        });
+    }
+
+    // ------------------------------------------------------------------
+    // 3. 下行（需要真实 Redis）
+    //    通过 RecallMqSender 发送 RecallMessage，验证 stream 内容正确
+    // ------------------------------------------------------------------
+
+    @Test
+    void testDownstreamRecall() {
+        Assumptions.assumeTrue(redisAvailable(), "Redis not available at localhost:6379, skipping");
+        redisStreamRunner().run(ctx -> {
+            StringRedisTemplate redis = ctx.getBean(StringRedisTemplate.class);
+            RecallMqSender sender = ctx.getBean(RecallMqSender.class);
+
+            // 清理，确保只有本次发送的消息
+            redis.delete("n1_recall_Topic");
+
+            RecallMessage msg = new RecallMessage();
+            msg.setGuid("g1");
+            // MqTemplate.send("n1_recall_Topic", msg) → RedisStreamMqDriver XADD
+            // stream key = StreamKeyBuilder.buildStream("n1_recall_Topic") = "n1_recall_Topic"
+            sender.send(msg, "n1");
+
+            Long size = redis.opsForStream().size("n1_recall_Topic");
+            assertThat(size).isGreaterThanOrEqualTo(1L);
+
+            @SuppressWarnings("unchecked")
+            List<MapRecord<String, Object, Object>> records =
+                    redis.opsForStream().read(
+                            StreamReadOptions.empty().count(1L),
+                            StreamOffset.create("n1_recall_Topic", ReadOffset.from("0-0"))
+                    );
+            assertThat(records).isNotEmpty();
+
+            Map<Object, Object> firstFields = records.get(0).getValue();
+            // DefaultMqTemplate.send(topic, payload) 使用 encodeBody(json, false) → enc="plain"
+            // 因此 body 即为原始 JSON，无需 gzip 解压
+            String body = (String) firstFields.get("body");
+            RecallMessage result = JSON.parseObject(body, RecallMessage.class);
+            assertThat(result.getGuid()).isEqualTo("g1");
+        });
+    }
+}

pom.xml

@@ -15,7 +15,7 @@
     <module>algorithm</module>
     <module>log</module>
     <module>data-processing</module>
-    <module>migration-influxdb</module>
+    <!--<module>migration-influxdb</module>-->
   </modules>
 
   <distributionManagement>
@@ -32,47 +32,13 @@
   </distributionManagement>
 
   <properties>
+    <spring.profiles.active>sjzx</spring.profiles.active>
     <!--内网-->
-<!--        <middle.server.url>192.168.1.22</middle.server.url>-->
-<!--        <service.server.url>192.168.1.121</service.server.url>-->
-<!--        <docker.server.url>192.168.1.22</docker.server.url>-->
-<!--        <nacos.url>${middle.server.url}:18848</nacos.url>-->
-<!--        <nacos.namespace>07ec981d-1377-4920-8760-b5a98ff7e668</nacos.namespace>-->
-
-<!--          <middle.server.url>192.168.21.129</middle.server.url>-->
-<!--          <service.server.url>192.168.21.1</service.server.url>-->
-<!--          <docker.server.url>192.168.1.22</docker.server.url>-->
-<!--          <nacos.url>${middle.server.url}:18848</nacos.url>-->
-<!--          <nacos.namespace>0c19477c-444e-413c-9782-e6ebc2eedac1</nacos.namespace>-->
-
-<!--    <middle.server.url>127.0.0.1</middle.server.url>-->
-<!--    &lt;!&ndash;微服务模块发布地址&ndash;&gt;-->
-<!--    <service.server.url>127.0.0.1</service.server.url>-->
-<!--    &lt;!&ndash;docker仓库地址&ndash;&gt;-->
-<!--    <docker.server.url>127.0.0.1</docker.server.url>-->
-<!--    &lt;!&ndash;nacos的ip:port&ndash;&gt;-->
-<!--    <nacos.url>${middle.server.url}:8848</nacos.url>-->
-<!--    <nacos.namespace>37a0e99f-eb96-4d2f-9b47-75bffa765827</nacos.namespace>-->
-<!--              <middle.server.url>24.43.102.139</middle.server.url>-->
-<!--              <service.server.url>24.43.102.139</service.server.url>-->
-<!--              <docker.server.url>24.43.102.139</docker.server.url>-->
-<!--              <nacos.url>${middle.server.url}:18848</nacos.url>-->
-<!--              <nacos.namespace></nacos.namespace>-->
-
-            <middle.server.url>127.0.0.1</middle.server.url>
-            <service.server.url>127.0.0.1</service.server.url>
-            <docker.server.url>127.0.0.1</docker.server.url>
-            <nacos.url>${middle.server.url}:8848</nacos.url>
-            <nacos.namespace>37a0e99f-eb96-4d2f-9b47-75bffa765827</nacos.namespace>
-
-<!--            <middle.server.url>192.168.21.129</middle.server.url>-->
-<!--            &lt;!&ndash;微服务模块发布地址&ndash;&gt;-->
-<!--            <service.server.url>192.168.21.1</service.server.url>-->
-<!--            &lt;!&ndash;docker仓库地址&ndash;&gt;-->
-<!--            <docker.server.url>192.168.1.22</docker.server.url>-->
-<!--          <nacos.url>${middle.server.url}:18848</nacos.url>-->
-<!--          <nacos.namespace>0c19477c-444e-413c-9782-e6ebc2eedac1</nacos.namespace>-->
-
+    <middle.server.url>192.168.1.65</middle.server.url>
+    <service.server.url>192.168.1.65</service.server.url>
+    <docker.server.url>192.168.1.22</docker.server.url>
+    <nacos.url>${middle.server.url}:18848</nacos.url>
+    <nacos.namespace></nacos.namespace>
     <!--sentinel:port-->
     <sentinel.url>${middle.server.url}:8080</sentinel.url>
     <!--网关地址，主要用于配置swagger中认证token-->
@@ -87,6 +53,12 @@
     <micro.sdk>common-microservice</micro.sdk>
     <!--        <micro.sdk>common-huawei</micro.sdk>-->
     <docker.operate>site</docker.operate>
+
+    <!--nacos开启鉴权后的用户名-->
+    <nacos.username>nacos</nacos.username>
+    <!--nacos的ip:port-->
+    <nacos.password>njcnpqs</nacos.password>
+
     <java.version>1.8</java.version>
     <maven.compiler.source>8</maven.compiler.source>
     <maven.compiler.target>8</maven.compiler.target>