From 948a99d54d4974dee3cf41b34a5ff644fdf3e972 Mon Sep 17 00:00:00 2001
From: lsh <lsh123456>
Date: 星期二, 25 十月 2022 18:44:30 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/thread/SiemensCrnThread.java | 7 ++++---
src/main/resources/application.yml | 10 +++++-----
2 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/SiemensCrnThread.java b/src/main/java/com/zy/core/thread/SiemensCrnThread.java
index f51d5c1..5d4dc1f 100644
--- a/src/main/java/com/zy/core/thread/SiemensCrnThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensCrnThread.java
@@ -330,6 +330,7 @@
BasCrnpService basCrnpService = SpringUtils.getBean(BasCrnpService.class);
BasCrnp basCrnp = new BasCrnp();
basCrnp.setCrnNo(slave.getId());
+ basCrnp.setCrnSts((int)crnProtocol.getMode());
if (!basCrnpService.updateById(crnProtocol.toSqlModel(basCrnp))){
log.error("鍫嗗灈鏈簆lc鏁版嵁搴撴洿鏂板け璐� ===>> [id:{}] [ip:{}] [port:{}] [rack:{}] [slot:{}]", slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot());
}
@@ -368,16 +369,16 @@
array[7] = command.getSourceStaNo();
array[8] = command.getDestinationStaNo();
// 浣滀笟淇℃伅
- OperateResult result = siemensNet.Write("DB1000.0", array);
+ OperateResult result = siemensNet.Write("DB10.0", array);
// 浠诲姟鍙� + 瀹屾垚浣�
short[] array2 = new short[2];
array2[0] = command.getTaskNo();
array2[1] = command.getAckFinish();
- OperateResult result1 = siemensNet.Write("DB1000.24", array2);
+ OperateResult result1 = siemensNet.Write("DB10.24", array2);
// 缁撴潫浣�
if (command.getAckFinish() == 0) {
- OperateResult result2 = siemensNet.Write("DB1000.28.1", true);
+ OperateResult result2 = siemensNet.Write("DB10.28.1", true);
}
// 鏃ュ織璁板綍
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 700e228..08539ab 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -8,7 +8,7 @@
name: @pom.build.finalName@
datasource:
driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
- url: jdbc:sqlserver://192.168.4.15:1433;databasename=htasrs3
+ url: jdbc:sqlserver://localhost:1433;databasename=htasrs3
username: sa
password: sa@123
mvc:
@@ -48,7 +48,7 @@
# 鍫嗗灈鏈�1
crn[0]:
id: 1
- ip: 10.10.10.101
+ ip: 10.10.10.3
port: 102
rack: 0
slot: 0
@@ -86,7 +86,7 @@
# 鍫嗗灈鏈�2
crn[1]:
id: 2
- ip: 10.10.10.111
+ ip: 10.10.10.10
port: 102
rack: 0
slot: 0
@@ -124,7 +124,7 @@
# 杈撻�佺嚎
devp[0]:
id: 1
- ip: 192.168.4.250
+ ip: 10.10.10.30
port: 102
rack: 0
slot: 0
@@ -167,5 +167,5 @@
# 纾呯Г
scale[1]:
id: 2
- ip: 10.10.10.201
+ ip: 10.10.10.202
port: 5005
\ No newline at end of file
--
Gitblit v1.9.1