From fc7ebc6bf97d7c4a4a8911c7a5d7cadcbda24719 Mon Sep 17 00:00:00 2001
From: houzhongjian <houzhongyi@126.com>
Date: 星期四, 12 六月 2025 17:41:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/api/MdkApiImpl.java | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/api/MdkApiImpl.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/api/MdkApiImpl.java
index a447139..d09e59e 100644
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/api/MdkApiImpl.java
+++ b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/api/MdkApiImpl.java
@@ -296,8 +296,7 @@
stScheduleSchemeService.updateTime(scheduleResult.getSchemeId(), scheduleResult.getScheduleTime(), scheduleResult.getResultCode());
log.info("调度计算结束: " + System.currentTimeMillis());
} catch (Exception ex) {
- log.info("调度计算异常: " + System.currentTimeMillis());
- ex.printStackTrace();
+ log.error("调度计算异常: " + System.currentTimeMillis(),ex);
return resp;
}
return resp;
@@ -365,14 +364,15 @@
continue;
}
Object resultValue = result.get(stScheduleModelOutDTO.getResultKey());
+ String resultJson = JSON.toJSONString(resultValue);
//判断解析方式
ModelOutResultType modelOutResultType = ModelOutResultType.getEumByCode(stScheduleModelOutDTO.getResultType());
switch (modelOutResultType) {
case D:
- value = Double.valueOf(resultValue.toString());
+ value = Double.valueOf(resultJson);
break;
case D1:
- JSONArray jsonArray = JSON.parseArray(resultValue.toString());
+ JSONArray jsonArray = JSON.parseArray(resultJson);
if (stScheduleModelOutDTO.getResultPort() < jsonArray.size()) {
value = jsonArray.getDoubleValue(stScheduleModelOutDTO.getResultPort());
} else {
@@ -380,7 +380,7 @@
}
break;
case D2:
- JSONArray json2Array = JSON.parseArray(resultValue.toString());
+ JSONArray json2Array = JSON.parseArray(resultJson);
if (stScheduleModelOutDTO.getResultPort() < json2Array.size() && stScheduleModelOutDTO.getResultIndex() < json2Array.getJSONArray(stScheduleModelOutDTO.getResultPort()).size()) {
value = json2Array.getJSONArray(stScheduleModelOutDTO.getResultPort()).getDoubleValue(stScheduleModelOutDTO.getResultIndex());
} else {
@@ -397,7 +397,7 @@
}
}
} catch (Exception ex) {
- log.error("下发数据异常",ex);
+ log.error("下发数据异常，result:" + JSON.toJSONString(result),ex);
}
return true;
}
--
Gitblit v1.9.3