lyhzzz 2 years ago
parent
commit
1424c3fd2f

+ 1 - 0
src/main/java/com/fdkankan/manage/common/ResultCode.java

@@ -59,6 +59,7 @@ public enum ResultCode  {
     SS_NO_COPY(50042, "深时场景暂不支持复制!"),
     AGENT_NOT_EMPTY(50043, "经销商名称已存在!"),
     CAMERA_NOT_MOVE(50044, "场景在改相机中,无需迁移!"),
+    SCENE_REBUILD_ERROR(50045, "场景重算失败。。。"),
 
     ;
 

+ 12 - 4
src/main/java/com/fdkankan/manage/controller/SceneController.java

@@ -12,6 +12,7 @@ import com.fdkankan.manage.service.IDownService;
 import com.fdkankan.manage.service.IScenePlusService;
 import com.fdkankan.manage.service.ISceneProService;
 import com.fdkankan.manage.vo.request.SceneParam;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -25,6 +26,7 @@ import java.util.HashMap;
  */
 @RestController
 @RequestMapping("/service/manage/scene")
+@Slf4j
 public class SceneController {
 
     @Autowired
@@ -124,11 +126,17 @@ public class SceneController {
         }
         HashMap<String,Object> paramMap = new HashMap<>();
         paramMap.put("num",num);
-        JSONObject jsonObject = fdKKClient.rebuildScene(paramMap);
-        Integer code = jsonObject.getInteger("code");
-        if(code != 0){
-            return ResultData.error(code,jsonObject.getString("message"));
+        try {
+            JSONObject jsonObject = fdKKClient.rebuildScene(paramMap);
+            Integer code = jsonObject.getInteger("code");
+            if(code != 0){
+                log.error("场景重算失败:{},{}",num,jsonObject);
+                throw new BusinessException(ResultCode.SCENE_REBUILD_ERROR);
+            }
+        }catch (Exception e){
+            throw new BusinessException(ResultCode.SCENE_REBUILD_ERROR);
         }
+
         return ResultData.ok();
     }
 }