From 5665c6d9ff476abd922b1f6a43ea1dac0600cb05 Mon Sep 17 00:00:00 2001
From: dengzedong <dengzedong@email>
Date: 星期五, 25 四月 2025 09:56:29 +0800
Subject: [PATCH] 数据下发 用jsonarray处理
---
iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/api/MdkApiImpl.java | 40 +++++++++-------------------------------
1 files changed, 9 insertions(+), 31 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 d0b36a8..a447139 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
@@ -1,6 +1,7 @@
package com.iailab.module.model.api;
import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.iailab.module.data.api.point.DataPointApi;
import com.iailab.module.data.api.point.dto.ApiPointValueWriteDTO;
@@ -368,42 +369,20 @@
ModelOutResultType modelOutResultType = ModelOutResultType.getEumByCode(stScheduleModelOutDTO.getResultType());
switch (modelOutResultType) {
case D:
- if (resultValue instanceof Integer) {
- value = ((Integer) resultValue).doubleValue();
- } else if (resultValue instanceof Double) {
- value = (Double) resultValue;
- } else {
- System.out.println("resultValue is not a number");
- }
+ value = Double.valueOf(resultValue.toString());
break;
case D1:
- /*ArrayList<Double> doubleList = (ArrayList<Double>) resultValue;
- double[] array1 = new double[doubleList.size()];
- for (int i = 0; i < doubleList.size(); i++) {
- array1[i] = doubleList.get(i);
- }*/
-
- double[] array1 = (double[]) resultValue;
- if (stScheduleModelOutDTO.getResultPort() < array1.length) {
- value = array1[stScheduleModelOutDTO.getResultPort()];
+ JSONArray jsonArray = JSON.parseArray(resultValue.toString());
+ if (stScheduleModelOutDTO.getResultPort() < jsonArray.size()) {
+ value = jsonArray.getDoubleValue(stScheduleModelOutDTO.getResultPort());
} else {
log.error(result.get(stScheduleModelOutDTO.getResultKey()) + "下角标超限");
}
break;
case D2:
- // ArrayList<ArrayList<Double>> doubleListList = (ArrayList<ArrayList<Double>>) resultValue;
- // double[][] array2 = new double[doubleListList.size()][];
- // double[][] array2 = (double[][]) resultValue;
- /*for (int i = 0; i < doubleListList.size(); i++) {
- ArrayList<Double> doubleList2 = doubleListList.get(i);
- array2[i] = new double[doubleList2.size()];
- for (int j = 0; j < doubleList2.size(); j++) {
- array2[i][j] = doubleList2.get(j);
- }
- }*/
- double[][] array2 = (double[][]) resultValue;
- if (stScheduleModelOutDTO.getResultPort() < array2.length && stScheduleModelOutDTO.getResultIndex() < array2[stScheduleModelOutDTO.getResultPort()].length) {
- value = array2[stScheduleModelOutDTO.getResultPort()][stScheduleModelOutDTO.getResultIndex()];
+ JSONArray json2Array = JSON.parseArray(resultValue.toString());
+ if (stScheduleModelOutDTO.getResultPort() < json2Array.size() && stScheduleModelOutDTO.getResultIndex() < json2Array.getJSONArray(stScheduleModelOutDTO.getResultPort()).size()) {
+ value = json2Array.getJSONArray(stScheduleModelOutDTO.getResultPort()).getDoubleValue(stScheduleModelOutDTO.getResultIndex());
} else {
log.error(result.get(stScheduleModelOutDTO.getResultKey()) + "下标超限");
}
@@ -418,8 +397,7 @@
}
}
} catch (Exception ex) {
- log.error("下发数据异常");
- ex.printStackTrace();
+ log.error("下发数据异常",ex);
}
return true;
}
--
Gitblit v1.9.3