From 67c9118cffb7d7407668bbbad4c64f9aaf21ba0d Mon Sep 17 00:00:00 2001
From: huang <1532065656@qq.com>
Date: 星期二, 18 三月 2025 10:06:37 +0800
Subject: [PATCH] 看板能耗管理
---
JiuMuMesParent/common/servicebase/src/main/java/com/mes/service/PlcAgreement.java | 19 ++++++++++---------
1 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/JiuMuMesParent/common/servicebase/src/main/java/com/mes/service/PlcAgreement.java b/JiuMuMesParent/common/servicebase/src/main/java/com/mes/service/PlcAgreement.java
index 978d6d2..52ec63b 100644
--- a/JiuMuMesParent/common/servicebase/src/main/java/com/mes/service/PlcAgreement.java
+++ b/JiuMuMesParent/common/servicebase/src/main/java/com/mes/service/PlcAgreement.java
@@ -24,7 +24,7 @@
/**
* 鍗忚鍙傛暟
*/
- private List<String> parameterKeys=null;
+ private List<String> parameterKeys=new ArrayList<>();
private Map<String,PlcParameter> parameters=null;
/**
* 鍗忚璺緞
@@ -40,11 +40,12 @@
public int plcAddressLength=0;
//绫讳技搴忓垪鍙凤紙4锛�+鍗忚鏍囧織锛�4锛�+闀垮害锛�4锛�+浠庣珯鍦板潃锛�2锛�+鍔熻兘浠ｇ爜锛�2锛�+璧峰鍦板潃锛�4锛�+璇诲彇鏁伴噺锛�4锛� "000100000006010300000032"
public String requestHead=null;
-
- PlcAgreement(){
- jsonFilePath = System.getProperty("user.dir") + "../../JsonFile/PlcCacheGlass.json";
+ private PlcAgreement(){}
+ PlcAgreement(String fileName){
+ //jsonFilePath = "D:/mes/JsonFile/"+fileName+".json";
+ jsonFilePath = System.getProperty("user.dir") + "/JsonFile/"+fileName+".json";
boolean initSuccess=initword();
- log.info("鍒濆鍖朠lcCacheGlass锛�"+initSuccess);
+ //log.info("鍒濆鍖朠lcCacheGlass锛�"+initSuccess);
}
//鍒濆鍖杦ord
public boolean initword() {
@@ -63,20 +64,20 @@
fileReader.close();
JSONObject jsonFile = new JSONObject(content.toString());
-
+ //log.info("璇诲彇鍐呭锛歿}",jsonFile);
JSONArray jsonArray = jsonFile.getJSONArray("parameterInfo");
-
this.plcAddressBegin=jsonFile.getStr("plcAddressBegin");//璁剧疆璧峰浣嶅湴鍧�
this.plcAddressLength=Integer.valueOf(jsonFile.getStr("plcAddressLength"));//璁剧疆鍦板潃闀垮害
this.requestHead=jsonFile.getStr("requestHead");//璁剧疆璇锋眰澶撮儴
for (int i = 0; i < jsonArray.size(); i++) {
JSONObject parameterObj = jsonArray.getJSONObject(i);
- String code = parameterObj.getStr("code");
+ String code = parameterObj.getStr("codeId");
PlcParameter plcParameter = new PlcParameter(
code,
Integer.valueOf(parameterObj.getStr("addressIndex")),
- Integer.valueOf(parameterObj.getStr("addressLength")),""); //鍙傛暟瀹炰緥
+ Integer.valueOf(parameterObj.getStr("addressLength")),
+ parameterObj.getStr("type")); //鍙傛暟瀹炰緥
parameterKeys.add(code);
parameters.put(code,plcParameter);
}
--
Gitblit v1.8.0