场景判断不能选择自己

common/src/main/java/com/huaxu/model/ResultStatus.java

@@ -111,7 +111,8 @@ public enum ResultStatus {
     SYSTEM_ERROR(999999, "系统错误"),
     PARAM_ERROR(700001, "参数缺失"),
     SCENE_TYPE_NAME_ALREADY_EXISTS(900015,"场景类型名称重复"),
-    SCENE_NAME_ALREADY_EXISTS(900015,"场景名称重复")
+    SCENE_NAME_ALREADY_EXISTS(900015,"场景名称重复"),
+    SCENE_PARENT_ALREADY_EXISTS(900016,"上级场景不能选择当前编辑场景")
     ;
 
     private final int status;

sms_water/src/main/java/com/huaxu/controller/SceneController.java

@@ -128,6 +128,12 @@ public class SceneController {
     @ResponseBody
     @ApiOperation(value = "修改保存场景信息")
     public AjaxMessage<Integer> editScene(@ApiParam(value = "场景", required = true) @RequestBody SceneEntity scene) {
+
+        //SceneEntity cScene = sceneService.findSceneById(scene.getId());
+        if(scene.getParentSceneId().equals(scene.getId()))
+        {
+            return new AjaxMessage<>(ResultStatus.SCENE_PARENT_ALREADY_EXISTS);
+        }
         int result = sceneService.updateSceneById(scene) ? 1 : 0;
         return new AjaxMessage<>(ResultStatus.OK, result);
     }

sms_water/src/main/java/com/huaxu/service/SceneService.java

@@ -29,10 +29,7 @@ import javax.annotation.Resource;
 
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.Date;
-import java.util.Map;
-import java.util.List;
-import java.util.Arrays;
+import java.util.*;
 
 import static com.google.common.collect.Lists.newArrayList;
 

sms_water/src/main/java/com/huaxu/service/SceneTypeService.java

@@ -19,6 +19,7 @@ import javax.annotation.Resource;
 
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.HashMap;
 import java.util.Map;
 import java.util.List;
 import java.util.Arrays;
@@ -58,7 +59,6 @@ public class SceneTypeService extends ServiceImpl<SceneTypeMapper, SceneTypeEnti
         List<SceneTypeEntity> sceneTypeTree = getSceneTypeTree(sceneTypeEntities, Long.valueOf(0), 1);
         return sceneTypeTree;
     }
-
     public static List<SceneTypeEntity> getSceneTypeTree(List<SceneTypeEntity> list, Long id, Integer leve) {
         List<SceneTypeEntity> temList = newArrayList();
         if (list != null) {