src/main/java/com/zy/core/model/command/CrnCommand.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/zy/core/thread/SiemensCrnThread.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/resources/application.yml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
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; 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(); 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: