修改已接听/删除推送消息接口

Controller/EquipmentInfo.py

@@ -13,16 +13,6 @@ from Service.CommonService import CommonService
 from Service.EquipmentInfoService import EquipmentInfoService
 from Service.ModelService import ModelService
 
-'''
-http://192.168.136.45:8077/equipment/info?token=test&operation=add&devUid=2N1K3LE78TYJ38CE111A&Channel=0&eventType=1&eventTime=1234567890&operation=add&alarm=21342134&receiveTime=1234567891234567
-http://test.dvema.com/equipment/info?token=test&operation=query&page=1&line=10
-http://192.168.136.45:8077/equipment/info?token=test&operation=delete&devUid=UKPAH63V23U4ZHEB111A&id=5&id=6&id=7
-http://192.168.136.40:8077/equipment/info?token=test&operation=update&devUid=UKPAH63V23U4ZHEB111A&id=3&id=4
-http://192.168.136.45:8077/equipment/info?token=test&operation=queryByAdmin&page=1&line=10&userID_id=151547867345163613800138001
-http://192.168.136.45:8077/equipment/info?token=test&operation=deleteByAdmin&id=5&id=6&id=7
-
-'''
-
 
 class EquipmentInfo(View):
     @method_decorator(csrf_exempt)
@@ -56,7 +46,7 @@ class EquipmentInfo(View):
         elif operation == 'update-answer-status':
             return self.update_answer_status(request_dict, userID, response)
         elif operation == 'delete':
-            return self.delete_info(request_dict, userID, response)
+            return self.delete_info(request_dict, response)
         elif operation == 'findByTime':
             return self.findByTime_info(request_dict, userID, response)
         if operation == 'queryByAdmin':
@@ -186,8 +176,7 @@ class EquipmentInfo(View):
             id_list = request_dict.getlist('id[]', None)
             if id_list is None or len(id_list) < 1:
                 id_list = request_dict.getlist('id', None)
-            param_flag = CommonService.get_param_flag(data=[id_list])
-            if not param_flag:
+            if not id_list:
                 return response.json(444)
             for full_id in id_list:
                 try:
@@ -211,33 +200,34 @@ class EquipmentInfo(View):
         event_time = request_dict.get('event_time', None)
         if not all([uid, event_time]):
             return response.json(444)
-        updated = EquipmentInfoService.update_equipment_answer_status(user_id, uid, event_time)
-        if updated:
-            return response.json(0)
-        else:
-            return response.json(5)
 
-    def delete_info(self, request_dict, userID, response):
+        kwargs = {
+            'device_user_id': user_id,
+            'device_uid': uid,
+            'event_time': event_time,
+            'event_type__in': [606, 607]
+        }
+        try:
+            EquipmentInfoService.update_equipment_info_answer_status(**kwargs)
+        except Exception as e:
+            print(repr(e))
+        return response.json(0)
+
+    @staticmethod
+    def delete_info(request_dict, response):
         id_list = request_dict.getlist('id[]', None)
         if id_list is None or len(id_list) < 1:
             id_list = request_dict.getlist('id', None)
-        param_flag = CommonService.get_param_flag(data=[id_list])
-        if param_flag is True:
-            try:
-                for ei_id in id_list:
-                    tab_val = int(ei_id[0:1])
-                    ei_id = int(ei_id[1:])
-                    eq = EquipmentInfoService.get_equipment_info_model('', tab_val)
-                    eq.filter(id=ei_id).delete()
-
-            except Exception as e:
-                errorInfo = traceback.format_exc()
-                print(errorInfo)
-                return response.json(424, repr(e))
-            else:
-                return response.json(0)
-        else:
+        if not id_list:
             return response.json(444)
+        try:
+            for full_id in id_list:
+                ei_id = int(full_id[2:])
+                equipment_info_model = EquipmentInfoService.get_equipment_info_model_with_full_id(full_id)
+                equipment_info_model.objects.filter(id=ei_id).delete()
+        except Exception as e:
+            print(repr(e))
+        return response.json(0)
 
     def findByTime_info(self, request_dict, userID, response):
         startTime = request_dict.get('startTime')

Service/EquipmentInfoService.py

@@ -651,6 +651,16 @@ class EquipmentInfoService:
         for equipment_info_model in EQUIPMENT_INFO_MODEL_LIST:
             equipment_info_model.objects.filter(**kwargs).update(status=1)
 
+    @staticmethod
+    def update_equipment_info_answer_status(**kwargs):
+        """
+        已接听一键通话消息
+        @param kwargs:
+        @return:
+        """
+        for equipment_info_model in EQUIPMENT_INFO_MODEL_LIST:
+            equipment_info_model.objects.filter(**kwargs).update(answer_status=1)
+
     @staticmethod
     def get_equipment_info_model_with_full_id(full_id):
         """