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

接口调整

Browse Source
This commit is contained in:
xy
2024-07-16 09:21:10 +08:00
parent c1bfc2347f
commit 458b2347ed
12 changed files with 274 additions and 247 deletions
Download Patch File Download Diff File Expand all files Collapse all files

285
pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RStatLimitTargetDMapper.xml
View File

@@ -308,7 +308,7 @@
inuharm_15_overtime+
inuharm_16_overtime)>0,1,0)) AS allCount
FROM
r_stat_limit_target_d
r_stat_limit_rate_d
<where>
<if test=" ids != null and ids.size > 0">
AND my_index IN
@@ -353,160 +353,135 @@
</select>
<select id="getSumTargetDetails" resultType="com.njcn.harmonic.pojo.vo.RStatLimitTargetVO">
SELECT
my_index AS lineId,
SUM( freq_dev_overtime ) AS freqDevOvertime,
SUM( flicker_overtime ) AS flickerOvertime,
SUM( voltage_dev_overtime ) AS voltageDevOvertime,
SUM( ubalance_overtime ) AS ubalanceOvertime,
SUM( uaberrance_overtime ) AS uaberranceOvertime,
SUM( i_neg_overtime ) AS iNegOvertime,
sum(if((uaberrance_overtime+
uharm_2_overtime+
uharm_3_overtime+
uharm_4_overtime+
uharm_5_overtime+
uharm_6_overtime+
uharm_7_overtime+
uharm_8_overtime+
uharm_9_overtime+
uharm_10_overtime+
uharm_11_overtime+
uharm_12_overtime+
uharm_13_overtime+
uharm_14_overtime+
uharm_15_overtime+
uharm_16_overtime+
uharm_17_overtime+
uharm_18_overtime+
uharm_19_overtime+
uharm_20_overtime+
uharm_21_overtime+
uharm_22_overtime+
uharm_23_overtime+
uharm_24_overtime+
uharm_25_overtime)>0,1,0))as uharmOvertime,
sum(if((iharm_2_overtime+
iharm_3_overtime+
iharm_4_overtime+
iharm_5_overtime+
iharm_6_overtime+
iharm_7_overtime+
iharm_8_overtime+
iharm_9_overtime+
iharm_10_overtime+
iharm_11_overtime+
iharm_12_overtime+
iharm_13_overtime+
iharm_14_overtime+
iharm_15_overtime+
iharm_16_overtime+
iharm_17_overtime+
iharm_18_overtime+
iharm_19_overtime+
iharm_20_overtime+
iharm_21_overtime+
iharm_22_overtime+
iharm_23_overtime+
iharm_24_overtime+
iharm_25_overtime)>0,1,0)) as iharmOvertime,
sum(if((inuharm_1_overtime+
inuharm_2_overtime+
inuharm_3_overtime+
inuharm_4_overtime+
inuharm_5_overtime+
inuharm_6_overtime+
inuharm_7_overtime+
inuharm_8_overtime+
inuharm_9_overtime+
inuharm_10_overtime+
inuharm_11_overtime+
inuharm_12_overtime+
inuharm_13_overtime+
inuharm_14_overtime+
inuharm_15_overtime+
inuharm_16_overtime)>0,1,0)) as inuharmOvertime,
sum(if((freq_dev_overtime+
flicker_overtime+
voltage_dev_overtime+
ubalance_overtime+
uaberrance_overtime+
i_neg_overtime+
uharm_2_overtime+
uharm_3_overtime+
uharm_4_overtime+
uharm_5_overtime+
uharm_6_overtime+
uharm_7_overtime+
uharm_8_overtime+
uharm_9_overtime+
uharm_10_overtime+
uharm_11_overtime+
uharm_12_overtime+
uharm_13_overtime+
uharm_14_overtime+
uharm_15_overtime+
uharm_16_overtime+
uharm_17_overtime+
uharm_18_overtime+
uharm_19_overtime+
uharm_20_overtime+
uharm_21_overtime+
uharm_22_overtime+
uharm_23_overtime+
uharm_24_overtime+
uharm_25_overtime+
iharm_2_overtime+
iharm_3_overtime+
iharm_4_overtime+
iharm_5_overtime+
iharm_6_overtime+
iharm_7_overtime+
iharm_8_overtime+
iharm_9_overtime+
iharm_10_overtime+
iharm_11_overtime+
iharm_12_overtime+
iharm_13_overtime+
iharm_14_overtime+
iharm_15_overtime+
iharm_16_overtime+
iharm_17_overtime+
iharm_18_overtime+
iharm_19_overtime+
iharm_20_overtime+
iharm_21_overtime+
iharm_22_overtime+
iharm_23_overtime+
iharm_24_overtime+
iharm_25_overtime+
inuharm_1_overtime+
inuharm_2_overtime+
inuharm_3_overtime+
inuharm_4_overtime+
inuharm_5_overtime+
inuharm_6_overtime+
inuharm_7_overtime+
inuharm_8_overtime+
inuharm_9_overtime+
inuharm_10_overtime+
inuharm_11_overtime+
inuharm_12_overtime+
inuharm_13_overtime+
inuharm_14_overtime+
inuharm_15_overtime+
inuharm_16_overtime)>0,1,0)) as allOvertime
A.lineId,
SUM(
CASE
WHEN A.freqDevOvertime > 0
THEN 1
ELSE 0
END
) freqDevOvertime,
SUM(
CASE
WHEN A.flickerOvertime > 0
THEN 1
ELSE 0
END
) flickerOvertime,
SUM(
CASE
WHEN A.voltageDevOvertime > 0
THEN 1
ELSE 0
END
) voltageDevOvertime,
SUM(
CASE
WHEN A.ubalanceOvertime > 0
THEN 1
ELSE 0
END
) ubalanceOvertime,
SUM(
CASE
WHEN A.uaberranceOvertime > 0
THEN 1
ELSE 0
END
) uaberranceOvertime,
SUM(
CASE
WHEN A.iNegOvertime > 0
THEN 1
ELSE 0
END
) iNegOvertime,
SUM(
CASE
WHEN A.uharmOvertime > 0
THEN 1
ELSE 0
END
) uharmOvertime,
SUM(
CASE
WHEN A.iharmOvertime > 0
THEN 1
ELSE 0
END
) iharmOvertime,
SUM(
CASE
WHEN A.inuharmOvertime > 0
THEN 1
ELSE 0
END
) inuharmOvertime,
SUM(
CASE
WHEN A.allOvertime > 0
THEN 1
ELSE 0
END
) allOvertime
FROM
r_stat_limit_target_d
<where>
and time_id between #{startTime} and #{endTime}
<if test=" ids != null and ids.size > 0">
AND my_index IN
<foreach collection='ids' item='item' index="index" open='(' separator=',' close=')'>
#{item}
</foreach>
</if>
</where>
GROUP BY
my_index
(SELECT
time_id,
my_index AS lineId,
SUM(freq_dev_overtime) AS freqDevOvertime,
SUM(flicker_overtime) AS flickerOvertime,
SUM(voltage_dev_overtime) AS voltageDevOvertime,
SUM(ubalance_overtime) AS ubalanceOvertime,
SUM(uaberrance_overtime) AS uaberranceOvertime,
SUM(i_neg_overtime) AS iNegOvertime,
SUM(
IF(
(
uaberrance_overtime + uharm_2_overtime + uharm_3_overtime + uharm_4_overtime + uharm_5_overtime + uharm_6_overtime + uharm_7_overtime + uharm_8_overtime + uharm_9_overtime + uharm_10_overtime + uharm_11_overtime + uharm_12_overtime + uharm_13_overtime + uharm_14_overtime + uharm_15_overtime + uharm_16_overtime + uharm_17_overtime + uharm_18_overtime + uharm_19_overtime + uharm_20_overtime + uharm_21_overtime + uharm_22_overtime + uharm_23_overtime + uharm_24_overtime + uharm_25_overtime
) > 0,
1,
0
)
) AS uharmOvertime,
SUM(
IF(
(
iharm_2_overtime + iharm_3_overtime + iharm_4_overtime + iharm_5_overtime + iharm_6_overtime + iharm_7_overtime + iharm_8_overtime + iharm_9_overtime + iharm_10_overtime + iharm_11_overtime + iharm_12_overtime + iharm_13_overtime + iharm_14_overtime + iharm_15_overtime + iharm_16_overtime + iharm_17_overtime + iharm_18_overtime + iharm_19_overtime + iharm_20_overtime + iharm_21_overtime + iharm_22_overtime + iharm_23_overtime + iharm_24_overtime + iharm_25_overtime
) > 0,
1,
0
)
) AS iharmOvertime,
SUM(
IF(
(
inuharm_1_overtime + inuharm_2_overtime + inuharm_3_overtime + inuharm_4_overtime + inuharm_5_overtime + inuharm_6_overtime + inuharm_7_overtime + inuharm_8_overtime + inuharm_9_overtime + inuharm_10_overtime + inuharm_11_overtime + inuharm_12_overtime + inuharm_13_overtime + inuharm_14_overtime + inuharm_15_overtime + inuharm_16_overtime
) > 0,
1,
0
)
) AS inuharmOvertime,
SUM(
IF(
(
freq_dev_overtime + flicker_overtime + voltage_dev_overtime + ubalance_overtime + uaberrance_overtime + i_neg_overtime + uharm_2_overtime + uharm_3_overtime + uharm_4_overtime + uharm_5_overtime + uharm_6_overtime + uharm_7_overtime + uharm_8_overtime + uharm_9_overtime + uharm_10_overtime + uharm_11_overtime + uharm_12_overtime + uharm_13_overtime + uharm_14_overtime + uharm_15_overtime + uharm_16_overtime + uharm_17_overtime + uharm_18_overtime + uharm_19_overtime + uharm_20_overtime + uharm_21_overtime + uharm_22_overtime + uharm_23_overtime + uharm_24_overtime + uharm_25_overtime + iharm_2_overtime + iharm_3_overtime + iharm_4_overtime + iharm_5_overtime + iharm_6_overtime + iharm_7_overtime + iharm_8_overtime + iharm_9_overtime + iharm_10_overtime + iharm_11_overtime + iharm_12_overtime + iharm_13_overtime + iharm_14_overtime + iharm_15_overtime + iharm_16_overtime + iharm_17_overtime + iharm_18_overtime + iharm_19_overtime + iharm_20_overtime + iharm_21_overtime + iharm_22_overtime + iharm_23_overtime + iharm_24_overtime + iharm_25_overtime + inuharm_1_overtime + inuharm_2_overtime + inuharm_3_overtime + inuharm_4_overtime + inuharm_5_overtime + inuharm_6_overtime + inuharm_7_overtime + inuharm_8_overtime + inuharm_9_overtime + inuharm_10_overtime + inuharm_11_overtime + inuharm_12_overtime + inuharm_13_overtime + inuharm_14_overtime + inuharm_15_overtime + inuharm_16_overtime
) > 0,
1,
0
)
) AS allOvertime
FROM
`r_stat_limit_rate_d`
<where>
and time_id between #{startTime} and #{endTime}
<if test=" ids != null and ids.size > 0">
AND my_index IN
<foreach collection='ids' item='item' index="index" open='(' separator=',' close=')'>
#{item}
</foreach>
</if>
</where>
GROUP BY time_id,my_index) A
GROUP BY A.lineId
</select>
</mapper>

