Merge branch 'test' of http://192.168.136.99:3000/servers/ASJServer into peng

Controller/SensorGateway/SmartSocketController.py

@@ -576,57 +576,60 @@ class SmartSocketView(View):
         编辑设备
         """
         # 编辑插座信息
-        serial_number = request_dict.get('serialNumber', None)
-        NickName = request_dict.get('NickName', None)
-        # room_save
-        # familyRoom = request_dict.get('familyRoom', None)
-        type_switch = request_dict.get('typeSwitch', None)  # 1：倒计时开关
-        status = request_dict.get('status', None)  # 开关状态 0：关闭，1：开启'
-
-        # 编辑插座排程
-        count_down_time = request_dict.get('countDownTime', None)  # 倒计时时间戳
-        time_type = request_dict.get('timeType', None)  # 排查时间类型 0:按时间 1：按时间段划分'
-        switch_status = request_dict.get('switchStatus', None)  # 开关状态 0：关闭，1：开启
-        start_time = request_dict.get('startTime', None)
-        end_time = request_dict.get('endTime', None)
-        repeat = request_dict.get('repeat', None)  # 重复周期用数值表示
-
-        if not all([serial_number]):
-            return response.json(444)
-        socket_info_qs = SocketInfo.objects.filter(serial_number=serial_number)
-        if not socket_info_qs.exists():
-            return response.json(173)
-        try:
-            with transaction.atomic():
-                if NickName:
-                    Device_Info.objects.update(serial_number=serial_number, NickName=NickName)
-                    UidSetModel.objects.update(serial_number=serial_number, nickname=NickName)
-                elif type_switch:
-                    socket_info_qs.update(type_switch=type_switch)
-                elif status:
-                    socket_info_qs.update(status=status)
-                elif count_down_time:
-                    socket_info_qs.update(count_down_time=count_down_time)
-                socket_qs = SocketSchedule.objects.filter(serial_number=serial_number)
-                if not socket_qs.exists():
-                    socket_info_qs.save()
-                    return response(0)
-                elif time_type:
-                    socket_qs.update(time_type=time_type)
-                elif switch_status:
-                    socket_qs.update(switch_status=switch_status)
-                elif start_time:
-                    socket_qs.update(start_time=start_time)
-                elif end_time:
-                    socket_qs.update(end_time=end_time)
-                elif repeat:
-                    socket_qs.update(repeat=repeat)
-                socket_info_qs.save()
-                socket_qs.save()
-                return response.json(0)
-        except Exception as e:
-            print(e)
-            return response.json(500)
+        # serial_number = request_dict.get('serialNumber', None)
+        # NickName = request_dict.get('NickName', None)
+        # # room_save
+        # # familyRoom = request_dict.get('familyRoom', None)
+        # type_switch = request_dict.get('typeSwitch', None)  # 1：倒计时开关
+        # status = request_dict.get('status', None)  # 开关状态 0：关闭，1：开启'
+        #
+        # # 编辑插座排程
+        # count_down_time = request_dict.get('countDownTime', None)  # 倒计时时间戳
+        # time_type = request_dict.get('timeType', None)  # 排查时间类型 0:按时间 1：按时间段划分'
+        # switch_status = request_dict.get('switchStatus', None)  # 开关状态 0：关闭，1：开启
+        # start_time = request_dict.get('startTime', None)
+        # end_time = request_dict.get('endTime', None)
+        # repeat = request_dict.get('repeat', None)  # 重复周期用数值表示
+        #
+        # if not all([serial_number]):
+        #     return response.json(444)
+        # socket_info_qs = SocketInfo.objects.filter(serial_number=serial_number)
+        # device_info_qs = Device_Info.objects.filter(serial_number=serial_number)
+        # uid_set_qs = UidSetModel.objects.filter(serial_number=serial_number)
+        # if not socket_info_qs.exists() or not device_info_qs.exists() or not uid_set_qs.exists():
+        #     return response.json(173)
+        # try:
+        #     with transaction.atomic():
+        #         if NickName:
+        #             device_info_qs.update(NickName=NickName)
+        #             uid_set_qs.update(nickname=NickName)
+        #         elif type_switch:
+        #             socket_info_qs.update(type_switch=type_switch)
+        #         elif status:
+        #             socket_info_qs.update(status=status)
+        #         elif count_down_time:
+        #             socket_info_qs.update(count_down_time=count_down_time)
+        #         socket_qs = SocketSchedule.objects.filter(serial_number=serial_number)
+        #         if not socket_qs.exists():
+        #             socket_info_qs.save()
+        #             return response(0)
+        #         elif time_type:
+        #             socket_qs.update(time_type=time_type)
+        #         elif switch_status:
+        #             socket_qs.update(switch_status=switch_status)
+        #         elif start_time:
+        #             socket_qs.update(start_time=start_time)
+        #         elif end_time:
+        #             socket_qs.update(end_time=end_time)
+        #         elif repeat:
+        #             socket_qs.update(repeat=repeat)
+        #         socket_info_qs.save()
+        #         socket_qs.save()
+        #         return response.json(0)
+        # except Exception as e:
+        #     print(e)
+        #     return response.json(500)
+        pass
 
     @classmethod
     def splittings_time(cls, startTime, endTime, unit):