Microservice/pqs
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

代码合并

Browse Source
This commit is contained in:
雨木c
2022-11-10 15:40:19 +08:00
parent cc8979d589
commit 0d959fe747
67 changed files with 3894 additions and 601 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/api/line/HarmonicGeneralFeignClient.java Normal file
View File

@@ -0,0 +1,28 @@
package com.njcn.prepare.harmonic.api.line;
import com.njcn.common.pojo.constant.ServerInfo;
import com.njcn.common.pojo.response.HttpResult;
import com.njcn.prepare.harmonic.api.line.fallback.DistortionRateFeignClientFallbackFactory;
import com.njcn.prepare.harmonic.pojo.param.LineParam;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
/**
* 稳态综合评估
* @author xiaoyao
* @version 1.0.0
* @createTime 2022/11/7 15:11
*/
@FeignClient(
value = ServerInfo.HARMONIC_PREPARE,
path = "/general",
fallbackFactory = DistortionRateFeignClientFallbackFactory.class
)
public interface HarmonicGeneralFeignClient {
@PostMapping("/generalData")
HttpResult<String> generalData(@RequestBody @Validated LineParam lineParam);
}

27
pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/api/line/HarmonicMetricFeignClient.java Normal file
View File

@@ -0,0 +1,27 @@
package com.njcn.prepare.harmonic.api.line;
import com.njcn.common.pojo.constant.ServerInfo;
import com.njcn.common.pojo.response.HttpResult;
import com.njcn.prepare.harmonic.api.line.fallback.HarmonicMetricFeignClientFallbackFactory;
import com.njcn.prepare.harmonic.pojo.param.LineParam;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
/**
* @author xiaoyao
* @version 1.0.0
* @createTime 2022/11/7 15:12
*/
@FeignClient(
value = ServerInfo.HARMONIC_PREPARE,
path = "/metric",
fallbackFactory = HarmonicMetricFeignClientFallbackFactory.class
)
public interface HarmonicMetricFeignClient {
@PostMapping("/metricData")
HttpResult<String> metricData(@RequestBody @Validated LineParam lineParam);
}

8
pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/api/line/NormalLimitFeignClient.java
View File

