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

1.pms稳态指标bug解决

Browse Source
This commit is contained in:
雨木c
2024-02-22 10:24:47 +08:00
parent 70b1e81dd4
commit 46268894f1
4 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/ROperatingIndexDPO.java
View File

@@ -26,6 +26,7 @@ import java.time.LocalDate;
@TableName(value = "r_operating_index_d") @TableName(value = "r_operating_index_d")
@AllArgsConstructor @AllArgsConstructor
@NoArgsConstructor @NoArgsConstructor
@Deprecated
public class ROperatingIndexDPO { public class ROperatingIndexDPO {
/** /**
* 单位ID * 单位ID

2
pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/majornetwork/RStatHarmonicController.java
View File

@@ -87,7 +87,7 @@ public class RStatHarmonicController extends BaseController {
*/ */
@GetMapping("/getRStatHarmonicIconDate") @GetMapping("/getRStatHarmonicIconDate")
@OperateInfo(info = LogEnum.BUSINESS_COMMON) @OperateInfo(info = LogEnum.BUSINESS_COMMON)
@ApiOperation("稳态电铁-频率偏差-越线日期统计图") @ApiOperation("主网稳态指标每日统计图")
public HttpResult<List<RHarmonicPolylineVO>> getRStatHarmonicIconDate(RStatHarmonicMParam param) { public HttpResult<List<RHarmonicPolylineVO>> getRStatHarmonicIconDate(RStatHarmonicMParam param) {
String methodDescribe = getMethodDescribe("getRStatHarmonicIconDate"); String methodDescribe = getMethodDescribe("getRStatHarmonicIconDate");
List<RHarmonicPolylineVO> rStatHarmonicIcon = rStatHarmonicMService.getRStatHarmonicIconDate(param); List<RHarmonicPolylineVO> rStatHarmonicIcon = rStatHarmonicMService.getRStatHarmonicIconDate(param);

4
pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/majornetwork/mapping/RStatHarmonicMMapper.xml
View File

@@ -22,8 +22,8 @@
ROUND( sum( over_limit_measurement_average )/ count(*), 2 ) AS overLimitMeasurementAverage, ROUND( sum( over_limit_measurement_average )/ count(*), 2 ) AS overLimitMeasurementAverage,
sum( over_limit_measurement_accrued ) AS overLimitMeasurementAccrued, sum( over_limit_measurement_accrued ) AS overLimitMeasurementAccrued,
sum( over_Day ) AS overDay, sum( over_Day ) AS overDay,
ROUND( sum( over_limit_measurement_ratio_average )/ count(*), 2 ) AS overLimitMeasurementRatioAverage, ROUND( (sum( over_limit_measurement_ratio_average )/ count(*))*100, 2 ) AS overLimitMeasurementRatioAverage,
sum( over_limit_measurement_ratio_accrued ) AS overLimitMeasurementRatioAccrued ROUND(sum( over_limit_measurement_ratio_accrued )*100,2) AS overLimitMeasurementRatioAccrued
FROM FROM
r_stat_harmonic_m r_stat_harmonic_m
<where> <where>

2
pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RStatHarmonicMServiceImpl.java
View File

@@ -278,7 +278,7 @@ public class RStatHarmonicMServiceImpl extends ServiceImpl<RStatHarmonicMMapper,
//反防止参数查询数据报错 //反防止参数查询数据报错
Assert.isTrue( Assert.isTrue(
ObjectUtil.isNotNull(measurementDate) || ObjectUtil.isNotNull(harmonicDate) ObjectUtil.isNotNull(measurementDate) || ObjectUtil.isNotNull(harmonicDate)
, "干扰源类型或者指标类型为空,请检查入参是否准确"); , "监测点标签或者指标类型为空,请检查入参是否准确");
//获取主网id信息 //获取主网id信息
DictData mainnetData = dicDataFeignClient.getDicDataByCode(DicDataEnum.MAINNET_POINT.getCode()).getData(); DictData mainnetData = dicDataFeignClient.getDicDataByCode(DicDataEnum.MAINNET_POINT.getCode()).getData();