diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/day/RStatLimitTargetDPO.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/day/RStatLimitTargetDPO.java index ff51a48bc..85c72f29a 100644 --- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/day/RStatLimitTargetDPO.java +++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/day/RStatLimitTargetDPO.java @@ -45,29 +45,29 @@ public class RStatLimitTargetDPO{ /** * 闪变总计算次数 */ + @TableField(value = "flicker_all_time") + private Integer flickerAllTime; + + /** + * 闪变越限次数 + */ @TableField(value = "flicker_overtime") private Integer flickerOvertime; /** * 频率偏差越限次数 */ - @TableField(value = "flicker_all_time") - private Integer flickerAllTime; - - /** - * 电压偏差越限次数 - */ @TableField(value = "freq_dev_overtime") private Integer freqDevOvertime; /** - * 电压不平衡度越限次数 + * 电压偏差越限次数 */ @TableField(value = "voltage_dev_overtime") private Integer voltageDevOvertime; /** - * 闪变越限次数 + * 电压不平衡度越限次数 */ @TableField(value = "ubalance_overtime") private Integer ubalanceOvertime; diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/RStatLimitTargetVO.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/RStatLimitTargetVO.java index 4ecc49055..6b8b0904c 100644 --- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/RStatLimitTargetVO.java +++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/RStatLimitTargetVO.java @@ -17,24 +17,24 @@ public class RStatLimitTargetVO { * 频率偏差越限天数 */ @ApiModelProperty("频率偏差越限天数") - private Integer flickerAllTime = 0; + private Integer freqDevOvertime = 0; + + /** + * 闪变越限天数 + */ + @ApiModelProperty("闪变越限天数") + private Integer flickerOvertime = 0; /** * 电压偏差越限天数 */ @ApiModelProperty("电压偏差越限天数") - private Integer freqDevOvertime = 0; + private Integer voltageDevOvertime = 0; /** * 电压不平衡度越限天数 */ @ApiModelProperty("电压不平衡度越限天数") - private Integer voltageDevOvertime = 0; - - /** - * 闪变越限天数 - */ - @ApiModelProperty("闪变越限天数") private Integer ubalanceOvertime = 0; /** diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RStatLimitTargetDMapper.xml b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RStatLimitTargetDMapper.xml index aa1583f3b..33651fc47 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RStatLimitTargetDMapper.xml +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RStatLimitTargetDMapper.xml @@ -285,10 +285,8 @@