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

谐波监测：畸变率异常bug

Browse Source
This commit is contained in:
wr
2023-04-24 15:28:07 +08:00
parent 04bd5d47c4
commit 28a5c8e73e
2 changed files with 156 additions and 159 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/HarmonicServiceImpl.java
View File

@@ -56,7 +56,6 @@ public class HarmonicServiceImpl implements IHarmonicService {
private final LineFeignClient lineFeignClient; private final LineFeignClient lineFeignClient;
private final RStatLimitTargetDMapper targetDMapper; private final RStatLimitTargetDMapper targetDMapper;
@Override @Override
public List<PollutionVO> getDeptSubstationRelations(HarmonicPublicParam harmonicPublicParam) { public List<PollutionVO> getDeptSubstationRelations(HarmonicPublicParam harmonicPublicParam) {
harmonicPublicParam.setServerName(generalInfo.getMicroServiceName()); harmonicPublicParam.setServerName(generalInfo.getMicroServiceName());
@@ -286,10 +285,8 @@ public class HarmonicServiceImpl implements IHarmonicService {
); );
return limitRates; return limitRates;
} }
/** /**
* 功能描述: 获取limitTarget数据 * 功能描述: 获取limitTarget数据
*
* @param lineList 部门列表 * @param lineList 部门列表
* @param startTime 开始时间 * @param startTime 开始时间
* @param endTime 结束时间 * @param endTime 结束时间
@@ -427,10 +424,13 @@ public class HarmonicServiceImpl implements IHarmonicService {
} }
/**
* todo
/** todo
* 功能描述: 处理区域(变电站)在线监测点数、超标监测点数、平均超标天数、占比 * 功能描述: 处理区域(变电站)在线监测点数、超标监测点数、平均超标天数、占比
*
* @param list 集合 * @param list 集合
* type 类型 * type 类型
* @return * @return
@@ -502,7 +502,6 @@ public class HarmonicServiceImpl implements IHarmonicService {
/** /**
* 功能描述: 处理区域在线监测点数、超标监测点数 * 功能描述: 处理区域在线监测点数、超标监测点数
*
* @param list 集合 * @param list 集合
* @return * @return
* @author xy * @author xy
@@ -511,7 +510,6 @@ public class HarmonicServiceImpl implements IHarmonicService {
private List<RStatLimitTargetDPO> getAllDataV(List<String> list, String startTime, String endTime){ private List<RStatLimitTargetDPO> getAllDataV(List<String> list, String startTime, String endTime){
return targetDMapper.getSumV(list,startTime,endTime); return targetDMapper.getSumV(list,startTime,endTime);
} }
private List<RStatLimitTargetDPO> getAllDataI(List<String> list, String startTime, String endTime){ private List<RStatLimitTargetDPO> getAllDataI(List<String> list, String startTime, String endTime){
return targetDMapper.getSumI(list,startTime,endTime); return targetDMapper.getSumI(list,startTime,endTime);
} }
@@ -519,14 +517,13 @@ public class HarmonicServiceImpl implements IHarmonicService {
/** /**
* 功能描述: 获取告警频次 * 功能描述: 获取告警频次
* * @author xy
* @param lineList 监测点id * @param lineList 监测点id
* @param startTime 开始时间 * @param startTime 开始时间
* @param endTime 结束时间 * @param endTime 结束时间
* @param type 类型 * @param type 类型
* @return
* @author xy
* @date 2022/4/24 16:47 * @date 2022/4/24 16:47
* @return
*/ */
private Integer getWarningInfo(List<String> lineList, String startTime, String endTime, String type) { private Integer getWarningInfo(List<String> lineList, String startTime, String endTime, String type) {
List<RStatLimitTargetDPO> sum=new ArrayList<>(); List<RStatLimitTargetDPO> sum=new ArrayList<>();
@@ -548,16 +545,16 @@ public class HarmonicServiceImpl implements IHarmonicService {
} }
/** /**
* 功能描述: 获取监测点超标天数 * 功能描述: 获取监测点超标天数
* * @author xy
* @param lineList 监测点id * @param lineList 监测点id
* @param startTime 开始时间 * @param startTime 开始时间
* @param endTime 结束时间 * @param endTime 结束时间
* @param type 类型 * @param type 类型
* @return
* @author xy
* @date 2022/4/24 16:47 * @date 2022/4/24 16:47
* @return
*/ */
private List<LimitTarget> getLineOverDays(List<String> lineList, String startTime, String endTime, String type) { private List<LimitTarget> getLineOverDays(List<String> lineList, String startTime, String endTime, String type) {
List<LimitTarget> listInfo=new ArrayList<>(); List<LimitTarget> listInfo=new ArrayList<>();

2
pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/DistortionRateServiceImpl.java
View File

@@ -74,7 +74,7 @@ public class DistortionRateServiceImpl implements DistortionRateService {
private List<DataVPO> getDistortionRateInfluxDb(String lineId, String date) { private List<DataVPO> getDistortionRateInfluxDb(String lineId, String date) {
String processParam = " and line_id = '" + lineId + "' and time >= '" + date + " 00:00:00' and time <= '" + date + " 23:59:59' tz('Asia/Shanghai')"; String processParam = " and line_id = '" + lineId + "' and time >= '" + date + " 00:00:00' and time <= '" + date + " 23:59:59' tz('Asia/Shanghai')";
QueryResult result = influxDbUtils.query ("SELECT line_id, max(v_thd) as v_thd FROM data_v WHERE phasic_type != 'T' and value_type = 'MAX'" + processParam); QueryResult result = influxDbUtils.query ("SELECT line_id, max(v_thd) as v_thd FROM data_v WHERE phasic_type != 'T' and value_type = 'CP95'" + processParam);
InfluxDBResultMapper resultMapper = new InfluxDBResultMapper ( ); InfluxDBResultMapper resultMapper = new InfluxDBResultMapper ( );
return resultMapper.toPOJO (result, DataVPO.class); return resultMapper.toPOJO (result, DataVPO.class);
} }