111

src/main/java/com/fdkankan/scene/controller/SceneController.java

@@ -8,7 +8,7 @@ import com.fdkankan.scene.bean.LaserSceneBean;
 import com.fdkankan.scene.service.ILaserService;
 import com.fdkankan.scene.vo.*;
 import com.fdkankan.scene.annotation.CheckPermit;
-import com.fdkankan.scene.service.ISceneDynamicPanelService;
+//import com.fdkankan.scene.service.ISceneDynamicPanelService;
 import com.fdkankan.scene.service.ISceneService;
 import com.fdkankan.web.response.ResultData;
 import com.fdkankan.scene.service.ISceneEditInfoService;
@@ -39,8 +39,8 @@ public class SceneController extends BaseController {
     private ILaserService laserService;
     @Autowired
     private ISceneService sceneService;
-    @Autowired
-    private ISceneDynamicPanelService sceneDynamicPanelService;
+//    @Autowired
+//    private ISceneDynamicPanelService sceneDynamicPanelService;
 
     /**
      * <p>
@@ -147,15 +147,15 @@ public class SceneController extends BaseController {
         return ResultData.ok();
     }
 
-    /**
-     * 查询是否有动态面板数据
-     * @param num
-     * @return
-     */
-    @GetMapping("/checkDynamicPanel")
-    public ResultData checkDynamicPanel(@RequestParam("num") String num){
-        return ResultData.ok(sceneDynamicPanelService.checkDynamicPanel(num));
-    }
+//    /**
+//     * 查询是否有动态面板数据
+//     * @param num
+//     * @return
+//     */
+//    @GetMapping("/checkDynamicPanel")
+//    public ResultData checkDynamicPanel(@RequestParam("num") String num){
+//        return ResultData.ok(sceneDynamicPanelService.checkDynamicPanel(num));
+//    }
 
 }
 

src/main/java/com/fdkankan/scene/controller/SceneDynamicPanelController.java

@@ -1,53 +1,53 @@
-package com.fdkankan.scene.controller;
-
-
-import com.fdkankan.scene.annotation.CheckPermit;
-import com.fdkankan.scene.service.ISceneDynamicPanelService;
-import com.fdkankan.scene.vo.BaseJsonDataParamVO;
-import com.fdkankan.web.response.ResultData;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import javax.validation.Valid;
-
-/**
- * <p>
- * 场景动态面板 前端控制器
- * </p>
- *
- * @author
- * @since 2024-05-21
- */
-@RestController
-@RequestMapping("/service/scene/edit/dynamicPanel")
-public class SceneDynamicPanelController {
-
-    @Autowired
-    private ISceneDynamicPanelService sceneDynamicPanelService;
-
-    /**
-     * 获取动态面板列表
-     * @param num
-     * @return
-     */
-    @CheckPermit
-    @GetMapping("/list")
-    public ResultData list(@RequestParam("num") String num){
-        return ResultData.ok(sceneDynamicPanelService.list(num));
-    }
-
-    /**
-     * 修改动态面板
-     * @param param
-     * @return
-     */
-    @CheckPermit
-    @PostMapping("/update")
-    public ResultData update(@RequestBody @Valid BaseJsonDataParamVO param){
-        sceneDynamicPanelService.update(param);
-        return ResultData.ok();
-    }
-
-
-}
-
+//package com.fdkankan.scene.controller;
+//
+//
+//import com.fdkankan.scene.annotation.CheckPermit;
+//import com.fdkankan.scene.service.ISceneDynamicPanelService;
+//import com.fdkankan.scene.vo.BaseJsonDataParamVO;
+//import com.fdkankan.web.response.ResultData;
+//import org.springframework.beans.factory.annotation.Autowired;
+//import org.springframework.web.bind.annotation.*;
+//
+//import javax.validation.Valid;
+//
+///**
+// * <p>
+// * 场景动态面板 前端控制器
+// * </p>
+// *
+// * @author
+// * @since 2024-05-21
+// */
+//@RestController
+//@RequestMapping("/service/scene/edit/dynamicPanel")
+//public class SceneDynamicPanelController {
+//
+//    @Autowired
+//    private ISceneDynamicPanelService sceneDynamicPanelService;
+//
+//    /**
+//     * 获取动态面板列表
+//     * @param num
+//     * @return
+//     */
+//    @CheckPermit
+//    @GetMapping("/list")
+//    public ResultData list(@RequestParam("num") String num){
+//        return ResultData.ok(sceneDynamicPanelService.list(num));
+//    }
+//
+//    /**
+//     * 修改动态面板
+//     * @param param
+//     * @return
+//     */
+//    @CheckPermit
+//    @PostMapping("/update")
+//    public ResultData update(@RequestBody @Valid BaseJsonDataParamVO param){
+//        sceneDynamicPanelService.update(param);
+//        return ResultData.ok();
+//    }
+//
+//
+//}
+//