102
pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/ReportMapper.xml
View File

@@ -7,21 +7,21 @@
AVG( CASE WHEN value_type = 'AVG' THEN rms END ) AS meanValue,
MIN( CASE WHEN value_type = 'MIN' THEN rms END ) AS minValue,
MAX( CASE WHEN value_type = 'MAX' THEN rms END ) AS fmaxValue,
MAX( CASE WHEN rank = #{param.count} THEN rms END ) AS cp95Value
MAX( CASE WHEN rankSum = #{param.count} THEN rms END ) AS cp95Value
FROM
(
SELECT
phasic_type,
value_type,
rms,
rank
rankSum
FROM
(
SELECT
phasic_type,
value_type,
rms,
@rank := IF( @CI := phasic_type, @rank + 1, 1 ) AS rank,
@rankSum := IF( @CI := phasic_type, @rankSum + 1, 1 ) AS rankSum,
@CI := phasic_type
FROM
r_stat_data_i_d
@@ -61,21 +61,21 @@
AVG( CASE WHEN value_type = 'AVG' THEN rms END ) AS meanValue,
MIN( CASE WHEN value_type = 'MIN' THEN rms END ) AS minValue,
MAX( CASE WHEN value_type = 'MAX' THEN rms END ) AS fmaxValue,
MAX( CASE WHEN rank = #{param.count} THEN rms END ) AS cp95Value
MAX( CASE WHEN rankSum = #{param.count} THEN rms END ) AS cp95Value
FROM
(
SELECT
phasic_type,
value_type,
rms,
rank
rankSum
FROM
(
SELECT
phasic_type,
value_type,
rms,
@rank := IF( @CI = phasic_type, @rank + 1, 1 ) AS rank,
@rankSum := IF( @CI = phasic_type, @rankSum + 1, 1 ) AS rankSum,
@CI := phasic_type
FROM
r_stat_data_v_d
@@ -175,21 +175,21 @@
AVG( CASE WHEN value_type = 'AVG' THEN rms END ) AS meanValue,
MIN( CASE WHEN value_type = 'MIN' THEN rms END ) AS minValue,
MAX( CASE WHEN value_type = 'MAX' THEN rms END ) AS fmaxValue,
MAX( CASE WHEN rank = #{param.count} THEN rms END ) AS cp95Value
MAX( CASE WHEN rankSum = #{param.count} THEN rms END ) AS cp95Value
FROM
(
SELECT
phasic_type,
value_type,
rms,
rank
rankSum
FROM
(
SELECT
phasic_type,
value_type,
rms_lvr as rms,
@rank := IF( @CI = phasic_type, @rank + 1, 1 ) AS rank,
@rankSum := IF( @CI = phasic_type, @rankSum + 1, 1 ) AS rankSum,
@CI := phasic_type
FROM
r_stat_data_v_d
@@ -229,23 +229,23 @@
AVG( CASE WHEN value_type = 'AVG' THEN rms END ) AS meanValue,
MIN( CASE WHEN value_type = 'MIN' THEN rms END ) AS minValue,
MAX( CASE WHEN value_type = 'MAX' THEN rms END ) AS fmaxValue,
MAX( CASE WHEN rank = #{param.count} THEN rms END ) AS cp95Value
MAX( CASE WHEN rankSum = #{param.count} THEN rms END ) AS cp95Value
FROM
(
SELECT
phasic_type,
value_type,
rms,
rank
rankSum
FROM
(
SELECT
phasic_type,
value_type,
p as rms,
@rank :=
@rankSum :=
IF
( @CI = phasic_type, @rank + 1, 1 ) AS rank,
( @CI = phasic_type, @rankSum + 1, 1 ) AS rankSum,
@CI := phasic_type
FROM
r_stat_data_harmpower_p_d
@@ -288,23 +288,23 @@
AVG( CASE WHEN value_type = 'AVG' THEN rms END ) AS meanValue,
MIN( CASE WHEN value_type = 'MIN' THEN rms END ) AS minValue,
MAX( CASE WHEN value_type = 'MAX' THEN rms END ) AS fmaxValue,
MAX( CASE WHEN rank = #{param.count} THEN rms END ) AS cp95Value
MAX( CASE WHEN rankSum = #{param.count} THEN rms END ) AS cp95Value
FROM
(
SELECT
phasic_type,
value_type,
rms,
rank
rankSum
FROM
(
SELECT
phasic_type,
value_type,
pf as rms,
@rank :=
@rankSum :=
IF
( @CI = phasic_type, @rank + 1, 1 ) AS rank,
( @CI = phasic_type, @rankSum + 1, 1 ) AS rankSum,
@CI := phasic_type
FROM
r_stat_data_harmpower_p_d
@@ -347,23 +347,23 @@
AVG( CASE WHEN value_type = 'AVG' THEN rms END ) AS meanValue,
MIN( CASE WHEN value_type = 'MIN' THEN rms END ) AS minValue,
MAX( CASE WHEN value_type = 'MAX' THEN rms END ) AS fmaxValue,
MAX( CASE WHEN rank = #{param.count} THEN rms END ) AS cp95Value
MAX( CASE WHEN rankSum = #{param.count} THEN rms END ) AS cp95Value
FROM
(
SELECT
phasic_type,
value_type,
rms,
rank
rankSum
FROM
(
SELECT
phasic_type,
value_type,
q as rms,
@rank :=
@rankSum :=
IF
( @CI = phasic_type, @rank + 1, 1 ) AS rank,
( @CI = phasic_type, @rankSum + 1, 1 ) AS rankSum,
@CI := phasic_type
FROM
r_stat_data_harmpower_q_d
@@ -406,23 +406,23 @@
AVG( CASE WHEN value_type = 'AVG' THEN rms END ) AS meanValue,
MIN( CASE WHEN value_type = 'MIN' THEN rms END ) AS minValue,
MAX( CASE WHEN value_type = 'MAX' THEN rms END ) AS fmaxValue,
MAX( CASE WHEN rank = #{param.count} THEN rms END ) AS cp95Value
MAX( CASE WHEN rankSum = #{param.count} THEN rms END ) AS cp95Value
FROM
(
SELECT
phasic_type,
value_type,
rms,
rank
rankSum
FROM
(
SELECT
phasic_type,
value_type,
s as rms,
@rank :=
@rankSum :=
IF
( @CI = phasic_type, @rank + 1, 1 ) AS rank,
( @CI = phasic_type, @rankSum + 1, 1 ) AS rankSum,
@CI := phasic_type
FROM
r_stat_data_harmpower_s_d
@@ -465,23 +465,23 @@
AVG( CASE WHEN value_type = 'AVG' THEN rms END ) AS meanValue,
MIN( CASE WHEN value_type = 'MIN' THEN rms END ) AS minValue,
MAX( CASE WHEN value_type = 'MAX' THEN rms END ) AS fmaxValue,
MAX( CASE WHEN rank = #{param.count} THEN rms END ) AS cp95Value
MAX( CASE WHEN rankSum = #{param.count} THEN rms END ) AS cp95Value
FROM
(
SELECT
phasic_type,
value_type,
rms,
rank
rankSum
FROM
(
SELECT
phasic_type,
value_type,
plt as rms,
@rank :=
@rankSum :=
IF
( @CI = phasic_type, @rank + 1, 1 ) AS rank,
( @CI = phasic_type, @rankSum + 1, 1 ) AS rankSum,
@CI := phasic_type
FROM
r_stat_data_flicker_d
@@ -524,23 +524,23 @@
AVG( CASE WHEN value_type = 'AVG' THEN rms END ) AS meanValue,
MIN( CASE WHEN value_type = 'MIN' THEN rms END ) AS minValue,
MAX( CASE WHEN value_type = 'MAX' THEN rms END ) AS fmaxValue,
MAX( CASE WHEN rank = #{param.count} THEN rms END ) AS cp95Value
MAX( CASE WHEN rankSum = #{param.count} THEN rms END ) AS cp95Value
FROM
(
SELECT
phasic_type,
value_type,
rms,
rank
rankSum
FROM
(
SELECT
phasic_type,
value_type,
pst as rms,
@rank :=
@rankSum :=
IF
( @CI = phasic_type, @rank + 1, 1 ) AS rank,
( @CI = phasic_type, @rankSum + 1, 1 ) AS rankSum,
@CI := phasic_type
FROM
r_stat_data_flicker_d
@@ -583,21 +583,21 @@
AVG( CASE WHEN value_type = 'AVG' THEN rms END ) AS meanValue,
MIN( CASE WHEN value_type = 'MIN' THEN rms END ) AS minValue,
MAX( CASE WHEN value_type = 'MAX' THEN rms END ) AS fmaxValue,
MAX( CASE WHEN rank = #{param.count} THEN rms END ) AS cp95Value
MAX( CASE WHEN rankSum = #{param.count} THEN rms END ) AS cp95Value
FROM
(
SELECT
phasic_type,
value_type,
rms,
rank
rankSum
FROM
(
SELECT
phasic_type,
value_type,
vu_dev as rms,
@rank := IF( @CI := phasic_type, @rank + 1, 1 ) AS rank,
@rankSum := IF( @CI := phasic_type, @rankSum + 1, 1 ) AS rankSum,
@CI := phasic_type
FROM
r_stat_data_v_d
@@ -637,21 +637,21 @@
AVG( CASE WHEN value_type = 'AVG' THEN rms END ) AS meanValue,
MIN( CASE WHEN value_type = 'MIN' THEN rms END ) AS minValue,
MAX( CASE WHEN value_type = 'MAX' THEN rms END ) AS fmaxValue,
MAX( CASE WHEN rank = #{param.count} THEN rms END ) AS cp95Value
MAX( CASE WHEN rankSum = #{param.count} THEN rms END ) AS cp95Value
FROM
(
SELECT
phasic_type,
value_type,
rms,
rank
rankSum
FROM
(
SELECT
phasic_type,
value_type,
vl_dev as rms,
@rank := IF( @CI := phasic_type, @rank + 1, 1 ) AS rank,
@rankSum := IF( @CI := phasic_type, @rankSum + 1, 1 ) AS rankSum,
@CI := phasic_type
FROM
r_stat_data_v_d
@@ -691,21 +691,21 @@
AVG( CASE WHEN value_type = 'AVG' THEN rms END ) AS meanValue,
MIN( CASE WHEN value_type = 'MIN' THEN rms END ) AS minValue,
MAX( CASE WHEN value_type = 'MAX' THEN rms END ) AS fmaxValue,
MAX( CASE WHEN rank = #{param.count} THEN rms END ) AS cp95Value
MAX( CASE WHEN rankSum = #{param.count} THEN rms END ) AS cp95Value
FROM
(
SELECT
phasic_type,
value_type,
rms,
rank
rankSum
FROM
(
SELECT
phasic_type,
value_type,
v_thd as rms,
@rank := IF( @CI := phasic_type, @rank + 1, 1 ) AS rank,
@rankSum := IF( @CI := phasic_type, @rankSum + 1, 1 ) AS rankSum,
@CI := phasic_type
FROM
r_stat_data_v_d
@@ -745,21 +745,21 @@
AVG( CASE WHEN value_type = 'AVG' THEN rms END ) AS meanValue,
MIN( CASE WHEN value_type = 'MIN' THEN rms END ) AS minValue,
MAX( CASE WHEN value_type = 'MAX' THEN rms END ) AS fmaxValue,
MAX( CASE WHEN rank = #{param.count} THEN rms END ) AS cp95Value
MAX( CASE WHEN rankSum = #{param.count} THEN rms END ) AS cp95Value
FROM
(
SELECT
phasic_type,
value_type,
rms,
rank
rankSum
FROM
(
SELECT
phasic_type,
value_type,
i_thd as rms,
@rank := IF( @CI := phasic_type, @rank + 1, 1 ) AS rank,
@rankSum := IF( @CI := phasic_type, @rankSum + 1, 1 ) AS rankSum,
@CI := phasic_type
FROM
r_stat_data_i_d
@@ -799,21 +799,21 @@
AVG( CASE WHEN value_type = 'AVG' THEN rms END ) AS meanValue,
MIN( CASE WHEN value_type = 'MIN' THEN rms END ) AS minValue,
MAX( CASE WHEN value_type = 'MAX' THEN rms END ) AS fmaxValue,
MAX( CASE WHEN rank = #{param.count} THEN rms END ) AS cp95Value
MAX( CASE WHEN rankSum = #{param.count} THEN rms END ) AS cp95Value
FROM
(
SELECT
phasic_type,
value_type,
rms,
rank
rankSum
FROM
(
SELECT
phasic_type,
value_type,
freq as rms,
@rank := IF( @CI := phasic_type, @rank + 1, 1 ) AS rank,
@rankSum := IF( @CI := phasic_type, @rankSum + 1, 1 ) AS rankSum,
@CI := phasic_type
FROM
r_stat_data_v_d
@@ -853,21 +853,21 @@
AVG( CASE WHEN value_type = 'AVG' THEN rms END ) AS meanValue,
MIN( CASE WHEN value_type = 'MIN' THEN rms END ) AS minValue,
MAX( CASE WHEN value_type = 'MAX' THEN rms END ) AS fmaxValue,
MAX( CASE WHEN rank = #{param.count} THEN rms END ) AS cp95Value
MAX( CASE WHEN rankSum = #{param.count} THEN rms END ) AS cp95Value
FROM
(
SELECT
phasic_type,
value_type,
rms,
rank
rankSum
FROM
(
SELECT
phasic_type,
value_type,
freq_dev as rms,
@rank := IF( @CI := phasic_type, @rank + 1, 1 ) AS rank,
@rankSum := IF( @CI := phasic_type, @rankSum + 1, 1 ) AS rankSum,
@CI := phasic_type
FROM
r_stat_data_v_d

63
pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/GridServiceImpl.java
View File

@@ -20,6 +20,7 @@ import com.njcn.harmonic.pojo.po.day.RStatAssesDPO;
import com.njcn.harmonic.pojo.po.day.RStatDataPltDPO;
import com.njcn.harmonic.pojo.po.day.RStatLimitRateDPO;
import com.njcn.harmonic.pojo.po.day.RStatLimitTargetDPO;
import com.njcn.harmonic.pojo.vo.RStatLimitTargetVO;
import com.njcn.harmonic.pojo.vo.hebeinorth.AssessDetailVo;
import com.njcn.harmonic.pojo.vo.hebeinorth.AssessVo;
import com.njcn.harmonic.pojo.vo.hebeinorth.EvaluationLevelVo;
@@ -72,7 +73,6 @@ public class GridServiceImpl implements IGridService {
List<AssessVo> children = new ArrayList<>();
DeptGetLineParam deptGetLineParam = new DeptGetLineParam();
deptGetLineParam.setDeptId(param.getDeptIndex());
deptGetLineParam.setServerName("harmonic-boot");
deptGetLineParam.setLineRunFlag(0);
List<DeptGetChildrenMoreDTO> list = commTerminalGeneralClient.deptGetLine(deptGetLineParam).getData();
//获取监测点集合
@@ -124,7 +124,6 @@ public class GridServiceImpl implements IGridService {
//查询部门监测点关系
DeptGetLineParam deptGetLineParam = new DeptGetLineParam();
deptGetLineParam.setDeptId(param.getDeptIndex());
deptGetLineParam.setServerName("harmonic-boot");
deptGetLineParam.setLineRunFlag(0);
List<DeptGetChildrenMoreDTO> list = commTerminalGeneralClient.deptGetLine(deptGetLineParam).getData();
//获取监测点集合
@@ -166,7 +165,6 @@ public class GridServiceImpl implements IGridService {
//查询部门监测点关系
DeptGetLineParam deptGetLineParam = new DeptGetLineParam();
deptGetLineParam.setDeptId(param.getDeptIndex());
deptGetLineParam.setServerName("harmonic-boot");
deptGetLineParam.setLineRunFlag(0);
List<DeptGetChildrenMoreDTO> list = commTerminalGeneralClient.deptGetLine(deptGetLineParam).getData();
//获取监测点集合
@@ -270,7 +268,6 @@ public class GridServiceImpl implements IGridService {
List<EvaluationVo.Children> childrenList = new ArrayList<>();
DeptGetLineParam deptGetLineParam = new DeptGetLineParam();
deptGetLineParam.setDeptId(param.getDeptIndex());
deptGetLineParam.setServerName("harmonic-boot");
deptGetLineParam.setLineRunFlag(0);
List<DeptGetChildrenMoreDTO> list = commTerminalGeneralClient.deptGetLine(deptGetLineParam).getData();
//获取监测点集合
@@ -319,7 +316,6 @@ public class GridServiceImpl implements IGridService {
List<EvaluationLevelVo> result = new ArrayList<>();
DeptGetLineParam deptGetLineParam = new DeptGetLineParam();
deptGetLineParam.setDeptId(param.getDeptIndex());
deptGetLineParam.setServerName("harmonic-boot");
deptGetLineParam.setLineRunFlag(0);
List<DeptGetChildrenMoreDTO> list = commTerminalGeneralClient.deptGetLine(deptGetLineParam).getData();
//获取监测点集合
@@ -385,7 +381,6 @@ public class GridServiceImpl implements IGridService {
List<EvaluationLevelVo.EvaluationRatio> result = new ArrayList<>();
DeptGetLineParam deptGetLineParam = new DeptGetLineParam();
deptGetLineParam.setDeptId(param.getDeptIndex());
deptGetLineParam.setServerName("harmonic-boot");
deptGetLineParam.setLineRunFlag(0);
List<DeptGetChildrenMoreDTO> list = commTerminalGeneralClient.deptGetLine(deptGetLineParam).getData();
//获取监测点集合
@@ -430,7 +425,6 @@ public class GridServiceImpl implements IGridService {
List<EvaluationLevelVo.EvaluationDetail> result = new ArrayList<>();
DeptGetLineParam deptGetLineParam = new DeptGetLineParam();
deptGetLineParam.setDeptId(param.getDeptIndex());
deptGetLineParam.setServerName("harmonic-boot");
deptGetLineParam.setLineRunFlag(0);
List<DeptGetChildrenMoreDTO> list = commTerminalGeneralClient.deptGetLine(deptGetLineParam).getData();
//获取监测点集合
@@ -441,7 +435,7 @@ public class GridServiceImpl implements IGridService {
.collect(Collectors.toList());
if (CollUtil.isNotEmpty(lineList)) {
//获取监测点越限集合
List<RStatLimitTargetDPO> overLimitList = rStatLimitTargetDMapper.getSumTarget(lineList,param.getStartTime(),param.getEndTime());
List<RStatLimitTargetVO> overLimitList = rStatLimitTargetDMapper.getSumTargetDetails(lineList,param.getStartTime(),param.getEndTime());
//获取部门
List<DeptDTO> deptList = deptFeignClient.getDepSonDetailByDeptId(param.getDeptIndex()).getData();
deptList.forEach(item->{
@@ -453,7 +447,7 @@ public class GridServiceImpl implements IGridService {
List<String> ll = lineMap.get(item.getId());
detail.setOnlineNum(ll.size());
//筛选当前部门下监测点的超标数据
List<RStatLimitTargetDPO> list2 = overLimitList.stream().filter(it->ll.contains(it.getLineId())).collect(Collectors.toList());
List<RStatLimitTargetVO> list2 = overLimitList.stream().filter(it->ll.contains(it.getLineId())).collect(Collectors.toList());
EvaluationLevelVo.TargetDetail detail1 = new EvaluationLevelVo.TargetDetail();
detail1.setTargetName(DicDataEnum.FREQUENCY_DEV.getName());
EvaluationLevelVo.TargetDetail detail2 = new EvaluationLevelVo.TargetDetail();
@@ -464,47 +458,71 @@ public class GridServiceImpl implements IGridService {
detail4.setTargetName(DicDataEnum.FLICKER.getName());
EvaluationLevelVo.TargetDetail detail5 = new EvaluationLevelVo.TargetDetail();
detail5.setTargetName(DicDataEnum.phase_Voltage.getName());
EvaluationLevelVo.TargetDetail detail6 = new EvaluationLevelVo.TargetDetail();
detail6.setTargetName(DicDataEnum.NEG_CURRENT.getName());
EvaluationLevelVo.TargetDetail detail7 = new EvaluationLevelVo.TargetDetail();
detail7.setTargetName(DicDataEnum.HARMONIC_CURRENT.getName());
EvaluationLevelVo.TargetDetail detail8 = new EvaluationLevelVo.TargetDetail();
detail8.setTargetName(DicDataEnum.HARMONIC_VOLTAGE.getName());
EvaluationLevelVo.TargetDetail detail9 = new EvaluationLevelVo.TargetDetail();
detail9.setTargetName(DicDataEnum.INTERHARMONIC_VOLTAGE.getName());
if (CollUtil.isNotEmpty(list2)) {
//筛选出五项指标(电压偏差、频率偏差、电压总谐波畸变率、电压闪变、三相电压不平衡度)超标监测点
long allNum = list2.stream().filter(o->o.getFreqDevOvertime() > 0
|| o.getVoltageDevOvertime() > 0
|| o.getFlickerOvertime() > 0
|| o.getUaberranceOvertime() > 0
|| o.getUbalanceOvertime() > 0).count();
//筛选出9项指标(电压偏差、频率偏差、电压总谐波畸变率、电压闪变、三相电压不平衡度、负序电流、谐波电流、间谐波电压、谐波电压)超标监测点
long allNum = list2.stream().filter(o->o.getAllOvertime() > 0).count();
detail.setOverNum((int) allNum);
detail.setOverRatio(PubUtils.doubleRound(2,detail.getOverNum()*100.0/detail.getOnlineNum()));
//筛选出电压偏差超标监测点
long num1 = list2.stream().filter(o->o.getFreqDevOvertime() > 0).count();
Integer day1 = list2.stream().max(Comparator.comparingInt(RStatLimitTargetDPO::getFreqDevOvertime)).get().getFreqDevOvertime();
Integer day1 = list2.stream().max(Comparator.comparingInt(RStatLimitTargetVO::getFreqDevOvertime)).get().getFreqDevOvertime();
detail1.setOverNum((int) num1);
detail1.setOverDay(day1);
//筛选出频率偏差超标监测点
long num2 = list2.stream().filter(o->o.getVoltageDevOvertime() > 0).count();
Integer day2 = list2.stream().max(Comparator.comparingInt(RStatLimitTargetDPO::getVoltageDevOvertime)).get().getVoltageDevOvertime();
Integer day2 = list2.stream().max(Comparator.comparingInt(RStatLimitTargetVO::getVoltageDevOvertime)).get().getVoltageDevOvertime();
detail2.setOverNum((int) num2);
detail2.setOverDay(day2);
//筛选出电压总谐波畸变率超标监测点
long num3 = list2.stream().filter(o->o.getUaberranceOvertime() > 0).count();
Integer day3 = list2.stream().max(Comparator.comparingInt(RStatLimitTargetDPO::getUaberranceOvertime)).get().getUaberranceOvertime();
Integer day3 = list2.stream().max(Comparator.comparingInt(RStatLimitTargetVO::getUaberranceOvertime)).get().getUaberranceOvertime();
detail3.setOverNum((int) num3);
detail3.setOverDay(day3);
//筛选出电压闪变超标监测点
long num4 = list2.stream().filter(o->o.getFlickerOvertime() > 0).count();
Integer day4 = list2.stream().max(Comparator.comparingInt(RStatLimitTargetDPO::getFlickerOvertime)).get().getFlickerOvertime();
Integer day4 = list2.stream().max(Comparator.comparingInt(RStatLimitTargetVO::getFlickerOvertime)).get().getFlickerOvertime();
detail4.setOverNum((int) num4);
detail4.setOverDay(day4);
//筛选出三相电压不平衡度超标监测点
long num5 = list2.stream().filter(o->o.getUbalanceOvertime() > 0).count();
Integer day5 = list2.stream().max(Comparator.comparingInt(RStatLimitTargetDPO::getUbalanceOvertime)).get().getUbalanceOvertime();
Integer day5 = list2.stream().max(Comparator.comparingInt(RStatLimitTargetVO::getUbalanceOvertime)).get().getUbalanceOvertime();
detail5.setOverNum((int) num5);
detail5.setOverDay(day5);
//筛选出负序电流超标监测点
long num6 = list2.stream().filter(o->o.getINegOvertime() > 0).count();
Integer day6 = list2.stream().max(Comparator.comparingInt(RStatLimitTargetVO::getINegOvertime)).get().getINegOvertime();
detail6.setOverNum((int) num6);
detail6.setOverDay(day6);
long num7 = list2.stream().filter(o->o.getIharmOvertime() > 0).count();
Integer day7 = list2.stream().max(Comparator.comparingInt(RStatLimitTargetVO::getIharmOvertime)).get().getIharmOvertime();
detail7.setOverNum((int) num7);
detail7.setOverDay(day7);
long num8 = list2.stream().filter(o->o.getUharmOvertime() > 0).count();
Integer day8 = list2.stream().max(Comparator.comparingInt(RStatLimitTargetVO::getUharmOvertime)).get().getUharmOvertime();
detail8.setOverNum((int) num8);
detail8.setOverDay(day8);
long num9 = list2.stream().filter(o->o.getInuharmOvertime() > 0).count();
Integer day9 = list2.stream().max(Comparator.comparingInt(RStatLimitTargetVO::getInuharmOvertime)).get().getInuharmOvertime();
detail9.setOverNum((int) num9);
detail9.setOverDay(day9);
}
List<EvaluationLevelVo.TargetDetail> details = Arrays.asList(detail1, detail2, detail3, detail4, detail5);
List<EvaluationLevelVo.TargetDetail> details = Arrays.asList(detail1, detail2, detail3, detail4, detail5, detail6, detail7, detail8, detail9);
detail.setList(details);
}
result.add(detail);
@@ -519,7 +537,6 @@ public class GridServiceImpl implements IGridService {
List<EvaluationLevelVo.QualifiedDetail> result = new ArrayList<>();
DeptGetLineParam deptGetLineParam = new DeptGetLineParam();
deptGetLineParam.setDeptId(param.getDeptIndex());
deptGetLineParam.setServerName("harmonic-boot");
deptGetLineParam.setLineRunFlag(0);
List<DeptGetChildrenMoreDTO> list = commTerminalGeneralClient.deptGetLine(deptGetLineParam).getData();
//获取监测点集合

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

@@ -259,7 +259,7 @@ public class RStatLimitServiceImpl implements RStatLimitService {
List<String> online = onData.stream().flatMap(x -> x.getLineIndexes().stream()).distinct().collect(Collectors.toList());
StatSubstationBizBaseParam baseParam=new StatSubstationBizBaseParam();
baseParam.setIds(online);
baseParam.setIds(line);
baseParam.setStartTime(DateUtil.beginOfDay(DateUtil.parse(param.getSearchBeginTime())).toString());
baseParam.setEndTime(DateUtil.endOfDay(DateUtil.parse(param.getSearchEndTime())).toString());
List<String> linesTarget=targetDService.getLinesTarget(baseParam);