liaoning #1

Merged
huangzj merged 2 commits from liaoning into main 2025-10-15 10:39:22 +08:00

View File

@@ -719,25 +719,25 @@ public class ExportModelController extends BaseController {
reportmap.put("$FV0%$", judgeNull(valueOfFreValue.getCp95Value())); reportmap.put("$FV0%$", judgeNull(valueOfFreValue.getCp95Value()));
try { try {
maxValue = Math.abs(Double.parseDouble(valueOfFreValue.getFmaxValue().toString())); maxValue = Double.parseDouble(valueOfFreValue.getFmaxValue().toString());
minValue = Math.abs(Double.parseDouble(valueOfFreValue.getMinValue().toString())); minValue = Double.parseDouble(valueOfFreValue.getMinValue().toString());
aveValue = Math.abs(Double.parseDouble(valueOfFreValue.getMeanValue().toString())); aveValue = Double.parseDouble(valueOfFreValue.getMeanValue().toString());
cp95Value = Math.abs(Double.parseDouble(valueOfFreValue.getCp95Value().toString())); cp95Value = Double.parseDouble(valueOfFreValue.getCp95Value().toString());
limit = Math.abs(Double.parseDouble(valueOfFreLimit)); limit = Math.abs(Double.parseDouble(valueOfFreLimit));
} catch (Exception e) { } catch (Exception e) {
strResultFreValue += "注意:从上表中可以看出" + strLineBaseName + "频率偏差数据存在异常(不是数值类型)。"; strResultFreValue += "注意:从上表中可以看出" + strLineBaseName + "频率偏差数据存在异常(不是数值类型)。";
} }
if (maxValue > limit) { if (Math.abs(maxValue) > limit) {
tmpstrResultFre += "最大值为:" + valueOfFreValue.getFmaxValue().toString() + deviceUnit.getUnitFrequencyDev(); tmpstrResultFre += "最大值为:" + valueOfFreValue.getFmaxValue().toString() + deviceUnit.getUnitFrequencyDev();
} }
if (minValue > limit) { if (Math.abs(minValue) > limit) {
tmpstrResultFre += "最小值为:" + valueOfFreValue.getMinValue().toString() + deviceUnit.getUnitFrequencyDev(); tmpstrResultFre += "最小值为:" + valueOfFreValue.getMinValue().toString() + deviceUnit.getUnitFrequencyDev();
} }
if (aveValue > limit) { if (Math.abs(aveValue) > limit) {
tmpstrResultFre += "平均值为:" + valueOfFreValue.getMeanValue().toString() + deviceUnit.getUnitFrequencyDev(); tmpstrResultFre += "平均值为:" + valueOfFreValue.getMeanValue().toString() + deviceUnit.getUnitFrequencyDev();
} }
if (cp95Value > limit) { if (Math.abs(cp95Value) > limit) {
tmpstrResultFre += "95%概率值为:" + valueOfFreValue.getCp95Value().toString() + deviceUnit.getUnitFrequencyDev(); tmpstrResultFre += "95%概率值为:" + valueOfFreValue.getCp95Value().toString() + deviceUnit.getUnitFrequencyDev();
} }