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

海南bug修改提交

Browse Source
This commit is contained in:
hzj
2026-01-05 20:33:45 +08:00
parent 95a571d3c3
commit be8c14625f
2 changed files with 167 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

159
pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/ExportModelController.java
View File

@@ -621,69 +621,126 @@ public class ExportModelController extends BaseController {
ReportValue vdeviation3 = this.listVdeviation.get(0).getList().get(2);
// 获取电压上下偏差的国标限值
String vdeviationLimit = judgeNull(this.listVdeviation.get(0).getOverLimit());
reportmap.put("$VD_L$", vdeviationLimit);
//电压下偏差
String ldeviationLimit = judgeNull(this.listVdeviation.get(1).getOverLimit());
reportmap.put("$VD_L$",ldeviationLimit+"至"+ vdeviationLimit);
String strResultVdeviationdata = "";
String tmpstrResultVdeviationdata = "";
String strResultVdeviationdataValue = "";
// 获取电压偏差
String tmpstrMap = "";
reportmap.put("$VDTX_A$", judgeNull(vdeviation1.getFmaxValue()));
reportmap.put("$VDTN_A$", judgeNull(vdeviation1.getMinValue()));
reportmap.put("$VDTE_A$", judgeNull(vdeviation1.getMeanValue()));
reportmap.put("$VDT%_A$", judgeNull(vdeviation1.getCp95Value()));
reportmap.put("$VDTX_B$", judgeNull(vdeviation2.getFmaxValue()));
reportmap.put("$VDTN_B$", judgeNull(vdeviation2.getMinValue()));
reportmap.put("$VDTE_B$", judgeNull(vdeviation2.getMeanValue()));
reportmap.put("$VDT%_B$", judgeNull(vdeviation2.getCp95Value()));
if (pttype != 2) {
reportmap.put("$VDTX_C$", judgeNull(vdeviation3.getFmaxValue()));
reportmap.put("$VDTN_C$", judgeNull(vdeviation3.getMinValue()));
reportmap.put("$VDTE_C$", judgeNull(vdeviation3.getMeanValue()));
reportmap.put("$VDT%_C$", judgeNull(vdeviation3.getCp95Value()));
} else {
reportmap.put("$VDTX_C$", "-");
reportmap.put("$VDTN_C$", "-");
reportmap.put("$VDTE_C$", "-");
reportmap.put("$VDT%_C$", "-");
}
// 获取电压偏差
// 值错误判断
try {
maxValue = Math.abs(Double.parseDouble(vdeviation1.getFmaxValue().toString()));
minValue = Math.abs(Double.parseDouble(vdeviation1.getMinValue().toString()));
aveValue = Math.abs(Double.parseDouble(vdeviation1.getMeanValue().toString()));
cp95Value = Math.abs(Double.parseDouble(vdeviation1.getCp95Value().toString()));
limit = Math.abs(Double.parseDouble(vdeviationLimit));
for (int i = 0; i < 3; i++) {
tmpstrMap = "A";
switch (i) {
case 0:
tmpstrMap = "A";
break;
case 1:
tmpstrMap = "B";
break;
default:
tmpstrMap = "C";
break;
}
ReportValue vdeviation = this.listVdeviation.get(0).getList().get(i);
if(Objects.equals("C",tmpstrMap)&&pttype == 2){
reportmap.put("$VDTX_C$", "-");
reportmap.put("$VDTN_C$", "-");
reportmap.put("$VDTE_C$", "-");
reportmap.put("$VDT%_C$", "-");
continue;
}else {
reportmap.put("$VDTX_" + tmpstrMap + "$", judgeNull(vdeviation.getFmaxValue()));
reportmap.put("$VDTN_" + tmpstrMap + "$", judgeNull(vdeviation.getMinValue()));
reportmap.put("$VDTE_" + tmpstrMap + "$", judgeNull(vdeviation.getMeanValue()));
reportmap.put("$VDT%_" + tmpstrMap + "$", judgeNull(vdeviation.getCp95Value()));
}
// 电压偏差
Double vmaxValue = Double.parseDouble(reportmap.get("$VDTX_" + tmpstrMap + "$").toString());
Double vminValue = Double.parseDouble(reportmap.get("$VDTX_" + tmpstrMap + "$").toString());
Double vaveValue = Double.parseDouble(reportmap.get("$VDTX_" + tmpstrMap + "$").toString());
Double vcp95Value = Double.parseDouble(reportmap.get("$VDT%_" + tmpstrMap + "$").toString());
if("".equals(strResultVdeviationdataValue)){
if (!(vmaxValue >= vminValue && vmaxValue >= vaveValue && vmaxValue >= vcp95Value)) {
strResultVdeviationdataValue += "注意:从上表中可以看出" + strLineBaseName
+ "电压偏差数据存在异常( 1、最大值>=最小值、平均值、95%概率值；2、平均值>=最小值；3、95%概率值>=最小值)。";
} else if (vaveValue < vminValue) {
strResultVdeviationdataValue += "注意:从上表中可以看出" + strLineBaseName
+ "电压偏差数据存在异常( 1、最大值>=最小值、平均值、95%概率值；2、平均值>=最小值；3、95%概率值>=最小值)。";
} else if (vcp95Value < vminValue) {
strResultVdeviationdataValue += "注意:从上表中可以看出" + strLineBaseName
+ "电压偏差数据数据存在异常( 1、最大值>=最小值、平均值、95%概率值；2、平均值>=最小值；3、95%概率值>=最小值)。";
}
}
if(vmaxValue>Double.valueOf(vdeviationLimit)||vmaxValue<Double.valueOf(ldeviationLimit)){
if (!"".equals(tmpstrResultVdeviationdata)){
tmpstrResultVdeviationdata += "、";
tmpstrResultVdeviationdata += tmpstrMap + "相最大值";
}else {
tmpstrResultVdeviationdata += tmpstrMap + "相最大值";
}
}
if(vminValue>Double.valueOf(vdeviationLimit)||vminValue<Double.valueOf(ldeviationLimit)){
if (!"".equals(tmpstrResultVdeviationdata)){
tmpstrResultVdeviationdata += "、";
tmpstrResultVdeviationdata += tmpstrMap + "相最小值";
}else {
tmpstrResultVdeviationdata += tmpstrMap + "相最小值";
}
}
if(vaveValue>Double.valueOf(vdeviationLimit)||vaveValue<Double.valueOf(ldeviationLimit)){
if (!"".equals(tmpstrResultVdeviationdata)){
tmpstrResultVdeviationdata += "、";
tmpstrResultVdeviationdata += tmpstrMap + "相平均值";
}else {
tmpstrResultVdeviationdata += tmpstrMap + "相平均值";
}
}
if(vcp95Value>Double.valueOf(vdeviationLimit)||vcp95Value<Double.valueOf(ldeviationLimit)){
if (!"".equals(tmpstrResultVdeviationdata)){
tmpstrResultVdeviationdata += "、";
tmpstrResultVdeviationdata += tmpstrMap + "相95%概率值";
}else {
tmpstrResultVdeviationdata += tmpstrMap + "相95%概率值";
}
}
}
} catch (Exception e) {
strResultVdeviationdataValue += "注意:从上表中可以看出" + strLineBaseName + "电压偏差数据存在异常(不是数值类型)。";
}
if ("".equals(strResultVdeviationdataValue)) {
if (!(maxValue >= minValue && maxValue >= aveValue && maxValue >= cp95Value)) {
strResultVdeviationdataValue += "注意:从上表中可以看出" + strLineBaseName
+ "电压偏差数据存在异常( 1、最大值>=最小值、平均值、95%概率值；2、平均值>=最小值；3、95%概率值>=最小值)。";
} else if (aveValue < minValue) {
strResultVdeviationdataValue += "注意:从上表中可以看出" + strLineBaseName
+ "电压偏差数据存在异常( 1、最大值>=最小值、平均值、95%概率值；2、平均值>=最小值；3、95%概率值>=最小值)。";
} else if (cp95Value < minValue) {
strResultVdeviationdataValue += "注意:从上表中可以看出" + strLineBaseName
+ "电压偏差数据存在异常( 1、最大值>=最小值、平均值、95%概率值；2、平均值>=最小值；3、95%概率值>=最小值)。";
}
}
// 限值判断
if (maxValue > limit) {
if (!"".equals(tmpstrResultVdeviationdata))
tmpstrResultVdeviationdata += "、";
tmpstrResultVdeviationdata += tmpstrMap + "相";
}
//
// // 限值判断
// if (maxValue > limit) {
// if (!"".equals(tmpstrResultVdeviationdata))
// tmpstrResultVdeviationdata += "、";
// tmpstrResultVdeviationdata += tmpstrMap + "相";
// }
// 假如为空则所有的都满足
if ("".equals(tmpstrResultVdeviationdata)) {
strResultVdeviationdata += "从上表中可以看出" + strLineBaseName + "A、B、C三相电压偏差满足国标限值（10%）的要求。";
strResultVdeviationdata += "从上表中可以看出" + strLineBaseName + "A、B、C三相电压偏差满足国标限值（"+ldeviationLimit+"%至"+vdeviationLimit+"%）的要求。";
} else {
strAnalysis += tmpstrResultVdeviationdata + "电压偏差不满足国标限值（10%）的要求。";
strAnalysis += tmpstrResultVdeviationdata + "电压偏差不满足国标限值（"+vdeviationLimit+"）的要求。";
strResultVdeviationdata += "从上表中可以看出" + strLineBaseName + tmpstrResultVdeviationdata
+ "电压偏差不满足国标限值（10%）的要求。";
+ "电压偏差不满足国标限值（"+ldeviationLimit+"%至"+vdeviationLimit+"%）的要求。";
}
reportmap.put("$ResultVdeviationdata$", strResultVdeviationdata);
@@ -1550,11 +1607,15 @@ public class ExportModelController extends BaseController {
public void getVdeviation(ReportQueryParam param, Overlimit overLimit) {
List<ReportValue> listVdeviation = reportService.getVdeviation(param);
List<Pass> list = new ArrayList<>();
for (int i = 0; i < 2; i++) {
// for (int i = 0; i < 2; i++) {
Pass pass;
pass = new Pass(overLimit.getVoltageDev(), EnumPass.MAX.getCode());
list.add(pass);
}
Pass pass1;
pass1 = new Pass(overLimit.getUvoltageDev(), EnumPass.MIN.getCode());
list.add(pass1);
// }
this.listVdeviation = new ArrayList<>();
transformData(this.listVdeviation, listVdeviation, list, true);
}

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

@@ -93,7 +93,7 @@
</select>
<select id="getTotalPstCP95Day" resultType="java.lang.Integer">
SELECT
count( plt ) total
count( pst ) total
FROM
r_stat_data_flicker_d
<where>
@@ -114,10 +114,10 @@
<select id="getVVirtualData" resultType="com.njcn.harmonic.pojo.vo.ReportValue">
SELECT
phasic_type AS phaseType,
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 value_type = 'CP95' THEN rms END ) AS cp95Value
AVG( CASE WHEN value_type = 'AVG' THEN rms_lvr END ) AS meanValue,
MIN( CASE WHEN value_type = 'MIN' THEN rms_lvr END ) AS minValue,
MAX( CASE WHEN value_type = 'MAX' THEN rms_lvr END ) AS fmaxValue,
MAX( CASE WHEN value_type = 'CP95' THEN rms_lvr END ) AS cp95Value
FROM
r_stat_data_v_d
<where>
@@ -139,10 +139,10 @@
<select id="getPowerP" resultType="com.njcn.harmonic.pojo.vo.ReportValue">
SELECT
phasic_type AS phaseType,
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 value_type = 'CP95' THEN rms END ) AS cp95Value
AVG( CASE WHEN value_type = 'AVG' THEN p END ) AS meanValue,
MIN( CASE WHEN value_type = 'MIN' THEN p END ) AS minValue,
MAX( CASE WHEN value_type = 'MAX' THEN p END ) AS fmaxValue,
MAX( CASE WHEN value_type = 'CP95' THEN p END ) AS cp95Value
FROM
r_stat_data_harmpower_p_d
<where>
@@ -164,10 +164,10 @@
<select id="getPF" resultType="com.njcn.harmonic.pojo.vo.ReportValue">
SELECT
phasic_type AS phaseType,
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 value_type = 'CP95' THEN rms END ) AS cp95Value
AVG( CASE WHEN value_type = 'AVG' THEN pf END ) AS meanValue,
MIN( CASE WHEN value_type = 'MIN' THEN pf END ) AS minValue,
MAX( CASE WHEN value_type = 'MAX' THEN pf END ) AS fmaxValue,
MAX( CASE WHEN value_type = 'CP95' THEN pf END ) AS cp95Value
FROM
r_stat_data_harmpower_p_d
<where>
@@ -189,10 +189,10 @@
<select id="getPowerQ" resultType="com.njcn.harmonic.pojo.vo.ReportValue">
SELECT
phasic_type AS phaseType,
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 value_type = 'CP95' THEN rms END ) AS cp95Value
AVG( CASE WHEN value_type = 'AVG' THEN q END ) AS meanValue,
MIN( CASE WHEN value_type = 'MIN' THEN q END ) AS minValue,
MAX( CASE WHEN value_type = 'MAX' THEN q END ) AS fmaxValue,
MAX( CASE WHEN value_type = 'CP95' THEN q END ) AS cp95Value
FROM
r_stat_data_harmpower_q_d
<where>
@@ -214,10 +214,10 @@
<select id="getPowerS" resultType="com.njcn.harmonic.pojo.vo.ReportValue">
SELECT
phasic_type AS phaseType,
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 value_type = 'CP95' THEN rms END ) AS cp95Value
AVG( CASE WHEN value_type = 'AVG' THEN s END ) AS meanValue,
MIN( CASE WHEN value_type = 'MIN' THEN s END ) AS minValue,
MAX( CASE WHEN value_type = 'MAX' THEN s END ) AS fmaxValue,
MAX( CASE WHEN value_type = 'CP95' THEN s END ) AS cp95Value
FROM
r_stat_data_harmpower_s_d
<where>
@@ -239,10 +239,10 @@
<select id="getFlickerData" resultType="com.njcn.harmonic.pojo.vo.ReportValue">
SELECT
phasic_type AS phaseType,
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 value_type = 'CP95' THEN rms END ) AS cp95Value
AVG( CASE WHEN value_type = 'AVG' THEN plt END ) AS meanValue,
MIN( CASE WHEN value_type = 'MIN' THEN plt END ) AS minValue,
MAX( CASE WHEN value_type = 'MAX' THEN plt END ) AS fmaxValue,
MAX( CASE WHEN value_type = 'CP95' THEN plt END ) AS cp95Value
FROM
r_stat_data_flicker_d
<where>
@@ -264,10 +264,10 @@
<select id="getLFlickerData" resultType="com.njcn.harmonic.pojo.vo.ReportValue">
SELECT
phasic_type AS phaseType,
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 value_type = 'CP95' THEN rms END ) AS cp95Value
AVG( CASE WHEN value_type = 'AVG' THEN pst END ) AS meanValue,
MIN( CASE WHEN value_type = 'MIN' THEN pst END ) AS minValue,
MAX( CASE WHEN value_type = 'MAX' THEN pst END ) AS fmaxValue,
MAX( CASE WHEN value_type = 'CP95' THEN pst END ) AS cp95Value
FROM
r_stat_data_flicker_d
<where>
@@ -289,10 +289,10 @@
<select id="getUVdeviationData" resultType="com.njcn.harmonic.pojo.vo.ReportValue">
SELECT
phasic_type AS phaseType,
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 value_type = 'CP95' THEN rms END ) AS cp95Value
AVG( CASE WHEN value_type = 'AVG' THEN vu_dev END ) AS meanValue,
MIN( CASE WHEN value_type = 'MIN' THEN vu_dev END ) AS minValue,
MAX( CASE WHEN value_type = 'MAX' THEN vu_dev END ) AS fmaxValue,
MAX( CASE WHEN value_type = 'CP95' THEN vu_dev END ) AS cp95Value
FROM
r_stat_data_v_d
<where>
@@ -314,10 +314,10 @@
<select id="getLVdeviationData" resultType="com.njcn.harmonic.pojo.vo.ReportValue">
SELECT
phasic_type AS phaseType,
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 value_type = 'CP95' THEN rms END ) AS cp95Value
AVG( CASE WHEN value_type = 'AVG' THEN vl_dev END ) AS meanValue,
MIN( CASE WHEN value_type = 'MIN' THEN vl_dev END ) AS minValue,
MAX( CASE WHEN value_type = 'MAX' THEN vl_dev END ) AS fmaxValue,
MAX( CASE WHEN value_type = 'CP95' THEN vl_dev END ) AS cp95Value
FROM
r_stat_data_v_d
<where>
@@ -339,10 +339,10 @@
<select id="getDistortionDataV" resultType="com.njcn.harmonic.pojo.vo.ReportValue">
SELECT
phasic_type AS phaseType,
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 value_type = 'CP95' THEN rms END ) AS cp95Value
AVG( CASE WHEN value_type = 'AVG' THEN v_thd END ) AS meanValue,
MIN( CASE WHEN value_type = 'MIN' THEN v_thd END ) AS minValue,
MAX( CASE WHEN value_type = 'MAX' THEN v_thd END ) AS fmaxValue,
MAX( CASE WHEN value_type = 'CP95' THEN v_thd END ) AS cp95Value
FROM
r_stat_data_v_d
<where>
@@ -364,10 +364,10 @@
<select id="getDistortionDataI" resultType="com.njcn.harmonic.pojo.vo.ReportValue">
SELECT
phasic_type AS phaseType,
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 value_type = 'CP95' THEN rms END ) AS cp95Value
AVG( CASE WHEN value_type = 'AVG' THEN i_thd END ) AS meanValue,
MIN( CASE WHEN value_type = 'MIN' THEN i_thd END ) AS minValue,
MAX( CASE WHEN value_type = 'MAX' THEN i_thd END ) AS fmaxValue,
MAX( CASE WHEN value_type = 'CP95' THEN i_thd END ) AS cp95Value
FROM
r_stat_data_i_d
<where>
@@ -389,10 +389,10 @@
<select id="getFrequencyData" resultType="com.njcn.harmonic.pojo.vo.ReportValue">
SELECT
phasic_type AS phaseType,
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 value_type = 'CP95' THEN rms END ) AS cp95Value
AVG( CASE WHEN value_type = 'AVG' THEN freq END ) AS meanValue,
MIN( CASE WHEN value_type = 'MIN' THEN freq END ) AS minValue,
MAX( CASE WHEN value_type = 'MAX' THEN freq END ) AS fmaxValue,
MAX( CASE WHEN value_type = 'CP95' THEN freq END ) AS cp95Value
FROM
r_stat_data_v_d
<where>
@@ -414,10 +414,10 @@
<select id="getDEVFrequencyData" resultType="com.njcn.harmonic.pojo.vo.ReportValue">
SELECT
phasic_type AS phaseType,
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 value_type = 'CP95' THEN rms END ) AS cp95Value
AVG( CASE WHEN value_type = 'AVG' THEN freq_dev END ) AS meanValue,
MIN( CASE WHEN value_type = 'MIN' THEN freq_dev END ) AS minValue,
MAX( CASE WHEN value_type = 'MAX' THEN freq_dev END ) AS fmaxValue,
MAX( CASE WHEN value_type = 'CP95' THEN freq_dev END ) AS cp95Value
FROM
r_stat_data_v_d
<where>
@@ -439,10 +439,10 @@
<select id="getINegData" resultType="com.njcn.harmonic.pojo.vo.ReportValue">
SELECT
phasic_type AS phaseType,
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 value_type = 'CP95' THEN rms END ) AS cp95Value
AVG( CASE WHEN value_type = 'AVG' THEN i_neg END ) AS meanValue,
MIN( CASE WHEN value_type = 'MIN' THEN i_neg END ) AS minValue,
MAX( CASE WHEN value_type = 'MAX' THEN i_neg END ) AS fmaxValue,
MAX( CASE WHEN value_type = 'CP95' THEN i_neg END ) AS cp95Value
FROM
r_stat_data_i_d
<where>