src/main/java/com/fdkankan/scene/service/ISceneDynamicPanelService.java

@@ -1,25 +1,25 @@
-package com.fdkankan.scene.service;
-
-import com.fdkankan.scene.entity.SceneDynamicPanel;
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.fdkankan.scene.vo.BaseJsonDataParamVO;
-import com.fdkankan.scene.vo.SceneDynamicPanelVO;
-
-import java.util.List;
-
-/**
- * <p>
- * 场景动态面板 服务类
- * </p>
- *
- * @author
- * @since 2024-05-21
- */
-public interface ISceneDynamicPanelService extends IService<SceneDynamicPanel> {
-
-    List<SceneDynamicPanelVO> list(String num);
-
-    void update(BaseJsonDataParamVO param);
-
-    Byte checkDynamicPanel(String num);
-}
+//package com.fdkankan.scene.service;
+//
+//import com.fdkankan.scene.entity.SceneDynamicPanel;
+//import com.baomidou.mybatisplus.extension.service.IService;
+//import com.fdkankan.scene.vo.BaseJsonDataParamVO;
+//import com.fdkankan.scene.vo.SceneDynamicPanelVO;
+//
+//import java.util.List;
+//
+///**
+// * <p>
+// * 场景动态面板 服务类
+// * </p>
+// *
+// * @author
+// * @since 2024-05-21
+// */
+//public interface ISceneDynamicPanelService extends IService<SceneDynamicPanel> {
+//
+//    List<SceneDynamicPanelVO> list(String num);
+//
+//    void update(BaseJsonDataParamVO param);
+//
+//    Byte checkDynamicPanel(String num);
+//}

src/main/java/com/fdkankan/scene/service/impl/SceneEditInfoServiceImpl.java

@@ -111,8 +111,8 @@ public class SceneEditInfoServiceImpl extends ServiceImpl<ISceneEditInfoMapper,
     private ICommonService commonService;
     @Autowired
     private ISceneDrawService sceneDrawService;
-    @Autowired
-    private ISceneDynamicPanelService sceneDynamicPanelService;
+//    @Autowired
+//    private ISceneDynamicPanelService sceneDynamicPanelService;
 //    @Autowired
 //    private IWbService wbService;
 
@@ -276,7 +276,7 @@ public class SceneEditInfoServiceImpl extends ServiceImpl<ISceneEditInfoMapper,
         //发布场景绘制
         sceneDrawService.publicSceneDraw(num, bucket);
 
-        sceneJson.setDynamicPanel(sceneDynamicPanelService.checkDynamicPanel(num));
+//        sceneJson.setDynamicPanel(sceneDynamicPanelService.checkDynamicPanel(num));
 
         //本地写sceneJson文件
         String localSceneJsonPath = String.format(scenePlusExt.getDataSource()+ ConstantFileLocPath.SCENE_DATA_PATH_V4, num) + "scene.json";
@@ -506,7 +506,7 @@ public class SceneEditInfoServiceImpl extends ServiceImpl<ISceneEditInfoMapper,
 
 //        this.setExtData(sceneInfoVO, scenePlus.getCameraId());
 
-        sceneInfoVO.setDynamicPanel(sceneDynamicPanelService.checkDynamicPanel(num));
+//        sceneInfoVO.setDynamicPanel(sceneDynamicPanelService.checkDynamicPanel(num));
 
         return sceneInfoVO;
     }