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

pms算法调整

Browse Source
This commit is contained in:
雨木c
2023-09-28 15:53:13 +08:00
parent 5523c4b1be
commit d38557765c
9 changed files with 33 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/RStatDevSignalDMapper.java
View File

@@ -11,6 +11,12 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
*/
public interface RStatDevSignalDMapper extends BaseMapper<RStatDevSignalD> {
/**
* 获取最新的装置状态
* @author cdf
* @date 2023/9/28
*/
}

2
pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/dto/PollutionLineDTO.java
View File

@@ -34,7 +34,7 @@ public class PollutionLineDTO {
private String busBar;
@ApiModelProperty("数据")
private Double data = -1.0;
private Double data = 3.14159;
@Data
public static class PVPollution extends PollutionLineDTO{

2
pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/dto/PollutionSubstationDTO.java
View File

@@ -25,6 +25,6 @@ public class PollutionSubstationDTO {
private String voltageLevel;
@ApiModelProperty("数据")
private Double data = -1.0;
private Double data = 3.14159;
}

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

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

2
pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/PollutionSubstationVO.java
View File

@@ -45,7 +45,7 @@ public class PollutionSubstationVO {
private String pollutionStatis;
@ApiModelProperty("污染指标值")
private Double pollutionData = -1.0;
private Double pollutionData = 3.14159;
}

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

@@ -150,10 +150,10 @@
<select id="getMonthRStatOrgIndex" resultType="com.njcn.harmonic.pojo.vo.RStatOrgIndexVO$RStatOrgIndexInfoVO">
select
org_no,
effective_measurement_accrued as allCount,
freq_pass_rate,
v_dev_pass_rate,
flicker_pass_rate
sum(effective_measurement_accrued) as allCount,
avg(freq_pass_rate) freq_pass_rate,
avg(v_dev_pass_rate) v_dev_pass_rate,
avg(flicker_pass_rate) flicker_pass_rate
from
r_stat_org_m rso
<where>
@@ -170,6 +170,7 @@
<if test="param!=null and param.endTime != null and param.endTime != ''">
AND rso.data_date &lt;= #{param.endTime}
</if>
group by org_no
</where>
</select>
<select id="getPwMonthRStatOrgIndex" resultType="com.njcn.harmonic.pojo.vo.PwRStatOrgVO">

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

@@ -149,10 +149,10 @@
<select id="getQuarterRStatOrgIndex" resultType="com.njcn.harmonic.pojo.vo.RStatOrgIndexVO$RStatOrgIndexInfoVO">
select
org_no,
effective_measurement_accrued as allCount,
freq_pass_rate,
v_dev_pass_rate,
flicker_pass_rate
sum(effective_measurement_accrued) as allCount,
avg(freq_pass_rate) freq_pass_rate,
avg(v_dev_pass_rate) v_dev_pass_rate,
avg(flicker_pass_rate) flicker_pass_rate
from
r_stat_org_q rso
<where>
@@ -169,6 +169,7 @@
<if test="param!=null and param.endTime != null and param.endTime != ''">
AND rso.data_date &lt;= #{param.endTime}
</if>
group by org_no
</where>
</select>
<select id="getPwQuarterRStatOrgIndex" resultType="com.njcn.harmonic.pojo.vo.PwRStatOrgVO">

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

@@ -150,10 +150,10 @@
<select id="getYearRStatOrgIndex" resultType="com.njcn.harmonic.pojo.vo.RStatOrgIndexVO$RStatOrgIndexInfoVO">
select
org_no,
effective_measurement_accrued as allCount,
freq_pass_rate,
v_dev_pass_rate,
flicker_pass_rate
sum(effective_measurement_accrued) as allCount,
avg(freq_pass_rate) freq_pass_rate,
avg(v_dev_pass_rate) v_dev_pass_rate,
avg(flicker_pass_rate) flicker_pass_rate
from
r_stat_org_y rso
<where>
@@ -170,6 +170,7 @@
<if test="param!=null and param.endTime != null and param.endTime != ''">
AND rso.data_date &lt;= #{param.endTime}
</if>
group by org_no
</where>
</select>
<select id="getPwYearRStatOrgIndex" resultType="com.njcn.harmonic.pojo.vo.PwRStatOrgVO">

6
pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/PollutionSubstationServiceImpl.java
View File

@@ -184,15 +184,15 @@ public class PollutionSubstationServiceImpl extends ServiceImpl<RStatPollutionSu
//获取统计类型
pmsDeviceInfoParam.setStatisticalType(harmonicPublicParam.getStatisticalType());
//获取主网台账信息
List<PmsGeneralDeviceDTO> deviceList = pmsGeneralDeviceInfoClient.getPmsDeviceInfoWithInOrg(pmsDeviceInfoParam).getData();
deviceList.forEach(temp -> {
List<PmsGeneralDeviceDTO> orgList = pmsGeneralDeviceInfoClient.getPmsDeviceInfoWithInOrg(pmsDeviceInfoParam).getData();
orgList.forEach(temp -> {
PollutionVO pollutionVO = new PollutionVO ();
String detpid = temp.getIndex ();
String name =temp.getName ();
List<String> powers = temp.getPowerrIdList ( );
pollutionVO.setId (detpid);
pollutionVO.setName (name+"\n("+temp.getMonitorIdList().size()+")");
pollutionVO.setData (-1.0);
pollutionVO.setData (3.14159);
setData(harmonicPublicParam, pollutionType, searchBeginTime,harmonicPublicParam.getSearchEndTime(), pollutionVO, detpid);
if(CollectionUtil.isNotEmpty(powers)) {
//子集变电站