diff --git a/jx_test/envs/20.json b/jx_test/envs/20.json index fd9db5b..2df35c9 100644 --- a/jx_test/envs/20.json +++ b/jx_test/envs/20.json @@ -10,9 +10,9 @@ "websocket": "mqtt://10.10.9.58:7885" }, "mysql": { - "jdbcUrl": "jdbc:p6spy:mysql://180.100.199.56:8306/rcs2_tw_zhanghui", - "username": "rcs2_tw_zhanghui", - "password": "Rcs2_tw_zhanghui" + "jdbcUrl": "jdbc:p6spy:mysql://10.10.9.58:3306/rcs2_tw_zhanghui", + "username": "admin", + "password": "admin123456" }, "redis": { "host": "10.10.9.58", diff --git a/jx_test/envs/23.json b/jx_test/envs/23.json index 58d1762..547dfa5 100644 --- a/jx_test/envs/23.json +++ b/jx_test/envs/23.json @@ -4,20 +4,21 @@ "isVirtual": true, "envConfig": { "mqtt": { - "brokerUrl": "tcp://180.100.199.56:7097", - "username": "galaxis", - "password": "Admin1234_", - "websocket": "mqtt://180.100.199.56:9097" + "brokerUrl": "tcp://10.10.9.58:1885", + "username": "admin", + "password": "admin", + "websocket": "mqtt://10.10.9.58:7885" }, "mysql": { - "jdbc-url": "jdbc:p6spy:mysql://180.100.199.56:8306/rcs2_tw_zhanghui", - "username": "rcs2_tw_zhanghui", - "password": "Rcs2_tw_zhanghui" + "jdbcUrl": "jdbc:p6spy:mysql://10.10.9.58:3306/rcs2_tw_zhanghui", + "username": "admin", + "password": "admin123456" }, "redis": { - "host": "127.0.0.1", + "host": "10.10.9.58", "port": 6379, - "database": 0 + "database": 0, + "password": "admin123456" } } } diff --git a/jx_test/floor/f1.json b/jx_test/floor/f1.json index ee7399f..2aa0369 100644 --- a/jx_test/floor/f1.json +++ b/jx_test/floor/f1.json @@ -2283,7 +2283,7 @@ ], [ 1.2425, - 1.211, + 12.901, 1 ] ], @@ -2313,7 +2313,7 @@ "in": [], "out": [], "rackWidth": 1.2425, - "rackHeight": 1.211 + "rackHeight": 12.901 }, "logicX": 507, "logicY": 504 @@ -2335,7 +2335,7 @@ ], [ 1.2425, - 1.211, + 12.901, 1 ] ], @@ -2365,7 +2365,7 @@ "in": [], "out": [], "rackWidth": 1.2425, - "rackHeight": 1.211 + "rackHeight": 12.901 }, "logicX": 508, "logicY": 504 @@ -2387,7 +2387,7 @@ ], [ 1.2425, - 1.211, + 12.901, 1 ] ], @@ -2417,7 +2417,7 @@ "in": [], "out": [], "rackWidth": 1.2425, - "rackHeight": 1.211 + "rackHeight": 12.901 }, "logicX": 509, "logicY": 504 @@ -2439,7 +2439,7 @@ ], [ 1.2425, - 1.211, + 12.901, 1 ] ], @@ -2469,7 +2469,7 @@ "in": [], "out": [], "rackWidth": 1.2425, - "rackHeight": 1.211 + "rackHeight": 12.901 }, "logicX": 510, "logicY": 504 @@ -2491,7 +2491,7 @@ ], [ 1.2425, - 1.211, + 12.901, 1 ] ], @@ -2521,7 +2521,7 @@ "in": [], "out": [], "rackWidth": 1.2425, - "rackHeight": 1.211 + "rackHeight": 12.901 }, "logicX": 507, "logicY": 505 @@ -2543,7 +2543,7 @@ ], [ 1.2425, - 1.211, + 12.901, 1 ] ], @@ -2573,7 +2573,7 @@ "in": [], "out": [], "rackWidth": 1.2425, - "rackHeight": 1.211 + "rackHeight": 12.901 }, "logicX": 508, "logicY": 505 @@ -2595,7 +2595,7 @@ ], [ 1.2425, - 1.211, + 12.901, 1 ] ], @@ -2625,7 +2625,7 @@ "in": [], "out": [], "rackWidth": 1.2425, - "rackHeight": 1.211 + "rackHeight": 12.901 }, "logicX": 509, "logicY": 505 @@ -2647,7 +2647,7 @@ ], [ 1.2425, - 1.211, + 12.901, 1 ] ], @@ -2677,7 +2677,7 @@ "in": [], "out": [], "rackWidth": 1.2425, - "rackHeight": 1.211 + "rackHeight": 12.901 }, "logicX": 510, "logicY": 505 @@ -2699,7 +2699,7 @@ ], [ 1.2425, - 1.211, + 12.901, 1 ] ], @@ -2729,7 +2729,7 @@ "in": [], "out": [], "rackWidth": 1.2425, - "rackHeight": 1.211 + "rackHeight": 12.901 }, "logicX": 504, "logicY": 504 @@ -2751,7 +2751,7 @@ ], [ 1.2425, - 1.211, + 12.901, 1 ] ], @@ -2781,7 +2781,7 @@ "in": [], "out": [], "rackWidth": 1.2425, - "rackHeight": 1.211 + "rackHeight": 12.901 }, "logicX": 505, "logicY": 504 @@ -2803,7 +2803,7 @@ ], [ 1.2425, - 1.211, + 12.901, 1 ] ], @@ -2833,7 +2833,7 @@ "in": [], "out": [], "rackWidth": 1.2425, - "rackHeight": 1.211 + "rackHeight": 12.901 }, "logicX": 504, "logicY": 505 @@ -2855,7 +2855,7 @@ ], [ 1.2425, - 1.211, + 12.901, 1 ] ], @@ -2885,7 +2885,7 @@ "in": [], "out": [], "rackWidth": 1.2425, - "rackHeight": 1.211 + "rackHeight": 12.901 }, "logicX": 505, "logicY": 505 @@ -2907,7 +2907,7 @@ ], [ 1.24, - 1.211, + 5.501, 1 ] ], @@ -2936,7 +2936,7 @@ "in": [], "out": [], "rackWidth": 1.24, - "rackHeight": 1.211 + "rackHeight": 5.501 }, "logicX": 504, "logicY": 502 @@ -2958,7 +2958,7 @@ ], [ 1.24, - 1.211, + 5.501, 1 ] ], @@ -2987,7 +2987,7 @@ "in": [], "out": [], "rackWidth": 1.24, - "rackHeight": 1.211 + "rackHeight": 5.501 }, "logicX": 505, "logicY": 502 @@ -3009,7 +3009,7 @@ ], [ 1.24, - 1.211, + 5.501, 1 ] ], @@ -3038,7 +3038,7 @@ "in": [], "out": [], "rackWidth": 1.24, - "rackHeight": 1.211 + "rackHeight": 5.501 }, "logicX": 504, "logicY": 503 @@ -3060,7 +3060,7 @@ ], [ 1.24, - 1.211, + 5.501, 1 ] ], @@ -3089,7 +3089,7 @@ "in": [], "out": [], "rackWidth": 1.24, - "rackHeight": 1.211 + "rackHeight": 5.501 }, "logicX": 505, "logicY": 503 @@ -3111,7 +3111,7 @@ ], [ 1.24, - 1.211, + 20.401, 1 ] ], @@ -3142,7 +3142,7 @@ "in": [], "out": [], "rackWidth": 1.24, - "rackHeight": 1.211 + "rackHeight": 20.401 }, "logicX": 500, "logicY": 500 @@ -3164,7 +3164,7 @@ ], [ 1.24, - 1.211, + 20.401, 1 ] ], @@ -3195,7 +3195,7 @@ "in": [], "out": [], "rackWidth": 1.24, - "rackHeight": 1.211 + "rackHeight": 20.401 }, "logicX": 501, "logicY": 500 @@ -3217,7 +3217,7 @@ ], [ 1.24, - 1.211, + 20.401, 1 ] ], @@ -3248,7 +3248,7 @@ "in": [], "out": [], "rackWidth": 1.24, - "rackHeight": 1.211 + "rackHeight": 20.401 }, "logicX": 502, "logicY": 500 @@ -3270,7 +3270,7 @@ ], [ 1.24, - 1.211, + 20.401, 1 ] ], @@ -3301,7 +3301,7 @@ "in": [], "out": [], "rackWidth": 1.24, - "rackHeight": 1.211 + "rackHeight": 20.401 }, "logicX": 503, "logicY": 500 @@ -3323,7 +3323,7 @@ ], [ 1.24, - 1.211, + 20.401, 1 ] ], @@ -3354,7 +3354,7 @@ "in": [], "out": [], "rackWidth": 1.24, - "rackHeight": 1.211 + "rackHeight": 20.401 }, "logicX": 504, "logicY": 500 @@ -3376,7 +3376,7 @@ ], [ 1.24, - 1.211, + 20.401, 1 ] ], @@ -3407,7 +3407,7 @@ "in": [], "out": [], "rackWidth": 1.24, - "rackHeight": 1.211 + "rackHeight": 20.401 }, "logicX": 505, "logicY": 500 @@ -3429,7 +3429,7 @@ ], [ 1.24, - 1.211, + 20.401, 1 ] ], @@ -3460,7 +3460,7 @@ "in": [], "out": [], "rackWidth": 1.24, - "rackHeight": 1.211 + "rackHeight": 20.401 }, "logicX": 500, "logicY": 501 @@ -3482,7 +3482,7 @@ ], [ 1.24, - 1.211, + 20.401, 1 ] ], @@ -3513,7 +3513,7 @@ "in": [], "out": [], "rackWidth": 1.24, - "rackHeight": 1.211 + "rackHeight": 20.401 }, "logicX": 501, "logicY": 501 @@ -3535,7 +3535,7 @@ ], [ 1.24, - 1.211, + 20.401, 1 ] ], @@ -3566,7 +3566,7 @@ "in": [], "out": [], "rackWidth": 1.24, - "rackHeight": 1.211 + "rackHeight": 20.401 }, "logicX": 502, "logicY": 501 @@ -3588,7 +3588,7 @@ ], [ 1.24, - 1.211, + 20.401, 1 ] ], @@ -3619,7 +3619,7 @@ "in": [], "out": [], "rackWidth": 1.24, - "rackHeight": 1.211 + "rackHeight": 20.401 }, "logicX": 503, "logicY": 501 @@ -3641,7 +3641,7 @@ ], [ 1.24, - 1.211, + 20.401, 1 ] ], @@ -3672,7 +3672,7 @@ "in": [], "out": [], "rackWidth": 1.24, - "rackHeight": 1.211 + "rackHeight": 20.401 }, "logicX": 504, "logicY": 501 @@ -3694,7 +3694,7 @@ ], [ 1.24, - 1.211, + 20.401, 1 ] ], @@ -3725,7 +3725,7 @@ "in": [], "out": [], "rackWidth": 1.24, - "rackHeight": 1.211 + "rackHeight": 20.401 }, "logicX": 505, "logicY": 501 @@ -3747,7 +3747,7 @@ ], [ 1.24, - 1.211, + 5.501, 1 ] ], @@ -3776,7 +3776,7 @@ "in": [], "out": [], "rackWidth": 1.24, - "rackHeight": 1.211 + "rackHeight": 5.501 }, "logicX": 500, "logicY": 502 @@ -3798,7 +3798,7 @@ ], [ 1.24, - 1.211, + 5.501, 1 ] ], @@ -3827,7 +3827,7 @@ "in": [], "out": [], "rackWidth": 1.24, - "rackHeight": 1.211 + "rackHeight": 5.501 }, "logicX": 501, "logicY": 502 @@ -3849,7 +3849,7 @@ ], [ 1.24, - 1.211, + 5.501, 1 ] ], @@ -3878,7 +3878,7 @@ "in": [], "out": [], "rackWidth": 1.24, - "rackHeight": 1.211 + "rackHeight": 5.501 }, "logicX": 502, "logicY": 502 @@ -3900,7 +3900,7 @@ ], [ 1.24, - 1.211, + 5.501, 1 ] ], @@ -3929,7 +3929,7 @@ "in": [], "out": [], "rackWidth": 1.24, - "rackHeight": 1.211 + "rackHeight": 5.501 }, "logicX": 500, "logicY": 503 @@ -3951,7 +3951,7 @@ ], [ 1.24, - 1.211, + 5.501, 1 ] ], @@ -3980,7 +3980,7 @@ "in": [], "out": [], "rackWidth": 1.24, - "rackHeight": 1.211 + "rackHeight": 5.501 }, "logicX": 501, "logicY": 503 @@ -4002,7 +4002,7 @@ ], [ 1.2425, - 1.211, + 12.901, 1 ] ], @@ -4032,7 +4032,7 @@ "in": [], "out": [], "rackWidth": 1.2425, - "rackHeight": 1.211 + "rackHeight": 12.901 }, "logicX": 500, "logicY": 504 @@ -4054,7 +4054,7 @@ ], [ 1.2425, - 1.211, + 12.901, 1 ] ], @@ -4084,7 +4084,7 @@ "in": [], "out": [], "rackWidth": 1.2425, - "rackHeight": 1.211 + "rackHeight": 12.901 }, "logicX": 501, "logicY": 504 @@ -4106,7 +4106,7 @@ ], [ 1.2425, - 1.211, + 12.901, 1 ] ], @@ -4136,7 +4136,7 @@ "in": [], "out": [], "rackWidth": 1.2425, - "rackHeight": 1.211 + "rackHeight": 12.901 }, "logicX": 502, "logicY": 504 @@ -4158,7 +4158,7 @@ ], [ 1.2425, - 1.211, + 12.901, 1 ] ], @@ -4188,7 +4188,7 @@ "in": [], "out": [], "rackWidth": 1.2425, - "rackHeight": 1.211 + "rackHeight": 12.901 }, "logicX": 503, "logicY": 504 diff --git a/jx_test/scripts/FRV_JX.ts b/jx_test/scripts/FRV_JX.ts new file mode 100644 index 0000000..16cf564 --- /dev/null +++ b/jx_test/scripts/FRV_JX.ts @@ -0,0 +1,4 @@ +await RCS.agvCarry("1001", "141_0_0_0", "141_0_1_0") +// await RCS.waitTaskFinish("1001"); +// await RCS.agvCarry("1001", "141_0_1_0", "141_0_2_0") +// await RCS.waitTaskFinish("1001"); \ No newline at end of file