Explorar o código

修改编辑智能场景不能重复名

peng %!s(int64=3) %!d(string=hai) anos
pai
achega
e171782bbe
Modificáronse 1 ficheiros con 7 adicións e 2 borrados
  1. 7 2
      Controller/SensorGateway/SmartSceneController.py

+ 7 - 2
Controller/SensorGateway/SmartSceneController.py

@@ -44,7 +44,7 @@ class SmartSceneView(View):
         elif operation == 'detail':  # 查询智能场景详情
         elif operation == 'detail':  # 查询智能场景详情
             return self.scene_detail(request_dict, response)
             return self.scene_detail(request_dict, response)
         elif operation == 'edit':  # 编辑智能场景
         elif operation == 'edit':  # 编辑智能场景
-            return self.edit_smart_scene(request_dict, response)
+            return self.edit_smart_scene(request_dict, user_id, response)
         elif operation == 'delete':  # 删除智能场景
         elif operation == 'delete':  # 删除智能场景
             return self.delete_smart_scene(request_dict, response)
             return self.delete_smart_scene(request_dict, response)
         else:
         else:
@@ -410,7 +410,7 @@ class SmartSceneView(View):
             return response.json(500, repr(e))
             return response.json(500, repr(e))
 
 
     @staticmethod
     @staticmethod
-    def edit_smart_scene(request_dict, response):
+    def edit_smart_scene(request_dict, user_id, response):
         """
         """
         编辑智能场景
         编辑智能场景
         @param request_dict: 请求参数
         @param request_dict: 请求参数
@@ -429,6 +429,11 @@ class SmartSceneView(View):
         conditions_dict = eval(conditions)
         conditions_dict = eval(conditions)
         tasks_list = eval(tasks)
         tasks_list = eval(tasks)
         now_time = int(time.time())
         now_time = int(time.time())
+
+        smart_scene_qs = SmartScene.objects.filter(user_id=user_id, scene_name=scene_name)
+        if smart_scene_qs.exists():
+            return response.json(174)
+
         res = {
         res = {
             'scene_name': scene_name,
             'scene_name': scene_name,
             'conditions': conditions_dict,
             'conditions': conditions_dict,