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

合并代码

Browse Source
This commit is contained in:
hongawen
2022-11-23 16:15:35 +08:00
parent dba5edcd35
commit dce2972202
83 changed files with 1078 additions and 639 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/distribution/mapping/PwRStatOrgMapper.xml
View File

@@ -7,7 +7,7 @@
select
org_no,
data_date,
measurement_type_class,
measurement_type_class as monitorSort,
all_count,
effective_measurement_average,
effective_measurement_accrued,
@@ -25,6 +25,12 @@
#{item}
</foreach>
</if>
<if test="param != null and param.ids != null and param.ids.size > 0">
AND measurement_type_class IN
<foreach collection='param.ids' item='item' index="index" open='(' separator=',' close=')'>
#{item}
</foreach>
</if>
<if test="param!=null and param.startTime != null and param.startTime !=''">
AND data_date >= #{param.startTime}
</if>
@@ -37,7 +43,7 @@
select
org_no,
data_date,
measurement_type_class,
measurement_type_class as monitorSort,
all_count,
effective_measurement_average,
effective_measurement_accrued,
@@ -55,6 +61,12 @@
#{item}
</foreach>
</if>
<if test="param != null and param.ids != null and param.ids.size > 0">
AND measurement_type_class IN
<foreach collection='param.ids' item='item' index="index" open='(' separator=',' close=')'>
#{item}
</foreach>
</if>
<if test="param!=null and param.startTime != null and param.startTime !=''">
AND data_date >= #{param.startTime}
</if>
@@ -67,12 +79,12 @@
select
org_no,
data_date,
measurement_type_class,
measurement_type_class as monitorSort,
all_count,
effective_measurement_average,
effective_measurement_accrued,
harmonic_measurement_average,
harmonic_measurement_accrued,
harmonic_measurement_average as overLimitMeasurementAverage,
harmonic_measurement_accrued as overLimitMeasurementAccrued,
harmonic_measurement_ratio_average,
TRUNCATE(harmonic_measurement_accrued / effective_measurement_accrued ,2) as harmonicMeasurementRatioAccrued,
TRUNCATE(over_day_accrued / effective_measurement_accrued ,2) as averageOverDay
@@ -85,6 +97,12 @@
#{item}
</foreach>
</if>
<if test="param != null and param.ids != null and param.ids.size > 0">
AND measurement_type_class IN
<foreach collection='param.ids' item='item' index="index" open='(' separator=',' close=')'>
#{item}
</foreach>
</if>
<if test="param!=null and param.startTime != null and param.startTime !=''">
AND data_date >= #{param.startTime}
</if>

16
pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/majornetwork/RStatHarmonicDMapper.java
View File

@@ -1,7 +1,11 @@
package com.njcn.harmonic.mapper.majornetwork;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.njcn.harmonic.pojo.param.StatSubstationBizBaseParam;
import com.njcn.harmonic.pojo.po.RStatHarmonicD;
import org.apache.ibatis.annotations.Param;
import java.util.List;
/**
* <p>
@@ -13,4 +17,16 @@ import com.njcn.harmonic.pojo.po.RStatHarmonicD;
*/
public interface RStatHarmonicDMapper extends BaseMapper<RStatHarmonicD> {
/**
* 查询全部
* @param param
* @param dataType
* @param measurementId
* @param harmonicId
* @return
*/
List<RStatHarmonicD> selectInfoList(@Param("param") StatSubstationBizBaseParam param,
@Param("dataType") String dataType,
@Param("measurementId") String measurementId,
@Param("harmonicId") String harmonicId);
}

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

@@ -1,7 +1,11 @@
package com.njcn.harmonic.mapper.majornetwork;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.njcn.harmonic.pojo.param.StatSubstationBizBaseParam;
import com.njcn.harmonic.pojo.po.RStatHarmonicM;
import org.apache.ibatis.annotations.Param;
import java.util.List;
/**
* <p>
@@ -13,5 +17,12 @@ import com.njcn.harmonic.pojo.po.RStatHarmonicM;
*/
public interface RStatHarmonicMMapper extends BaseMapper<RStatHarmonicM> {
/**
* 查询监测点
* @param param
* @param dataType
* @return
*/
List<RStatHarmonicM> selectInfoList(@Param("param") StatSubstationBizBaseParam param,
@Param("dataType") String dataType);
}

