From d1bd20f33173a250015130bbe68fd47f37fd9160 Mon Sep 17 00:00:00 2001
From: huang <1532065656@qq.com>
Date: 星期五, 29 八月 2025 16:12:33 +0800
Subject: [PATCH] 修改点胶页面
---
JiuMuMesParent/common/servicebase/src/main/java/com/mes/service/PlcAgreement.java | 75 +++++++++++++------------------------
1 files changed, 26 insertions(+), 49 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 8b4a87c..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
@@ -20,11 +20,11 @@
@Slf4j
public class PlcAgreement {
- public Socket socket =null;//閫氳
+ //public Socket socket =null;//閫氳
/**
* 鍗忚鍙傛暟
*/
- 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);
}
@@ -86,46 +87,22 @@
}
return false;
}
-
- //璇诲彇鏁版嵁
- public void read()throws Exception{
- int bufSizes = 0;
- byte[] msgs = new byte[2048];
- //鍐欏叆璇诲彇鍦板潃
- DataOutputStream outToServer = new DataOutputStream(socket.getOutputStream());
- outToServer.write(HexConversion.stringToInt(this.requestHead));
- outToServer.flush();
- //璇诲彇鍐呭
- DataInputStream in = new DataInputStream(socket.getInputStream());
- bufSizes = in.read(msgs);
- String message = HexConversion.byteToHexString(bufSizes, msgs);//鍗佽繘鍒跺瓧鑺傛暟缁勮浆鍗佸叚杩涘埗瀛楃涓�
- //鑾峰彇鍙傛暟鍊�
- for (String key:parameters.keySet()){
- parameters.get(key).setReadValue(message);
+ //鑾峰彇姝ゅ湴鍧�鍏ㄩ儴鍙傛暟
+ public Map<String,PlcParameter> getPlcParameters(){
+ return parameters;
+ }
+ //閫氳繃鍙傛暟鍚嶇О鑾峰彇
+ public PlcParameter getPlcParameter(String name){
+ return parameters.get(name);
+ }
+ //閫氳繃鍙傛暟搴忓彿鑾峰彇
+ public PlcParameter getPlcParameter(int index){
+ String key=parameterKeys.get(index);
+ if(key!=null&& !key.isEmpty()){
+ return this.getPlcParameter(key);
}
- }
- //鍐欏叆鏁版嵁
- public void write(String key,String writeValue)throws Exception{
- parameters.get(key);
- if (writeValue != null && !"".equals(writeValue)) {
- //鍐欏叆鍙戦�佹暟鎹�
- DataOutputStream out = new DataOutputStream(socket.getOutputStream());
- out.write(HexConversion.stringToInt(writeValue));
- out.flush();
- }
- }
- //鍐�
- public String message(String senddate, String address) {
- String Herd = "0110" + address;
- int length = senddate.length() / 4;
- String dates = Herd + HexUtil.intTo2ByteHex(length) + HexUtil.intTo1ByteHex(length * 2) + senddate;
- int lengths = dates.length() / 2;
- String date = "00000000" + HexUtil.intTo2ByteHex(lengths) + dates;
- return date;
- }
-
- public String getValueString(String key){
- return parameters.get(key).toString();
+ log.info("鏃犳晥涓嬫爣:{},涓嬫爣鑼冨洿:0-{}",index,parameterKeys.size());
+ return null;
}
public int getValueInt(){
return 0;
--
Gitblit v1.8.0