From deb12de25c41d2b8b20b0b08c9b1338e8a4d8b12 Mon Sep 17 00:00:00 2001
From: cpT <1@123>
Date: 星期四, 19 六月 2025 10:32:17 +0800
Subject: [PATCH] #改造
---
src/main/java/com/zy/core/thread/RgvThread.java | 10 +++++-----
src/main/java/com/zy/core/model/protocol/RgvProtocol.java | 14 ++++++++++++++
src/main/resources/application.yml | 4 +++-
3 files changed, 22 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/zy/core/model/protocol/RgvProtocol.java b/src/main/java/com/zy/core/model/protocol/RgvProtocol.java
index e69ba54..8e984e1 100644
--- a/src/main/java/com/zy/core/model/protocol/RgvProtocol.java
+++ b/src/main/java/com/zy/core/model/protocol/RgvProtocol.java
@@ -116,6 +116,10 @@
// 鍏夌數寮傚父
private boolean err6;
+ //灏忚溅妯″紡鍒囨崲閿欒
+ private boolean err7;
+ //鍏朵粬鏈煡寮傚父
+ private boolean err8;
private String errorRgv;
public void setMode(Short mode) {
@@ -185,6 +189,12 @@
if (err6){
return 6;
}
+ if (err7){
+ return 7;
+ }
+ if (err8){
+ return 8;
+ }
return 0;
}
public String getAlarmM(){
@@ -201,6 +211,10 @@
return "鍙橀鍣ㄥ紓甯�";
case 6:
return "鍏夌數寮傚父";
+ case 7:
+ return "灏忚溅妯″紡鍒囨崲閿欒";
+ case 8:
+ return "鍏跺畠鏈煡寮傚父";
}
return "姝ｅ父";
}
diff --git a/src/main/java/com/zy/core/thread/RgvThread.java b/src/main/java/com/zy/core/thread/RgvThread.java
index 0a76c89..602cae6 100644
--- a/src/main/java/com/zy/core/thread/RgvThread.java
+++ b/src/main/java/com/zy/core/thread/RgvThread.java
@@ -1118,11 +1118,10 @@
rgvProtocol.setErr4(status[11]);
rgvProtocol.setErr5(status[12]);
rgvProtocol.setErr6(status[13]);
+ rgvProtocol.setErr7(status[13]);
+ rgvProtocol.setErr8(status[13]);
// System.out.println("璇荤嚎绋�"+ slave.getId()+"---"+JSON.toJSONString(rgvProtocol));
// System.out.println("璇荤嚎绋�,灏忚溅鍙�"+ slave.getId()+"鏃堕棿鎴筹細"+System.currentTimeMillis()+"灏忚溅鏁版嵁锛�"+JSON.toJSONString(rgvProtocol));
- if (rgvProtocol.getRgvNo()==1){
- log.info("璇荤嚎绋�,灏忚溅鍙�"+ slave.getId()+"鏃堕棿鎴筹細"+System.currentTimeMillis()+"灏忚溅鏁版嵁锛�"+JSON.toJSONString(rgvProtocol));
- }
OutputQueue.RGV.offer(MessageFormat.format("銆恵0}銆慬id:{1}] <<<<< 瀹炴椂鏁版嵁鏇存柊鎴愬姛", DateUtils.convert(new Date()), slave.getId()));
// // 宸ヤ綅1澶嶄綅淇″彿
// if (rgvProtocol.getStatusType().equals(RgvStatusType.WAITING)
@@ -1228,10 +1227,11 @@
OperateResult result2 = siemensNet.Write("DB100.6", taskProtocol.getTaskNo().intValue());
OperateResult result3 = siemensNet.Write("DB100.10", taskProtocol.isDirection()? (short) 1 : (short) 2); // 鎵ц鏂瑰悜锛堥潰鏈濊建閬� 瀹氫綅鍊煎乏灏忓彸澶э級 true:宸� false:鍙�
Thread.sleep(20L);
- this.wrkSign = 1;
OperateResult result4 = siemensNet.Write("DB100.12.0", true);
- log.info("浠诲姟涓嬪彂绾跨▼,灏忚溅鍙�"+ slave.getId()+"鏃堕棿鎴筹細"+System.currentTimeMillis());
+ this.wrkSign = 1;
+
+// log.info("浠诲姟涓嬪彂绾跨▼,灏忚溅鍙�"+ slave.getId()+"鏃堕棿鎴筹細"+System.currentTimeMillis());
// if (taskProtocol.getAckFinish1() == 0) {
// short commandFinish = 3; //宸ヤ綅1銆�2浠诲姟鍚屾椂鍐欏叆
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 9ac2b12..2730672 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -13,7 +13,9 @@
# password: sa@123
driver-class-name: dm.jdbc.driver.DmDriver
# url: jdbc:dm://27.172.2.102:5236/SOURCE
- url: jdbc:dm://27.172.1.130:5236/SOURCE
+# url: jdbc:dm://27.172.1.130:5236/SOURCE
+ url: jdbc:dm://27.172.1.129:5236/SOURCE
+# url: jdbc:dm://27.172.1.131/dm?zeroDateTimeBehavior=convertToNull&useUnicode=true&characterEncoding=GB18030
# url: jdbc:dm://127.0.0.1:5236/SOURCE
# username: SYSDBA
# password: Zy@12345
--
Gitblit v1.9.1