Middleware/cn-data-platform
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

添加电压含有率

Browse Source
This commit is contained in:
hzj
2025-02-28 16:32:16 +08:00
parent 798f09b9e1
commit 15716878cc
42 changed files with 1086 additions and 357 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/api/DataVCvtFeignClient.java Normal file
View File

@@ -0,0 +1,31 @@
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.DataVCvtFeignClientFallbackFactory;
import com.njcn.dataProcess.api.fallback.DataVFeignClientFallbackFactory;
import com.njcn.dataProcess.dto.DataVDTO;
import com.njcn.dataProcess.param.LineCountEvaluateParam;
import com.njcn.dataProcess.po.influx.DataVCvt;
import com.njcn.dataProcess.pojo.dto.CommonMinuteDto;
import com.njcn.dataProcess.pojo.dto.DataVDto;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestParam;
import java.time.LocalDateTime;
import java.util.List;
@FeignClient(value = ServerInfo.PLATFORM_DATA_PROCESSING_BOOT, path = "/dataVCvt", fallbackFactory = DataVCvtFeignClientFallbackFactory.class, contextId = "dataVCvt")
public interface DataVCvtFeignClient {
//获取原始数据
@PostMapping("/getRawData")
HttpResult<List<DataVCvt>> getRawData(@RequestBody LineCountEvaluateParam lineParam);
}

6
data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/api/DataVFeignClient.java
View File

@@ -5,9 +5,10 @@ import com.njcn.common.pojo.response.HttpResult;
import com.njcn.dataProcess.api.fallback.DataVFeignClientFallbackFactory;
import com.njcn.dataProcess.dto.DataVDTO;
import com.njcn.dataProcess.param.LineCountEvaluateParam;
import com.njcn.dataProcess.po.influx.DataV;
import com.njcn.dataProcess.pojo.dto.CommonMinuteDto;
import com.njcn.dataProcess.pojo.dto.DataVCvtDTO;
import com.njcn.dataProcess.pojo.dto.DataVDto;
import io.swagger.annotations.ApiOperation;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
@@ -46,4 +47,7 @@ public interface DataVFeignClient {
@PostMapping("/addInfluxDbList")
HttpResult<String> addInfluxDbList(@RequestBody List<DataVDto> list);
@PostMapping("/batchInsertionCvtDTO")
HttpResult<String> batchInsertionCvtDTO(@RequestBody List<DataVCvtDTO> cvtDTOList);
}

55
data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/api/fallback/DataVCvtFeignClientFallbackFactory.java Normal file
View File

@@ -0,0 +1,55 @@
package com.njcn.dataProcess.api.fallback;
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.DataVCvtFeignClient;
import com.njcn.dataProcess.api.DataVFeignClient;
import com.njcn.dataProcess.dto.DataVDTO;
import com.njcn.dataProcess.param.LineCountEvaluateParam;
import com.njcn.dataProcess.po.influx.DataVCvt;
import com.njcn.dataProcess.pojo.dto.CommonMinuteDto;
import com.njcn.dataProcess.pojo.dto.DataVDto;
import com.njcn.dataProcess.util.DataProcessingEnumUtil;
import feign.hystrix.FallbackFactory;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;
import java.time.LocalDateTime;
import java.util.List;
/**
* @author denghuajun
* @version 1.0.0
* @date 2022年01月05日 15:08
*/
@Slf4j
@Component
public class DataVCvtFeignClientFallbackFactory implements FallbackFactory<DataVCvtFeignClient> {
/**
* 输出远程请求接口异常日志
* @param cause RPC请求异常
*/
@Override
public DataVCvtFeignClient create(Throwable cause) {
//判断抛出异常是否为解码器抛出的业务异常
Enum<?> exceptionEnum = CommonResponseEnum.SERVICE_FALLBACK;
if(cause.getCause() instanceof BusinessException){
BusinessException businessException = (BusinessException) cause.getCause();
exceptionEnum = DataProcessingEnumUtil.getExceptionEnum(businessException.getResult());
}
Enum<?> finalExceptionEnum = exceptionEnum;
return new DataVCvtFeignClient() {
@Override
public HttpResult<List<DataVCvt>> getRawData(LineCountEvaluateParam lineParam) {
log.error("{}异常，降级处理，异常为：{}","获取原始数据",cause.toString());
throw new BusinessException(finalExceptionEnum);
}
};
}
}

7
data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/api/fallback/DataVFeignClientFallbackFactory.java
View File

