|
@@ -308,7 +308,7 @@ class CronUpdateDataView(View):
|
|
|
used_serial_redis_list = []
|
|
|
for i in range(used_serial_redis_list_len):
|
|
|
used_serial_redis_list.append(redis_obj.lpop(USED_SERIAL_REDIS_LIST))
|
|
|
- request_thread = threading.Thread(target=cls.do_request_thread, args=(used_serial_redis_list, 3))
|
|
|
+ request_thread = threading.Thread(target=cls.do_request_thread, args=(str(used_serial_redis_list), 3))
|
|
|
request_thread.start()
|
|
|
# 更新未使用序列号其他服务器的状态
|
|
|
unused_serial_redis_list_len = redis_obj.llen(UNUSED_SERIAL_REDIS_LIST)
|
|
@@ -316,7 +316,7 @@ class CronUpdateDataView(View):
|
|
|
unused_serial_redis_list = []
|
|
|
for i in range(unused_serial_redis_list_len):
|
|
|
unused_serial_redis_list.append(redis_obj.lpop(UNUSED_SERIAL_REDIS_LIST))
|
|
|
- request_thread = threading.Thread(target=cls.do_request_thread, args=(used_serial_redis_list, 1))
|
|
|
+ request_thread = threading.Thread(target=cls.do_request_thread, args=(str(unused_serial_redis_list), 1))
|
|
|
request_thread.start()
|
|
|
return response.json(0)
|
|
|
|
|
@@ -339,6 +339,13 @@ class CronUpdateDataView(View):
|
|
|
|
|
|
@staticmethod
|
|
|
def updateSerialStatus(request_dict, response):
|
|
|
+ """
|
|
|
+ 更新序列号状态
|
|
|
+ @param request_dict: 请求参数
|
|
|
+ @request_dict serial_redis_list: 序列号redis列表
|
|
|
+ @request_dict status: 状态, 1: 未使用, 3: 已占用
|
|
|
+ @param response: 响应对象
|
|
|
+ """
|
|
|
serial_redis_list = request_dict.get('serial_redis_list', None)
|
|
|
status = request_dict.get('status', None)
|
|
|
if not all([serial_redis_list, status]):
|
|
@@ -346,6 +353,7 @@ class CronUpdateDataView(View):
|
|
|
serial_redis_list = eval(serial_redis_list)
|
|
|
CompanySerialModel.objects.filter(serial_number__in=serial_redis_list).update(status=int(status))
|
|
|
|
|
|
+
|
|
|
class CronCollectDataView(View):
|
|
|
def get(self, request, *args, **kwargs):
|
|
|
request.encoding = 'utf-8'
|