12
pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/majornetwork/RStatHarmonicQMapper.java
View File

@@ -1,7 +1,11 @@
package com.njcn.harmonic.mapper.majornetwork;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.njcn.harmonic.pojo.param.StatSubstationBizBaseParam;
import com.njcn.harmonic.pojo.po.RStatHarmonicQ;
import org.apache.ibatis.annotations.Param;
import java.util.List;
/**
* <p>
@@ -13,4 +17,12 @@ import com.njcn.harmonic.pojo.po.RStatHarmonicQ;
*/
public interface RStatHarmonicQMapper extends BaseMapper<RStatHarmonicQ> {
/**
* 查询监测点
* @param param
* @param dataType
* @return
*/
List<RStatHarmonicQ> selectInfoList(@Param("param") StatSubstationBizBaseParam param,
@Param("dataType") String dataType);
}

17
pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/majornetwork/RStatHarmonicVoltageMMapper.java
View File

@@ -1,7 +1,12 @@
package com.njcn.harmonic.mapper.majornetwork;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.njcn.harmonic.pojo.param.StatSubstationBizBaseParam;
import com.njcn.harmonic.pojo.po.RStatHarmonicVoltageM;
import com.njcn.harmonic.pojo.po.RStatHarmonicY;
import org.apache.ibatis.annotations.Param;
import java.util.List;
/**
* <p>
@@ -13,4 +18,16 @@ import com.njcn.harmonic.pojo.po.RStatHarmonicVoltageM;
*/
public interface RStatHarmonicVoltageMMapper extends BaseMapper<RStatHarmonicVoltageM> {
/**
* 监测点数据查询
* @param param
* @param dataType
* @param measurementId
* @param harmonicId
* @return
*/
List<RStatHarmonicVoltageM> selectInfoList(@Param("param") StatSubstationBizBaseParam param,
@Param("dataType") String dataType,
@Param("measurementId") String measurementId,
@Param("harmonicId") String harmonicId);
}

12
pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/majornetwork/RStatHarmonicYMapper.java
View File

@@ -1,7 +1,11 @@
package com.njcn.harmonic.mapper.majornetwork;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.njcn.harmonic.pojo.param.StatSubstationBizBaseParam;
import com.njcn.harmonic.pojo.po.RStatHarmonicY;
import org.apache.ibatis.annotations.Param;
import java.util.List;
/**
* <p>
@@ -13,4 +17,12 @@ import com.njcn.harmonic.pojo.po.RStatHarmonicY;
*/
public interface RStatHarmonicYMapper extends BaseMapper<RStatHarmonicY> {
/**
* 监测点数据查询
* @param param
* @param dataType
* @return
*/
List<RStatHarmonicY> selectInfoList(@Param("param") StatSubstationBizBaseParam param,
@Param("dataType") String dataType);
}

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