@@ -8,6 +8,7 @@ import com.njcn.dataProcess.dto.DataVDTO;
import com.njcn.dataProcess.param.LineCountEvaluateParam;
import com.njcn.dataProcess.po.influx.DataV;
import com.njcn.dataProcess.pojo.dto.CommonMinuteDto;
import com.njcn.dataProcess.pojo.dto.DataVCvtDTO;
import com.njcn.dataProcess.pojo.dto.DataVDto;
import com.njcn.dataProcess.util.DataProcessingEnumUtil;
import feign.hystrix.FallbackFactory;
@@ -77,6 +78,12 @@ public class DataVFeignClientFallbackFactory implements FallbackFactory<DataVFei
log.error("{}异常，降级处理，异常为：{}","时序数据库插入数据",cause.toString());
throw new BusinessException(finalExceptionEnum);
}
@Override
public HttpResult<String> batchInsertionCvtDTO(List<DataVCvtDTO> cvtDTOList) {
log.error("{}异常，降级处理，异常为：{}","cvt数据插入DataV",cause.toString());
throw new BusinessException(finalExceptionEnum);
}
};
}
}

2
data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/po/influx/DataFlicker.java
View File

@@ -43,7 +43,7 @@ public class DataFlicker {
private Double pst=0.00;
@Column(name = "quality_flag",tag = true)
private String qualityFlag;
private String qualityFlag ="0";
public static DataFlicker relationToInfluxDB(DataFlickerDTO dataFlicker) {

2
data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/po/influx/DataFluc.java
View File

@@ -41,7 +41,7 @@ public class DataFluc {
@Column(name = "quality_flag",tag = true)
private String qualityFlag;
private String qualityFlag="0";
public static DataFluc relationToInfluxDB(DataFlucDTO dataFluc) {
if (dataFluc == null) {

2
data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/po/influx/DataHarmphasicI.java
View File

@@ -38,7 +38,7 @@ public class DataHarmphasicI {
private String phasicType;
@Column(name = "quality_flag",tag = true)
private String qualityFlag;
private String qualityFlag="0";
@Column(name = "value_type",tag = true)
private String valueType;

2
data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/po/influx/DataHarmphasicV.java
View File

@@ -39,7 +39,7 @@ public class DataHarmphasicV {
private String phasicType;
@Column(name = "quality_flag",tag = true)
private String qualityFlag;
private String qualityFlag="0";
@Column(name = "value_type",tag = true)
private String valueType;

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

@@ -39,7 +39,7 @@ public class DataHarmpowerP {
private String phasicType;
@Column(name = "quality_flag",tag = true)
private String qualityFlag;
private String qualityFlag="0";
@Column(name = "value_type",tag = true)
private String valueType;

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

@@ -39,7 +39,7 @@ public class DataHarmpowerQ {
private String phasicType;
@Column(name = "quality_flag",tag = true)
private String qualityFlag;
private String qualityFlag="0";
@Column(name = "value_type",tag = true)
private String valueType;

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

@@ -39,7 +39,7 @@ public class DataHarmpowerS {
private String phasicType;
@Column(name = "quality_flag",tag = true)
private String qualityFlag;
private String qualityFlag="0";
@Column(name = "value_type",tag = true)
private String valueType;

2
data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/po/influx/DataHarmrateI.java
View File

@@ -38,7 +38,7 @@ public class DataHarmrateI {
private String phasicType;
@Column(name = "quality_flag",tag = true)
private String qualityFlag;
private String qualityFlag="0";
@Column(name = "value_type",tag = true)
private String valueType;

2
data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/po/influx/DataHarmrateV.java
View File

@@ -38,7 +38,7 @@ public class DataHarmrateV {
private String phasicType;
@Column(name = "quality_flag",tag = true)
private String qualityFlag;
private String qualityFlag="0";
@Column(name = "value_type",tag = true)
private String valueType;

2
data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/po/influx/DataI.java
View File

@@ -39,7 +39,7 @@ public class DataI {
private String phasicType;
@Column(name = "quality_flag",tag = true)
private String qualityFlag;
private String qualityFlag="0";
@Column(name = "value_type",tag = true)
private String valueType;

2
data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/po/influx/DataInharmI.java
View File

@@ -39,7 +39,7 @@ public class DataInharmI {
private String phasicType;
@Column(name = "quality_flag",tag = true)
private String qualityFlag;
private String qualityFlag="0";
@Column(name = "value_type",tag = true)
private String valueType;

2
data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/po/influx/DataInharmV.java
View File

@@ -39,7 +39,7 @@ public class DataInharmV {
private String phasicType;
@Column(name = "quality_flag",tag = true)
private String qualityFlag;
private String qualityFlag="0";
@Column(name = "value_type",tag = true)
private String valueType;

2
data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/po/influx/DataPlt.java
View File

@@ -35,7 +35,7 @@ public class DataPlt {
private String phasicType;
@Column(name = "quality_flag",tag = true)
private String qualityFlag;
private String qualityFlag="0";
@Column(name = "plt")
private Double plt;

2
data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/po/influx/DataV.java
View File

@@ -43,7 +43,7 @@ public class DataV {
private String valueType;
@Column(name = "quality_flag", tag = true)
private String qualityFlag;
private String qualityFlag="0";
//是否是异常指标数据，0否1是
@Column(name = "abnormal_flag")

32
data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/po/influx/DataVCvt.java Normal file
View File

@@ -0,0 +1,32 @@
package com.njcn.dataProcess.po.influx;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.njcn.dataProcess.dto.DataVDTO;
import com.njcn.influx.utils.InstantDateSerializer;
import lombok.Data;
import org.influxdb.annotation.Column;
import org.influxdb.annotation.Measurement;
import org.influxdb.annotation.TimeColumn;
import org.springframework.beans.BeanUtils;
import java.time.Instant;
import java.time.ZoneId;
import java.util.ArrayList;
import java.util.List;
import java.util.Objects;
import java.util.stream.Collectors;
import java.util.stream.Stream;
/**
* 类的介绍：
*
* @author xuyang
* @version 1.0.0
* @createTime 2022/4/7 10:00
*/
@Data
@Measurement(name = "data_v_cvt")
public class DataVCvt extends DataV{
}

159
data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/pojo/dto/DataVCvtDTO.java Normal file
View File

@@ -0,0 +1,159 @@
package com.njcn.dataProcess.pojo.dto;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.njcn.influx.utils.InstantDateSerializer;
import lombok.Data;
import org.influxdb.annotation.Column;
import org.influxdb.annotation.TimeColumn;
import java.time.Instant;
/**
* Description:
* Date: 2025/02/27 上午 8:53【需求编号】
*
* @author clam
* @version V1.0.0
*/
@Data
public class DataVCvtDTO {
private Instant time;
private String lineId;
private String phasicType;
private String valueType;
private String qualityFlag="0";
//是否是异常指标数据，0否1是
private Integer abnormalFlag;
private Double freq;
private Double freqDev;
private Double rms;
private Double rmsLvr;
private Double vlDev;
private Double vuDev;
private Double vNeg;
private Double vPos;
private Double vThd;
private Double vUnbalance;
private Double vZero;
private Double v1;
private Double v2;
private Double v3;
private Double v4;
private Double v5;
private Double v6;
private Double v7;
private Double v8;
private Double v9;
private Double v10;
private Double v11;
private Double v12;
private Double v13;
private Double v14;
private Double v15;
private Double v16;
private Double v17;
private Double v18;
private Double v19;
private Double v20;
private Double v21;
private Double v22;
private Double v23;
private Double v24;
private Double v25;
private Double v26;
private Double v27;
private Double v28;
private Double v29;
private Double v30;
private Double v31;
private Double v32;
private Double v33;
private Double v34;
private Double v35;
private Double v36;
private Double v37;
private Double v38;
private Double v39;
private Double v40;
private Double v41;
private Double v42;
private Double v43;
private Double v44;
private Double v45;
private Double v46;
private Double v47;
private Double v48;
private Double v49;
private Double v50;
}

39
data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/controller/DataHarmrateVController.java
View File

@@ -8,11 +8,9 @@ import com.njcn.common.pojo.response.HttpResult;
import com.njcn.common.utils.HttpResultUtil;
import com.njcn.dataProcess.annotation.InsertBean;
import com.njcn.dataProcess.annotation.QueryBean;
import com.njcn.dataProcess.dto.DataHarmphasicIDTO;
import com.njcn.dataProcess.dto.DataHarmrateVDTO;
import com.njcn.dataProcess.po.influx.DataHarmrateV;
import com.njcn.dataProcess.service.IDataHarmphasicI;
import com.njcn.dataProcess.service.IDataHarmrateV;
import com.njcn.dataProcess.param.LineCountEvaluateParam;
import com.njcn.dataProcess.pojo.dto.DataHarmDto;
import com.njcn.dataProcess.service.IDataHarmRateV;
import com.njcn.web.controller.BaseController;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -35,30 +33,23 @@ import java.util.List;
@Slf4j
@Controller
@RestController
@RequestMapping("/dataHarmratev")
@Api(tags = "谐波电流角度数据")
public class DataHarmrateVController extends BaseController {
@RequestMapping("/dataHarmRateV")
@Api(tags = "谐波电压含有率")
public class DataHarmRateVController extends BaseController {
@QueryBean
private IDataHarmrateV dataHarmrateVQuery;
private IDataHarmRateV dataHarmRateVQuery;
@InsertBean
private IDataHarmrateV dataHarmrateVInsert;
private IDataHarmRateV dataHarmRateVInsert;
@OperateInfo(info = LogEnum.BUSINESS_COMMON,operateType = OperateType.ADD)
@PostMapping("/batchInsertion")
@ApiOperation("批量插入")
public HttpResult<String> batchInsertion(@RequestBody List<DataHarmrateVDTO> dataHarmrateVDTOList) {
String methodDescribe = getMethodDescribe("batchInsertion");
dataHarmrateVInsert.batchInsertion(dataHarmrateVDTOList);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
@OperateInfo(info = LogEnum.BUSINESS_COMMON,operateType = OperateType.QUERY)
@PostMapping("/getRawData")
@ApiOperation("获取原始数据")
public HttpResult<List<DataHarmDto>> getRawData(@RequestBody LineCountEvaluateParam lineParam) {
String methodDescribe = getMethodDescribe("getRawData");
List<DataHarmDto> data = dataHarmRateVQuery.getRawData(lineParam);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, data, methodDescribe);
}
}

13
data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/controller/DataVController.java
View File

@@ -12,6 +12,7 @@ import com.njcn.dataProcess.dto.DataVDTO;
import com.njcn.dataProcess.dto.DataVFiveItemDTO;
import com.njcn.dataProcess.param.LineCountEvaluateParam;
import com.njcn.dataProcess.pojo.dto.CommonMinuteDto;
import com.njcn.dataProcess.pojo.dto.DataVCvtDTO;
import com.njcn.dataProcess.pojo.dto.DataVDto;
import com.njcn.dataProcess.service.IDataV;
import com.njcn.web.controller.BaseController;
@@ -65,6 +66,16 @@ public class DataVController extends BaseController {
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
}
@OperateInfo(info = LogEnum.BUSINESS_COMMON,operateType = OperateType.ADD)
@PostMapping("/batchInsertionCvtDTO")
@ApiOperation("批量插入cvtDto")
public HttpResult<String> batchInsertionCvtDTO(@RequestBody List<DataVCvtDTO> cvtDTOList) {
String methodDescribe = getMethodDescribe("batchInsertion");
dataVInsert.batchInsertionCvtDTO(cvtDTOList);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
}
@OperateInfo(info = LogEnum.BUSINESS_COMMON,operateType = OperateType.ADD)
@PostMapping("/monitoringTime")
@ApiOperation("获取监测点数据时间点(补招使用)")
@@ -111,4 +122,6 @@ public class DataVController extends BaseController {
dataVQuery.addInfluxDbList(dataVList);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, "", methodDescribe);
}
}

62
data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/controller/DataVCvtController.java Normal file
View File

@@ -0,0 +1,62 @@
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.annotation.InsertBean;
import com.njcn.dataProcess.annotation.QueryBean;
import com.njcn.dataProcess.dto.DataVDTO;
import com.njcn.dataProcess.dto.DataVFiveItemDTO;
import com.njcn.dataProcess.param.LineCountEvaluateParam;
import com.njcn.dataProcess.po.influx.DataVCvt;
import com.njcn.dataProcess.pojo.dto.CommonMinuteDto;
import com.njcn.dataProcess.pojo.dto.DataVDto;
import com.njcn.dataProcess.service.IDataV;
import com.njcn.dataProcess.service.IDataVCvt;
import com.njcn.web.controller.BaseController;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
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 java.time.LocalDateTime;
import java.util.List;
import java.util.Map;
/**
* @author hongawen
* @version 1.0
* @data 2024/11/6 19:48
*/
@Validated
@Slf4j
@Controller
@RestController
@RequestMapping("/dataVCvt")
@Api(tags = "电压类数(cvt表)据获取")
public class DataVCvtController extends BaseController {
@QueryBean
private IDataVCvt dataVCvtQuery;
@InsertBean
private IDataVCvt dataVCvtInsert;
@OperateInfo(info = LogEnum.BUSINESS_COMMON,operateType = OperateType.QUERY)
@PostMapping("/getRawData")
@ApiOperation("获取原始数据")
public HttpResult<List<DataVCvt>> getRawData(@RequestBody LineCountEvaluateParam lineParam) {
String methodDescribe = getMethodDescribe("getRawData");
List<DataVCvt> data = dataVCvtQuery.getRawData(lineParam);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, data, methodDescribe);
}
}

14
data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/dao/imapper/DataHarmrateVMapper.java
View File

@@ -1,18 +1,14 @@
package com.njcn.dataProcess.dao.imapper;
import com.njcn.dataProcess.po.influx.DataHarmphasicV;
import com.njcn.dataProcess.po.influx.DataHarmrateV;
import com.njcn.influx.base.InfluxDbBaseMapper;
/**
* <p>
* Mapper 接口
* </p>
*
* @author hongawen
* @since 2023-12-28
* @author xy
*/
public interface DataHarmrateVMapper extends InfluxDbBaseMapper<DataHarmrateV> {
public interface DataHarmRateVMapper extends InfluxDbBaseMapper<DataHarmrateV> {
}

19
data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/dao/imapper/DataVCvtMapper.java Normal file
View File

@@ -0,0 +1,19 @@
package com.njcn.dataProcess.dao.imapper;
import com.njcn.dataProcess.dto.LineDataVFiveItemDTO;
import com.njcn.dataProcess.po.influx.DataV;
import com.njcn.dataProcess.po.influx.DataVCvt;
import com.njcn.influx.base.InfluxDbBaseMapper;
import com.njcn.influx.query.InfluxQueryWrapper;
import java.util.List;
/**
* @author hongawen
* @version 1.0
* @data 2024/11/7 18:49
*/
public interface DataVCvtMapper extends InfluxDbBaseMapper<DataVCvt> {
}

20
data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/IDataHarmrateV.java
View File

@@ -1,17 +1,19 @@
package com.njcn.dataProcess.service;
import com.njcn.dataProcess.dto.DataHarmphasicIDTO;
import com.njcn.dataProcess.dto.DataHarmrateVDTO;
import com.njcn.dataProcess.param.LineCountEvaluateParam;
import com.njcn.dataProcess.pojo.dto.DataHarmDto;
import java.util.List;
/**
* Description:
* Date: 2024/11/18 11:17【需求编号】
*
* @author clam
* @version V1.0.0
* @author xy
*/
public interface IDataHarmrateV {
void batchInsertion(List<DataHarmrateVDTO> dataHarmrateVDTOList);
public interface IDataHarmRateV {
/**
* 获取原始数据
* @param lineParam
* @return
*/
List<DataHarmDto> getRawData(LineCountEvaluateParam lineParam);
}

3
data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/IDataV.java
View File

@@ -5,6 +5,7 @@ import com.njcn.dataProcess.dto.DataVDTO;
import com.njcn.dataProcess.dto.DataVFiveItemDTO;
import com.njcn.dataProcess.param.LineCountEvaluateParam;
import com.njcn.dataProcess.pojo.dto.CommonMinuteDto;
import com.njcn.dataProcess.pojo.dto.DataVCvtDTO;
import com.njcn.dataProcess.pojo.dto.DataVDto;
import com.njcn.dataProcess.pojo.po.RStatDataVD;
@@ -49,4 +50,6 @@ public interface IDataV extends IMppService<RStatDataVD> {
void addList(List<DataVDto> dataVDtoList);
void addInfluxDbList(List<DataVDto> dataVList);
void batchInsertionCvtDTO(List<DataVCvtDTO> cvtDTOList);
}

25
data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/IDataVCvt.java Normal file
View File

@@ -0,0 +1,25 @@
package com.njcn.dataProcess.service;
import com.github.jeffreyning.mybatisplus.service.IMppService;
import com.njcn.dataProcess.dto.DataVDTO;
import com.njcn.dataProcess.dto.DataVFiveItemDTO;
import com.njcn.dataProcess.param.LineCountEvaluateParam;
import com.njcn.dataProcess.po.influx.DataVCvt;
import com.njcn.dataProcess.pojo.dto.CommonMinuteDto;
import com.njcn.dataProcess.pojo.dto.DataVDto;
import com.njcn.dataProcess.pojo.po.RStatDataVD;
import java.time.LocalDateTime;
import java.util.List;
import java.util.Map;
/**
* @author hongawen
* @version 1.0
* @data 2024/11/7 10:54
*/
public interface IDataVCvt {
List<DataVCvt> getRawData(LineCountEvaluateParam lineParam);
}

111
data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/influxdb/InfluxdbDataHarmrateVImpl.java
View File

@@ -1,51 +1,98 @@
package com.njcn.dataProcess.service.impl.influxdb;
import com.njcn.dataProcess.dao.imapper.DataHarmphasicVMapper;
import com.njcn.dataProcess.dao.imapper.DataHarmrateVMapper;
import com.njcn.dataProcess.dto.DataHarmphasicVDTO;
import com.njcn.dataProcess.dto.DataHarmrateVDTO;
import com.njcn.dataProcess.po.influx.DataHarmphasicV;
import cn.hutool.core.collection.CollectionUtil;
import com.njcn.common.utils.HarmonicTimesUtil;
import com.njcn.dataProcess.dao.imapper.DataHarmRateVMapper;
import com.njcn.dataProcess.param.LineCountEvaluateParam;
import com.njcn.dataProcess.po.influx.DataHarmrateV;
import com.njcn.dataProcess.service.IDataHarmphasicV;
import com.njcn.dataProcess.service.IDataHarmrateV;
import com.njcn.dataProcess.pojo.dto.DataHarmDto;
import com.njcn.dataProcess.service.IDataHarmRateV;
import com.njcn.influx.constant.InfluxDbSqlConstant;
import com.njcn.influx.query.InfluxQueryWrapper;
import lombok.RequiredArgsConstructor;
import org.apache.commons.collections4.ListUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import java.time.ZoneId;
import java.time.format.DateTimeFormatter;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
/**
* Description:
* Date: 2024/11/18 14:33【需求编号】
*
* @author clam
* @version V1.0.0
* @author xy
*/
@Service("InfluxdbDataHarmrateVImpl")
@Service("InfluxdbDataHarmRateVImpl")
@RequiredArgsConstructor
public class InfluxdbDataHarmrateVImpl implements IDataHarmrateV {
public class InfluxdbDataHarmRateVImpl implements IDataHarmRateV {
private final DataHarmrateVMapper dataHarmrateVMapper;
private final DateTimeFormatter DATE_TIME_FORMATTER = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss").withZone(ZoneId.systemDefault());
private final DataHarmRateVMapper dataHarmRateVMapper;
@Override
public void batchInsertion(List<DataHarmrateVDTO> dataHarmrateVDTOList) {
int totalCount = dataHarmrateVDTOList.size();
if(totalCount<=0){
return;
}
List<DataHarmrateV> collect = dataHarmrateVDTOList.stream().flatMap(temp -> DataHarmrateV.relationToInfluxDB(temp).stream()).collect(Collectors.toList());
int minSize = Math.min(1200000, collect.size());
List<List<DataHarmrateV>> partition = ListUtils.partition(collect, minSize);
for (List<DataHarmrateV> dataHarmrateVList : partition) {
List<DataHarmrateV> sublistAsOriginalListType = new ArrayList<>(dataHarmrateVList);
dataHarmrateVMapper.insertBatch(sublistAsOriginalListType);
}
public List<DataHarmDto> getRawData(LineCountEvaluateParam lineParam) {
List<DataHarmDto> result = new ArrayList<>();
List<DataHarmrateV> list = getMinuteDataI(lineParam.getLineId(), lineParam.getStartTime(), lineParam.getEndTime(), lineParam.getAbnormalTime());
list.forEach(item->{
DataHarmDto dto = new DataHarmDto();
BeanUtils.copyProperties(item,dto);
dto.setMinTime(DATE_TIME_FORMATTER.format(item.getTime()));
result.add(dto);
});
return result;
}
/**
* 按监测点集合、时间条件获取dataI分钟数据
* timeMap参数来判断是否进行数据处理 timeMap为空则不进行数据处理
* 需要进行剔除异常数据时,这里会有三种情况判断
* 1.无异常数据，则直接返回集合；
* 2.异常数据和无异常数据参杂，剔除异常数据，只计算正常数据；
* 3.全是异常数据，则使用异常数据进行计算，但是日表中需要标记出来，此数据有异常
*/
public List<DataHarmrateV> getMinuteDataI(List<String> lineList, String startTime, String endTime, Map<String,List<String>> timeMap) {
List<DataHarmrateV> result = new ArrayList<>();
InfluxQueryWrapper influxQueryWrapper = new InfluxQueryWrapper(DataHarmrateV.class);
influxQueryWrapper.samePrefixAndSuffix(InfluxDbSqlConstant.V, "", HarmonicTimesUtil.harmonicTimesList(2, 50, 1));
influxQueryWrapper.regular(DataHarmrateV::getLineId, lineList)
.select(DataHarmrateV::getLineId)
.select(DataHarmrateV::getPhasicType)
.select(DataHarmrateV::getValueType)
.select(DataHarmrateV::getQualityFlag)
.between(DataHarmrateV::getTime, startTime, endTime)
.eq(DataHarmrateV::getQualityFlag,"0");
List<DataHarmrateV> list = dataHarmRateVMapper.selectByQueryWrapper(influxQueryWrapper);
Map<String,List<DataHarmrateV>> lineMap = list.stream().collect(Collectors.groupingBy(DataHarmrateV::getLineId));
//有异常数据
if (CollectionUtil.isNotEmpty(timeMap)) {
lineMap.forEach((k,v)->{
List<String> timeList = timeMap.get(k);
//有异常数据,当前监测点自身的异常数据
if (CollectionUtil.isNotEmpty(timeList)) {
List<DataHarmrateV> filterList = v.stream().filter(item -> !timeList.contains(DATE_TIME_FORMATTER.format(item.getTime()))).collect(Collectors.toList());
//1.过滤掉异常数据后还有正常数据，则用正常数据计算
if (CollectionUtil.isNotEmpty(filterList)) {
result.addAll(filterList);
}
//2.过滤掉异常数据后没有正常数据，则用所有异常数据计算，但是需要标记数据为异常的
else {
v.parallelStream().forEach(item -> item.setQualityFlag("1"));
result.addAll(v);
}
}
//没有异常数据，则使用原数据
else {
result.addAll(v);
}
});
}
//没有异常数据，则使用原数据
else {
result.addAll(list);
}
return result;
}
}

56
data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/influxdb/InfluxdbDataVCvtImpl.java Normal file
View File

@@ -0,0 +1,56 @@
package com.njcn.dataProcess.service.impl.influxdb;
import com.njcn.dataProcess.constant.InfluxDBTableConstant;
import com.njcn.dataProcess.dao.imapper.DataVCvtMapper;
import com.njcn.dataProcess.dao.imapper.DataVMapper;
import com.njcn.dataProcess.dto.DataVDTO;
import com.njcn.dataProcess.param.LineCountEvaluateParam;
import com.njcn.dataProcess.po.influx.DataV;
import com.njcn.dataProcess.po.influx.DataVCvt;
import com.njcn.dataProcess.service.IDataVCvt;
import com.njcn.influx.query.InfluxQueryWrapper;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.time.LocalDateTime;
import java.time.ZoneId;
import java.util.ArrayList;
import java.util.List;
import java.util.stream.Collectors;
/**
* Description:
* Date: 2025/02/24 下午 3:34【需求编号】
*
* @author clam
* @version V1.0.0
*/
@Service("InfluxdbDataVCvtImpl")
@RequiredArgsConstructor
public class InfluxdbDataVCvtImpl implements IDataVCvt {
@Resource
private DataVCvtMapper dataVCvtMapper;
/**
* @Description: 获取时间段内的数据
* @Param:
* @return: java.util.List<com.njcn.dataProcess.dto.DataVDTO>
* @Author: clam
* @Date: 2025/02/24
*/
@Override
public List<DataVCvt> getRawData(LineCountEvaluateParam lineParam) {
InfluxQueryWrapper influxQueryWrapper = new InfluxQueryWrapper(DataVCvt.class);
influxQueryWrapper.regular(DataV::getLineId,lineParam.getLineId()).between(DataV::getTime, lineParam.getStartTime(), lineParam.getEndTime());
List<DataVCvt> dataVCvts = dataVCvtMapper.selectByQueryWrapper(influxQueryWrapper);
return dataVCvts;
}
}

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

@@ -2,6 +2,7 @@ package com.njcn.dataProcess.service.impl.influxdb;
import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.collection.ListUtil;
import cn.hutool.core.date.LocalDateTimeUtil;
import com.github.jeffreyning.mybatisplus.service.MppServiceImpl;
import com.njcn.common.utils.HarmonicTimesUtil;
import com.njcn.dataProcess.constant.InfluxDBTableConstant;
@@ -14,6 +15,7 @@ import com.njcn.dataProcess.dto.LineDataVFiveItemDTO;
import com.njcn.dataProcess.param.LineCountEvaluateParam;
import com.njcn.dataProcess.po.influx.DataV;
import com.njcn.dataProcess.pojo.dto.CommonMinuteDto;
import com.njcn.dataProcess.pojo.dto.DataVCvtDTO;
import com.njcn.dataProcess.pojo.dto.DataVDto;
import com.njcn.dataProcess.pojo.po.RStatDataVD;
import com.njcn.dataProcess.service.IDataV;
@@ -114,7 +116,16 @@ public class InfluxdbDataVImpl extends MppServiceImpl<RStatDataVRelationMapper,
@Override
public List<LocalDateTime> monitoringTime(String lineId, String localData) {
return null;
InfluxQueryWrapper influxQueryWrapper = new InfluxQueryWrapper(DataV.class);
String startTime = localData+ InfluxDBTableConstant.START_TIME;
String endTime = localData+ InfluxDBTableConstant.END_TIME;
influxQueryWrapper.eq(DataV::getLineId,lineId).between(DataV::getTime, startTime, endTime);
List<DataV> dataVS = dataVMapper.selectByQueryWrapper(influxQueryWrapper);
List<LocalDateTime> result = dataVS.stream().map(temp->{
return LocalDateTime.ofInstant(temp.getTime(), ZoneId.systemDefault());
}).distinct().collect(Collectors.toList());
return result;
}
@Override
@@ -256,6 +267,30 @@ public class InfluxdbDataVImpl extends MppServiceImpl<RStatDataVRelationMapper,
dataVMapper.insertBatch(result);
}
@Override
public void batchInsertionCvtDTO(List<DataVCvtDTO> cvtDTOList) {
int totalCount = cvtDTOList.size();
if(totalCount<=0){
return;
}
List<DataV> collect = cvtDTOList.stream().map(temp ->
{
DataV dataV = new DataV();
BeanUtils.copyProperties(temp,dataV);
return dataV;
}).collect(Collectors.toList());
int minSize = Math.min(1200000, collect.size());
List<List<DataV>> partition = ListUtils.partition(collect, minSize);
for (List<DataV> dataVList : partition) {
List<DataV> sublistAsOriginalListType = new ArrayList<>(dataVList);
dataVMapper.insertBatch(sublistAsOriginalListType);
}
}
/**
* 按监测点集合、时间条件获取dataV分钟数据
* timeMap参数来判断是否进行数据出来 timeMap为空则不进行数据处理

54
data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/relation/RelationDataHarmrateVImpl.java
View File

@@ -1,56 +1,28 @@
package com.njcn.dataProcess.service.impl.relation;
import com.njcn.dataProcess.dao.relation.mapper.DataHarmphasicVRelationMapper;
import com.njcn.dataProcess.dao.relation.mapper.DataHarmrateVRelationMapper;
import com.njcn.dataProcess.dto.DataHarmrateVDTO;
import com.njcn.dataProcess.po.relation.DataHarmphasicV;
import com.njcn.dataProcess.po.relation.DataHarmrateV;
import com.njcn.dataProcess.service.IDataHarmrateV;
import com.njcn.dataProcess.util.BeanFeildUtils;
import com.njcn.dataProcess.dao.relation.mapper.DataIRelationMapper;
import com.njcn.dataProcess.param.LineCountEvaluateParam;
import com.njcn.dataProcess.pojo.dto.DataHarmDto;
import com.njcn.dataProcess.service.IDataHarmRateV;
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.util.Collections;
import java.util.List;
import java.util.stream.Collectors;
/**
* Description:
* Date: 2025/02/21 下午 3:15【需求编号】
*
* @author clam
* @version V1.0.0
* @author xy
*/
@Service("RelationDataHarmrateVImpl")
@Service("RelationDataHarmRateVImpl")
@RequiredArgsConstructor
public class RelationDataHarmrateVImpl implements IDataHarmrateV {
private final DataHarmrateVRelationMapper dataHarmrateVRelationMapper;
public class RelationDataHarmRateVImpl implements IDataHarmRateV {
@Resource
private DataIRelationMapper dataIRelationMapper;
@Override
public void batchInsertion(List<DataHarmrateVDTO> dataHarmrateVDTOList) {
int totalCount = dataHarmrateVDTOList.size();
int minSize = Math.min(120, totalCount);
if(totalCount<=0){
return;
}
List<DataHarmrateV> collect = dataHarmrateVDTOList.stream().map(temp -> {
DataHarmrateV dataHarmrateV = new DataHarmrateV();
BeanUtils.copyProperties(temp, dataHarmrateV, BeanFeildUtils.getNullPropertyNames(temp));
return dataHarmrateV;
}).collect(Collectors.toList());
collect = collect.stream().collect(Collectors.toMap(
temp -> temp.getTimeid() + temp.getLineid() + temp.getPhasicType(),
temp -> temp,
(exist, replace) -> exist
)).values().stream().collect(Collectors.toList());
List<List<DataHarmrateV>> partition = ListUtils.partition(collect, minSize);
for (List<DataHarmrateV> dataHarmphasicVList : partition) {
dataHarmrateVRelationMapper.insertBatchSomeColumn(dataHarmphasicVList);
}
public List<DataHarmDto> getRawData(LineCountEvaluateParam lineParam) {
return Collections.emptyList();
}
}

26
data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/relation/RelationDataVCvtImpl.java Normal file
View File

@@ -0,0 +1,26 @@
package com.njcn.dataProcess.service.impl.relation;
import com.njcn.dataProcess.dto.DataVDTO;
import com.njcn.dataProcess.param.LineCountEvaluateParam;
import com.njcn.dataProcess.po.influx.DataVCvt;
import com.njcn.dataProcess.service.IDataVCvt;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import java.util.List;
/**
* Description:
* Date: 2025/02/24 下午 3:34【需求编号】
*
* @author clam
* @version V1.0.0
*/
@Service("RelationDataVCvtImpl")
@RequiredArgsConstructor
public class RelationDataVCvtImpl implements IDataVCvt {
@Override
public List<DataVCvt> getRawData(LineCountEvaluateParam lineParam) {
return null;
}
}

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

@@ -10,6 +10,7 @@ import com.njcn.dataProcess.dto.DataVFiveItemDTO;
import com.njcn.dataProcess.param.LineCountEvaluateParam;
import com.njcn.dataProcess.po.relation.DataV;
import com.njcn.dataProcess.pojo.dto.CommonMinuteDto;
import com.njcn.dataProcess.pojo.dto.DataVCvtDTO;
import com.njcn.dataProcess.pojo.dto.DataVDto;
import com.njcn.dataProcess.pojo.po.RStatDataVD;
import com.njcn.dataProcess.service.IDataV;
@@ -116,5 +117,10 @@ public class RelationDataVImpl extends MppServiceImpl<RStatDataVRelationMapper,
}
@Override
public void batchInsertionCvtDTO(List<DataVCvtDTO> cvtDTOList) {
}
}

2
data-processing/data-processing-boot/src/main/resources/bootstrap.yml
View File

@@ -56,7 +56,7 @@ data:
source:
query: Influxdb
# insert: Influxdb
insert: Relation
insert: Influxdb
#mybatis配置信息
mybatis-plus:
configuration: