From e88fba9645a57535d858ce48da8e9d9a3dc84adc Mon Sep 17 00:00:00 2001
From: dongyukun <1208714201@qq.com>
Date: 星期四, 02 一月 2025 16:48:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/api/McsApiImpl.java | 73 ------------------------------------
1 files changed, 0 insertions(+), 73 deletions(-)
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/api/McsApiImpl.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/api/McsApiImpl.java
index 129b8da..92e3e0e 100644
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/api/McsApiImpl.java
+++ b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/api/McsApiImpl.java
@@ -87,9 +87,6 @@
@Autowired
private StScheduleSchemeService stScheduleSchemeService;
- @Autowired
- private StScheduleModelOutService stScheduleModelOutService;
-
private int HOUR_MINS = 60;
@Override
@@ -561,76 +558,6 @@
params.put("triggerMethod", triggerMethod);
params.put("triggerCondition", triggerCondition);
return stScheduleSchemeService.list(params);
- }
-
- @Override
- public Boolean scheduleModelOut(MdkScheduleRespDTO dto) {
- String modelId = stScheduleSchemeService.getByCode(dto.getScheduleCode()).getModelId();
- Map<String,Object> result = dto.getResult();
- List<StScheduleModelOutDTO> list = stScheduleModelOutService.list(modelId);
- try{
- list.forEach(
- item -> {
- double value = 0;
- //判断点位是否下发以及返回结果是否存在
- if(item.getIsWrite()==1){
- if(result.get(item.getResultKey())==null){
- log.error(result.get(item.getResultKey()) + "resultKey匹配失败");
- }
- Object resultValue = result.get(item.getResultKey());
- //判断解析方式
- if(item.getResultType().equals("double")){
- if(resultValue instanceof Double) {
- value = (Double) resultValue;
- }
- }else if(item.getResultType().equals("double[]")){
- ArrayList<Double> doubleList = (ArrayList<Double>) resultValue;
- double[] array = new double[doubleList.size()];
- for (int i = 0; i < doubleList.size(); i++) {
- array[i] = doubleList.get(i);
- }
- if(array!= null && item.getResultPort() < array.length){
- value = array[item.getResultPort()];
- }else{
- log.error(result.get(item.getResultKey()) + "下角标超限");
- }
-
- }else if(item.getResultType().equals("double[][]")){
- if (item.getResultType().equals("double[][]")) {
- if (resultValue instanceof ArrayList) {
- ArrayList<ArrayList<Double>> doubleListList = (ArrayList<ArrayList<Double>>) resultValue;
- double[][] array = new double[doubleListList.size()][];
- for (int i = 0; i < doubleListList.size(); i++) {
- ArrayList<Double> doubleList = doubleListList.get(i);
- array[i] = new double[doubleList.size()];
- for (int j = 0; j < doubleList.size(); j++) {
- array[i][j] = doubleList.get(j);
- }
- }
- if (array != null && item.getResultPort() < array.length && item.getResultIndex() < array[item.getResultPort()].length) {
- value = array[item.getResultPort()][item.getResultIndex()];
- } else {
- log.error(result.get(item.getResultKey()) + "下标超限");
- }
- }
- }
- }
- //下发到point点位
- ApiPointValueWriteDTO ApiPointValueWriteDTO = new ApiPointValueWriteDTO();
- ApiPointValueWriteDTO.setPointNo(item.getPointNo());
- ApiPointValueWriteDTO.setValue(value);
- if (!dataPointApi.writePointRealValue(ApiPointValueWriteDTO)) {
- log.error(result.get(item.getResultKey()) + "下发数据异常");
- }
-
- }
- }
- );
- }catch (Exception ex){
- log.error("下发数据异常");
- ex.printStackTrace();
- }
- return true;
}
private Date[] calResultTime(ItemVO predictItem, Date startTimeReq, Date endTimeReq, int lengthLeft, int lengthRight) {
--
Gitblit v1.9.3