dengsixing пре 3 година
родитељ
комит
e2416a1f5f
27 измењених фајлова са 69 додато и 69 уклоњено
  1. 1 1
      src/main/java/com/fdkankan/scene/Interceptor/CheckPermitAspect.java
  2. 1 1
      src/main/java/com/fdkankan/scene/callback/FdkkMiniReqErrorCallback.java
  3. 1 1
      src/main/java/com/fdkankan/scene/callback/FdkkMiniReqSuccessCallback.java
  4. 1 1
      src/main/java/com/fdkankan/scene/callback/FdkkMiniReqSuccessCondition.java
  5. 2 2
      src/main/java/com/fdkankan/scene/controller/FileConvertController.java
  6. 3 3
      src/main/java/com/fdkankan/scene/controller/SceneController.java
  7. 33 33
      src/main/java/com/fdkankan/scene/controller/SceneEditController.java
  8. 1 1
      src/main/java/com/fdkankan/scene/controller/TestController.java
  9. 7 7
      src/main/java/com/fdkankan/scene/controller/V3Controller.java
  10. 1 1
      src/main/java/com/fdkankan/scene/service/ISceneEditInfoService.java
  11. 1 1
      src/main/java/com/fdkankan/scene/service/ISceneEditService.java
  12. 1 1
      src/main/java/com/fdkankan/scene/service/IScenePlusService.java
  13. 1 1
      src/main/java/com/fdkankan/scene/service/ISceneProService.java
  14. 1 1
      src/main/java/com/fdkankan/scene/service/ISceneUpgradeToV4Service.java
  15. 1 1
      src/main/java/com/fdkankan/scene/service/ISceneUploadService.java
  16. 1 1
      src/main/java/com/fdkankan/scene/service/impl/SceneEditInfoServiceImpl.java
  17. 1 1
      src/main/java/com/fdkankan/scene/service/impl/SceneEditServiceImpl.java
  18. 1 1
      src/main/java/com/fdkankan/scene/service/impl/ScenePlusServiceImpl.java
  19. 1 1
      src/main/java/com/fdkankan/scene/service/impl/SceneProServiceImpl.java
  20. 1 1
      src/main/java/com/fdkankan/scene/service/impl/SceneServiceImpl.java
  21. 1 1
      src/main/java/com/fdkankan/scene/service/impl/SceneUpgradeToV4Service.java
  22. 2 2
      src/main/java/com/fdkankan/scene/service/impl/SceneUploadServiceImpl.java
  23. 1 1
      src/main/java/com/fdkankan/scene/vo/DeviceSceneParamVO.java
  24. 1 1
      src/main/java/com/fdkankan/scene/vo/RebuildVedioSceneParamVO.java
  25. 1 1
      src/main/java/com/fdkankan/scene/vo/SceneCooperationParamVO.java
  26. 1 1
      src/main/java/com/fdkankan/scene/vo/SceneParamVO.java
  27. 1 1
      src/main/java/com/fdkankan/scene/vo/UserParamVO.java

+ 1 - 1
src/main/java/com/fdkankan/scene/Interceptor/CheckPermitAspect.java

