1

src/main/java/com/fdkankan/manage_jp/controller/CameraController.java

@@ -5,6 +5,7 @@ import com.fdkankan.manage_jp.common.Result;
 import com.fdkankan.manage_jp.service.ICameraService;
 import com.fdkankan.manage_jp.vo.request.CameraAddParam;
 import com.fdkankan.manage_jp.vo.request.CameraListParam;
+import com.fdkankan.manage_jp.vo.request.SceneParam;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -52,10 +53,9 @@ public class CameraController extends BaseController{
         return Result.success();
     }
 
-    @GetMapping("/getByUser/{userId}/{oldCameraId}")
-    public Result getByUser(@PathVariable Long userId,
-                            @PathVariable Long oldCameraId){
-        return Result.success(cameraService.getByUser(userId,oldCameraId));
+    @PostMapping("/getByUser")
+    public Result getByUser(@RequestBody SceneParam param){
+        return Result.success(cameraService.getByUser(param));
     }
 }
 

src/main/java/com/fdkankan/manage_jp/service/ICameraService.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.fdkankan.manage_jp.entity.User;
 import com.fdkankan.manage_jp.vo.request.CameraAddParam;
 import com.fdkankan.manage_jp.vo.request.CameraListParam;
+import com.fdkankan.manage_jp.vo.request.SceneParam;
 import com.github.yulichang.base.MPJBaseService;
 
 import java.util.List;
@@ -37,5 +38,5 @@ public interface ICameraService extends MPJBaseService<Camera> {
 
     List<Camera> getByWiFiName(List<String> wifiName);
 
-    Object getByUser(Long userId, Long oldCameraId);
+    Object getByUser(SceneParam param);
 }

src/main/java/com/fdkankan/manage_jp/service/impl/CameraServiceImpl.java

@@ -22,9 +22,11 @@ import com.fdkankan.manage_jp.httpClient.service.LaserService;
 import com.fdkankan.manage_jp.mapper.ICameraMapper;
 import com.fdkankan.manage_jp.service.*;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.fdkankan.manage_jp.util.CameraTypeUtils;
 import com.fdkankan.manage_jp.vo.request.CameraAddParam;
 import com.fdkankan.manage_jp.vo.request.CameraListParam;
 import com.fdkankan.manage_jp.vo.request.RequestCamera;
+import com.fdkankan.manage_jp.vo.request.SceneParam;
 import com.fdkankan.manage_jp.vo.response.ResponseCamera;
 import com.github.yulichang.base.MPJBaseServiceImpl;
 import com.github.yulichang.wrapper.MPJLambdaWrapper;
@@ -204,12 +206,12 @@ public class CameraServiceImpl extends MPJBaseServiceImpl<ICameraMapper, Camera>
     }
 
     @Override
-    public Object getByUser(Long userId, Long oldCameraId) {
-        CameraDetail cameraDetail = cameraDetailService.getByCameraId(oldCameraId);
-        if(cameraDetail == null){
-            return  null;
+    public Object getByUser(SceneParam param) {
+        if(param.getUserId() == null && param.getType() == null){
+            throw new BusinessException(ResultCode.PARAM_ERROR);
         }
-        List<CameraDetail> cameraDetails = cameraDetailService.getByUserIdAndType(userId,cameraDetail.getType());
+        Integer cameraType = CameraTypeUtils.getCameraType(param.getType());
+        List<CameraDetail> cameraDetails = cameraDetailService.getByUserIdAndType(param.getUserId(),cameraType);
         if(cameraDetails.isEmpty()){
             return null;
         }

src/main/java/com/fdkankan/manage_jp/util/CameraTypeUtils.java

@@ -0,0 +1,14 @@
+package com.fdkankan.manage_jp.util;
+
+public class CameraTypeUtils {
+
+    public static Integer getCameraType(Integer type){
+        switch (type){
+            case 0 : return 4;
+            case 1 : return 9;
+            case 2 : return 10;
+            case 4 : return 10;
+            default:return 4;
+        }
+    }
+}