diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/ROperatingIndexDPO.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/ROperatingIndexDPO.java index e360133fa..5e2da8b5a 100644 --- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/ROperatingIndexDPO.java +++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/ROperatingIndexDPO.java @@ -26,6 +26,7 @@ import java.time.LocalDate; @TableName(value = "r_operating_index_d") @AllArgsConstructor @NoArgsConstructor +@Deprecated public class ROperatingIndexDPO { /** * 单位ID diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/majornetwork/RStatHarmonicController.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/majornetwork/RStatHarmonicController.java index bf24c3e86..e92d6e59f 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/majornetwork/RStatHarmonicController.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/majornetwork/RStatHarmonicController.java @@ -87,7 +87,7 @@ public class RStatHarmonicController extends BaseController { */ @GetMapping("/getRStatHarmonicIconDate") @OperateInfo(info = LogEnum.BUSINESS_COMMON) - @ApiOperation("稳态电铁-频率偏差-越线日期统计图") + @ApiOperation("主网稳态指标每日统计图") public HttpResult> getRStatHarmonicIconDate(RStatHarmonicMParam param) { String methodDescribe = getMethodDescribe("getRStatHarmonicIconDate"); List rStatHarmonicIcon = rStatHarmonicMService.getRStatHarmonicIconDate(param); diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/majornetwork/mapping/RStatHarmonicMMapper.xml b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/majornetwork/mapping/RStatHarmonicMMapper.xml index 59ae1009d..9a497f02d 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/majornetwork/mapping/RStatHarmonicMMapper.xml +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/majornetwork/mapping/RStatHarmonicMMapper.xml @@ -22,8 +22,8 @@ ROUND( sum( over_limit_measurement_average )/ count(*), 2 ) AS overLimitMeasurementAverage, sum( over_limit_measurement_accrued ) AS overLimitMeasurementAccrued, sum( over_Day ) AS overDay, - ROUND( sum( over_limit_measurement_ratio_average )/ count(*), 2 ) AS overLimitMeasurementRatioAverage, - sum( over_limit_measurement_ratio_accrued ) AS overLimitMeasurementRatioAccrued + ROUND( (sum( over_limit_measurement_ratio_average )/ count(*))*100, 2 ) AS overLimitMeasurementRatioAverage, + ROUND(sum( over_limit_measurement_ratio_accrued )*100,2) AS overLimitMeasurementRatioAccrued FROM r_stat_harmonic_m diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RStatHarmonicMServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RStatHarmonicMServiceImpl.java index 0d2c9472e..9a39409ff 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RStatHarmonicMServiceImpl.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RStatHarmonicMServiceImpl.java @@ -278,7 +278,7 @@ public class RStatHarmonicMServiceImpl extends ServiceImpl