Browse Source

2022/11/10 检查节点后超界判断逻辑修复

wk 3 years ago
parent
commit
3ed95be8e7
2 changed files with 9 additions and 9 deletions
  1. 6 6
      指令检查节点/CheckCommand.py
  2. 3 3
      指令检查节点/node.py

+ 6 - 6
指令检查节点/CheckCommand.py

@@ -38,18 +38,18 @@ class CheckCommand():
     def check_pick_command(self, msg):
         pick = message.park_table()
         tf.Parse(msg, pick)
-        unit_id = pick.unit_id
         if pick.primary_key is None:
             pick.statu.execute_statu = message.eError
             pick.statu.statu_description = " 唯一码不能为空!"
             return tf.MessageToString(pick, as_utf8=True)
-        results = self.check_dispatch_node_statu(unit_id)
-        if results is not True:
-            pick.statu.execute_statu = message.eError
-            pick.statu.statu_description = " 调度状态错误!"
-            return tf.MessageToString(pick, as_utf8=True)
         return tf.MessageToString(pick, as_utf8=True)
 
+        # results = self.check_dispatch_node_statu(unit_id)
+        # if results is not True:
+        #     pick.statu.execute_statu = message.eError
+        #     pick.statu.statu_description = " 调度状态错误!"
+        #     return tf.MessageToString(pick, as_utf8=True)
+
     def check_measure_statu(self, key):
         if g_rabbitmq[key].statu is not None and g_rabbitmq[key].timeout() is False:
             # if 0.85 > self.measure_info[index].theta or self.measure_info[index].theta> 0.95:

+ 3 - 3
指令检查节点/node.py

@@ -25,10 +25,10 @@ statu_ex_keys = [
     ["statu_ex","dispatch_3_statu_port"]
 ]
 # mq参数
-mq_ip = "192.168.1.233"
+mq_ip = "127.0.0.1"
 mq_port = 5672
-mq_user = "zx"
-mq_password = "zx123456"
+mq_user = "wk"
+mq_password = "123456"
 ex_name = "command_ex"