1.异常数据界面业务调整
2.解决全景监测点详情跳转台账数据不准确稳
This commit is contained in:
@@ -5,6 +5,7 @@ import cn.hutool.core.collection.CollUtil;
|
||||
import cn.hutool.core.date.DateTime;
|
||||
import cn.hutool.core.date.DateUtil;
|
||||
import cn.hutool.core.util.NumberUtil;
|
||||
import cn.hutool.core.util.ObjUtil;
|
||||
import cn.hutool.core.util.ObjectUtil;
|
||||
import cn.hutool.core.util.StrUtil;
|
||||
import com.njcn.common.pojo.enums.response.CommonResponseEnum;
|
||||
@@ -25,7 +26,6 @@ import com.njcn.event.pojo.param.EventCountParam;
|
||||
import com.njcn.event.pojo.po.RmpEventDetailPO;
|
||||
import com.njcn.harmonic.pojo.param.ReportQueryParam;
|
||||
import com.njcn.harmonic.pojo.po.report.EnumPass;
|
||||
import com.njcn.harmonic.pojo.po.report.OverLimitInfo;
|
||||
import com.njcn.harmonic.pojo.po.report.Pass;
|
||||
import com.njcn.harmonic.pojo.po.report.ReportTarget;
|
||||
import com.njcn.harmonic.pojo.vo.ReportValue;
|
||||
@@ -145,7 +145,7 @@ public class ExportModelJBController extends BaseController {
|
||||
}
|
||||
bdname = lineDto.getBdName();
|
||||
areaName = lineDto.getAreaName();
|
||||
if(areaName.equals("冀北")){
|
||||
if("冀北".equals(areaName)){
|
||||
areaName="国网"+areaName;
|
||||
}
|
||||
pttype = PubUtils.ptTypeName(lineDto.getPtType());
|
||||
@@ -198,18 +198,14 @@ public class ExportModelJBController extends BaseController {
|
||||
param.setB(day == 0);
|
||||
|
||||
//限值
|
||||
OverLimitInfo overLimitData = reportService.getOverLimitData(param);
|
||||
Overlimit overLimit;
|
||||
if (type == 0) {
|
||||
overLimit = lineFeignClient.getOverLimitData(param.getLineId()).getData();
|
||||
} else {
|
||||
overLimit = monitorClient.getOverLimitData(param.getLineId()).getData();
|
||||
}
|
||||
param.setCount(overLimitData.getCount());
|
||||
overLimitData.setOverLimitRate(Arrays.asList(overLimit));
|
||||
|
||||
|
||||
if (0 == overLimitData.getOverLimitRate().size()) {
|
||||
if (ObjUtil.isNull(overLimit)) {
|
||||
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, "dataFail", methodDescribe);
|
||||
}
|
||||
|
||||
@@ -237,7 +233,7 @@ public class ExportModelJBController extends BaseController {
|
||||
}
|
||||
|
||||
|
||||
Map<String, Object> reportmap = new HashMap<>();// 报告Map
|
||||
Map<String, Object> reportmap = new HashMap<>(200);
|
||||
//数据单位
|
||||
PqsDeviceUnit deviceUnit = deviceUnitClient.lineUnitDetail(lineIndex).getData();
|
||||
reportmap.putAll(unitMap(deviceUnit));
|
||||
@@ -245,7 +241,7 @@ public class ExportModelJBController extends BaseController {
|
||||
reportmap.put("$btype$", btype);
|
||||
reportmap.put("$ctype$", ctype);
|
||||
|
||||
Map<String, Object> header = new HashMap<String, Object>();
|
||||
Map<String, Object> header = new HashMap<String, Object>(2);
|
||||
if (ObjectUtil.isNotEmpty(file)) {
|
||||
byte[] bytes = file.getBytes();
|
||||
if(bytes.length>0){
|
||||
@@ -302,16 +298,24 @@ public class ExportModelJBController extends BaseController {
|
||||
reportmap.put("$image$", header);
|
||||
|
||||
getVirtualData(param);
|
||||
ReportValue voltage1 = this.listVirtual.get(0).getList().get(0);// 电压幅值
|
||||
ReportValue voltage2 = this.listVirtual.get(0).getList().get(1);// 电压幅值
|
||||
ReportValue voltage3 = this.listVirtual.get(0).getList().get(2);// 电压幅值
|
||||
ReportValue current1 = this.listVirtual.get(1).getList().get(0);// 电流幅值
|
||||
ReportValue current2 = this.listVirtual.get(1).getList().get(1);// 电流幅值
|
||||
ReportValue current3 = this.listVirtual.get(1).getList().get(2);// 电流幅值
|
||||
//电压幅值
|
||||
ReportValue voltage1 = this.listVirtual.get(0).getList().get(0);
|
||||
// 电压幅值
|
||||
ReportValue voltage2 = this.listVirtual.get(0).getList().get(1);
|
||||
// 电压幅值
|
||||
ReportValue voltage3 = this.listVirtual.get(0).getList().get(2);
|
||||
// 电流幅值
|
||||
ReportValue current1 = this.listVirtual.get(1).getList().get(0);
|
||||
// 电流幅值
|
||||
ReportValue current2 = this.listVirtual.get(1).getList().get(1);
|
||||
// 电流幅值
|
||||
ReportValue current3 = this.listVirtual.get(1).getList().get(2);
|
||||
|
||||
String strLineBaseName = String.format("%s%s", new String[]{bdname + "_", name});
|
||||
String strAnalysis = "";// 分析建议
|
||||
String strError = "";// 报表错误
|
||||
// 分析建议
|
||||
String strAnalysis = "";
|
||||
// 报表错误
|
||||
String strError = "";
|
||||
|
||||
/**************************************************************
|
||||
**** 基波电压/电流有效值表格
|
||||
@@ -421,8 +425,9 @@ public class ExportModelJBController extends BaseController {
|
||||
int iCount = 0;
|
||||
// 判断所取的基波电压、基波电流值是否为null
|
||||
for (Object value : reportmap.values()) {
|
||||
if (value == null)
|
||||
if (value == null){
|
||||
iCount++;
|
||||
}
|
||||
}
|
||||
// 假如所有的数据都为null,则返回(所选的时间段内未找到数据)
|
||||
if (iCount == reportmap.size()) {
|
||||
@@ -485,50 +490,65 @@ public class ExportModelJBController extends BaseController {
|
||||
}
|
||||
}
|
||||
reportmap.put("$BaseVIResult$", strBaseVIResult);
|
||||
if (!"".equals(strBaseVIResult))
|
||||
if (!"".equals(strBaseVIResult)){
|
||||
strError += strBaseVIResult;
|
||||
}
|
||||
|
||||
/**************************************************************
|
||||
**** 所选的时间段内有数据存在则进行其他加载
|
||||
***************************************************************/
|
||||
|
||||
// Depts dep = R.getCurrentDept();
|
||||
// String detpName = dep.getArea();
|
||||
reportmap.put("$detpName$", areaName); // 区域名称
|
||||
// 区域名称
|
||||
reportmap.put("$detpName$", areaName);
|
||||
// 获取报告生成时间
|
||||
Date currentTime = new Date();
|
||||
SimpleDateFormat formatter = new SimpleDateFormat("yyyy年MM月dd日 HH时mm分ss秒");// 报告时分秒格式
|
||||
// 报告时分秒格式
|
||||
SimpleDateFormat formatter = new SimpleDateFormat("yyyy年MM月dd日 HH时mm分ss秒");
|
||||
String strTime = String.format("%s——%s。",
|
||||
new String[]{DateUtil.format(startDate, "yyyy年MM月dd日 HH时mm分ss秒"),
|
||||
DateUtil.format(endDate, "yyyy年MM月dd日 HH时mm分ss秒")});
|
||||
reportmap.put("$number$", StrUtil.isBlank(reportNumber)?"":reportNumber); // 报告编号
|
||||
reportmap.put("$titlePoint$",StrUtil.isBlank(crmName)?"":crmName); // 客户名称
|
||||
|
||||
reportmap.put("$TitleTime$", formatter.format(currentTime)); // 报告生成时间
|
||||
reportmap.put("$ReportTitle$",
|
||||
String.format("对该地区%s电能质量在线监测数据进行分析, 以判断电能质量指标是否满足国标。", new String[]{strLineBaseName}));// 报告标题
|
||||
reportmap.put("$ReportTime$", strTime);// 报告分析时间段
|
||||
reportmap.put("$RunBaseName$", String.format("以下将对%s电能质量统计数据进行分析,数据包括基波电压/电流、谐波电压/电流、电压偏差、频率偏差、电压总谐波畸变率、2-25次谐波电压含有率、2-25次谐波电流、0.5-15.5次间谐波电压含有率、负序电压不平衡度、负序电流、电压闪变。",
|
||||
new String[]{strLineBaseName}));// 运行数据分析
|
||||
reportmap.put("$BaseVITable$", String.format("报告分析时间段内%s的基波电压/电流分钟统计数据见下表。", new String[]{strLineBaseName}));// 基波电压和电流
|
||||
reportmap.put("$VDTable$", String.format("报告分析时间段内%s的电压偏差统计数据见下表。", new String[]{strLineBaseName}));// 供电电压偏差
|
||||
reportmap.put("$FRETable$", String.format("报告分析时间段内%s的频率偏差统计数据见下表。", new String[]{strLineBaseName}));// 频率偏差
|
||||
reportmap.put("$THETable$", String.format("报告分析时间段内%s的三相电压不平衡度统计数据见下表。", new String[]{strLineBaseName}));// 三相电压不平衡度
|
||||
reportmap.put("$PLTTable$", String.format("报告分析时间段内%s的闪变统计数据见下表。", new String[]{strLineBaseName}));// 闪变
|
||||
reportmap.put("$ThdTable$", String.format("报告分析时间段内%s的电压总谐波畸变率统计数据见下表。", new String[]{strLineBaseName}));// 电压总谐波畸变率
|
||||
reportmap.put("$IneTable$", String.format("报告分析时间段内%s的负序电流统计数据见下表。", new String[]{strLineBaseName}));// 负序电流
|
||||
reportmap.put("$RVTable$",
|
||||
String.format("报告分析时间段内%s的2-25次谐波电压含有率CP95概率值统计数据见下表。", new String[]{strLineBaseName}));// 谐波电压
|
||||
reportmap.put("$INTable$",
|
||||
String.format("报告分析时间段内%s的0.5-15.5次间谐波电压含有率CP95概率值统计数据见下表。", new String[]{strLineBaseName}));// 间谐波
|
||||
reportmap.put("$RITable$",
|
||||
String.format("报告分析时间段内%s的2-25次谐波电流幅值CP95概率值统计数据见下表。", new String[]{strLineBaseName}));// 谐波电流
|
||||
|
||||
reportmap.put("$LineName1$", name);// 监测点名称1
|
||||
reportmap.put("$LineName2$", name);// 监测点名称2
|
||||
reportmap.put("$LineName3$", name);// 监测点名称3
|
||||
reportmap.put("$LineName4$", name);// 监测点名称4
|
||||
reportmap.put("$LineName5$", name);// 监测点名称5
|
||||
// 报告编号
|
||||
reportmap.put("$number$", StrUtil.isBlank(reportNumber)?"":reportNumber);
|
||||
// 客户名称
|
||||
reportmap.put("$titlePoint$",StrUtil.isBlank(crmName)?"":crmName);
|
||||
// 报告生成时间
|
||||
reportmap.put("$TitleTime$", formatter.format(currentTime));
|
||||
// 报告标题
|
||||
reportmap.put("$ReportTitle$", String.format("对该地区%s电能质量在线监测数据进行分析, 以判断电能质量指标是否满足国标。", new String[]{strLineBaseName}));
|
||||
// 报告分析时间段
|
||||
reportmap.put("$ReportTime$", strTime);
|
||||
// 运行数据分析
|
||||
reportmap.put("$RunBaseName$", String.format("以下将对%s电能质量统计数据进行分析,数据包括基波电压/电流、谐波电压/电流、电压偏差、频率偏差、电压总谐波畸变率、2-25次谐波电压含有率、2-25次谐波电流、0.5-15.5次间谐波电压含有率、负序电压不平衡度、负序电流、电压闪变。", new String[]{strLineBaseName}));
|
||||
// 基波电压和电流
|
||||
reportmap.put("$BaseVITable$", String.format("报告分析时间段内%s的基波电压/电流分钟统计数据见下表。", new String[]{strLineBaseName}));
|
||||
// 供电电压偏差
|
||||
reportmap.put("$VDTable$", String.format("报告分析时间段内%s的电压偏差统计数据见下表。", new String[]{strLineBaseName}));
|
||||
// 频率偏差
|
||||
reportmap.put("$FRETable$", String.format("报告分析时间段内%s的频率偏差统计数据见下表。", new String[]{strLineBaseName}));
|
||||
// 三相电压不平衡度
|
||||
reportmap.put("$THETable$", String.format("报告分析时间段内%s的三相电压不平衡度统计数据见下表。", new String[]{strLineBaseName}));
|
||||
// 闪变
|
||||
reportmap.put("$PLTTable$", String.format("报告分析时间段内%s的闪变统计数据见下表。", new String[]{strLineBaseName}));
|
||||
// 电压总谐波畸变率
|
||||
reportmap.put("$ThdTable$", String.format("报告分析时间段内%s的电压总谐波畸变率统计数据见下表。", new String[]{strLineBaseName}));
|
||||
// 负序电流
|
||||
reportmap.put("$IneTable$", String.format("报告分析时间段内%s的负序电流统计数据见下表。", new String[]{strLineBaseName}));
|
||||
// 谐波电压
|
||||
reportmap.put("$RVTable$", String.format("报告分析时间段内%s的2-25次谐波电压含有率CP95概率值统计数据见下表。", new String[]{strLineBaseName}));
|
||||
// 间谐波
|
||||
reportmap.put("$INTable$", String.format("报告分析时间段内%s的0.5-15.5次间谐波电压含有率CP95概率值统计数据见下表。", new String[]{strLineBaseName}));
|
||||
// 谐波电流
|
||||
reportmap.put("$RITable$", String.format("报告分析时间段内%s的2-25次谐波电流幅值CP95概率值统计数据见下表。", new String[]{strLineBaseName}));
|
||||
// 监测点名称1
|
||||
reportmap.put("$LineName1$", name);
|
||||
// 监测点名称2
|
||||
reportmap.put("$LineName2$", name);
|
||||
// 监测点名称3
|
||||
reportmap.put("$LineName3$", name);
|
||||
// 监测点名称4
|
||||
reportmap.put("$LineName4$", name);
|
||||
// 监测点名称5
|
||||
reportmap.put("$LineName5$", name);
|
||||
|
||||
/**********************
|
||||
**** 数据获取
|
||||
@@ -544,16 +564,20 @@ public class ExportModelJBController extends BaseController {
|
||||
getCurrentRate(param, overLimit);
|
||||
getInRate(param, overLimit);
|
||||
getIne(param, overLimit);
|
||||
|
||||
ReportValue pst1 = this.listFlicker.get(0).getList().get(0);// 短闪
|
||||
ReportValue pst2 = this.listFlicker.get(0).getList().get(1);// 短闪
|
||||
ReportValue pst3 = this.listFlicker.get(0).getList().get(2);// 短闪
|
||||
ReportValue plt1 = this.listFlicker.get(1).getList().get(0);// 长闪
|
||||
ReportValue plt2 = this.listFlicker.get(1).getList().get(1);// 长闪
|
||||
ReportValue plt3 = this.listFlicker.get(1).getList().get(2);// 长闪
|
||||
|
||||
reportmap.put("$LineBase$", String.format("%s%s,CT变比为:%s,PT变比为:%s。",
|
||||
new String[]{bdname, name, lineDto.getCt(), lineDto.getPt()}));// 监测点基本信息
|
||||
// 短闪 A
|
||||
ReportValue pst1 = this.listFlicker.get(0).getList().get(0);
|
||||
// 短闪 B
|
||||
ReportValue pst2 = this.listFlicker.get(0).getList().get(1);
|
||||
// 短闪 C
|
||||
ReportValue pst3 = this.listFlicker.get(0).getList().get(2);
|
||||
// 长闪 A
|
||||
ReportValue plt1 = this.listFlicker.get(1).getList().get(0);
|
||||
// 长闪 B
|
||||
ReportValue plt2 = this.listFlicker.get(1).getList().get(1);
|
||||
// 长闪 C
|
||||
ReportValue plt3 = this.listFlicker.get(1).getList().get(2);
|
||||
// 监测点基本信息
|
||||
reportmap.put("$LineBase$", String.format("%s%s,CT变比为:%s,PT变比为:%s。", new String[]{bdname, name, lineDto.getCt(), lineDto.getPt()}));
|
||||
|
||||
/**************************************************************
|
||||
**** 三张大表基础数据幅值
|
||||
@@ -604,74 +628,105 @@ public class ExportModelJBController extends BaseController {
|
||||
/**************************************************************
|
||||
**** 电压偏差(上偏差和下偏差)
|
||||
***************************************************************/
|
||||
ReportValue vdeviation1 = this.listVdeviation.get(0).getList().get(0);
|
||||
ReportValue vdeviation2 = this.listVdeviation.get(0).getList().get(1);
|
||||
ReportValue vdeviation3 = this.listVdeviation.get(0).getList().get(2);
|
||||
String vdeviationLimit = judgeNull(this.listVdeviation.get(0).getOverLimit());// 获取电压上下偏差的国标限值
|
||||
// 获取电压上偏差的国标限值
|
||||
String vdeviationLimit = judgeNull(this.listVdeviation.get(0).getOverLimit());
|
||||
reportmap.put("$VD_L$", vdeviationLimit);
|
||||
reportmap.put("$VD_U$", judgeNull(this.listVdeviation.get(1).getOverLimit()));
|
||||
//获取电压下偏差的国标限值
|
||||
String ldeviationLimit = judgeNull(this.listVdeviation.get(1).getOverLimit());
|
||||
reportmap.put("$VD_U$", ldeviationLimit);
|
||||
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++) {
|
||||
String tmpstrMap ;
|
||||
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 + "相最大值";
|
||||
|
||||
}
|
||||
if(vminValue>Double.valueOf(vdeviationLimit)||vminValue<Double.valueOf(ldeviationLimit)){
|
||||
if (!"".equals(tmpstrResultVdeviationdata)){
|
||||
tmpstrResultVdeviationdata += "、";
|
||||
}
|
||||
tmpstrResultVdeviationdata += tmpstrMap + "相最小值";
|
||||
|
||||
}
|
||||
if(vaveValue>Double.valueOf(vdeviationLimit)||vaveValue<Double.valueOf(ldeviationLimit)){
|
||||
if (!"".equals(tmpstrResultVdeviationdata)){
|
||||
tmpstrResultVdeviationdata += "、";
|
||||
}
|
||||
tmpstrResultVdeviationdata += tmpstrMap + "相平均值";
|
||||
|
||||
}
|
||||
if(vcp95Value>Double.valueOf(vdeviationLimit)||vcp95Value<Double.valueOf(ldeviationLimit)){
|
||||
if (!"".equals(tmpstrResultVdeviationdata)){
|
||||
tmpstrResultVdeviationdata += "、";
|
||||
}
|
||||
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 ("".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);
|
||||
@@ -682,7 +737,8 @@ public class ExportModelJBController extends BaseController {
|
||||
**** 频率偏差
|
||||
***************************************************************/
|
||||
ReportValue valueOfFreValue = this.listFrequency.get(1).getList().get(0);
|
||||
String valueOfFreLimit = judgeNull(this.listFrequency.get(1).getOverLimit());// 获取频率偏差国标限值
|
||||
// 获取频率偏差国标限值
|
||||
String valueOfFreLimit = judgeNull(this.listFrequency.get(1).getOverLimit());
|
||||
reportmap.put("$FRE_L$", valueOfFreLimit);
|
||||
String strResultFre = "";
|
||||
String tmpstrResultFre = "";
|
||||
@@ -703,25 +759,25 @@ public class ExportModelJBController extends BaseController {
|
||||
reportmap.put("$FV0%$", judgeNull(valueOfFreValue.getCp95Value()));
|
||||
|
||||
try {
|
||||
maxValue = Math.abs(Double.parseDouble(valueOfFreValue.getFmaxValue().toString()));
|
||||
minValue = Math.abs(Double.parseDouble(valueOfFreValue.getMinValue().toString()));
|
||||
aveValue = Math.abs(Double.parseDouble(valueOfFreValue.getMeanValue().toString()));
|
||||
cp95Value = Math.abs(Double.parseDouble(valueOfFreValue.getCp95Value().toString()));
|
||||
maxValue = Double.parseDouble(valueOfFreValue.getFmaxValue().toString());
|
||||
minValue = Double.parseDouble(valueOfFreValue.getMinValue().toString());
|
||||
aveValue = Double.parseDouble(valueOfFreValue.getMeanValue().toString());
|
||||
cp95Value = Double.parseDouble(valueOfFreValue.getCp95Value().toString());
|
||||
limit = Math.abs(Double.parseDouble(valueOfFreLimit));
|
||||
} catch (Exception e) {
|
||||
strResultFreValue += "注意:从上表中可以看出" + strLineBaseName + "频率偏差数据存在异常(不是数值类型)。";
|
||||
}
|
||||
|
||||
if (maxValue > limit) {
|
||||
if (Math.abs(maxValue) > limit) {
|
||||
tmpstrResultFre += "最大值为:" + valueOfFreValue.getFmaxValue().toString() + deviceUnit.getUnitFrequencyDev();
|
||||
}
|
||||
if (minValue > limit) {
|
||||
if (Math.abs(minValue) > limit) {
|
||||
tmpstrResultFre += "最小值为:" + valueOfFreValue.getMinValue().toString() + deviceUnit.getUnitFrequencyDev();
|
||||
}
|
||||
if (aveValue > limit) {
|
||||
if (Math.abs(aveValue) > limit) {
|
||||
tmpstrResultFre += "平均值为:" + valueOfFreValue.getMeanValue().toString() + deviceUnit.getUnitFrequencyDev();
|
||||
}
|
||||
if (cp95Value > limit) {
|
||||
if (Math.abs(cp95Value) > limit) {
|
||||
tmpstrResultFre += "95%概率值为:" + valueOfFreValue.getCp95Value().toString() + deviceUnit.getUnitFrequencyDev();
|
||||
}
|
||||
|
||||
@@ -737,10 +793,12 @@ public class ExportModelJBController extends BaseController {
|
||||
}
|
||||
|
||||
if ("".equals(tmpstrResultFre)) {
|
||||
reportmap.put("$FV0R$", "合格");// 三张大表取值
|
||||
// 三张大表取值
|
||||
reportmap.put("$FV0R$", "合格");
|
||||
strResultFre += "从上表中可以看出" + strLineBaseName + "频率偏差均满足国标限值(±" + valueOfFreLimit + deviceUnit.getUnitFrequencyDev() + ")的要求。";
|
||||
} else {
|
||||
reportmap.put("$FV0R$", "不合格");// 三张大表取值
|
||||
// 三张大表取值
|
||||
reportmap.put("$FV0R$", "不合格");
|
||||
strAnalysis += tmpstrResultFre + ",均不满足国标限值(±" + valueOfFreLimit + deviceUnit.getUnitFrequencyDev() + ")的要求。";
|
||||
strResultFre += "从上表中可以看出" + strLineBaseName + "频率偏差" + tmpstrResultFre + ",均不满足国标限值(±" + valueOfFreLimit
|
||||
+ deviceUnit.getUnitFrequencyDev() + ")的要求。";
|
||||
@@ -754,7 +812,8 @@ public class ExportModelJBController extends BaseController {
|
||||
**** 三相电压不平衡度
|
||||
***************************************************************/
|
||||
ReportValue valueOfThree = this.listThreephase.get(0).getList().get(0);
|
||||
String valueOfThreeLimit = judgeNull(this.listThreephase.get(0).getOverLimit());// 获取三相电压不平衡度国标限值
|
||||
// 获取三相电压不平衡度国标限值
|
||||
String valueOfThreeLimit = judgeNull(this.listThreephase.get(0).getOverLimit());
|
||||
reportmap.put("$THE_L$", valueOfThreeLimit);
|
||||
String strResultThree = "";
|
||||
String tmpstrResultThree = "";
|
||||
@@ -783,10 +842,12 @@ public class ExportModelJBController extends BaseController {
|
||||
strResultThreeValue += "注意:从上表中可以看出" + strLineBaseName + "三相电压不平衡度数据存在异常(不是数值类型)。";
|
||||
}
|
||||
if (cp95Value > limit) {
|
||||
reportmap.put("$TV0R$", "不合格");// 三张大表取值
|
||||
// 三张大表取值
|
||||
reportmap.put("$TV0R$", "不合格");
|
||||
tmpstrResultThree += "三相电压不平衡度95%概率值为:" + valueOfThree.getCp95Value().toString();
|
||||
} else {
|
||||
reportmap.put("$TV0R$", "合格");// 三张大表取值
|
||||
// 三张大表取值
|
||||
reportmap.put("$TV0R$", "合格");
|
||||
}
|
||||
|
||||
if (!(maxValue >= minValue && maxValue >= aveValue && maxValue >= cp95Value)) {
|
||||
@@ -816,7 +877,8 @@ public class ExportModelJBController extends BaseController {
|
||||
/**************************************************************
|
||||
**** 电压闪变
|
||||
***************************************************************/
|
||||
String valueOfFlickerLimit = judgeNull(this.listFlicker.get(1).getOverLimit());// 获取电压长时闪变的限值
|
||||
// 获取电压长时闪变的限值
|
||||
String valueOfFlickerLimit = judgeNull(this.listFlicker.get(1).getOverLimit());
|
||||
reportmap.put("$PLT_L$", valueOfFlickerLimit);
|
||||
String strResultFlicker = "";
|
||||
String tmpstrResultFlicker = "";
|
||||
@@ -836,8 +898,9 @@ public class ExportModelJBController extends BaseController {
|
||||
strResultFlickerValue += "注意:从上表中可以看出" + strLineBaseName + "长时闪变数据存在异常(不是数值类型)。";
|
||||
}
|
||||
if (fmaxValue1 > flickerLimit) {
|
||||
if (!"".equals(tmpstrResultFlicker))
|
||||
if (!"".equals(tmpstrResultFlicker)) {
|
||||
tmpstrResultFlicker += ",";
|
||||
}
|
||||
tmpstrResultFlicker += atype + "最大值为:" + plt1.getFmaxValue().toString();
|
||||
reportmap.put("$" + "L" + "V0R_" + "A" + "$", "不合格");
|
||||
} else {
|
||||
@@ -845,8 +908,9 @@ public class ExportModelJBController extends BaseController {
|
||||
}
|
||||
|
||||
if (fmaxValue2 > flickerLimit) {
|
||||
if (!"".equals(tmpstrResultFlicker))
|
||||
if (!"".equals(tmpstrResultFlicker)) {
|
||||
tmpstrResultFlicker += ",";
|
||||
}
|
||||
tmpstrResultFlicker += btype + "最大值为:" + plt2.getFmaxValue().toString();
|
||||
reportmap.put("$" + "L" + "V0R_" + "B" + "$", "不合格");
|
||||
} else {
|
||||
@@ -854,8 +918,9 @@ public class ExportModelJBController extends BaseController {
|
||||
}
|
||||
|
||||
if (fmaxValue3 > flickerLimit && pttype != 2) {
|
||||
if (!"".equals(tmpstrResultFlicker))
|
||||
if (!"".equals(tmpstrResultFlicker)) {
|
||||
tmpstrResultFlicker += ",";
|
||||
}
|
||||
tmpstrResultFlicker += ctype + "最大值为:" + plt3.getFmaxValue().toString();
|
||||
reportmap.put("$" + "L" + "V0R_" + "C" + "$", "不合格");
|
||||
} else {
|
||||
@@ -1021,26 +1086,38 @@ public class ExportModelJBController extends BaseController {
|
||||
|
||||
String tmpstrResult = "";
|
||||
if (maxValue > limit) {
|
||||
if (!"".equals(tmpstrResult))
|
||||
if (!"".equals(tmpstrResult)) {
|
||||
tmpstrResult += "、";
|
||||
}
|
||||
tmpstrResult += "A";
|
||||
reportmap.put("$CV" + (i + 1) + "R_A$", "不合格");// 三张大表取值
|
||||
} else
|
||||
reportmap.put("$CV" + (i + 1) + "R_A$", "合格");// 三张大表取值
|
||||
// 三张大表取值
|
||||
reportmap.put("$CV" + (i + 1) + "R_A$", "不合格");
|
||||
} else {
|
||||
// 三张大表取值
|
||||
reportmap.put("$CV" + (i + 1) + "R_A$", "合格");
|
||||
}
|
||||
if (minValue > limit) {
|
||||
if (!"".equals(tmpstrResult))
|
||||
if (!"".equals(tmpstrResult)) {
|
||||
tmpstrResult += "、";
|
||||
}
|
||||
tmpstrResult += "B";
|
||||
reportmap.put("$CV" + (i + 1) + "R_B$", "不合格");// 三张大表取值
|
||||
} else
|
||||
reportmap.put("$CV" + (i + 1) + "R_B$", "合格");// 三张大表取值
|
||||
// 三张大表取值
|
||||
reportmap.put("$CV" + (i + 1) + "R_B$", "不合格");
|
||||
} else {
|
||||
// 三张大表取值
|
||||
reportmap.put("$CV" + (i + 1) + "R_B$", "合格");
|
||||
}
|
||||
if (aveValue > limit) {
|
||||
if (!"".equals(tmpstrResult))
|
||||
if (!"".equals(tmpstrResult)) {
|
||||
tmpstrResult += "、";
|
||||
}
|
||||
tmpstrResult += "C";
|
||||
reportmap.put("$CV" + (i + 1) + "R_C$", "不合格");// 三张大表取值
|
||||
} else
|
||||
reportmap.put("$CV" + (i + 1) + "R_C$", "合格");// 三张大表取值
|
||||
// 三张大表取值
|
||||
reportmap.put("$CV" + (i + 1) + "R_C$", "不合格");
|
||||
} else {
|
||||
// 三张大表取值
|
||||
reportmap.put("$CV" + (i + 1) + "R_C$", "合格");
|
||||
}
|
||||
// 判断单个结论是否存在
|
||||
if (!"".equals(tmpstrResult)) {
|
||||
tmpstrResultVoltageRate += (i + 1) + "次谐波电压含有率95%概率值" + tmpstrResult + ";";
|
||||
@@ -1054,6 +1131,9 @@ public class ExportModelJBController extends BaseController {
|
||||
strAnalysis += tmpstrResultVoltageRate + "2-25次谐波电压含有率95%概率值均不满足国标限值要求。";
|
||||
strResultVoltageRate += "从上表中可以看出" + strLineBaseName + tmpstrResultVoltageRate + "均不满足国标限值要求。";
|
||||
}
|
||||
reportmap.put("$ResultVoltageRate$", strResultVoltageRate );
|
||||
reportmap.put("$ResultVoltageRateValue$", strResultVoltageRateValue);
|
||||
|
||||
|
||||
/**************************************************************
|
||||
**** 电压总谐波畸变率(THD)
|
||||
@@ -1102,28 +1182,31 @@ public class ExportModelJBController extends BaseController {
|
||||
}
|
||||
// 限值判断
|
||||
if (cp95ValueA > limit) {
|
||||
if (!"".equals(tmpstrResultDistortion))
|
||||
if (!"".equals(tmpstrResultDistortion)) {
|
||||
tmpstrResultDistortion += "、";
|
||||
}
|
||||
tmpstrResultDistortion += atype;
|
||||
reportmap.put("$TV0R_A$", "不合格");// 三张大表取值
|
||||
reportmap.put("$TV0R_A$", "不合格");
|
||||
} else {
|
||||
reportmap.put("$TV0R_A$", "合格");// 三张大表取值
|
||||
reportmap.put("$TV0R_A$", "合格");
|
||||
}
|
||||
if (cp95ValueB > limit) {
|
||||
if (!"".equals(tmpstrResultDistortion))
|
||||
if (!"".equals(tmpstrResultDistortion)) {
|
||||
tmpstrResultDistortion += "、";
|
||||
}
|
||||
tmpstrResultDistortion += btype;
|
||||
reportmap.put("$TV0R_B$", "不合格");// 三张大表取值
|
||||
reportmap.put("$TV0R_B$", "不合格");
|
||||
} else {
|
||||
reportmap.put("$TV0R_B$", "合格");// 三张大表取值
|
||||
reportmap.put("$TV0R_B$", "合格");
|
||||
}
|
||||
if (cp95ValueC > limit && pttype != 2) {
|
||||
if (!"".equals(tmpstrResultDistortion))
|
||||
if (!"".equals(tmpstrResultDistortion)){
|
||||
tmpstrResultDistortion += "、";
|
||||
}
|
||||
tmpstrResultDistortion += ctype;
|
||||
reportmap.put("$TV0R_C$", "不合格");// 三张大表取值
|
||||
reportmap.put("$TV0R_C$", "不合格");
|
||||
} else {
|
||||
reportmap.put("$TV0R_C$", "合格");// 三张大表取值
|
||||
reportmap.put("$TV0R_C$", "合格");
|
||||
}
|
||||
|
||||
// 假如为空则所有的都满足
|
||||
@@ -1134,8 +1217,7 @@ public class ExportModelJBController extends BaseController {
|
||||
strResultDistortion += "从上表中可以看出" + strLineBaseName + tmpstrResultDistortion + "均不满足国标限值要求。";
|
||||
}
|
||||
|
||||
reportmap.put("$ResultVoltageRate$", strResultVoltageRate );
|
||||
reportmap.put("$ResultVoltageRateValue$", strResultVoltageRateValue + strResultDistortionValue);
|
||||
|
||||
reportmap.put("$ResultThdRate$", strResultDistortion);
|
||||
reportmap.put("$ResultThdRateValue$", strResultDistortionValue);
|
||||
|
||||
@@ -1194,26 +1276,32 @@ public class ExportModelJBController extends BaseController {
|
||||
|
||||
String tmpstrResult = "";
|
||||
if (maxValue > limit) {
|
||||
if (!"".equals(tmpstrResult))
|
||||
if (!"".equals(tmpstrResult)) {
|
||||
tmpstrResult += "、";
|
||||
}
|
||||
tmpstrResult += "A";
|
||||
reportmap.put("$CI" + (i + 1) + "R_A$", "不合格");// 三张大表取值
|
||||
} else
|
||||
reportmap.put("$CI" + (i + 1) + "R_A$", "合格");// 三张大表取值
|
||||
reportmap.put("$CI" + (i + 1) + "R_A$", "不合格");
|
||||
} else {
|
||||
reportmap.put("$CI" + (i + 1) + "R_A$", "合格");
|
||||
}
|
||||
if (minValue > limit) {
|
||||
if (!"".equals(tmpstrResult))
|
||||
if (!"".equals(tmpstrResult)) {
|
||||
tmpstrResult += "、";
|
||||
}
|
||||
tmpstrResult += "B";
|
||||
reportmap.put("$CI" + (i + 1) + "R_B$", "不合格");// 三张大表取值
|
||||
} else
|
||||
reportmap.put("$CI" + (i + 1) + "R_B$", "合格");// 三张大表取值
|
||||
reportmap.put("$CI" + (i + 1) + "R_B$", "不合格");
|
||||
} else {
|
||||
reportmap.put("$CI" + (i + 1) + "R_B$", "合格");
|
||||
}
|
||||
if (aveValue > limit) {
|
||||
if (!"".equals(tmpstrResult))
|
||||
if (!"".equals(tmpstrResult)) {
|
||||
tmpstrResult += "、";
|
||||
}
|
||||
tmpstrResult += "C";
|
||||
reportmap.put("$CI" + (i + 1) + "R_C$", "不合格");// 三张大表取值
|
||||
} else
|
||||
reportmap.put("$CI" + (i + 1) + "R_C$", "合格");// 三张大表取值
|
||||
reportmap.put("$CI" + (i + 1) + "R_C$", "不合格");
|
||||
} else {
|
||||
reportmap.put("$CI" + (i + 1) + "R_C$", "合格");
|
||||
}
|
||||
// 判断单个结论是否存在
|
||||
if (!"".equals(tmpstrResult)) {
|
||||
tmpstrResultCurrent += (i + 1) + "次谐波电流幅值95%概率值" + tmpstrResult + ";";
|
||||
@@ -1234,20 +1322,23 @@ public class ExportModelJBController extends BaseController {
|
||||
|
||||
|
||||
/**************************************************************
|
||||
**** 负序电压
|
||||
**** 负序电流
|
||||
***************************************************************/
|
||||
String ineLimit = judgeNull(this.listIneRate.get(0).getOverLimit());// 获取电压长时闪变的限值
|
||||
// 获取电压长时闪变的限值
|
||||
String ineLimit = judgeNull(this.listIneRate.get(0).getOverLimit());
|
||||
|
||||
String strResultIne = "";
|
||||
String tmpstrResultIne = "";
|
||||
String strResultIneValue = "";
|
||||
ReportValue ine1 = this.listIneRate.get(0).getList().get(0);// 短闪
|
||||
ReportValue ine2 = this.listIneRate.get(0).getList().get(1);// 短闪
|
||||
ReportValue ine3 = this.listIneRate.get(0).getList().get(2);// 短闪
|
||||
// 负序电流
|
||||
ReportValue ine1 = this.listIneRate.get(0).getList().get(0);
|
||||
ReportValue ine2 = this.listIneRate.get(0).getList().get(1);
|
||||
ReportValue ine3 = this.listIneRate.get(0).getList().get(2);
|
||||
try {
|
||||
if (Double.parseDouble(ine1.getFmaxValue().toString()) > Double.parseDouble(ineLimit)) {
|
||||
if (!"".equals(tmpstrResultFlicker))
|
||||
if (!"".equals(tmpstrResultFlicker)) {
|
||||
tmpstrResultIne += ",";
|
||||
}
|
||||
tmpstrResultIne += atype + "最大值为:" + ine1.getFmaxValue().toString();
|
||||
reportmap.put("$" + "L" + "V0R_" + "A" + "$", "不合格");
|
||||
} else {
|
||||
@@ -1255,8 +1346,9 @@ public class ExportModelJBController extends BaseController {
|
||||
}
|
||||
|
||||
if (Double.parseDouble(ine2.getFmaxValue().toString()) > Double.parseDouble(ineLimit)) {
|
||||
if (!"".equals(tmpstrResultIne))
|
||||
if (!"".equals(tmpstrResultIne)) {
|
||||
tmpstrResultIne += ",";
|
||||
}
|
||||
tmpstrResultIne += btype + "最大值为:" + ine2.getFmaxValue().toString();
|
||||
reportmap.put("$" + "L" + "V0R_" + "B" + "$", "不合格");
|
||||
} else {
|
||||
@@ -1264,16 +1356,18 @@ public class ExportModelJBController extends BaseController {
|
||||
}
|
||||
|
||||
if (Double.parseDouble(ine3.getFmaxValue().toString()) > Double.parseDouble(ineLimit) ) {
|
||||
if (!"".equals(tmpstrResultIne))
|
||||
if (!"".equals(tmpstrResultIne)) {
|
||||
tmpstrResultIne += ",";
|
||||
}
|
||||
tmpstrResultIne += ctype + "最大值为:" + ine3.getFmaxValue().toString();
|
||||
reportmap.put("$" + "L" + "V0R_" + "C" + "$", "不合格");
|
||||
} else {
|
||||
reportmap.put("$" + "L" + "V0R_" + "C" + "$", "合格");
|
||||
}
|
||||
} catch (Exception e) {
|
||||
if ("".equals(strResultIneValue))
|
||||
if ("".equals(strResultIneValue)) {
|
||||
strResultIneValue += "注意:从上表中可以看出" + strLineBaseName + "负序电流数据存在异常(不是数值类型)。";
|
||||
}
|
||||
}
|
||||
reportmap.put("$INETX_A$", judgeNull(ine1.getFmaxValue()));
|
||||
reportmap.put("$INETN_A$", judgeNull(ine1.getMinValue()));
|
||||
@@ -1319,7 +1413,7 @@ public class ExportModelJBController extends BaseController {
|
||||
String strMap = "$IN";
|
||||
String strCurrent = strMap + i + "%";
|
||||
|
||||
// 基波电压含有率
|
||||
// 间谐波电压
|
||||
strCurrentA = judgeNull(this.listInRate.get(i).getList().get(0).getCp95Value());
|
||||
strCurrentB = judgeNull(this.listInRate.get(i).getList().get(1).getCp95Value());
|
||||
strCurrentC = judgeNull(this.listInRate.get(i).getList().get(2).getCp95Value());
|
||||
@@ -1361,26 +1455,32 @@ public class ExportModelJBController extends BaseController {
|
||||
|
||||
String tmpstrResult = "";
|
||||
if (maxValue > limit) {
|
||||
if (!"".equals(tmpstrResult))
|
||||
if (!"".equals(tmpstrResult)) {
|
||||
tmpstrResult += "、";
|
||||
}
|
||||
tmpstrResult += "A";
|
||||
reportmap.put("$IN" + i + "R_A$", "不合格");// 三张大表取值
|
||||
} else
|
||||
reportmap.put("$IN" + i + "R_A$", "合格");// 三张大表取值
|
||||
reportmap.put("$IN" + i + "R_A$", "不合格");
|
||||
} else {
|
||||
reportmap.put("$IN" + i + "R_A$", "合格");
|
||||
}
|
||||
if (minValue > limit) {
|
||||
if (!"".equals(tmpstrResult))
|
||||
if (!"".equals(tmpstrResult)) {
|
||||
tmpstrResult += "、";
|
||||
}
|
||||
tmpstrResult += "B";
|
||||
reportmap.put("$IN" + i + "R_B$", "不合格");// 三张大表取值
|
||||
} else
|
||||
reportmap.put("$IN" + i + "R_B$", "合格");// 三张大表取值
|
||||
reportmap.put("$IN" + i + "R_B$", "不合格");
|
||||
} else {
|
||||
reportmap.put("$IN" + i + "R_B$", "合格");
|
||||
}
|
||||
if (aveValue > limit) {
|
||||
if (!"".equals(tmpstrResult))
|
||||
if (!"".equals(tmpstrResult)) {
|
||||
tmpstrResult += "、";
|
||||
}
|
||||
tmpstrResult += "C";
|
||||
reportmap.put("$IN" + i + "R_C$", "不合格");// 三张大表取值
|
||||
} else
|
||||
reportmap.put("$IN" + i + "R_C$", "合格");// 三张大表取值
|
||||
reportmap.put("$IN" + i + "R_C$", "不合格");
|
||||
} else {
|
||||
reportmap.put("$IN" + i + "R_C$", "合格");
|
||||
}
|
||||
// 判断单个结论是否存在
|
||||
if (!"".equals(tmpstrResult)) {
|
||||
tmpstrResultIn += i + "次间谐波电压含有率95%概率值" + tmpstrResult + ";";
|
||||
@@ -1403,22 +1503,30 @@ public class ExportModelJBController extends BaseController {
|
||||
// 测试结果填写
|
||||
reportmap.put("$ResultTitle$", String.format("通过对(%s——%s)时间段内%s电能质量统计数据分析后得出以下结论:",
|
||||
new String[]{DateUtil.format(startDate, "yyyy年MM月dd日 HH时mm分ss秒"),
|
||||
DateUtil.format(endDate, "yyyy年MM月dd日 HH时mm分ss秒"), strLineBaseName}));// 结论标题
|
||||
reportmap.put("$Result_VD$", String.format("(1)电压偏差:%s", new String[]{strResultVdeviationdata}));// 电压偏差
|
||||
reportmap.put("$Result_FRE$", String.format("(2)频率偏差:%s", new String[]{strResultFre}));// 频率偏差
|
||||
reportmap.put("$Result_THE$", String.format("(3)三相电压不平衡度:%s", new String[]{strResultThree}));// 三相电压不平衡度
|
||||
reportmap.put("$Result_FIC$", String.format("(4)电压长时闪变:%s", new String[]{strResultFlicker}));// 电压长时闪变
|
||||
reportmap.put("$Result_VOL$", String.format("(5)谐波电压含有率:%s", new String[]{strResultVoltageRate}));// 谐波电压
|
||||
reportmap.put("$Result_U$", String.format("(6)电压总谐波畸变率:%s", new String[]{strResultDistortion}));// 谐波电压
|
||||
reportmap.put("$Result_IN$", String.format("(7)间谐波电压含有率:%s", new String[]{strResultIn}));// 谐波电压
|
||||
reportmap.put("$Result_CUR$", String.format("(8)谐波电流:%s", new String[]{strResultCurrent}));// 谐波电流
|
||||
//todo 负序电流 暂降事件
|
||||
reportmap.put("$Result_CUR$", String.format("(9)负序电流:%s", new String[]{strResultCurrent}));// 负序电流
|
||||
DateUtil.format(endDate, "yyyy年MM月dd日 HH时mm分ss秒"), strLineBaseName}));
|
||||
// 电压偏差
|
||||
reportmap.put("$Result_VD$", String.format("(1)电压偏差:%s", new String[]{strResultVdeviationdata}));
|
||||
// 频率偏差
|
||||
reportmap.put("$Result_FRE$", String.format("(2)频率偏差:%s", new String[]{strResultFre}));
|
||||
// 三相电压不平衡度
|
||||
reportmap.put("$Result_THE$", String.format("(3)三相电压不平衡度:%s", new String[]{strResultThree}));
|
||||
// 电压长时闪变
|
||||
reportmap.put("$Result_FIC$", String.format("(4)电压长时闪变:%s", new String[]{strResultFlicker}));
|
||||
// 谐波电压
|
||||
reportmap.put("$Result_VOL$", String.format("(5)谐波电压含有率:%s", new String[]{strResultVoltageRate}));
|
||||
// 电压总谐波畸变率
|
||||
reportmap.put("$Result_U$", String.format("(6)电压总谐波畸变率:%s", new String[]{strResultDistortion}));
|
||||
// 间谐波电压含有率
|
||||
reportmap.put("$Result_IN$", String.format("(7)间谐波电压含有率:%s", new String[]{strResultIn}));
|
||||
// 谐波电流
|
||||
reportmap.put("$Result_CUR$", String.format("(8)谐波电流:%s", new String[]{strResultCurrent}));
|
||||
// 负序电流
|
||||
reportmap.put("$Result_CUR$", String.format("(9)负序电流:%s", new String[]{strResultCurrent}));
|
||||
// 分析建议填写
|
||||
if (!"".equals(strAnalysis) || !"".equals(strError)) {
|
||||
reportmap.put("$Analysis$", "根据统计数据结果分析,监测点为:" + name + "," + strAnalysis + strError);// 分析建议
|
||||
reportmap.put("$Analysis$", "根据统计数据结果分析,监测点为:" + name + "," + strAnalysis + strError);
|
||||
} else {
|
||||
reportmap.put("$Analysis$", "根据统计数据结果分析,监测点为:" + name + ",电能质量数据满足国标限值要求。");// 分析建议
|
||||
reportmap.put("$Analysis$", "根据统计数据结果分析,监测点为:" + name + ",电能质量数据满足国标限值要求。");
|
||||
}
|
||||
|
||||
/************************************
|
||||
@@ -1444,7 +1552,8 @@ public class ExportModelJBController extends BaseController {
|
||||
reportmap.put("$YF0X$", judgeNull(powerDto4.getFmaxValue()));
|
||||
reportmap.put("$YF0N$", judgeNull(powerDto4.getMinValue()));
|
||||
reportmap.put("$YF0E$", judgeNull(powerDto4.getMeanValue()));
|
||||
formatter = new SimpleDateFormat("yyyyMMddHHmmss");// 报告时分秒格式
|
||||
// 报告时分秒格式
|
||||
formatter = new SimpleDateFormat("yyyyMMddHHmmss");
|
||||
|
||||
/****
|
||||
* 暂态列表
|
||||
@@ -1512,7 +1621,8 @@ public class ExportModelJBController extends BaseController {
|
||||
tableList.add(2,risEList);
|
||||
tableList.add(3,shortList);
|
||||
}
|
||||
reportmap.put("$Result_EVENT$", String.format("(10)监测分析时间段内,发生电压暂升事件%s次,电压暂降事件%s次,电压中断事件%s次,需考虑相应治理措施", new String[]{tableList.get(1).size()+"",tableList.get(2).size()+"",tableList.get(3).size()+""}));// 负序电流
|
||||
// 暂降事件列表
|
||||
reportmap.put("$Result_EVENT$", String.format("(10)监测分析时间段内,发生电压暂升事件%s次,电压暂降事件%s次,电压中断事件%s次,需考虑相应治理措施", new String[]{tableList.get(1).size()+"",tableList.get(2).size()+"",tableList.get(3).size()+""}));
|
||||
String reportFileUrl = "";
|
||||
try {
|
||||
String fileName = name + formatter.format(currentTime) + ".docx";
|
||||
|
||||
@@ -89,6 +89,7 @@ public class RStatLimitServiceImpl implements RStatLimitService {
|
||||
public List<GridDiagramVO.LineData> getGridDiagramLineData(DeviceInfoParam.BusinessParam deviceInfoParam) {
|
||||
List<GridDiagramVO.LineData> info = new ArrayList<>();
|
||||
deviceInfoParam.setLineRunFlag(0);
|
||||
deviceInfoParam.setLineOrDevice(1);
|
||||
List<GeneralDeviceDTO> data = generalDeviceInfoClient.getPracticalRunDeviceInfo(deviceInfoParam).getData();
|
||||
List<GeneralDeviceDTO> list = data.stream().sorted(Comparator.comparing(x -> x.getLineIndexes().size(), Comparator.reverseOrder())).collect(Collectors.toList());
|
||||
//终端总数量
|
||||
|
||||
Reference in New Issue
Block a user