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-12-15 10:36:12 +08:00
parent c43b64faa5
commit 339cf9c75e
85 changed files with 4172 additions and 762 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,7 +1,9 @@
package com.njcn.harmonic.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.njcn.harmonic.pojo.param.StatSubstationBizBaseParam;
import com.njcn.harmonic.pojo.po.RStatHarmonicOrgM;
import com.njcn.harmonic.pojo.vo.RStatHarmonicVO;
import com.njcn.harmonic.pojo.vo.StatHarmonicOrgVO;
import com.njcn.user.pojo.dto.DeptDTO;
import org.apache.ibatis.annotations.Param;
@@ -21,4 +23,14 @@ public interface StatHarmonicOrgMMapper extends BaseMapper<RStatHarmonicOrgM> {
* @return 结果
*/
List<StatHarmonicOrgVO> listMonthRatio(@Param("list") List<DeptDTO> list, @Param("startTime") String startTime, @Param("endTime") String endTime);
/**
*各单位监测点数
* @param param
* @param dataType
* @return
*/
List<RStatHarmonicVO> selectInfoList(@Param("param") StatSubstationBizBaseParam param,
@Param("ids") List<String> ids,
@Param("dataType") String dataType);
}

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

@@ -1,7 +1,10 @@
package com.njcn.harmonic.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.njcn.harmonic.pojo.param.StatSubstationBizBaseParam;
import com.njcn.harmonic.pojo.po.RStatHarmonicOrgQ;
import com.njcn.harmonic.pojo.po.RStatHarmonicOrgY;
import com.njcn.harmonic.pojo.vo.RStatHarmonicVO;
import com.njcn.harmonic.pojo.vo.StatHarmonicOrgVO;
import com.njcn.user.pojo.dto.DeptDTO;
import org.apache.ibatis.annotations.Param;
@@ -21,4 +24,14 @@ public interface StatHarmonicOrgQMapper extends BaseMapper<RStatHarmonicOrgQ> {
* @return 结果
*/
List<StatHarmonicOrgVO> listQuarterRatio(@Param("list") List<DeptDTO> list, @Param("startTime") String startTime, @Param("endTime") String endTime);
/**
*各单位监测点数
* @param param
* @param dataType
* @return
*/
List<RStatHarmonicVO> selectInfoList(@Param("param") StatSubstationBizBaseParam param,
@Param("ids") List<String> ids,
@Param("dataType") String dataType);
}

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

@@ -1,7 +1,9 @@
package com.njcn.harmonic.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.njcn.harmonic.pojo.param.StatSubstationBizBaseParam;
import com.njcn.harmonic.pojo.po.RStatHarmonicOrgY;
import com.njcn.harmonic.pojo.vo.RStatHarmonicVO;
import com.njcn.harmonic.pojo.vo.StatHarmonicOrgVO;
import com.njcn.user.pojo.dto.DeptDTO;
import org.apache.ibatis.annotations.Param;
@@ -21,4 +23,15 @@ public interface StatHarmonicOrgYMapper extends BaseMapper<RStatHarmonicOrgY> {
* @return 结果
*/
List<StatHarmonicOrgVO> listYearRatio(@Param("list") List<DeptDTO> list, @Param("startTime") String startTime, @Param("endTime") String endTime);
/**
* 各单位监测点查询
* @param param
* @param ids
* @param dataType
* @return
*/
List<RStatHarmonicVO> selectInfoList(@Param("param") StatSubstationBizBaseParam param,
@Param("ids") List<String> ids,
@Param("dataType") String dataType);
}

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

@@ -41,7 +41,8 @@
DISTINCT
a.id,
a.NAME,
b.activation
b.activation,
a.report_form
FROM
sys_excel_rpt_temp a
LEFT JOIN sys_dept_temp b ON a.Id = b.temp_id

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

@@ -18,5 +18,39 @@
and DATE_FORMAT(data_date,'%Y-%m-%d') between #{startTime} and #{endTime}
</if>
</select>
<select id="selectInfoList" resultType="com.njcn.harmonic.pojo.vo.RStatHarmonicVO">
SELECT
harmonic_type,
sum( over_limit_measurement_average )/ count(*) AS overLimitMeasurementAverage,
sum( over_limit_measurement_accrued ) AS overLimitMeasurementAccrued,
sum( over_Day )/ sum( over_limit_measurement_accrued )/ count(*) AS averageOverDay,
sum( over_limit_measurement_ratio_average )/ count(*) AS overLimitMeasurementRatioAverage,
sum( over_limit_measurement_ratio_accrued ) AS overLimitMeasurementRatioAccrued
FROM
r_stat_harmonic_org_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="ids != null and ids.size > 0">
AND harmonic_type IN
<foreach collection='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
harmonic_type
</select>
</mapper>

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

@@ -18,5 +18,39 @@
and DATE_FORMAT(data_date,'%Y-%m-%d') between #{startTime} and #{endTime}
</if>
</select>
<select id="selectInfoList" resultType="com.njcn.harmonic.pojo.vo.RStatHarmonicVO">
SELECT
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_org_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="ids != null and ids.size > 0">
AND harmonic_type IN
<foreach collection='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
harmonic_type
</select>
</mapper>

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

