优化

src/main/java/com/fdkankan/openApi/controller/www/SceneController.java

@@ -10,6 +10,7 @@ import com.fdkankan.openApi.entity.www.ScenePlus;
 import com.fdkankan.openApi.service.laser.SceneService;
 import com.fdkankan.openApi.service.www.IScenePlusService;
 import com.fdkankan.openApi.vo.BaseSceneParamVo;
+import com.fdkankan.openApi.vo.www.PageScenesParamVo;
 import com.fdkankan.openApi.vo.www.SceneVO;
 import com.fdkankan.web.response.ResultData;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -44,8 +45,8 @@ public class SceneController extends BaseController {
      */
     @SaIgnore
     @PostMapping("/getScenesByUsername")
-    public ResultData getScenesByUsername(@RequestBody SceneVO sceneVO) {
-        PageInfo pageInfo = scenePlusService.getScenesByUserId(this.getUserId(),sceneVO);
+    public ResultData getScenesByUsername(@RequestBody PageScenesParamVo param) {
+        PageInfo pageInfo = scenePlusService.getScenesByUserId(this.getUserId(),param);
         return ResultData.ok(pageInfo);
     }
 

src/main/java/com/fdkankan/openApi/service/www/IScenePlusService.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.fdkankan.openApi.common.PageInfo;
 import com.fdkankan.openApi.entity.www.ScenePlus;
 import com.fdkankan.openApi.vo.www.CreateFicTitiousSceneParamVO;
+import com.fdkankan.openApi.vo.www.PageScenesParamVo;
 import com.fdkankan.openApi.vo.www.SceneVO;
 import com.fdkankan.web.response.ResultData;
 
@@ -25,7 +26,7 @@ public interface IScenePlusService extends IService<ScenePlus> {
 
     ResultData createVirtualScene(CreateFicTitiousSceneParamVO param) throws Exception;
 
-    PageInfo<SceneVO> getScenesByUserId(Long userName, SceneVO sceneVO);
+    PageInfo<SceneVO> getScenesByUserId(Long userName, PageScenesParamVo param);
 
     Object getPointInfo(String sceneCode);
 

src/main/java/com/fdkankan/openApi/service/www/impl/ScenePlusServiceImpl.java

@@ -30,6 +30,7 @@ import com.fdkankan.openApi.service.laser.FilterService;
 import com.fdkankan.openApi.service.laser.SceneService;
 import com.fdkankan.openApi.service.www.*;
 import com.fdkankan.openApi.vo.www.CreateFicTitiousSceneParamVO;
+import com.fdkankan.openApi.vo.www.PageScenesParamVo;
 import com.fdkankan.openApi.vo.www.SceneEditControlsVO;
 import com.fdkankan.openApi.vo.www.SceneVO;
 import com.fdkankan.redis.constant.RedisKey;
@@ -304,12 +305,12 @@ public class ScenePlusServiceImpl extends ServiceImpl<IScenePlusMapper, ScenePlu
     }
 
     @Override
-    public PageInfo<SceneVO> getScenesByUserId(Long userId, SceneVO sceneVO) {
+    public PageInfo<SceneVO> getScenesByUserId(Long userId, PageScenesParamVo param) {
         LambdaQueryWrapper<ScenePlus> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(ScenePlus::getUserId,userId);
 
-        if (!ObjectUtils.isEmpty(sceneVO.getCameraType())) {
-            switch (sceneVO.getCameraType()){
+        if (!ObjectUtils.isEmpty(param.getCameraType())) {
+            switch (param.getCameraType()){
                 case "mega":
                     queryWrapper.eq(ScenePlus::getSceneSource, 4);
                     break;
@@ -318,7 +319,7 @@ public class ScenePlusServiceImpl extends ServiceImpl<IScenePlusMapper, ScenePlu
                     break;
             }
         }
-        Page<ScenePlus> scenePage = this.page(new Page<>(sceneVO.getPageNum(), sceneVO.getPageSize()), queryWrapper);
+        Page<ScenePlus> scenePage = this.page(new Page<>(param.getPageNum(), param.getPageSize()), queryWrapper);
         if(CollUtil.isEmpty(scenePage.getRecords())){
             return PageInfo.PageInfo(scenePage);
         }

src/main/java/com/fdkankan/openApi/vo/www/PageScenesParamVo.java

@@ -0,0 +1,42 @@
+package com.fdkankan.openApi.vo.www;
+
+import com.fdkankan.web.request.RequestBase;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * TODO
+ * </p>
+ *
+ * @author dengsixing
+ * @since 2022/1/18
+ **/
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class PageScenesParamVo extends RequestBase implements Serializable {
+
+    private String userName;
+
+    /**
+     * 相机类型，mega:激光相机，kankan:八目或者转台相机
+     */
+    private String cameraType;
+
+    private String sceneCode;
+
+    private String sceneName;
+
+    private String createTime;
+
+    private Integer shootCount;
+
+    private String snCode;
+
+}

src/main/java/com/fdkankan/openApi/vo/www/SceneVO.java

@@ -20,7 +20,7 @@ import java.io.Serializable;
 @Builder
 @NoArgsConstructor
 @AllArgsConstructor
-public class SceneVO extends RequestBase implements Serializable {
+public class SceneVO implements Serializable {
 
     private String userName;