From 34774c2713233f929e0f332461ec566127016773 Mon Sep 17 00:00:00 2001
From: zhangchao <zc857179121@qq.com>
Date: 星期四, 29 八月 2024 13:30:36 +0800
Subject: [PATCH] 配置
---
src/main/java/com/zy/core/thread/SiemensCrnThread.java | 28 ++++++++++++++++++----------
src/main/java/com/zy/core/model/command/CrnCommand.java | 16 ++++++++++++++++
src/main/resources/application.yml | 4 ++--
3 files changed, 36 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/zy/core/model/command/CrnCommand.java b/src/main/java/com/zy/core/model/command/CrnCommand.java
index c777ecb..6c9f1fe 100644
--- a/src/main/java/com/zy/core/model/command/CrnCommand.java
+++ b/src/main/java/com/zy/core/model/command/CrnCommand.java
@@ -49,6 +49,14 @@
// 婧愪綅缃眰鍙�
private Short sourcePosZ = 0;
+ // 婧愪綅缃帓鍙�
+ private Short sourcePosXTwo = 0;
+
+ // 婧愪綅缃垪鍙�
+ private Short sourcePosYTwo = 0;
+
+ // 婧愪綅缃眰鍙�
+ private Short sourcePosZTwo = 0;
// 婧愮珯
private Short sourceStaNo = 0;
@@ -64,6 +72,14 @@
// 鐩爣浣嶇疆灞傚彿
private Short destinationPosZ = 0;
+ // 鐩爣浣嶇疆鎺掑彿
+ private Short destinationPosXTwo = 0;
+
+ // 鐩爣浣嶇疆鍒楀彿
+ private Short destinationPosYTwo = 0;
+
+ // 鐩爣浣嶇疆灞傚彿
+ private Short destinationPosZTwo = 0;
// 鐩爣绔�
private Short destinationStaNo = 0;
diff --git a/src/main/java/com/zy/core/thread/SiemensCrnThread.java b/src/main/java/com/zy/core/thread/SiemensCrnThread.java
index a3eefae..86dd358 100644
--- a/src/main/java/com/zy/core/thread/SiemensCrnThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensCrnThread.java
@@ -244,16 +244,24 @@
}
// convertRow(command);
command.setCrnNo(slave.getId());
- short[] array = new short[10];
- array[0] = command.getAckFinish();
- array[1] = command.getTaskNo();
- array[2] = command.getTaskMode();
- array[3] = command.getSourcePosX();
- array[4] = command.getSourcePosY();
- array[5] = command.getSourcePosZ();
- array[6] = command.getDestinationPosX();
- array[7] = command.getDestinationPosY();
- array[8] = command.getDestinationPosZ();
+ short[] array = new short[17];
+ array[0] = command.getTaskNo();
+ array[1] = command.getTaskMode();
+ array[2] = command.getSourcePosX();
+ array[3] = command.getSourcePosY();
+ array[4] = command.getSourcePosZ();
+ array[5] = command.getDestinationPosX();
+ array[6] = command.getDestinationPosY();
+ array[7] = command.getDestinationPosZ();
+ array[8] = command.getSourcePosXTwo();
+ array[9] = command.getSourcePosYTwo();
+ array[10] = command.getSourcePosZTwo();
+ array[11] = command.getDestinationPosXTwo();
+ array[12] = command.getDestinationPosYTwo();
+ array[13] = command.getDestinationPosZTwo();
+ array[14] = command.getCommand();
+ array[15] = command.getAckFinish();
+
// array[9] = command.getSourceStaNo();
// array[10] = command.getDestinationStaNo();
array[9] = command.getCommand();
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index c1b852d..559857f 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -8,8 +8,8 @@
name: @pom.build.finalName@
datasource:
driver-class-name: com.oscar.Driver
- url: jdbc:oscar://aezj52528314.vicp.fun:13560/osrdb?CURRENTSCHEMA=BJYCWMS
-# url: jdbc:oscar://localhost:2003/osrdb?CURRENTSCHEMA=BJYCWMS
+ # url: jdbc:oscar://aezj52528314.vicp.fun:13560/osrdb?CURRENTSCHEMA=BJYCWMS
+ url: jdbc:oscar://10.10.10.200:2003/osrdb?CURRENTSCHEMA=BJYCWMS
username: SYSDBA
password: szoscar55
mvc:
--
Gitblit v1.9.1