From f4f7953be1735e739df1a0e5798bdd3cf0ba1bf6 Mon Sep 17 00:00:00 2001 From: dongyukun <1208714201@qq.com> Date: 星期一, 05 五月 2025 19:27:56 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- ansteel-biz/src/main/java/com/iailab/module/ansteel/job/task/RunCokingOverviewTask.java | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ansteel-biz/src/main/java/com/iailab/module/ansteel/job/task/RunCokingOverviewTask.java b/ansteel-biz/src/main/java/com/iailab/module/ansteel/job/task/RunCokingOverviewTask.java index f64418a..ad3fa59 100644 --- a/ansteel-biz/src/main/java/com/iailab/module/ansteel/job/task/RunCokingOverviewTask.java +++ b/ansteel-biz/src/main/java/com/iailab/module/ansteel/job/task/RunCokingOverviewTask.java @@ -198,12 +198,14 @@ List<String> points = new ArrayList<>(); points.add(conf.getPointNo()); Map<String, Object> pointsRealValue = dataPointApi.queryPointsRealValue(points); - value = Double.valueOf(pointsRealValue.get(conf.getPointNo()).toString()); + if (pointsRealValue.containsKey(conf.getPointNo())) { + value = Double.valueOf(pointsRealValue.get(conf.getPointNo()).toString()); + } break; case IND: List<ApiIndItemValueDTO> indValues = indItemApi.queryIndItemDefaultValue(conf.getPointNo()); if (!CollectionUtils.isEmpty(indValues)) { - value = Double.valueOf(indValues.get(indValues.size() - 1).getDataValue().toString()); + value = Double.valueOf(indValues.get(0).getDataValue().toString()); } break; case MODEL: @@ -212,6 +214,9 @@ break; } + if (value != null && StringUtils.isNotBlank(conf.getExt5())) { + value = value * Double.valueOf(conf.getExt5()); + } return value; } } \ No newline at end of file -- Gitblit v1.9.3