| src/main/java/com/zy/asrs/controller/RgvController.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/java/com/zy/asrs/domain/param/RingThroughParam.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/java/com/zy/core/thread/RgvThread.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/resources/application.yml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
src/main/java/com/zy/asrs/controller/RgvController.java
@@ -350,16 +350,19 @@ } RingThroughParam ringThroughParam = new RingThroughParam(); ringThroughParam.setIndex(rgv.getId()); ringThroughParam.setIndex(rgv.getId()+10); // ringThroughParam.setIndex(i); // double[] doubles = Utils.RingThroughXY2(perimeter, NumUtils.GetRandomIntInRange(183)); // double[] doubles = Utils.RingThroughXYRgv(perimeter, perimeter-rgvProtocol.RgvPos.doubleValue()); double[] doubles = Utils.getRgvPosNew(perimeter, rgvProtocol.RgvPos.doubleValue()); ringThroughParam.setValueX(doubles[0]); ringThroughParam.setValueY(doubles[1]); ringThroughParam.setValueX(doubles[0]);// ringThroughParam.setValueY(doubles[1]);// ringThroughParam.setRgvPosMax(new Object[]{"el_1775520471475", 0L, perimeter}); ringThroughParam.setRgvPos(rgvProtocol.RgvPos); ringThroughParam.setModeColor(rgvProtocol.modeType.color); ringThroughParam.setStatusColor(rgvProtocol.statusType.color); // ringThroughParam.setRgvPosR(1); if (rgvProtocol.getModeType() == RgvModeType.AUTO){ ringThroughParam.setAnimation(2); } src/main/java/com/zy/asrs/domain/param/RingThroughParam.java
@@ -7,12 +7,23 @@ // RGV号 private Integer index; //条码值 private Long RgvPos; //条码最大值 private Object[] RgvPosMax;// Object[0]:String:轨道ID Object[1]：Long:最小值 Object[2] ：Long:最大值 //轨道ID private Integer RgvPosR; //x坐标 OLD private Double valueX; //Y坐标 OLD private Double valueY; //颜色 OLD private String modeColor; //颜色 private String statusColor; private int animation = 0;//光效 src/main/java/com/zy/core/thread/RgvThread.java
@@ -192,8 +192,8 @@ continue; } Thread.sleep(40); readStatus(); // readStatus(); initRgv(); } catch (Exception e) { log.error("RGV读线程异常"+e.getMessage()); @@ -214,13 +214,30 @@ rgvProtocol = new RgvProtocol(); } rgvProtocol.setRgvNo(slave.getId()); rgvProtocol.setMode((short) -1); rgvProtocol.setStatus((short)-1); // rgvProtocol.setMode((short) -1); // rgvProtocol.setStatus((short)-1); // rgvProtocol.setTaskNo1((short)0); // rgvProtocol.setStatus1((short)-1); // rgvProtocol.setLoaded1((short)0); // rgvProtocol.setWalkPos((short)0); // rgvProtocol.setRgvPos(0L); // rgvProtocol.setTaskNo2((short)0); // rgvProtocol.setStatus2((short)-1); // rgvProtocol.setLoaded2((short)0); // rgvProtocol.setAlarm((short)0); // rgvProtocol.setxSpeed((short) 0); // rgvProtocol.setxDistance((short) 0); // rgvProtocol.setxDuration((short) 0); rgvProtocol.setMode((short) 3); rgvProtocol.setStatus((short)0); rgvProtocol.setTaskNo1((short)0); rgvProtocol.setStatus1((short)-1); rgvProtocol.setStatus1((short)0); rgvProtocol.setLoaded1((short)0); rgvProtocol.setWalkPos((short)0); rgvProtocol.setRgvPos(0L); if (rgvProtocol.getRgvPos()==null || rgvProtocol.getRgvPos()==0){ rgvProtocol.setRgvPos(1L+rgvProtocol.getRgvNo()*10000); } rgvProtocol.setRgvPos(rgvProtocol.getRgvPos()+1000); rgvProtocol.setTaskNo2((short)0); rgvProtocol.setStatus2((short)-1); rgvProtocol.setLoaded2((short)0); @@ -228,7 +245,7 @@ rgvProtocol.setxSpeed((short) 0); rgvProtocol.setxDistance((short) 0); rgvProtocol.setxDuration((short) 0); log.error("连接中断：RGV号："+slave.getId()); // log.error("连接中断：RGV号："+slave.getId()); try { // 根据实时信息更新数据库 BasRgvService basRgvService = SpringUtils.getBean(BasRgvService.class); src/main/resources/application.yml
@@ -8,9 +8,9 @@ name: @pom.build.finalName@ datasource: driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver url: jdbc:sqlserver://127.0.0.1:50751;databasename=rscar # url: jdbc:sqlserver://127.0.0.1:50751;databasename=rscar # url: jdbc:sqlserver://127.0.0.1:50948;databasename=gdhmasrs # url: jdbc:sqlserver://127.0.0.1:62316;databasename=gdhmasrs url: jdbc:sqlserver://192.168.4.196:62316;databasename=gdhmasrs username: sa password: sa@123 mvc: @@ -76,7 +76,7 @@ # RGV穿梭车1 rgv[0]: id: 1 ip: 172.17.196.3 ip: 192.168.4.250 port: 502 rack: 0 slot: 0 @@ -84,7 +84,7 @@ # RGV穿梭车1 rgv[1]: id: 2 ip: 172.17.196.6 ip: 192.168.4.250 port: 502 rack: 0 slot: 0 @@ -92,7 +92,7 @@ # RGV穿梭车1 rgv[2]: id: 3 ip: 172.17.196.9 ip: 192.168.4.250 port: 502 rack: 0 slot: 0 @@ -100,7 +100,7 @@ # RGV穿梭车1 rgv[3]: id: 4 ip: 172.17.196.12 ip: 192.168.4.250 port: 502 rack: 0 slot: 0 @@ -108,7 +108,7 @@ # RGV穿梭车1 rgv[4]: id: 5 ip: 172.17.196.15 ip: 192.168.4.250 port: 502 rack: 0 slot: 0 @@ -116,7 +116,7 @@ # RGV穿梭车1 rgv[5]: id: 6 ip: 172.17.196.18 ip: 192.168.4.250 port: 502 rack: 0 slot: 0 @@ -124,7 +124,7 @@ # RGV穿梭车1 rgv[6]: id: 7 ip: 172.17.196.21 ip: 192.168.4.250 port: 502 rack: 0 slot: 0 @@ -132,7 +132,7 @@ # RGV穿梭车1 rgv[7]: id: 8 ip: 172.17.196.25 ip: 192.168.4.250 port: 502 rack: 0 slot: 0 @@ -140,7 +140,7 @@ # RGV穿梭车1 rgv[8]: id: 9 ip: 172.17.196.28 ip: 192.168.4.250 port: 502 rack: 0 slot: 0 @@ -148,7 +148,7 @@ # RGV穿梭车1 rgv[9]: id: 10 ip: 172.17.196.31 ip: 192.168.4.250 port: 502 rack: 0 slot: 0
