소스 검색

修复测试工具删除设备接口bug,更新序列号状态添加打印

locky 2 년 전
부모
커밋
19c5bd8ff3
2개의 변경된 파일9개의 추가작업 그리고 3개의 파일을 삭제
  1. 8 2
      Controller/Cron/CronTaskController.py
  2. 1 1
      Controller/EquipmentManagerV3.py

+ 8 - 2
Controller/Cron/CronTaskController.py

@@ -8,6 +8,7 @@
 # @File    : CronTaskController.py
 # @Software: PyCharm
 import datetime
+import logging
 import threading
 import time
 
@@ -333,10 +334,15 @@ class CronUpdateDataView(View):
         """
         serial_redis_list = request_dict.get('serial_redis_list', None)
         status = request_dict.get('status', None)
+        logger = logging.getLogger('info')
+        logger.info('---更新序列号状态参数---serial_redis_list:{},status:{}'.format(serial_redis_list, status))
         if not all([serial_redis_list, status]):
             return response.json(444)
-        serial_redis_list = eval(serial_redis_list)
-        CompanySerialModel.objects.filter(serial_number__in=serial_redis_list).update(status=int(status))
+        try:
+            serial_redis_list = eval(serial_redis_list)
+            CompanySerialModel.objects.filter(serial_number__in=serial_redis_list).update(status=int(status))
+        except Exception as e:
+            logger.info('---更新序列号状态异常---:{}'.format(repr(e)))
 
 
 class CronCollectDataView(View):

+ 1 - 1
Controller/EquipmentManagerV3.py

@@ -1088,7 +1088,7 @@ class EquipmentManagerV3(View):
                 return response.json(13)
 
             with transaction.atomic():
-                Device_Info.objects.filter(userID_id=user_id, uid=uid).delete()
+                Device_Info.objects.filter(userID_id=user_id, UID=uid).delete()
                 # 删除推送消息
                 for val in range(1, 8):
                     EquipmentInfoService.get_equipment_info_model('', val). \