فهرست منبع

自己不能移动到自己

lyhzzz 2 سال پیش
والد
کامیت
4b23dbd4e2
2فایلهای تغییر یافته به همراه8 افزوده شده و 1 حذف شده
  1. 3 1
      src/main/java/com/cdf/common/ResultCode.java
  2. 5 0
      src/main/java/com/cdf/controller/back/SceneBackController.java

+ 3 - 1
src/main/java/com/cdf/common/ResultCode.java

@@ -26,7 +26,9 @@ public enum ResultCode {
 
 
     UPLOAD_ERROR(7001,"文件上传失败"),
     UPLOAD_ERROR(7001,"文件上传失败"),
     UPLOAD_FILE_NO_EXIST(7002,"上传文件不存在"),
     UPLOAD_FILE_NO_EXIST(7002,"上传文件不存在"),
-    UPLOAD_FILE_TO_LONG(7003,"文件上传过大");
+    UPLOAD_FILE_TO_LONG(7003,"文件上传过大"),
+
+    MOVE_FOLDER_ERROR(7004,"移动文件夹错误");
 
 
     public int code;
     public int code;
     public String msg;
     public String msg;

+ 5 - 0
src/main/java/com/cdf/controller/back/SceneBackController.java

@@ -3,7 +3,9 @@ package com.cdf.controller.back;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.JSONObject;
 import com.cdf.aop.SysLog;
 import com.cdf.aop.SysLog;
+import com.cdf.common.ResultCode;
 import com.cdf.common.ResultData;
 import com.cdf.common.ResultData;
+import com.cdf.exception.BusinessException;
 import com.cdf.httpClient.request.FdkkAllSceneRequest;
 import com.cdf.httpClient.request.FdkkAllSceneRequest;
 import com.cdf.httpClient.request.FdkkSceneFolderRequest;
 import com.cdf.httpClient.request.FdkkSceneFolderRequest;
 import com.cdf.httpClient.request.FdkkSceneListRequest;
 import com.cdf.httpClient.request.FdkkSceneListRequest;
@@ -68,6 +70,9 @@ public class SceneBackController {
     @PostMapping("/move")
     @PostMapping("/move")
     @SysLog(logType = "場景管理",value = "移動")
     @SysLog(logType = "場景管理",value = "移動")
     public ResultData move (@RequestBody FdkkSceneFolderRequest param, @RequestHeader String token ){
     public ResultData move (@RequestBody FdkkSceneFolderRequest param, @RequestHeader String token ){
+        if(param.getParentId().equals(param.getId())){
+            throw new BusinessException(ResultCode.MOVE_FOLDER_ERROR);
+        }
         fdkkSceneService.move(param,token);
         fdkkSceneService.move(param,token);
         return ResultData.ok();
         return ResultData.ok();
     }
     }