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

1.pms3.0稳态指标和暂态指标中部分部门排序

Browse Source
This commit is contained in:
wr
2024-02-02 10:23:10 +08:00
parent e8e0572485
commit a5119bbec0
11 changed files with 59 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -151,9 +151,9 @@
select
org_no,
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
TRUNCATE(avg(freq_pass_rate),2) freq_pass_rate,
TRUNCATE(avg(v_dev_pass_rate),2) v_dev_pass_rate,
TRUNCATE(avg(flicker_pass_rate),2) flicker_pass_rate
from
r_stat_org_m rso
<where>

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

@@ -150,9 +150,9 @@
select
org_no,
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
TRUNCATE(avg(freq_pass_rate),2) freq_pass_rate,
TRUNCATE(avg(v_dev_pass_rate),2) v_dev_pass_rate,
TRUNCATE(avg(flicker_pass_rate),2) flicker_pass_rate
from
r_stat_org_q rso
<where>

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

@@ -151,9 +151,9 @@
select
org_no,
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
TRUNCATE(avg(freq_pass_rate),2) freq_pass_rate,
TRUNCATE(avg(v_dev_pass_rate),2) v_dev_pass_rate,
TRUNCATE( avg(flicker_pass_rate),2) flicker_pass_rate
from
r_stat_org_y rso
<where>

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

@@ -39,6 +39,7 @@ import org.springframework.stereotype.Service;
import java.text.DecimalFormat;
import java.util.ArrayList;
import java.util.Comparator;
import java.util.List;
import java.util.Map;
import java.util.function.Function;
@@ -368,6 +369,7 @@ public class RStatOrgYServiceImpl extends ServiceImpl<RStatOrgYMapper, RStatOrgY
value.setSubstationName(dto1.getPowerrName());
}
});
rSubstationInfoVOS.sort(Comparator.comparing(x->x.getCityName()+";"+x.getSubstationName()));
}
return rSubstationInfoVOS;
}
@@ -412,9 +414,13 @@ public class RStatOrgYServiceImpl extends ServiceImpl<RStatOrgYMapper, RStatOrgY
for (RStatOrgIndexVO vo : info) {
if (dto.getCode().equals(vo.getOrgNo())) {
vo.setOrgName(dto.getName());
vo.setSort(dto.getSort());
}
}
}
if(CollUtil.isNotEmpty(info)){
info.sort(Comparator.comparing(RStatOrgIndexVO::getSort).reversed());
}
return info;
}