@@ -27,6 +27,7 @@ public interface RStatOrgMMapper extends BaseMapper<RStatOrgM> {
* @return
*/
List<RStatSubstationOrgVO> getMonthRStatHarmonicOrgInfo(@Param("param") StatSubstationBizBaseParam param,
@Param("deptIds") List<String> deptIds,
@Param("dataType") String dataType);
/**

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

@@ -27,6 +27,7 @@ public interface RStatOrgQMapper extends BaseMapper<RStatOrgQ> {
* @return
*/
List<RStatSubstationOrgVO> getQuarterRStatHarmonicOrgInfo(@Param("param") StatSubstationBizBaseParam param,
@Param("deptIds") List<String> deptIds,
@Param("dataType") String dataType);
/**

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

@@ -23,10 +23,12 @@ public interface RStatOrgYMapper extends BaseMapper<RStatOrgY> {
/**
* 区域稳态指标超标分类统计表--年表数据
* @param param
* @param deptIds
* @param dataType
* @return
*/
List<RStatSubstationOrgVO> getYearRStatHarmonicOrgInfo(@Param("param") StatSubstationBizBaseParam param,
@Param("deptIds") List<String> deptIds,
@Param("dataType") String dataType);
/**

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

@@ -12,5 +12,36 @@
<result column="over_limit_measurement_ratio" property="overLimitMeasurementRatio" />
<result column="data_type" property="dataType" />
</resultMap>
<select id="selectInfoList" resultType="com.njcn.harmonic.pojo.po.RStatHarmonicD">
SELECT
data_date,
measurement_type_class,
harmonic_type,
sum(over_limit_measurement) as overLimitMeasurement,
sum(over_limit_measurement_ratio) as overLimitMeasurementRatio
FROM
r_stat_harmonic_d
<where>
and data_Type=#{dataType}
and measurement_type_class=#{measurementId}
and harmonic_type=#{harmonicId}
<if test="param != null and param.ids != null and param.ids.size > 0">
AND org_no IN
<foreach collection='param.ids' item='item' index="index" open='(' separator=',' close=')'>
#{item}
</foreach>
</if>
<if test="param!=null and param.startTime != null and param.startTime !=''">
AND data_date >= #{param.startTime}
</if>
<if test="param!=null and param.endTime != null and param.endTime != ''">
AND data_date &lt;= #{param.endTime}
</if>
</where>
GROUP BY
data_date,
measurement_type_class,
harmonic_type
</select>
</mapper>

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

@@ -15,5 +15,35 @@
<result column="over_limit_measurement_ratio_accrued" property="overLimitMeasurementRatioAccrued" />
<result column="data_type" property="dataType" />
</resultMap>
<select id="selectInfoList" resultType="com.njcn.harmonic.pojo.po.RStatHarmonicM">
SELECT
measurement_type_class,
harmonic_type,
sum(over_limit_measurement_average)/count(*) as overLimitMeasurementAverage ,
sum(over_limit_measurement_accrued) as overLimitMeasurementAccrued,
sum(over_Day) as overDay,
sum(over_limit_measurement_ratio_average)/count(*) as overLimitMeasurementRatioAverage,
sum(over_limit_measurement_ratio_accrued) as overLimitMeasurementRatioAccrued
FROM
r_stat_harmonic_m
<where>
and data_Type=#{dataType}
<if test="param != null and param.ids != null and param.ids.size > 0">
AND org_no IN
<foreach collection='param.ids' item='item' index="index" open='(' separator=',' close=')'>
#{item}
</foreach>
</if>
<if test="param!=null and param.startTime != null and param.startTime !=''">
AND data_date >= #{param.startTime}
</if>
<if test="param!=null and param.endTime != null and param.endTime != ''">
AND data_date &lt;= #{param.endTime}
</if>
</where>
GROUP BY
measurement_type_class,
harmonic_type
</select>
</mapper>

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

@@ -15,5 +15,35 @@
<result column="over_limit_measurement_ratio_accrued" property="overLimitMeasurementRatioAccrued" />
<result column="data_type" property="dataType" />
</resultMap>
<select id="selectInfoList" resultType="com.njcn.harmonic.pojo.po.RStatHarmonicQ">
SELECT
measurement_type_class,
harmonic_type,
sum(over_limit_measurement_average)/count(*) as overLimitMeasurementAverage ,
sum(over_limit_measurement_accrued) as overLimitMeasurementAccrued,
sum(average_over_day)/count(*) as averageOverDay,
sum(over_limit_measurement_ratio_average)/count(*) as overLimitMeasurementRatioAverage,
sum(over_limit_measurement_ratio_accrued) as overLimitMeasurementRatioAccrued
FROM
r_stat_harmonic_q
<where>
and data_Type=#{dataType}
<if test="param != null and param.ids != null and param.ids.size > 0">
AND org_no IN
<foreach collection='param.ids' item='item' index="index" open='(' separator=',' close=')'>
#{item}
</foreach>
</if>
<if test="param!=null and param.startTime != null and param.startTime !=''">
AND data_date >= #{param.startTime}
</if>
<if test="param!=null and param.endTime != null and param.endTime != ''">
AND data_date &lt;= #{param.endTime}
</if>
</where>
GROUP BY
measurement_type_class,
harmonic_type
</select>
</mapper>

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

@@ -16,5 +16,39 @@
<result column="over_limit_measurement_ratio_accrued" property="overLimitMeasurementRatioAccrued" />
<result column="data_type" property="dataType" />
</resultMap>
<select id="selectInfoList" resultType="com.njcn.harmonic.pojo.po.RStatHarmonicVoltageM">
SELECT
measurement_type_class,
harmonic_type,
voltage_type,
sum(over_limit_measurement_average)/count(*) as overLimitMeasurementAverage ,
sum(over_limit_measurement_accrued) as overLimitMeasurementAccrued,
sum(over_Day) as overDay,
sum(over_limit_measurement_ratio_average)/count(*) as overLimitMeasurementRatioAverage,
sum(over_limit_measurement_ratio_accrued) as overLimitMeasurementRatioAccrued
FROM
r_stat_harmonic_voltage_m
<where>
and data_Type=#{dataType}
and measurement_type_class=#{measurementId}
and harmonic_type=#{harmonicId}
<if test="param != null and param.ids != null and param.ids.size > 0">
AND org_no IN
<foreach collection='param.ids' item='item' index="index" open='(' separator=',' close=')'>
#{item}
</foreach>
</if>
<if test="param!=null and param.startTime != null and param.startTime !=''">
AND data_date >= #{param.startTime}
</if>
<if test="param!=null and param.endTime != null and param.endTime != ''">
AND data_date &lt;= #{param.endTime}
</if>
</where>
GROUP BY
voltage_type,
measurement_type_class,
harmonic_type
</select>
</mapper>

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

@@ -15,5 +15,35 @@
<result column="over_limit_measurement_ratio_accrued" property="overLimitMeasurementRatioAccrued" />
<result column="data_type" property="dataType" />
</resultMap>
<select id="selectInfoList" resultType="com.njcn.harmonic.pojo.po.RStatHarmonicY">
SELECT
measurement_type_class,
harmonic_type,
sum(over_limit_measurement_average)/count(*) as overLimitMeasurementAverage ,
sum(over_limit_measurement_accrued) as overLimitMeasurementAccrued,
sum(average_over_day)/count(*) as averageOverDay,
sum(over_limit_measurement_ratio_average)/count(*) as overLimitMeasurementRatioAverage,
sum(over_limit_measurement_ratio_accrued) as overLimitMeasurementRatioAccrued
FROM
r_stat_harmonic_y
<where>
and data_Type=#{dataType}
<if test="param != null and param.ids != null and param.ids.size > 0">
AND org_no IN
<foreach collection='param.ids' item='item' index="index" open='(' separator=',' close=')'>
#{item}
</foreach>
</if>
<if test="param!=null and param.startTime != null and param.startTime !=''">
AND data_date >= #{param.startTime}
</if>
<if test="param!=null and param.endTime != null and param.endTime != ''">
AND data_date &lt;= #{param.endTime}
</if>
</where>
GROUP BY
measurement_type_class,
harmonic_type
</select>
</mapper>

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

@@ -29,6 +29,7 @@
<select id="getMonthRStatHarmonicOrgInfo" resultType="com.njcn.harmonic.pojo.vo.RStatSubstationOrgVO">
SELECT
rso.org_no AS orgNo,
rso.measurement_type_class,
rso.data_date AS dataDate,
rso.effective_measurement_average AS effectiveMeasurementAverage,
rso.effective_measurement_accrued AS effectiveMeasurementAccrued,
@@ -118,11 +119,17 @@
<where>
c.data_Type=#{dataType} and rso.data_Type=#{dataType}
<if test="param != null and param.ids != null and param.ids.size > 0">
AND rso.org_no IN
AND rso.measurement_type_class IN
<foreach collection='param.ids' item='item' index="index" open='(' separator=',' close=')'>
#{item}
</foreach>
</if>
<if test="deptIds != null and deptIds.size > 0">
AND rso.org_no IN
<foreach collection='deptIds' item='item' index="index" open='(' separator=',' close=')'>
#{item}
</foreach>
</if>
<if test="param!=null and param.startTime != null and param.startTime !=''">
AND rso.data_date >= #{param.startTime} AND c.data_date >= #{param.startTime}
</if>
@@ -163,7 +170,7 @@
<select id="getPwMonthRStatOrgIndex" resultType="com.njcn.harmonic.pojo.vo.PwRStatOrgVO">
select
org_no,
measurement_type_class,
measurement_type_class as monitorSort,
effective_measurement_accrued as allCount,
freq_pass_rate,
v_dev_pass_rate,

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

@@ -29,6 +29,7 @@
<select id="getQuarterRStatHarmonicOrgInfo" resultType="com.njcn.harmonic.pojo.vo.RStatSubstationOrgVO">
SELECT
rso.org_no AS orgNo,
rso.measurement_type_class,
rso.data_date AS dataDate,
rso.effective_measurement_average AS effectiveMeasurementAverage,
rso.effective_measurement_accrued AS effectiveMeasurementAccrued,
@@ -118,11 +119,17 @@
<where>
c.data_Type=#{dataType} and rso.data_Type=#{dataType}
<if test="param != null and param.ids != null and param.ids.size > 0">
AND rso.org_no IN
AND rso.measurement_type_class IN
<foreach collection='param.ids' item='item' index="index" open='(' separator=',' close=')'>
#{item}
</foreach>
</if>
<if test="deptIds != null and deptIds.size > 0">
AND rso.org_no IN
<foreach collection='deptIds' item='item' index="index" open='(' separator=',' close=')'>
#{item}
</foreach>
</if>
<if test="param!=null and param.startTime != null and param.startTime !=''">
AND rso.data_date >= #{param.startTime} AND c.data_date >= #{param.startTime}
</if>
@@ -163,7 +170,7 @@
<select id="getPwQuarterRStatOrgIndex" resultType="com.njcn.harmonic.pojo.vo.PwRStatOrgVO">
select
org_no,
measurement_type_class,
measurement_type_class as monitorSort,
effective_measurement_accrued as allCount,
freq_pass_rate,
v_dev_pass_rate,

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

@@ -29,6 +29,7 @@
<select id="getYearRStatHarmonicOrgInfo" resultType="com.njcn.harmonic.pojo.vo.RStatSubstationOrgVO">
SELECT
rso.org_no AS orgNo,
rso.measurement_type_class,
rso.data_date AS dataDate,
rso.effective_measurement_average AS effectiveMeasurementAverage,
rso.effective_measurement_accrued AS effectiveMeasurementAccrued,
@@ -118,11 +119,17 @@
<where>
c.data_Type=#{dataType} and rso.data_Type=#{dataType}
<if test="param != null and param.ids != null and param.ids.size > 0">
AND rso.org_no IN
AND rso.measurement_type_class IN
<foreach collection='param.ids' item='item' index="index" open='(' separator=',' close=')'>
#{item}
</foreach>
</if>
<if test="deptIds != null and deptIds.size > 0">
AND rso.org_no IN
<foreach collection='deptIds' item='item' index="index" open='(' separator=',' close=')'>
#{item}
</foreach>
</if>
<if test="param!=null and param.startTime != null and param.startTime !=''">
AND rso.data_date >= #{param.startTime} and c.data_date >= #{param.startTime}
</if>
@@ -163,7 +170,7 @@
<select id="getPwYearRStatOrgIndex" resultType="com.njcn.harmonic.pojo.vo.PwRStatOrgVO">
select
org_no,
measurement_type_class,
measurement_type_class as monitorSort,
effective_measurement_accrued as allCount,
freq_pass_rate,
v_dev_pass_rate,