用户，相机查询

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

@@ -6,11 +6,7 @@ import com.fdkankan.manage_jp.service.ICameraService;
 import com.fdkankan.manage_jp.vo.request.CameraAddParam;
 import com.fdkankan.manage_jp.vo.request.CameraListParam;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 /**
  * <p>
@@ -55,5 +51,11 @@ public class CameraController extends BaseController{
         cameraService.bind(param);
         return Result.success();
     }
+
+    @GetMapping("/getByUser/{userId}/{oldCameraId}")
+    public Result getByUser(@PathVariable Long userId,
+                            @PathVariable Long oldCameraId){
+        return Result.success(cameraService.getByUser(userId,oldCameraId));
+    }
 }
 

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

@@ -3,6 +3,7 @@ package com.fdkankan.manage_jp.controller;
 
 import com.fdkankan.common.util.JwtUtil;
 import com.fdkankan.manage_jp.common.Result;
+import com.fdkankan.manage_jp.entity.User;
 import com.fdkankan.manage_jp.service.IUserService;
 import com.fdkankan.manage_jp.vo.request.LoginParam;
 import com.fdkankan.manage_jp.vo.request.UserListParam;
@@ -65,5 +66,9 @@ public class UserController extends BaseController {
     }
 
 
+    @PostMapping("/allUserList")
+    public Result allUserList(@RequestBody User param){
+        return Result.success(userService.allList(param));
+    }
 }
 

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

@@ -42,4 +42,6 @@ public interface ICameraDetailService extends MPJBaseService<CameraDetail> {
     void unbindUser(Long userId,Long companyUserId);
 
     CameraDetail getByWiFiName(String wifiName);
+
+    List<CameraDetail> getByUserIdAndType(Long userId, Integer type);
 }

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

@@ -36,4 +36,6 @@ public interface ICameraService extends MPJBaseService<Camera> {
     List<Camera> getLikeChildName(String childName);
 
     List<Camera> getByWiFiName(List<String> wifiName);
+
+    Object getByUser(Long userId, Long oldCameraId);
 }

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

@@ -39,4 +39,6 @@ public interface IUserService extends IService<User> {
     void updatePassword(UserParam param);
 
     void logout(String token);
+
+    Object allList(User param);
 }

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

@@ -163,4 +163,12 @@ public class CameraDetailServiceImpl extends MPJBaseServiceImpl<ICameraDetailMap
         Camera camera = byChildNames.get(0);
         return this.getByCameraId(camera.getId());
     }
+
+    @Override
+    public List<CameraDetail> getByUserIdAndType(Long userId, Integer type) {
+        LambdaQueryWrapper<CameraDetail> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(CameraDetail::getUserId,userId);
+        wrapper.eq(CameraDetail::getType,type);
+        return this.list(wrapper);
+    }
 }

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

@@ -202,4 +202,18 @@ public class CameraServiceImpl extends MPJBaseServiceImpl<ICameraMapper, Camera>
         wrapper.like(Camera::getChildName,childName);
         return this.list(wrapper);
     }
+
+    @Override
+    public Object getByUser(Long userId, Long oldCameraId) {
+        CameraDetail cameraDetail = cameraDetailService.getByCameraId(oldCameraId);
+        if(cameraDetail == null){
+            return  null;
+        }
+        List<CameraDetail> cameraDetails = cameraDetailService.getByUserIdAndType(userId,cameraDetail.getType());
+        if(cameraDetails.isEmpty()){
+            return null;
+        }
+        List<Long> cameraIds = cameraDetails.stream().map(CameraDetail::getCameraId).collect(Collectors.toList());
+        return this.listByIds(cameraIds);
+    }
 }

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

@@ -216,4 +216,15 @@ public class UserServiceImpl extends ServiceImpl<IUserMapper, User> implements I
     public void logout(String token) {
         redisUtil.del(String.format(RedisKey.TOKEN_V3,token));
     }
+
+    @Override
+    public Object allList(User param) {
+        if(StringUtils.isNotBlank(param.getUserName())){
+            LambdaQueryWrapper<User> wrapper = new LambdaQueryWrapper<>();
+            wrapper.like(User::getUserName,param.getUserName());
+            return this.list(wrapper);
+        }
+
+        return this.list();
+    }
 }