From 865e425cdf7395fece0a53a6def75e2c84d6dbf0 Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期二, 15 十月 2024 09:56:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
JiuMuMesParent/common/servicebase/src/main/java/com/mes/service/PlcAgreement.java | 56 ++++++++++++++++----------------------------------------
1 files changed, 16 insertions(+), 40 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..978d6d2 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,7 +20,7 @@
@Slf4j
public class PlcAgreement {
- public Socket socket =null;//閫氳
+ //public Socket socket =null;//閫氳
/**
* 鍗忚鍙傛暟
*/
@@ -86,46 +86,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