From 3e55baa1e86c962d4899f4102b684bfd52d5ad13 Mon Sep 17 00:00:00 2001 From: haungxing <1203316822@qq.com> Date: Mon, 19 Aug 2024 18:26:03 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E8=BF=90=E8=A1=8C=E6=9C=88=E6=8A=A5?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=9F=A5=E8=AF=A2=E6=95=B0=E6=8D=AE=E6=A0=BC?= =?UTF-8?q?=E5=BC=8F=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/hnac/hzims/bigmodel/interactive/constants/FuncRouteEnum.java | 3 ++- .../com/hnac/hzims/bigmodel/schedule/RunReportAnalyseSchedule.java | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/hzims-service/hzims-big-model/src/main/java/com/hnac/hzims/bigmodel/interactive/constants/FuncRouteEnum.java b/hzims-service/hzims-big-model/src/main/java/com/hnac/hzims/bigmodel/interactive/constants/FuncRouteEnum.java index cdd2857..79f6c08 100644 --- a/hzims-service/hzims-big-model/src/main/java/com/hnac/hzims/bigmodel/interactive/constants/FuncRouteEnum.java +++ b/hzims-service/hzims-big-model/src/main/java/com/hnac/hzims/bigmodel/interactive/constants/FuncRouteEnum.java @@ -24,7 +24,8 @@ public enum FuncRouteEnum { SHOW_PARAM("result_record","设备参数查询", FunctionConstants.TypeEnum.PARAMS), CHOOSE_YC("choose_yc","选择遥测数据",FunctionConstants.TypeEnum.CHOOSE), HISTORY_DATA("history_data","查询历史数据",FunctionConstants.TypeEnum.CHART), - CONTROL_DEVICE("control_device","设备控制",FunctionConstants.TypeEnum.PARAMS) + CONTROL_DEVICE("control_device","设备控制",FunctionConstants.TypeEnum.PARAMS), + SHOW_DATA("show_data","智能分析",FunctionConstants.TypeEnum.PARAMS) ; @Getter private String func; diff --git a/hzims-service/hzims-big-model/src/main/java/com/hnac/hzims/bigmodel/schedule/RunReportAnalyseSchedule.java b/hzims-service/hzims-big-model/src/main/java/com/hnac/hzims/bigmodel/schedule/RunReportAnalyseSchedule.java index dac9cf4..5e42faf 100644 --- a/hzims-service/hzims-big-model/src/main/java/com/hnac/hzims/bigmodel/schedule/RunReportAnalyseSchedule.java +++ b/hzims-service/hzims-big-model/src/main/java/com/hnac/hzims/bigmodel/schedule/RunReportAnalyseSchedule.java @@ -45,11 +45,11 @@ public class RunReportAnalyseSchedule { if(Func.isNotEmpty(answerVOS)) { AnswerVO answerVO = answerVOS.get(0); if(answerVO.getRunning() == 0) { - log.info("运行月报分析结果为：" + answerVO.getAnswer()); + log.info("运行月报分析结果为：" + JSON.toJSONString(answerVO)); JSONObject message = new JSONObject(); message.put("stationCode", analyseObject.getString("stationCode")); message.put("month", analyseObject.getString("month")); - message.put("result", answerVO.getAnswer()); + message.put("result", JSONObject.parseObject(JSON.toJSONString(answerVO.getExtras()[0])).getString("data")); // 获取到问答答案，存入消息中 mqttSender.sendToMqtt(MqttTopicConstants.RUN_REPORT_ANALYSE_RESULT,JSON.toJSONString(message)); redisTemplate.opsForList().remove(RedisKeyConstants.RUN_REPORT_SESSION_ID,1,analyse);