From 34491829675033e41715648b1e92f339bf2f35d1 Mon Sep 17 00:00:00 2001
From: Administrator <admin@example.com>
Date: 星期四, 25 八月 2022 17:51:10 +0800
Subject: [PATCH] Changes
---
l2_code_operate.py | 30 ++++++++++++++++++++----------
1 files changed, 20 insertions(+), 10 deletions(-)
diff --git a/l2_code_operate.py b/l2_code_operate.py
index f5eed79..f5e59b3 100644
--- a/l2_code_operate.py
+++ b/l2_code_operate.py
@@ -1,5 +1,6 @@
# 鎿嶄綔l2鐨勪唬鐮�
import json
+import logging
import os
import queue
import threading
@@ -40,8 +41,10 @@
result = server.send_msg(client_id, data)
logger_code_operate.info(
"setGPCode缁撴潫锛坽}锛夛細clientid-{} position-{} code-{}".format(result, client_id, position, gpcode))
- if result.__contains__('OK'):
+ jsonData = json.loads(result)
+ if jsonData["code"] == 0:
gpcode_manager.set_listen_code_by_pos(client_id, position, gpcode)
+ L2CodeOperate.set_operate_code_state(client_id, position, 1)
except Exception as e:
logger_code_operate.error("setGPCode鍑洪敊锛歿}", str(e))
@@ -97,19 +100,20 @@
if code_ == "" or code_ is None:
continue
- logger_code_operate.info("淇浠ｇ爜涓�鑷达細{}-{}-{}", client, pos, code)
+ logger_code_operate.info("淇浠ｇ爜涓�鑷达細{}-{}-{}", client_id, pos, code)
L2CodeOperate.setGPCode(client_id, pos, code)
# 淇l2鐨勬暟鎹敊璇�
elif type == 3:
- data = data["data"]
client = data["client"]
- server.send_msg(client, json.dumps(data))
-
+ data=data["data"]
+ result = server.send_msg(client, data)
+ print("L2鏁告摎淇京绲愭灉锛�",result)
else:
time.sleep(1)
- except:
- print("鍙戦�佹搷浣滃紓甯�")
+ except Exception as e:
+ logging.exception(e)
+ print("鍙戦�佹搷浣滃紓甯�:",str(e))
def add_operate(self, type, code):
redis = self.redis_manager_.getRedis()
@@ -117,6 +121,11 @@
redis.rpush("code_operate_queue", json.dumps({"type": type, "code": code}))
def repaire_operate(self, client, pos, code):
+ # 濡傛灉鏈潵璇ヤ綅缃唬鐮佷负绌哄垯涓嶇敤淇
+ code_ = gpcode_manager.get_listen_code_by_pos(client, pos)
+ if code_ == "" or code_ is None:
+ return
+ logger_code_operate.info("瀹㈡埛绔綅缃唬鐮佷慨澶嶏細client-{}锛宲os-{},code-{}", client, pos, code)
redis = self.redis_manager_.getRedis()
redis.rpush("code_operate_queue", json.dumps({"type": 2, "client": client, "pos": pos, "code": code}))
@@ -133,7 +142,7 @@
"data": {"index": int(pos), "code": code, "min_price": float(min_price),
"max_price": float(max_price)}}
redis = self.redis_manager_.getRedis()
- redis.rpush("code_operate_queue", json.dumps({"type": 3, "client": client_id, "data": data}))
+ redis.rpush("code_operate_queue", json.dumps({"type": 3,"code":code, "client": client_id, "data": data}))
# 绉婚櫎鐩戞帶
def remove_l2_listen(self, code):
@@ -142,8 +151,9 @@
self.add_operate(0, code)
# 璁剧疆浠ｇ爜鎿嶄綔鐘舵�侊紝鏈嶅姟鍣ㄤ繚瀛樼殑浠ｇ爜鏄惁涓庡疄闄呰缃殑浠ｇ爜淇濇寔涓�鑷�
- def set_operate_code_state(self, client_id, channel, state):
- self.getRedis().setex("code-operate_state-{}-{}".format(client_id, channel), tool.get_expire(), state)
+ @classmethod
+ def set_operate_code_state(cls, client_id, channel, state):
+ cls.getRedis().setex("code-operate_state-{}-{}".format(client_id, channel), tool.get_expire(), state)
def get_operate_code_state(self, client_id, channel):
value = self.getRedis().get("code-operate_state-{}-{}".format(client_id, channel))
--
Gitblit v1.8.0