@@ -18,4 +18,39 @@
and DATE_FORMAT(data_date,'%Y-%m-%d') between #{startTime} and #{endTime}
</if>
</select>
<select id="selectInfoList" resultType="com.njcn.harmonic.pojo.vo.RStatHarmonicVO">
SELECT
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_org_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="ids != null and ids.size > 0">
AND harmonic_type IN
<foreach collection='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
harmonic_type
</select>
</mapper>

16
pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/specialanalysis/RMpRailwayTractionDetailMapper.java Normal file
View File

@@ -0,0 +1,16 @@
package com.njcn.harmonic.mapper.specialanalysis;
import com.njcn.harmonic.pojo.po.RMpRailwayTractionDetail;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
* <p>
* 电气化铁路_详细信息表（专项分析） Mapper 接口
* </p>
*
* @author wr
* @since 2022-12-09
*/
public interface RMpRailwayTractionDetailMapper extends BaseMapper<RMpRailwayTractionDetail> {
}

16
pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/specialanalysis/mapping/RMpRailwayTractionDetailMapper.xml Normal file
View File

@@ -0,0 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.njcn.harmonic.mapper.specialanalysis.RMpRailwayTractionDetailMapper">
<!-- 通用查询映射结果 -->
<resultMap id="BaseResultMap" type="com.njcn.harmonic.pojo.po.RMpRailwayTractionDetail">
<id column="traction_station_id" property="tractionStationId" />
<result column="data_date" property="dataDate" />
<result column="active_power_times" property="activePowerTimes" />
<result column="v_times" property="vTimes" />
<result column="i_times" property="iTimes" />
<result column="unbalance_times" property="unbalanceTimes" />
<result column="i_neg_times" property="iNegTimes" />
</resultMap>
</mapper>

5
pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/specialanalysis/mapping/RMpWpPowerDetailMMapper.xml
View File

@@ -6,6 +6,7 @@
<resultMap id="BaseResultMap" type="com.njcn.harmonic.pojo.po.RMpWpPowerDetailM">
<id column="measurement_point_id" property="measurementPointId" />
<result column="data_date" property="dataDate" />
<result column="monitor_tag" property="monitorTag" />
<result column="load_rate_avg" property="loadRateAvg" />
<result column="load_rate_95" property="loadRate95" />
<result column="load_rate_99" property="loadRate99" />
@@ -24,6 +25,10 @@
<result column="bp_active_power_95" property="bpActivePower95" />
<result column="bp_active_power_99" property="bpActivePower99" />
<result column="bp_active_power_avg" property="bpActivePowerAvg" />
<result column="cp_active_power_95" property="cpActivePower95" />
<result column="cp_active_power_99" property="cpActivePower99" />
<result column="cp_active_power_avg" property="cpActivePowerAvg" />
<result column="ap_fundamental_voltage" property="apFundamentalVoltage" />
<result column="bp_fundamental_voltage" property="bpFundamentalVoltage" />
<result column="cp_fundamental_voltage" property="cpFundamentalVoltage" />

5
pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/specialanalysis/mapping/RMpWpPowerDetailQMapper.xml
View File

@@ -6,6 +6,7 @@
<resultMap id="BaseResultMap" type="com.njcn.harmonic.pojo.po.RMpWpPowerDetailQ">
<id column="measurement_point_id" property="measurementPointId" />
<result column="data_date" property="dataDate" />
<result column="monitor_tag" property="monitorTag" />
<result column="load_rate_avg" property="loadRateAvg" />
<result column="load_rate_95" property="loadRate95" />
<result column="load_rate_99" property="loadRate99" />
@@ -24,6 +25,10 @@
<result column="bp_active_power_95" property="bpActivePower95" />
<result column="bp_active_power_99" property="bpActivePower99" />
<result column="bp_active_power_avg" property="bpActivePowerAvg" />
<result column="cp_active_power_95" property="cpActivePower95" />
<result column="cp_active_power_99" property="cpActivePower99" />
<result column="cp_active_power_avg" property="cpActivePowerAvg" />
<result column="ap_fundamental_voltage" property="apFundamentalVoltage" />
<result column="bp_fundamental_voltage" property="bpFundamentalVoltage" />
<result column="cp_fundamental_voltage" property="cpFundamentalVoltage" />

5
pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/specialanalysis/mapping/RMpWpPowerDetailYMapper.xml
View File

@@ -6,6 +6,7 @@
<resultMap id="BaseResultMap" type="com.njcn.harmonic.pojo.po.RMpWpPowerDetailY">
<id column="measurement_point_id" property="measurementPointId" />
<result column="data_date" property="dataDate" />
<result column="monitor_tag" property="monitorTag" />
<result column="load_rate_avg" property="loadRateAvg" />
<result column="load_rate_95" property="loadRate95" />
<result column="load_rate_99" property="loadRate99" />
@@ -24,6 +25,10 @@
<result column="bp_active_power_95" property="bpActivePower95" />
<result column="bp_active_power_99" property="bpActivePower99" />
<result column="bp_active_power_avg" property="bpActivePowerAvg" />
<result column="cp_active_power_95" property="cpActivePower95" />
<result column="cp_active_power_99" property="cpActivePower99" />
<result column="cp_active_power_avg" property="cpActivePowerAvg" />
<result column="ap_fundamental_voltage" property="apFundamentalVoltage" />
<result column="bp_fundamental_voltage" property="bpFundamentalVoltage" />
<result column="cp_fundamental_voltage" property="cpFundamentalVoltage" />