@@ -10,8 +10,8 @@ import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
/**
* 自定义报表
* @author qijian
*
* @author denghaujun
* @date 2022/10/20
*/
@FeignClient(
@@ -22,8 +22,8 @@ import org.springframework.web.bind.annotation.RequestBody;
public interface NormalLimitFeignClient {
/**
* 批量处理报表
* @author qijian
*
* @author denghaujun
* @date 2022/10/19
*/
@PostMapping("/getNormLimitData")

5
pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/api/line/fallback/CoustomReportFeignClientFallbackFactory.java
View File

@@ -9,6 +9,7 @@ import com.njcn.prepare.harmonic.pojo.param.LineParam;
import feign.hystrix.FallbackFactory;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;
import org.springframework.web.bind.annotation.RequestBody;
/**
* ReportFeignClientFallbackFactory
@@ -32,8 +33,8 @@ public class CoustomReportFeignClientFallbackFactory implements FallbackFactory<
Enum<?> finalExceptionEnum = exceptionEnum;
return new CoustmReportFeignClient() {
@Override
public HttpResult<Boolean> batchReport(LineParam reportParam){
log.error("{}异常，降级处理，异常为：{}", "自定义报表预处理任务: ", throwable.toString());
public HttpResult<Boolean> batchReport(@RequestBody LineParam reportParam){
log.error("{}异常，降级处理，异常为：{}", "生成自定义报表: ", throwable.toString());
throw new BusinessException(finalExceptionEnum);
}
};

3
pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/api/line/fallback/DayDataFeignClientFallbackFactory.java
View File

@@ -9,6 +9,7 @@ import com.njcn.prepare.harmonic.pojo.param.LineParam;
import feign.hystrix.FallbackFactory;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;
import org.springframework.web.bind.annotation.RequestBody;
/**
* ReportFeignClientFallbackFactory
@@ -32,7 +33,7 @@ public class DayDataFeignClientFallbackFactory implements FallbackFactory<DayDat
Enum<?> finalExceptionEnum = exceptionEnum;
return new DayDataFeignClient() {
@Override
public HttpResult<Boolean> dayDataHanlder(LineParam jobParam){
public HttpResult<Boolean> dayDataHanlder(@RequestBody LineParam jobParam){
log.error("{}异常，降级处理，异常为：{}", "Date数据转Day数据: ", throwable.toString());
throw new BusinessException(finalExceptionEnum);
}

40
pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/api/line/fallback/HarmonicGeneralFeignClientFallbackFactory.java Normal file
View File

@@ -0,0 +1,40 @@
package com.njcn.prepare.harmonic.api.line.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.device.pq.utils.DeviceEnumUtil;
import com.njcn.prepare.harmonic.api.line.HarmonicGeneralFeignClient;
import com.njcn.prepare.harmonic.pojo.param.LineParam;
import feign.hystrix.FallbackFactory;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.RequestBody;
/**
* @author xiaoyao
* @version 1.0.0
* @createTime 2022/11/7 15:17
*/
@Slf4j
@Component
public class HarmonicGeneralFeignClientFallbackFactory implements FallbackFactory<HarmonicGeneralFeignClient> {
@Override
public HarmonicGeneralFeignClient create(Throwable throwable) {
Enum<?> exceptionEnum = CommonResponseEnum.SERVICE_FALLBACK;
if (throwable.getCause() instanceof BusinessException) {
BusinessException businessException = (BusinessException)throwable.getCause();
exceptionEnum = DeviceEnumUtil.getExceptionEnum(businessException.getResult());
}
Enum<?> finalExceptionEnum = exceptionEnum;
return new HarmonicGeneralFeignClient() {
@Override
public HttpResult<String> generalData(@RequestBody @Validated LineParam lineParam){
log.error("{}异常，降级处理，异常为：{}", "稳态综合评估: ", throwable.toString());
throw new BusinessException(finalExceptionEnum);
}
};
}
}

40
pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/api/line/fallback/HarmonicMetricFeignClientFallbackFactory.java Normal file
View File

@@ -0,0 +1,40 @@
package com.njcn.prepare.harmonic.api.line.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.device.pq.utils.DeviceEnumUtil;
import com.njcn.prepare.harmonic.api.line.HarmonicMetricFeignClient;
import com.njcn.prepare.harmonic.pojo.param.LineParam;
import feign.hystrix.FallbackFactory;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.RequestBody;
/**
* @author xiaoyao
* @version 1.0.0
* @createTime 2022/11/7 15:14
*/
@Slf4j
@Component
public class HarmonicMetricFeignClientFallbackFactory implements FallbackFactory<HarmonicMetricFeignClient> {
@Override
public HarmonicMetricFeignClient create(Throwable throwable) {
Enum<?> exceptionEnum = CommonResponseEnum.SERVICE_FALLBACK;
if (throwable.getCause() instanceof BusinessException) {
BusinessException businessException = (BusinessException)throwable.getCause();
exceptionEnum = DeviceEnumUtil.getExceptionEnum(businessException.getResult());
}
Enum<?> finalExceptionEnum = exceptionEnum;
return new HarmonicMetricFeignClient() {
@Override
public HttpResult<String> metricData(@RequestBody @Validated LineParam lineParam){
log.error("{}异常，降级处理，异常为：{}", "稳态指标评估: ", throwable.toString());
throw new BusinessException(finalExceptionEnum);
}
};
}
}

6
pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/api/line/fallback/IntegrityFeignClientFallbackFactory.java
View File

@@ -9,6 +9,8 @@ import com.njcn.prepare.harmonic.pojo.param.LineParam;
import feign.hystrix.FallbackFactory;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.RequestBody;
/**
* IntegrityFeignClientFallbackFactory
@@ -28,8 +30,8 @@ public class IntegrityFeignClientFallbackFactory implements FallbackFactory<Inte
Enum<?> finalExceptionEnum = exceptionEnum;
return new IntegrityFeignClient() {
@Override
public HttpResult<String> computeDataIntegrity(LineParam lineParam) {
log.error("{}异常，降级处理，异常为：{}", "数据完整性预处理: ", throwable.toString());
public HttpResult<String> computeDataIntegrity(@RequestBody @Validated LineParam lineParam) {
log.error("{}异常，降级处理，异常为：{}", "数据完整性处理: ", throwable.toString());
throw new BusinessException(finalExceptionEnum);
}
};

6
pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/api/line/fallback/LimitTargetFeignClientFallbackFactory.java
View File

@@ -9,6 +9,8 @@ import com.njcn.prepare.harmonic.pojo.param.LineParam;
import feign.hystrix.FallbackFactory;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.RequestBody;
/**
* ReportFeignClientFallbackFactory
@@ -32,8 +34,8 @@ public class LimitTargetFeignClientFallbackFactory implements FallbackFactory<Li
Enum<?> finalExceptionEnum = exceptionEnum;
return new LimitTargetFeignClient() {
@Override
public HttpResult<String> getLimitTargetData(LineParam lineParam) {
log.error("{}异常，降级处理，异常为：{}", "越限次数数据预处理: ", throwable.toString());
public HttpResult<String> getLimitTargetData(@RequestBody @Validated LineParam lineParam) {
log.error("{}异常，降级处理，异常为：{}", "越限数据: ", throwable.toString());
throw new BusinessException(finalExceptionEnum);
}
};

5
pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/api/line/fallback/LimitrateFeignClientFallbackFactory.java
View File

@@ -9,6 +9,7 @@ import com.njcn.prepare.harmonic.pojo.param.LineParam;
import feign.hystrix.FallbackFactory;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;
import org.springframework.web.bind.annotation.RequestBody;
/**
* ReportFeignClientFallbackFactory
@@ -32,8 +33,8 @@ public class LimitrateFeignClientFallbackFactory implements FallbackFactory<Limi
Enum<?> finalExceptionEnum = exceptionEnum;
return new LimitrateFeignClient() {
@Override
public HttpResult<Boolean> limitRateHanlder(LineParam limitRateHanlderParam ){
log.error("{}异常，降级处理，异常为：{}", "越限是否数据预处理: ", throwable.toString());
public HttpResult<Boolean> limitRateHanlder(@RequestBody LineParam limitRateHanlderParam ){
log.error("{}异常，降级处理，异常为：{}", "越限数据处理: ", throwable.toString());
throw new BusinessException(finalExceptionEnum);
}
};

2
pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/api/line/fallback/NormalFeignClientFallbackFactory.java
View File

@@ -29,7 +29,7 @@ public class NormalFeignClientFallbackFactory implements FallbackFactory<NormalL
return new NormalLimitFeignClient() {
@Override
public HttpResult<String> getNormLimitData(LineParam lineParam) {
log.error("{}异常，降级处理，异常为：{}", "告警数据预处理: ", throwable.toString());
log.error("{}异常，降级处理，异常为：{}", "告警数据: ", throwable.toString());
throw new BusinessException(finalExceptionEnum);
}
};

6
pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/api/line/fallback/OnlineRateFeignClientFallbackFactory.java
View File

@@ -9,6 +9,8 @@ import com.njcn.prepare.harmonic.pojo.param.LineParam;
import feign.hystrix.FallbackFactory;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.RequestBody;
/**
* OnlineRateFeignClientFallbackFactory
@@ -28,8 +30,8 @@ public class OnlineRateFeignClientFallbackFactory implements FallbackFactory<Onl
Enum<?> finalExceptionEnum = exceptionEnum;
return new OnlineRateFeignClient() {
@Override
public HttpResult<String> getOnlineRateData(LineParam lineParam){
log.error("{}异常，降级处理，异常为：{}", "在线率数据预处理: ", throwable.toString());
public HttpResult<String> getOnlineRateData(@RequestBody @Validated LineParam lineParam){
log.error("{}异常，降级处理，异常为：{}", "在线率: ", throwable.toString());
throw new BusinessException(finalExceptionEnum);
}
};

6
pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/api/line/fallback/PollutionFeignClientFallbackFactory.java
View File

@@ -9,6 +9,8 @@ import com.njcn.prepare.harmonic.pojo.param.LineParam;
import feign.hystrix.FallbackFactory;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.RequestBody;
/**
* PollutionFeignClientFallbackFactory
@@ -29,8 +31,8 @@ public class PollutionFeignClientFallbackFactory implements FallbackFactory<Poll
Enum<?> finalExceptionEnum = exceptionEnum;
return new PollutionFeignClient() {
@Override
public HttpResult<String> processPollutionData(LineParam lineParam){
log.error("{}异常，降级处理，异常为：{}", "污区数据预处理: ", throwable.toString());
public HttpResult<String> processPollutionData(@RequestBody @Validated LineParam lineParam){
log.error("{}异常，降级处理，异常为：{}", "污区数据: ", throwable.toString());
throw new BusinessException(finalExceptionEnum);
}
};

4
pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/DataFlickerPO.java
View File

@@ -40,4 +40,8 @@ public class DataFlickerPO {
@Column(name = "pst")
private Double pst;
//自定义字段
@Column(name = "count")
private Integer count;
}

2
pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/DataInHarmVPO.java
View File

@@ -182,5 +182,5 @@ public class DataInHarmVPO {
@Column(name = "v_50")
private Double v50;
}

3
pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/DataPltPO.java
View File

@@ -32,4 +32,7 @@ public class DataPltPO {
@Column(name = "flicker_all_time")
private Integer flickerAllTime;
//自定义字段
@Column(name = "mean")
private Double mean;
}

2
pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/DataPolluctionPO.java
View File

@@ -12,7 +12,7 @@ import java.time.Instant;
* @createTime 2022/10/21 13:45
*/
@Data
@Measurement(name = "data_polluction")
@Measurement(name = "harmonic_pollution")
public class DataPolluctionPO {
@Column(name = "line_id")

8
pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/DataVPO.java
View File

@@ -211,4 +211,12 @@ public class DataVPO {
//自定义字段-总计算次数
@Column(name = "all_time")
private Integer allTime;
//自定义字段
@Column(name = "mean")
private Double mean;
//自定义字段
@Column(name = "count")
private Integer count;
}

464
pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/MpSurplusAbnormalD.java Normal file
View File

@@ -0,0 +1,464 @@
package com.njcn.prepare.harmonic.pojo.po;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import java.time.LocalDateTime;
/**
* <p>
*
* </p>
*
* @author hongawen
* @since 2022-11-08
*/
@Data
@TableName("r_mp_surplus_abnormal_d")
public class MpSurplusAbnormalD{
private static final long serialVersionUID = 1L;
/**
* 统计数据时间
*/
private LocalDateTime timeId;
/**
* 越限监测点
*/
private String id;
/**
* 数据类型,’A’表示A相，’B’表示B相,’C’表示C相,’T’表示总
*/
private String phasicType;
/**
* 指标类型，’AVG’代表平均值平均值，‘MAX’代表最大值，‘MIN’代表最小值，‘CP95’代表CP95值
*/
private String valueType;
/**
* 电压上偏差数值
*/
private Float voltageDev = -3.14159f;
/**
* 电压下偏差数值
*/
private Float uvoltageDev = -3.14159f;
/**
* 三相电压不平衡度数值
*/
private Float ubalance = -3.14159f;
/**
* 闪变数值
*/
private Float flicker = -3.14159f;
/**
* 电压总畸变率数值
*/
private Float uaberrance = -3.14159f;
/**
* 负序电流
*/
private Float iNeg = -3.14159f;
/**
* 频率
*/
private Float freq = -3.14159f;
/**
* 2次谐波电压数值
*/
@TableField(value = "uharm_2")
private Float uharm2 = -3.14159f;
/**
* 3次谐波电压数值
*/
@TableField(value = "uharm_3")
private Float uharm3 = -3.14159f;
/**
* 4次谐波电压数值
*/
@TableField(value = "uharm_4")
private Float uharm4 = -3.14159f;
/**
* 5次谐波电压数值
*/
@TableField(value = "uharm_5")
private Float uharm5 = -3.14159f;
/**
* 6次谐波电压数值
*/
@TableField(value = "uharm_6")
private Float uharm6 = -3.14159f;
/**
* 7次谐波电压数值
*/
@TableField(value = "uharm_7")
private Float uharm7 = -3.14159f;
/**
* 8次谐波电压数值
*/
@TableField(value = "uharm_8")
private Float uharm8 = -3.14159f;
/**
* 9次谐波电压数值
*/
@TableField(value = "uharm_9")
private Float uharm9 = -3.14159f;
/**
* 10次谐波电压数值
*/
@TableField(value = "uharm_10")
private Float uharm10 = -3.14159f;
/**
* 11次谐波电压数值
*/
@TableField(value = "uharm_11")
private Float uharm11 = -3.14159f;
/**
* 12次谐波电压数值
*/
@TableField(value = "uharm_12")
private Float uharm12 = -3.14159f;
/**
* 13次谐波电压数值
*/
@TableField(value = "uharm_13")
private Float uharm13 = -3.14159f;
/**
* 14次谐波电压数值
*/
@TableField(value = "uharm_14")
private Float uharm14 = -3.14159f;
/**
* 15次谐波电压数值
*/
@TableField(value = "uharm_15")
private Float uharm15 = -3.14159f;
/**
* 16次谐波电压数值
*/
@TableField(value = "uharm_16")
private Float uharm16 = -3.14159f;
/**
* 17次谐波电压数值
*/
@TableField(value = "uharm_17")
private Float uharm17 = -3.14159f;
/**
* 18次谐波电压数值
*/
@TableField(value = "uharm_18")
private Float uharm18 = -3.14159f;
/**
* 19次谐波电压数值
*/
@TableField(value = "uharm_19")
private Float uharm19 = -3.14159f;
/**
* 20次谐波电压数值
*/
@TableField(value = "uharm_20")
private Float uharm20 = -3.14159f;
/**
* 21次谐波电压数值
*/
@TableField(value = "uharm_21")
private Float uharm21 = -3.14159f;
/**
* 22次谐波电压数值
*/
@TableField(value = "uharm_22")
private Float uharm22 = -3.14159f;
/**
* 23次谐波电压数值
*/
@TableField(value = "uharm_23")
private Float uharm23 = -3.14159f;
/**
* 24次谐波电压数值
*/
@TableField(value = "uharm_24")
private Float uharm24 = -3.14159f;
/**
* 25次谐波电压数值
*/
@TableField(value = "uharm_25")
private Float uharm25 = -3.14159f;
/**
* 2次谐波电流数值
*/
@TableField(value = "iharm_2")
private Float iharm2 = -3.14159f;
/**
* 3次谐波电流数值
*/
@TableField(value = "iharm_3")
private Float iharm3 = -3.14159f;
/**
* 4次谐波电流数值
*/
@TableField(value = "iharm_4")
private Float iharm4 = -3.14159f;
/**
* 5次谐波电流数值
*/
@TableField(value = "iharm_5")
private Float iharm5 = -3.14159f;
/**
* 6次谐波电流数值
*/
@TableField(value = "iharm_6")
private Float iharm6 = -3.14159f;
/**
* 7次谐波电流数值
*/
@TableField(value = "iharm_7")
private Float iharm7 = -3.14159f;
/**
* 8次谐波电流数值
*/
@TableField(value = "iharm_8")
private Float iharm8 = -3.14159f;
/**
* 9次谐波电流数值
*/
@TableField(value = "iharm_9")
private Float iharm9 = -3.14159f;
/**
* 10次谐波电流数值
*/
@TableField(value = "iharm_10")
private Float iharm10 = -3.14159f;
/**
* 11次谐波电流数值
*/
@TableField(value = "iharm_11")
private Float iharm11 = -3.14159f;
/**
* 12次谐波电流数值
*/
@TableField(value = "iharm_12")
private Float iharm12 = -3.14159f;
/**
* 13次谐波电流数值
*/
@TableField(value = "iharm_13")
private Float iharm13 = -3.14159f;
/**
* 14次谐波电流数值
*/
@TableField(value = "iharm_14")
private Float iharm14 = -3.14159f;
/**
* 15次谐波电流数值
*/
@TableField(value = "iharm_15")
private Float iharm15 = -3.14159f;
/**
* 16次谐波电流数值
*/
@TableField(value = "iharm_16")
private Float iharm16 = -3.14159f;
/**
* 17次谐波电流数值
*/
@TableField(value = "iharm_17")
private Float iharm17 = -3.14159f;
/**
* 18次谐波电流数值
*/
@TableField(value = "iharm_18")
private Float iharm18 = -3.14159f;
/**
* 19次谐波电流数值
*/
@TableField(value = "iharm_19")
private Float iharm19 = -3.14159f;
/**
* 20次谐波电流数值
*/
@TableField(value = "iharm_20")
private Float iharm20 = -3.14159f;
/**
* 21次谐波电流数值
*/
@TableField(value = "iharm_21")
private Float iharm21 = -3.14159f;
/**
* 22次谐波电流数值
*/
@TableField(value = "iharm_22")
private Float iharm22 = -3.14159f;
/**
* 23次谐波电流数值
*/
@TableField(value = "iharm_23")
private Float iharm23 = -3.14159f;
/**
* 24次谐波电流数值
*/
@TableField(value = "iharm_24")
private Float iharm24 = -3.14159f;
/**
* 25次谐波电流数值
*/
@TableField(value = "iharm_25")
private Float iharm25 = -3.14159f;
/**
* 0.5次间谐波电压数值
*/
@TableField(value = "inuharm_1")
private Float inuharm1 = -3.14159f;
/**
* 1.5次间谐波电压数值
*/
@TableField(value = "inuharm_2")
private Float inuharm2 = -3.14159f;
/**
* 2.5次间谐波电压数值
*/
@TableField(value = "inuharm_3")
private Float inuharm3 = -3.14159f;
/**
* 3.5次间谐波电压数值
*/
@TableField(value = "inuharm_4")
private Float inuharm4 = -3.14159f;
/**
* 4.5次间谐波电压数值
*/
@TableField(value = "inuharm_5")
private Float inuharm5 = -3.14159f;
/**
* 5.5次间谐波电压数值
*/
@TableField(value = "inuharm_6")
private Float inuharm6 = -3.14159f;
/**
* 6.5次间谐波电压数值
*/
@TableField(value = "inuharm_7")
private Float inuharm7 = -3.14159f;
/**
* 7.5次间谐波电压数值
*/
@TableField(value = "inuharm_8")
private Float inuharm8 = -3.14159f;
/**
* 8.5次间谐波电压数值
*/
@TableField(value = "inuharm_9")
private Float inuharm9 = -3.14159f;
/**
* 9.5次间谐波电压数值
*/
@TableField(value = "inuharm_10")
private Float inuharm10 = -3.14159f;
/**
* 10.5次间谐波电压数值
*/
@TableField(value = "inuharm_11")
private Float inuharm11 = -3.14159f;
/**
* 11.5次间谐波电压数值
*/
@TableField(value = "inuharm_12")
private Float inuharm12 = -3.14159f;
/**
* 12.5次间谐波电压数值
*/
@TableField(value = "inuharm_13")
private Float inuharm13 = -3.14159f;
/**
* 13.5次间谐波电压数值
*/
@TableField(value = "inuharm_14")
private Float inuharm14 = -3.14159f;
/**
* 14.5次间谐波电压数值
*/
@TableField(value = "inuharm_15")
private Float inuharm15 = -3.14159f;
/**
* 15.5次间谐波电压数值
*/
@TableField(value = "inuharm_16")
private Float inuharm16 = -3.14159f;
}

3
pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/PqsCommunicatePO.java
View File

@@ -22,6 +22,9 @@ public class PqsCommunicatePO {
@Column(name = "line_id")
private String lineId;
@Column(name = "dev_id")
private String devId;
@Column(name = "type")
private Integer type;

116
pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/RMpPollutionD.java
View File

@@ -21,7 +21,7 @@ public class RMpPollutionD implements Serializable {
private static final long serialVersionUID = 1L;
/**
* 监测点id
* 单位id
*/
@TableId(value = "line_id", type = IdType.AUTO)
private String lineId;
@@ -32,44 +32,14 @@ public class RMpPollutionD implements Serializable {
private LocalDateTime dataDate;
/**
* 频率偏差
* 污区图统计类型
*/
private Float freqDev;
private String pollutionType;
/**
* 电压偏差
* 统计值
*/
private Float vDev;
/**
* 三相电压不平衡度
*/
private Float vUnbalance;
/**
* 谐波电压(电压总谐波畸变率、各次谐波电压含有率)
*/
private Float vAll;
/**
* 长时闪变
*/
private Float plt;
/**
* 谐波电流
*/
private Float iAll;
/**
* 负序电流
*/
private Float iNeg;
/**
* 间谐波电压含有率
*/
private Float vInharm;
private Float value;
public String getLineId() {
return lineId;
@@ -85,76 +55,28 @@ public class RMpPollutionD implements Serializable {
public void setDataDate(LocalDateTime dataDate) {
this.dataDate = dataDate;
}
public Float getFreqDev() {
return freqDev;
public String getPollutionType() {
return pollutionType;
}
public void setFreqDev(Float freqDev) {
this.freqDev = freqDev;
public void setPollutionType(String pollutionType) {
this.pollutionType = pollutionType;
}
public Float getvDev() {
return vDev;
public Float getValue() {
return value;
}
public void setvDev(Float vDev) {
this.vDev = vDev;
}
public Float getvUnbalance() {
return vUnbalance;
}
public void setvUnbalance(Float vUnbalance) {
this.vUnbalance = vUnbalance;
}
public Float getvAll() {
return vAll;
}
public void setvAll(Float vAll) {
this.vAll = vAll;
}
public Float getPlt() {
return plt;
}
public void setPlt(Float plt) {
this.plt = plt;
}
public Float getiAll() {
return iAll;
}
public void setiAll(Float iAll) {
this.iAll = iAll;
}
public Float getiNeg() {
return iNeg;
}
public void setiNeg(Float iNeg) {
this.iNeg = iNeg;
}
public Float getvInharm() {
return vInharm;
}
public void setvInharm(Float vInharm) {
this.vInharm = vInharm;
public void setValue(Float value) {
this.value = value;
}
@Override
public String toString() {
return "RMpPollutionD{" +
"lineId=" + lineId +
", dataDate=" + dataDate +
", freqDev=" + freqDev +
", vDev=" + vDev +
", vUnbalance=" + vUnbalance +
", vAll=" + vAll +
", plt=" + plt +
", iAll=" + iAll +
", iNeg=" + iNeg +
", vInharm=" + vInharm +
"}";
return "RStatPollutionOrgD{" +
"lineId=" + lineId +
", dataDate=" + dataDate +
", pollutionType=" + pollutionType +
", value=" + value +
"}";
}
}

82
pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/RMpVThd.java Normal file
View File

@@ -0,0 +1,82 @@
package com.njcn.prepare.harmonic.pojo.po;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
import java.time.LocalDateTime;
/**
* <p>
* 谐波畸变率排名
* </p>
*
* @author xiaoyao
* @since 2022-11-07
*/
@TableName("r_mp_v_thd")
public class RMpVThd implements Serializable {
private static final long serialVersionUID = 1L;
/**
* 监测点ID
*/
@TableId(value = "measurement_point_id", type = IdType.AUTO)
private String measurementPointId;
/**
* 排名类型,字典表（0日，1月，2季，3年）
*/
private String dataType;
/**
* 时间
*/
private LocalDateTime dataDate;
/**
* 谐波畸变率
*/
private Float vThd;
public String getMeasurementPointId() {
return measurementPointId;
}
public void setMeasurementPointId(String measurementPointId) {
this.measurementPointId = measurementPointId;
}
public String getDataType() {
return dataType;
}
public void setDataType(String dataType) {
this.dataType = dataType;
}
public LocalDateTime getDataDate() {
return dataDate;
}
public void setDataDate(LocalDateTime dataDate) {
this.dataDate = dataDate;
}
public Float getvThd() {
return vThd;
}
public void setvThd(Float vThd) {
this.vThd = vThd;
}
@Override
public String toString() {
return "RMpVThd{" +
"measurementPointId=" + measurementPointId +
", dataType=" + dataType +
", dataDate=" + dataDate +
", vThd=" + vThd +
"}";
}
}

4
pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/line/LimitTargetPO.java
View File

@@ -9,7 +9,7 @@ import lombok.NoArgsConstructor;
import java.util.Date;
/**
*
*
* Description:
* 接口文档访问地址：http://serverIP:port/swagger-ui.html
* Date: 2022/10/20 18:26【需求编号】
@@ -475,4 +475,4 @@ public class LimitTargetPO {
*/
@TableField(value = "inuharm_16_overtime")
private Integer inuharm16Overtime;
}
}

4
pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/line/RMpFlickerReportDPO.java
View File

@@ -10,7 +10,7 @@ import lombok.Data;
import java.util.Date;
/**
*
*
* Description:
* 接口文档访问地址：http://serverIP:port/swagger-ui.html
* Date: 2022/10/26 14:15【需求编号】
@@ -98,4 +98,4 @@ public class RMpFlickerReportDPO {
@TableField(value = "SHORT_TERM_SEVERITY_95")
@ApiModelProperty(value="短时间闪变值-95值")
private Double shortTermSeverity95;
}
}

2
pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/line/RMpHarmonicPReportDPO.java
View File

@@ -5195,4 +5195,4 @@ public class RMpHarmonicPReportDPO {
public void setHarmonicActivePower5095(Double harmonicActivePower5095) {
this.harmonicActivePower5095 = harmonicActivePower5095;
}
}
}

2
pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/line/RMpInharmonicIMagReportDPO.java
View File

@@ -1441,4 +1441,4 @@ public class RMpInharmonicIMagReportDPO {
@TableField(value = "simple_harmonic_current_effective_50_cp95")
@ApiModelProperty(value = "49.5次间谐波电流有效值95值")
private Double simpleHarmonicCurrentEffective50Cp95;
}
}

2
pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/line/RMpInharmonicVRateReportDPO.java
View File

@@ -1441,4 +1441,4 @@ public class RMpInharmonicVRateReportDPO {
@TableField(value = "centre_harmonic_voltage_content50_cp95")
@ApiModelProperty(value = "49.5次间谐波电压含有率95值")
private Double centreHarmonicVoltageContent50Cp95;
}
}

4
pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/line/RMpMeasurePhaseReportDPO.java
View File

@@ -10,7 +10,7 @@ import lombok.Data;
import java.util.Date;
/**
*
*
* Description:
* 接口文档访问地址：http://serverIP:port/swagger-ui.html
* Date: 2022/10/28 10:53【需求编号】
@@ -322,4 +322,4 @@ public class RMpMeasurePhaseReportDPO {
@TableField(value = "sp_fundamental_power_factor_95")
@ApiModelProperty(value="单相基波功率因数-95值")
private Double spFundamentalPowerFactor95;
}
}

4
pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/line/RMpMeasureReportDPO.java
View File

@@ -10,7 +10,7 @@ import lombok.Data;
import java.util.Date;
/**
*
*
* Description:
* 接口文档访问地址：http://serverIP:port/swagger-ui.html
* Date: 2022/10/28 10:54【需求编号】
@@ -679,4 +679,4 @@ public class RMpMeasureReportDPO {
@TableField(value = "unbalanced_apparent_power_95")
@ApiModelProperty(value="不平衡视在功率-95值")
private Double unbalancedApparentPower95;
}
}

4
pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/po/line/RMpPltReportDPO.java
View File

@@ -10,7 +10,7 @@ import lombok.Data;
import java.util.Date;
/**
*
*
* Description:
* 接口文档访问地址：http://serverIP:port/swagger-ui.html
* Date: 2022/10/26 15:26【需求编号】
@@ -70,4 +70,4 @@ public class RMpPltReportDPO {
@TableField(value = "long_time_flashing_95")
@ApiModelProperty(value="长时间闪变值-95值")
private Double longTimeFlashing95;
}
}