|
@@ -16,9 +16,6 @@ import check_command_ZKXY as CHE_ZKXY
|
|
import mytool.json_helper.parse_json as parse_json
|
|
import mytool.json_helper.parse_json as parse_json
|
|
from http.server import HTTPServer, BaseHTTPRequestHandler
|
|
from http.server import HTTPServer, BaseHTTPRequestHandler
|
|
from mytool.log_helper.logger import HandleLog
|
|
from mytool.log_helper.logger import HandleLog
|
|
-
|
|
|
|
-
|
|
|
|
-
|
|
|
|
def check_park_command(body):
|
|
def check_park_command(body):
|
|
# print("接收停车指令 %s message:%s" % (datetime.datetime.now(), body))
|
|
# print("接收停车指令 %s message:%s" % (datetime.datetime.now(), body))
|
|
log.info("接收停车指令 %s message:%s" % (datetime.datetime.now(),body[0:260]))
|
|
log.info("接收停车指令 %s message:%s" % (datetime.datetime.now(),body[0:260]))
|
|
@@ -33,7 +30,7 @@ def check_park_command(body):
|
|
g_rabbitmq.publish(mq_config['mq_command_exchange_name'], response_port, tf.MessageToString(cmd, as_utf8=True))
|
|
g_rabbitmq.publish(mq_config['mq_command_exchange_name'], response_port, tf.MessageToString(cmd, as_utf8=True))
|
|
if cmd.statu.execute_statu == message.eNormal:
|
|
if cmd.statu.execute_statu == message.eNormal:
|
|
# 指令检查正常
|
|
# 指令检查正常
|
|
- dispatch_key = "dispatch_park_command_request_port"
|
|
|
|
|
|
+ dispatch_key = "dispatch_park_command_%d_request_port" % cmd.unit_id
|
|
g_rabbitmq.publish(mq_config['mq_command_exchange_name'], dispatch_key, tf.MessageToString(table, as_utf8=True))
|
|
g_rabbitmq.publish(mq_config['mq_command_exchange_name'], dispatch_key, tf.MessageToString(table, as_utf8=True))
|
|
log.info("停车指令 %s OK:%s 检查成功!\n" % (datetime.datetime.now(), tf.MessageToString(table, as_utf8=True)))
|
|
log.info("停车指令 %s OK:%s 检查成功!\n" % (datetime.datetime.now(), tf.MessageToString(table, as_utf8=True)))
|
|
else:
|
|
else:
|
|
@@ -67,7 +64,7 @@ def check_pick_command(body):
|
|
if cmd.statu.execute_statu == message.eNormal and cmd.statu.table_process_mod != message.PROCESS_ONLY_TO_PAY:
|
|
if cmd.statu.execute_statu == message.eNormal and cmd.statu.table_process_mod != message.PROCESS_ONLY_TO_PAY:
|
|
# 指令检查正常
|
|
# 指令检查正常
|
|
log.info("取车指令 %s OK :%s 检查成功!\n" % (datetime.datetime.now(), tf.MessageToString(cmd, as_utf8=True)))
|
|
log.info("取车指令 %s OK :%s 检查成功!\n" % (datetime.datetime.now(), tf.MessageToString(cmd, as_utf8=True)))
|
|
- dispatch_key = "dispatch_pick_command_request_port"
|
|
|
|
|
|
+ dispatch_key = "dispatch_pick_command_%d_request_port" % cmd.unit_id
|
|
g_rabbitmq.publish(mq_config['mq_command_exchange_name'], dispatch_key, tf.MessageToString(cmd, as_utf8=True))
|
|
g_rabbitmq.publish(mq_config['mq_command_exchange_name'], dispatch_key, tf.MessageToString(cmd, as_utf8=True))
|
|
else:
|
|
else:
|
|
if cmd.statu.execute_statu == message.eWarning:
|
|
if cmd.statu.execute_statu == message.eWarning:
|