@@ -59,7 +59,7 @@ public class CheckPermitAspect {
 		if(Objects.isNull(user)){
 			throw new BusinessException(ErrorCode.TOKEN_NOT_FOUND);
 		}
-		String num = WebUtil.getNum(joinPoint, request);
+		String num = WebUtil.getParameter("num", joinPoint, request);
 		if(StrUtil.isEmpty(num)){
 			throw new BusinessException(ErrorCode.PARAM_REQUIRED);
 		}

+ 1 - 1
src/main/java/com/fdkankan/scene/callback/FdkkMiniReqErrorCallback.java

@@ -8,7 +8,7 @@ import com.dtflys.forest.http.ForestRequest;
 import com.dtflys.forest.http.ForestResponse;
 import com.fdkankan.common.constant.ServerCode;
 import com.fdkankan.common.exception.BusinessException;
-import com.fdkankan.common.response.Result;
+import com.fdkankan.web.response.Result;
 import lombok.extern.slf4j.Slf4j;
 
 /**

+ 1 - 1
src/main/java/com/fdkankan/scene/callback/FdkkMiniReqSuccessCallback.java

@@ -3,7 +3,7 @@ package com.fdkankan.scene.callback;
 import com.dtflys.forest.callback.OnSuccess;
 import com.dtflys.forest.http.ForestRequest;
 import com.dtflys.forest.http.ForestResponse;
-import com.fdkankan.common.response.Result;
+import com.fdkankan.web.response.Result;
 import lombok.extern.slf4j.Slf4j;
 
 /**

+ 1 - 1
src/main/java/com/fdkankan/scene/callback/FdkkMiniReqSuccessCondition.java

@@ -6,7 +6,7 @@ import com.dtflys.forest.callback.SuccessWhen;
 import com.dtflys.forest.http.ForestRequest;
 import com.dtflys.forest.http.ForestResponse;
 import com.fdkankan.common.constant.ServerCode;
-import com.fdkankan.common.response.Result;
+import com.fdkankan.web.response.Result;
 
 /**
  * <p>

+ 2 - 2
src/main/java/com/fdkankan/scene/controller/FileConvertController.java

@@ -1,8 +1,8 @@
 package com.fdkankan.scene.controller;
 
-import com.fdkankan.common.response.ResultData;
 import com.fdkankan.scene.service.IFileConvertService;
 import com.fdkankan.web.controller.BaseController;
+import com.fdkankan.web.response.ResultData;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -32,7 +32,7 @@ public class FileConvertController extends BaseController {
      * @author dengsixing
      * @date 2022/8/1
      * @param file
-     * @return com.fdkankan.common.response.ResultData
+     * @return com.fdkankan.web.response.ResultData
      **/
     @PostMapping("/convertTxtToModeldata")
     public ResultData convertTxtToModeldata(@RequestParam("file") MultipartFile file) throws Exception{

+ 3 - 3
src/main/java/com/fdkankan/scene/controller/SceneController.java

@@ -2,7 +2,7 @@ package com.fdkankan.scene.controller;
 
 
 import com.fdkankan.common.constant.SceneInfoReqType;
-import com.fdkankan.common.response.ResultData;
+import com.fdkankan.web.response.ResultData;
 import com.fdkankan.scene.service.ISceneEditInfoService;
 import com.fdkankan.scene.service.IScenePlusService;
 import com.fdkankan.scene.vo.BaseSceneParamVO;
@@ -57,7 +57,7 @@ public class SceneController extends BaseController {
      * @author dengsixing
      * @date 2022/8/1
      * @param param
-     * @return com.fdkankan.common.response.ResultData
+     * @return com.fdkankan.web.response.ResultData
      **/
     @PostMapping(value = "/check/key")
     public ResultData checkKey(@RequestBody @Validated SceneCheckKeyParamVO param) throws Exception {
@@ -71,7 +71,7 @@ public class SceneController extends BaseController {
      * @author dengsixing
      * @date 2022/8/1
      * @param param
-     * @return com.fdkankan.common.response.ResultData
+     * @return com.fdkankan.web.response.ResultData
      **/
     @PostMapping(value = "/downLoadZSData")
     public ResultData downLoadZSData(@Validated BaseSceneParamVO param) throws Exception{

+ 33 - 33
src/main/java/com/fdkankan/scene/controller/SceneEditController.java

@@ -3,7 +3,7 @@ package com.fdkankan.scene.controller;
 import com.fdkankan.common.constant.ErrorCode;
 import com.fdkankan.common.constant.SceneInfoReqType;
 import com.fdkankan.common.exception.BusinessException;
-import com.fdkankan.common.response.ResultData;
+import com.fdkankan.web.response.ResultData;
 import com.fdkankan.scene.annotation.CheckPermit;
 import com.fdkankan.scene.service.ISceneEditInfoService;
 import com.fdkankan.scene.service.ISceneEditService;
@@ -75,7 +75,7 @@ public class SceneEditController extends BaseController {
      * @author dengsixing
      * @date 2022/1/12
      * @param param
-     * @return com.fdkankan.common.response.ResultData
+     * @return com.fdkankan.web.response.ResultData
      **/
     @CheckPermit
     @PostMapping(value = "/base/save")
@@ -90,7 +90,7 @@ public class SceneEditController extends BaseController {
      * @author dengsixing
      * @date 2022/1/12
      * @param param
-     * @return com.fdkankan.common.response.ResultData
+     * @return com.fdkankan.web.response.ResultData
      **/
     @CheckPermit
     @PostMapping(value = "/publicScene")
@@ -105,7 +105,7 @@ public class SceneEditController extends BaseController {
      * @author dengsixing
      * @date 2022/1/12
      * @param param
-     * @return com.fdkankan.common.response.ResultData
+     * @return com.fdkankan.web.response.ResultData
      **/
     @CheckPermit
     @PostMapping(value = "/saveInitialPage")
@@ -120,7 +120,7 @@ public class SceneEditController extends BaseController {
      * @author dengsixing
      * @date 2022/1/12
      * @param param
-     * @return com.fdkankan.common.response.ResultData
+     * @return com.fdkankan.web.response.ResultData
      **/
     @CheckPermit
     @PostMapping(value = "/tag/save")
@@ -135,7 +135,7 @@ public class SceneEditController extends BaseController {
      * @author dengsixing
      * @date 2022/2/16
      * @param param
-     * @return com.fdkankan.common.response.ResultData
+     * @return com.fdkankan.web.response.ResultData
      **/
     @CheckPermit
     @PostMapping(value = "/tag/delete")
@@ -150,7 +150,7 @@ public class SceneEditController extends BaseController {
      * @author dengsixing
      * @date 2022/8/1
      * @param num
-     * @return com.fdkankan.common.response.ResultData
+     * @return com.fdkankan.web.response.ResultData
      **/
     @PostMapping(value = "/tag/list")
     public ResultData listTags(@RequestParam(value = "num") String num) throws Exception {
@@ -164,7 +164,7 @@ public class SceneEditController extends BaseController {
      * @author dengsixing
      * @date 2022/2/16
      * @param param
-     * @return com.fdkankan.common.response.ResultData
+     * @return com.fdkankan.web.response.ResultData
      **/
     @CheckPermit
     @PostMapping(value = "/icons/delete")
@@ -179,7 +179,7 @@ public class SceneEditController extends BaseController {
      * @author dengsixing
      * @date 2022/1/12
      * @param param
-     * @return com.fdkankan.common.response.ResultData
+     * @return com.fdkankan.web.response.ResultData
      **/
     @CheckPermit
     @PostMapping(value = "/saveRoam")
@@ -194,7 +194,7 @@ public class SceneEditController extends BaseController {
      * @author dengsixing
      * @date 2022/8/1
      * @param param
-     * @return com.fdkankan.common.response.ResultData
+     * @return com.fdkankan.web.response.ResultData
      **/
     @CheckPermit
     @PostMapping(value = "/saveTagsVisible")
@@ -209,7 +209,7 @@ public class SceneEditController extends BaseController {
      * @author dengsixing
      * @date 2022/8/1
      * @param num
-     * @return com.fdkankan.common.response.ResultData
+     * @return com.fdkankan.web.response.ResultData
      **/
     @CheckPermit
     @PostMapping(value = "/downloadModel")
@@ -225,7 +225,7 @@ public class SceneEditController extends BaseController {
      * @date 2022/8/1
      * @param num
      * @param file
-     * @return com.fdkankan.common.response.ResultData
+     * @return com.fdkankan.web.response.ResultData
      **/
     @CheckPermit
     @PostMapping(value = "/uploadModel")
@@ -243,7 +243,7 @@ public class SceneEditController extends BaseController {
      * @param sid
      * @param fileName
      * @param file 
-     * @return com.fdkankan.common.response.ResultData
+     * @return com.fdkankan.web.response.ResultData
      **/
     @CheckPermit
     @PostMapping(value = "/linkPan/upload")
@@ -262,7 +262,7 @@ public class SceneEditController extends BaseController {
      * @author dengsixing
      * @date 2022/8/1
      * @param param
-     * @return com.fdkankan.common.response.ResultData
+     * @return com.fdkankan.web.response.ResultData
      **/
     @CheckPermit
     @PostMapping(value = "/linkPan/save")
@@ -277,7 +277,7 @@ public class SceneEditController extends BaseController {
      * @author dengsixing
      * @date 2022/8/1
      * @param param
-     * @return com.fdkankan.common.response.ResultData
+     * @return com.fdkankan.web.response.ResultData
      **/
     @CheckPermit
     @PostMapping(value = "/linkPan/delete")
@@ -292,7 +292,7 @@ public class SceneEditController extends BaseController {
      * @author dengsixing
      * @date 2022/8/1
      * @param param
-     * @return com.fdkankan.common.response.ResultData
+     * @return com.fdkankan.web.response.ResultData
      **/
     @CheckPermit
     @PostMapping(value = "/styles/delete")
@@ -307,7 +307,7 @@ public class SceneEditController extends BaseController {
      * @author dengsixing
      * @date 2022/8/1
      * @param num
-     * @return com.fdkankan.common.response.ResultData
+     * @return com.fdkankan.web.response.ResultData
      **/
     @CheckPermit
     @PostMapping(value = "/linkPan/list")
@@ -322,7 +322,7 @@ public class SceneEditController extends BaseController {
      * @author dengsixing
      * @date 2022/1/20
      * @param param
-     * @return com.fdkankan.common.response.ResultData
+     * @return com.fdkankan.web.response.ResultData
      **/
     @CheckPermit
     @PostMapping(value = "/cad/save")
@@ -412,7 +412,7 @@ public class SceneEditController extends BaseController {
      * @author dengsixing
      * @date 2022/2/18
      * @param param
-     * @return com.fdkankan.common.response.ResultData
+     * @return com.fdkankan.web.response.ResultData
      **/
     @CheckPermit
     @PostMapping(value = "/video/box/save")
@@ -427,7 +427,7 @@ public class SceneEditController extends BaseController {
      * @author dengsixing
      * @date 2022/2/18
      * @param param
-     * @return com.fdkankan.common.response.ResultData
+     * @return com.fdkankan.web.response.ResultData
      **/
     @CheckPermit
     @PostMapping(value = "/video/box/delete")
@@ -442,7 +442,7 @@ public class SceneEditController extends BaseController {
      * @author dengsixing
      * @date 2022/2/18
      * @param param
-     * @return com.fdkankan.common.response.ResultData
+     * @return com.fdkankan.web.response.ResultData
      **/
     @CheckPermit
     @PostMapping(value = "/photo/box/save")
@@ -457,7 +457,7 @@ public class SceneEditController extends BaseController {
      * @author dengsixing
      * @date 2022/2/18
      * @param param
-     * @return com.fdkankan.common.response.ResultData
+     * @return com.fdkankan.web.response.ResultData
      **/
     @CheckPermit
     @PostMapping(value = "/photo/box/delete")
@@ -490,7 +490,7 @@ public class SceneEditController extends BaseController {
      * @param num
      * @param fileName
      * @param file
-     * @return com.fdkankan.common.response.ResultData
+     * @return com.fdkankan.web.response.ResultData
      **/
     @CheckPermit
     @PostMapping(value = "/uploadBallScreenVideo")
@@ -549,7 +549,7 @@ public class SceneEditController extends BaseController {
      * @author dengsixing
      * @date 2022/2/23
      * @param paramVO
-     * @return com.fdkankan.common.response.ResultData
+     * @return com.fdkankan.web.response.ResultData
      **/
     @CheckPermit
     @PostMapping("/delete/file")
@@ -569,7 +569,7 @@ public class SceneEditController extends BaseController {
      * @param ajkJson
      * @param cameraJson
      * @param files
-     * @return com.fdkankan.common.response.ResultData
+     * @return com.fdkankan.web.response.ResultData
      **/
     @CheckPermit
     @PostMapping(value = "/sceneSync")
@@ -605,7 +605,7 @@ public class SceneEditController extends BaseController {
      * @author dengsixing
      * @date 2022/4/11
      * @param param
-     * @return com.fdkankan.common.response.ResultData
+     * @return com.fdkankan.web.response.ResultData
      **/
     @PostMapping(value = "/locales")
     public ResultData locales(@RequestBody @Validated LocalesParamVO param) throws Exception {
@@ -622,7 +622,7 @@ public class SceneEditController extends BaseController {
      * @author dengsixing
      * @date 2022/8/1
      * @param param
-     * @return com.fdkankan.common.response.ResultData
+     * @return com.fdkankan.web.response.ResultData
      **/
     @CheckPermit
     @PostMapping(value = "/tour/save")
@@ -637,7 +637,7 @@ public class SceneEditController extends BaseController {
      * @author dengsixing
      * @date 2022/8/1
      * @param param
-     * @return com.fdkankan.common.response.ResultData
+     * @return com.fdkankan.web.response.ResultData
      **/
     @CheckPermit
     @PostMapping(value = "/tour/delete")
@@ -652,7 +652,7 @@ public class SceneEditController extends BaseController {
      * @author dengsixing
      * @date 2022/8/1
      * @param param
-     * @return com.fdkankan.common.response.ResultData
+     * @return com.fdkankan.web.response.ResultData
      **/
     @CheckPermit
     @PostMapping(value = "/mosaics/add")
@@ -667,7 +667,7 @@ public class SceneEditController extends BaseController {
      * @author dengsixing
      * @date 2022/8/1
      * @param param
-     * @return com.fdkankan.common.response.ResultData
+     * @return com.fdkankan.web.response.ResultData
      **/
     @CheckPermit
     @PostMapping(value = "/mosaics/delete")
@@ -682,7 +682,7 @@ public class SceneEditController extends BaseController {
      * @author dengsixing
      * @date 2022/8/1
      * @param param
-     * @return com.fdkankan.common.response.ResultData
+     * @return com.fdkankan.web.response.ResultData
      **/
     @CheckPermit
     @PostMapping(value = "/mosaics/list")
@@ -697,7 +697,7 @@ public class SceneEditController extends BaseController {
      * @author dengsixing
      * @date 2022/8/1
      * @param param
-     * @return com.fdkankan.common.response.ResultData
+     * @return com.fdkankan.web.response.ResultData
      **/
     @CheckPermit
     @PostMapping(value = "/waterMark/add")
@@ -712,7 +712,7 @@ public class SceneEditController extends BaseController {
      * @author dengsixing
      * @date 2022/8/1
      * @param param
-     * @return com.fdkankan.common.response.ResultData
+     * @return com.fdkankan.web.response.ResultData
      **/
     @CheckPermit
     @PostMapping(value = "/waterMark/delete")

+ 1 - 1
src/main/java/com/fdkankan/scene/controller/TestController.java

@@ -1,6 +1,6 @@
 package com.fdkankan.scene.controller;
 
-import com.fdkankan.common.response.ResultData;
+import com.fdkankan.web.response.ResultData;
 import com.fdkankan.fyun.face.FYunFileServiceInterface;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;

+ 7 - 7
src/main/java/com/fdkankan/scene/controller/V3Controller.java

@@ -1,6 +1,6 @@
 package com.fdkankan.scene.controller;
 
-import com.fdkankan.common.response.ResultData;
+import com.fdkankan.web.response.ResultData;
 import com.fdkankan.scene.service.ISceneEditInfoService;
 import com.fdkankan.scene.service.IScenePlusService;
 import com.fdkankan.scene.service.ISceneUpgradeToV4Service;
@@ -43,7 +43,7 @@ public class V3Controller extends BaseController {
 //     * </p>
 //     * @author dengsixing
 //     * @date 2022/4/21
-//     * @return com.fdkankan.common.response.ResultData
+//     * @return com.fdkankan.web.response.ResultData
 //     **/
 //    @PostMapping(value = "/upgradeToV4")
 //    public ResultData upgradeToV4(@RequestBody @Validated UpgradeToV4ParamVO param){
@@ -58,7 +58,7 @@ public class V3Controller extends BaseController {
      * </p>
      * @author dengsixing
      * @date 2022/4/21
-     * @return com.fdkankan.common.response.ResultData
+     * @return com.fdkankan.web.response.ResultData
      **/
     @GetMapping(value = "/getUpgradeToV4Progress")
     public ResultData getUpgradeToV4Progress(@RequestParam(value = "num") String num){
@@ -73,7 +73,7 @@ public class V3Controller extends BaseController {
      * </p>
      * @author dengsixing
      * @date 2022/4/21
-     * @return com.fdkankan.common.response.ResultData
+     * @return com.fdkankan.web.response.ResultData
      **/
     @GetMapping(value = "/getSceneViewInfo")
     public ResultData getSceneViewInfo(@RequestParam(value = "num") String num){
@@ -86,7 +86,7 @@ public class V3Controller extends BaseController {
      * </p>
      * @author dengsixing
      * @date 2022/6/23
-     * @return com.fdkankan.common.response.ResultData
+     * @return com.fdkankan.web.response.ResultData
      **/
     @PostMapping(value = "/updateScenePlusUserIdByCameraId")
     public ResultData updateScenePlusUserIdByCameraId(@RequestBody @Validated UnbindOrBindCameraParamVO param){
@@ -99,7 +99,7 @@ public class V3Controller extends BaseController {
      * </p>
      * @author dengsixing
      * @date 2022/6/23
-     * @return com.fdkankan.common.response.ResultData
+     * @return com.fdkankan.web.response.ResultData
      **/
     @PostMapping(value = "/moveScene")
     public ResultData moveScene(
@@ -113,7 +113,7 @@ public class V3Controller extends BaseController {
 //     * </p>
 //     * @author tianboguang
 //     * @date 2022/6/29
-//     * @return com.fdkankan.common.response.ResultData
+//     * @return com.fdkankan.web.response.ResultData
 //     **/
 //    @PostMapping(value = "/copyScene")
 //    public ResultData copyScene(

+ 1 - 1
src/main/java/com/fdkankan/scene/service/ISceneEditInfoService.java

@@ -2,7 +2,7 @@ package com.fdkankan.scene.service;
 
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.fdkankan.common.response.ResultData;
+import com.fdkankan.web.response.ResultData;
 import com.fdkankan.scene.entity.SceneEditInfo;
 import com.fdkankan.scene.vo.BallScreenVideoParamVO;
 import com.fdkankan.scene.vo.BaseDataParamVO;

+ 1 - 1
src/main/java/com/fdkankan/scene/service/ISceneEditService.java

@@ -1,6 +1,6 @@
 package com.fdkankan.scene.service;
 
-import com.fdkankan.common.response.ResultData;
+import com.fdkankan.web.response.ResultData;
 import com.fdkankan.scene.vo.BaseDataParamVO;
 import com.fdkankan.scene.vo.BaseSceneParamVO;
 import com.fdkankan.scene.vo.LocalesParamVO;

+ 1 - 1
src/main/java/com/fdkankan/scene/service/IScenePlusService.java

@@ -1,7 +1,7 @@
 package com.fdkankan.scene.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.fdkankan.common.response.ResultData;
+import com.fdkankan.web.response.ResultData;
 import com.fdkankan.scene.vo.BaseSceneParamVO;
 import java.util.List;
 import com.fdkankan.scene.entity.ScenePlus;

+ 1 - 1
src/main/java/com/fdkankan/scene/service/ISceneProService.java

@@ -1,7 +1,7 @@
 package com.fdkankan.scene.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.fdkankan.common.response.ResultData;
+import com.fdkankan.web.response.ResultData;
 import com.fdkankan.scene.entity.ScenePro;
 import com.fdkankan.scene.vo.BaseDataParamVO;
 import com.fdkankan.scene.vo.DeleteHotIconParamVO;

+ 1 - 1
src/main/java/com/fdkankan/scene/service/ISceneUpgradeToV4Service.java

@@ -1,6 +1,6 @@
 package com.fdkankan.scene.service;
 
-import com.fdkankan.common.response.ResultData;
+import com.fdkankan.web.response.ResultData;
 import com.fdkankan.scene.vo.UpgradeToV4ParamVO;
 
 /**

+ 1 - 1
src/main/java/com/fdkankan/scene/service/ISceneUploadService.java

@@ -1,7 +1,7 @@
 package com.fdkankan.scene.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.fdkankan.common.response.ResultData;
+import com.fdkankan.web.response.ResultData;
 import com.fdkankan.scene.entity.SceneUpload;
 import com.fdkankan.scene.vo.DeleteFileParamVO;
 import com.fdkankan.scene.vo.UploadContentParamVO;

+ 1 - 1
src/main/java/com/fdkankan/scene/service/impl/SceneEditInfoServiceImpl.java

@@ -21,7 +21,7 @@ import com.fdkankan.common.constant.SceneInfoReqType;
 import com.fdkankan.common.constant.ServerCode;
 import com.fdkankan.model.constants.UploadFilePath;
 import com.fdkankan.common.exception.BusinessException;
-import com.fdkankan.common.response.ResultData;
+import com.fdkankan.web.response.ResultData;
 import com.fdkankan.model.utils.ComputerUtil;
 import com.fdkankan.model.utils.CreateHouseJsonUtil;
 import com.fdkankan.model.utils.CreateObjUtil;

+ 1 - 1
src/main/java/com/fdkankan/scene/service/impl/SceneEditServiceImpl.java

@@ -11,7 +11,7 @@ import com.fdkankan.common.constant.CommonStatus;
 import com.fdkankan.common.constant.ErrorCode;
 import com.fdkankan.model.constants.UploadFilePath;
 import com.fdkankan.common.exception.BusinessException;
-import com.fdkankan.common.response.ResultData;
+import com.fdkankan.web.response.ResultData;
 import com.fdkankan.common.util.DateExtUtil;
 import com.fdkankan.fyun.face.FYunFileServiceInterface;
 import com.fdkankan.scene.entity.Camera;

+ 1 - 1
src/main/java/com/fdkankan/scene/service/impl/ScenePlusServiceImpl.java

@@ -9,7 +9,7 @@ import com.fdkankan.common.constant.ErrorCode;
 import com.fdkankan.common.constant.PayStatus;
 import com.fdkankan.common.constant.SceneStatus;
 import com.fdkankan.common.exception.BusinessException;
-import com.fdkankan.common.response.ResultData;
+import com.fdkankan.web.response.ResultData;
 import com.fdkankan.redis.constant.RedisKey;
 import com.fdkankan.redis.constant.RedisLockKey;
 import com.fdkankan.redis.util.RedisLockUtil;

+ 1 - 1
src/main/java/com/fdkankan/scene/service/impl/SceneProServiceImpl.java

@@ -16,7 +16,7 @@ import com.fdkankan.common.constant.FileBizType;
 import com.fdkankan.common.constant.ServerCode;
 import com.fdkankan.model.constants.UploadFilePath;
 import com.fdkankan.common.exception.BusinessException;
-import com.fdkankan.common.response.ResultData;
+import com.fdkankan.web.response.ResultData;
 import com.fdkankan.model.utils.ComputerUtil;
 import com.fdkankan.model.utils.ConvertUtils;
 import com.fdkankan.model.utils.CreateObjUtil;

+ 1 - 1
src/main/java/com/fdkankan/scene/service/impl/SceneServiceImpl.java

@@ -16,7 +16,7 @@
 //import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 //import com.fdkankan.common.constant.*;
 //import com.fdkankan.common.exception.BusinessException;
-//import com.fdkankan.common.response.ResultData;
+//import com.fdkankan.web.response.ResultData;
 //import com.fdkankan.common.util.ConvertUtils;
 //import com.fdkankan.common.util.DateExtUtil;
 //import com.fdkankan.common.util.FileUtils;

+ 1 - 1
src/main/java/com/fdkankan/scene/service/impl/SceneUpgradeToV4Service.java

@@ -3,7 +3,7 @@ package com.fdkankan.scene.service.impl;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSON;
 import com.fdkankan.model.constants.ConstantFilePath;
-import com.fdkankan.common.response.ResultData;
+import com.fdkankan.web.response.ResultData;
 import com.fdkankan.fyun.face.FYunFileServiceInterface;
 import com.fdkankan.redis.constant.RedisKey;
 import com.fdkankan.redis.util.RedisUtil;

+ 2 - 2
src/main/java/com/fdkankan/scene/service/impl/SceneUploadServiceImpl.java

@@ -11,8 +11,8 @@ import com.fdkankan.common.constant.ServerCode;
 import com.fdkankan.common.util.FileUtils;
 import com.fdkankan.model.constants.UploadFilePath;
 import com.fdkankan.common.exception.BusinessException;
-import com.fdkankan.common.response.ResultData;
-import com.fdkankan.common.util.BASE64DecodedMultipartFile;
+import com.fdkankan.web.response.ResultData;
+import com.fdkankan.web.util.BASE64DecodedMultipartFile;
 import com.fdkankan.fyun.face.FYunFileServiceInterface;
 import com.fdkankan.scene.entity.ScenePlus;
 import com.fdkankan.scene.entity.ScenePlusExt;

+ 1 - 1
src/main/java/com/fdkankan/scene/vo/DeviceSceneParamVO.java

@@ -1,6 +1,6 @@
 package com.fdkankan.scene.vo;
 
-import com.fdkankan.common.request.RequestBase;
+import com.fdkankan.web.request.RequestBase;
 import lombok.Data;
 
 import java.io.Serializable;

+ 1 - 1
src/main/java/com/fdkankan/scene/vo/RebuildVedioSceneParamVO.java

@@ -1,6 +1,6 @@
 package com.fdkankan.scene.vo;
 
-import com.fdkankan.common.request.RequestBase;
+import com.fdkankan.web.request.RequestBase;
 import lombok.Data;
 
 import java.io.Serializable;

+ 1 - 1
src/main/java/com/fdkankan/scene/vo/SceneCooperationParamVO.java

@@ -1,6 +1,6 @@
 package com.fdkankan.scene.vo;
 
-import com.fdkankan.common.request.RequestBase;
+import com.fdkankan.web.request.RequestBase;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;

+ 1 - 1
src/main/java/com/fdkankan/scene/vo/SceneParamVO.java

@@ -1,6 +1,6 @@
 package com.fdkankan.scene.vo;
 
-import com.fdkankan.common.request.RequestBase;
+import com.fdkankan.web.request.RequestBase;
 import java.io.Serializable;
 import java.util.Date;
 import java.util.List;

+ 1 - 1
src/main/java/com/fdkankan/scene/vo/UserParamVO.java

@@ -1,6 +1,6 @@
 package com.fdkankan.scene.vo;
 
-import com.fdkankan.common.request.RequestBase;
+import com.fdkankan.web.request.RequestBase;
 import lombok.Data;
 
 import java.io.Serializable;