From 7c47f7800d58efa8043f60ccd6566de1e296939d Mon Sep 17 00:00:00 2001 From: 潘志宝 <979469083@qq.com> Date: 星期日, 27 四月 2025 09:46:13 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- ansteel-biz/src/main/java/com/iailab/module/ansteel/job/task/RunCokingTraceModelLJTask.java | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/ansteel-biz/src/main/java/com/iailab/module/ansteel/job/task/RunCokingTraceModelLJTask.java b/ansteel-biz/src/main/java/com/iailab/module/ansteel/job/task/RunCokingTraceModelLJTask.java index eb85583..cfef52f 100644 --- a/ansteel-biz/src/main/java/com/iailab/module/ansteel/job/task/RunCokingTraceModelLJTask.java +++ b/ansteel-biz/src/main/java/com/iailab/module/ansteel/job/task/RunCokingTraceModelLJTask.java @@ -87,13 +87,13 @@ "\"cokeRow0\":[[0,13],[0,42],[0,34]],\n" + " " + "\"cokeRow1\":[[13,12],[12,34],[24,42]],\n" + " " + "\"cokeRow2\":[[27,45],[58,42],[70,31]],\n" + " " + - "\"cokeRow3\":[[108,56],[110,89],[185,21]],\n" + " " + - "\"cokeRow4\":[[199,13],[200,51],[197,34]],\n" + " " + - "\"cokeRow5\":[[147,33],[131,12],[122,13]],\n" + " " + + "\"cokeRow3\":[[18,56],[10,89],[15,21]],\n" + " " + + "\"cokeRow4\":[[19,13],[20,51],[17,34]],\n" + " " + + "\"cokeRow5\":[[47,33],[31,12],[22,13]],\n" + " " + "\"cokeHomePage\":[[202,42],[203,13],[204,45],[205,34],[206,17]],\n" + " " + "\"cokeHomeIndex\":[[90.4,90.2],[80.3,78],[103,100],[280,270]],\n" + " " + - "\"cokeHomeIndexInfo\":\"2月18日甲班:吨焦耗热量异常\",\n" + " " + - "\"cokeHomeErr\":\"2月18日煤气预热器前数据异常(无数据)\"\n" + " " + "}\n" + "}"; + "\"cokeHomeIndexInfo\":\"4月25日甲班:吨焦耗热量异常\",\n" + " " + + "\"cokeHomeErr\":\"4月25日煤气预热器前数据异常(无数据)\"\n" + " " + "}\n" + "}"; @Override public void run(String params) { @@ -186,12 +186,12 @@ @Transactional public void saveTraceDeviation(String relId, String process, String clock, JSONObject result) { - List<ChartParamDTO> list = mcsApi.getChartParamList(CommonConstant.COAL_INDEX_CHARTCODE); + List<ChartParamDTO> list = mcsApi.getChartParamList(CommonConstant.COKE_INDEX_CHARTCODE); Map<String, String> steamIndexMaps = list.stream().collect(Collectors.toMap(ChartParamDTO::getParamCode, e -> e.getParamName())); List<String> coalRowKeys = new ArrayList<>(); result.forEach((key, value) -> { - if (StringUtils.isBlank(key) && key.contains(cokeRow)) { + if (StringUtils.isNotBlank(key) && key.contains(cokeRow)) { coalRowKeys.add(key); } -- Gitblit v1.9.3