创建项目

musk/src/main/java/com/huimv/farm/musk/controller/SysCameraController.java

@@ -32,9 +32,14 @@ public class SysCameraController {
     private ISysCameraService cameraService;
 
     @PostMapping("/list")
-    public Result list(HttpServletRequest request, @RequestBody CameraListVo cameraListVo) {
+    public Result list( @RequestBody CameraListVo cameraListVo) {
+        return cameraService.listPage(cameraListVo);
+    }
+
+    @PostMapping("/listApp")
+    public Result listApp(HttpServletRequest request, @RequestBody CameraListVo cameraListVo) {
         Integer userId = TokenSign.getMemberIdByJwtToken(request);
-        return cameraService.listPage(cameraListVo,userId);
+        return cameraService.listApp(cameraListVo,userId);
     }
 
     @PostMapping("/add")

musk/src/main/java/com/huimv/farm/musk/service/ISysCameraService.java

@@ -17,7 +17,7 @@ import java.util.List;
  * @since 2023-06-01
  */
 public interface ISysCameraService extends IService<SysCamera> {
-    Result listPage(CameraListVo cameraListVo,Integer userId);
+    Result listPage(CameraListVo cameraListVo);
 
     List getCameraDetails(CameraListsVo cameraListsVo,Integer userId) throws InterruptedException;
 
@@ -27,5 +27,7 @@ public interface ISysCameraService extends IService<SysCamera> {
 
     List<String> listIds();
 
+    Result listApp(CameraListVo cameraListVo, Integer userId);
+
 //    Result initCamera(Integer farmId, Integer userId);
 }

musk/src/main/java/com/huimv/farm/musk/service/impl/SysCameraServiceImpl.java

@@ -47,7 +47,7 @@ public class SysCameraServiceImpl extends ServiceImpl<SysCameraMapper, SysCamera
 //    private BaseScreenCameraAccountMapper cameraAccountMapper;
 
     @Override
-    public Result listPage(CameraListVo cameraListVo,Integer userId) {
+    public Result listPage(CameraListVo cameraListVo) {
         Integer current = cameraListVo.getCurrent();
         String strchStr = cameraListVo.getStrchStr();
         Integer size = cameraListVo.getSize();
@@ -62,15 +62,15 @@ public class SysCameraServiceImpl extends ServiceImpl<SysCameraMapper, SysCamera
             wrapper.and(i -> i.like("camera_name", strchStr)
                     .or().like("camera_ip", strchStr));
         }
-        if (userId != 1){
-            SysAccountMultilevel sysAccountMultilevel = sysAccountMultilevelMapper.selectById(userId);
-            String cameraIds = sysAccountMultilevel.getCameraIds();
-            List<String> list = new ArrayList();
-            if (StringUtils.isNotBlank(cameraIds)){
-                list  = Arrays.asList(cameraIds);
-            }
-            wrapper.in("id",list);
-        }
+//        if (userId != 1){
+//            SysAccountMultilevel sysAccountMultilevel = sysAccountMultilevelMapper.selectById(userId);
+//            String cameraIds = sysAccountMultilevel.getCameraIds();
+//            List<String> list = new ArrayList();
+//            if (StringUtils.isNotBlank(cameraIds)){
+//                list  = Arrays.asList(cameraIds);
+//            }
+//            wrapper.in("id",list);
+//        }
 
         if (farmId != null) {
             wrapper.eq("farm_id", farmId);
@@ -115,7 +115,7 @@ public class SysCameraServiceImpl extends ServiceImpl<SysCameraMapper, SysCamera
             return null;
         }
         List cameraDetailsList = new ArrayList();
-        IPage<SysCamera> page = (IPage<SysCamera>) this.listPage(cameraListVo, userId).getData();
+        IPage<SysCamera> page = (IPage<SysCamera>) this.listPage(cameraListVo).getData();
         List<SysCamera> list = page.getRecords();
         int i = 0;
         final String farmAppPort = "8081";
@@ -214,6 +214,59 @@ public class SysCameraServiceImpl extends ServiceImpl<SysCameraMapper, SysCamera
         return cameraBaseMapper.listIds();
     }
 
+    @Override
+    public Result listApp(CameraListVo cameraListVo, Integer userId) {
+        Integer current = cameraListVo.getCurrent();
+        String strchStr = cameraListVo.getStrchStr();
+        Integer size = cameraListVo.getSize();
+        Integer areaId = cameraListVo.getAreaId();
+        Integer brandId = cameraListVo.getBrandId();
+        Integer sort = cameraListVo.getSort();
+        Integer farmId = cameraListVo.getFarmId();
+        Integer isOnline = cameraListVo.getIsOnline();
+
+        QueryWrapper<SysCamera> wrapper = new QueryWrapper<>();
+        if (StringUtils.isNotBlank(strchStr)) {
+            wrapper.and(i -> i.like("camera_name", strchStr)
+                    .or().like("camera_ip", strchStr));
+        }
+        if (userId != 1){
+            SysAccountMultilevel sysAccountMultilevel = sysAccountMultilevelMapper.selectById(userId);
+            String cameraIds = sysAccountMultilevel.getCameraIds();
+            List<String> list = new ArrayList();
+            if (StringUtils.isNotBlank(cameraIds)){
+                list  = Arrays.asList(cameraIds);
+            }
+            wrapper.in("id",list);
+        }
+
+        if (farmId != null) {
+            wrapper.eq("farm_id", farmId);
+        }
+
+        if (areaId != null) {
+            wrapper.eq("area_id", areaId);
+        }
+
+        if (brandId != null) {
+            wrapper.eq("brand_id", brandId);
+        }
+
+        if (isOnline != null) {
+            wrapper.eq("is_online", isOnline);
+        }
+
+        if (sort == null) {
+            wrapper.orderByDesc("id");
+        } else if (sort == 1) {
+            wrapper.orderByDesc("sort");
+        } else {
+            wrapper.orderByAsc("sort");
+        }
+//        wrapper.orderByDesc("id");
+        return new Result(ResultCode.SUCCESS, page(new Page<>(current, size), wrapper));
+    }
+
 //    @Override
 //    public Result initCamera(Integer farmId, Integer userId) {
 //        BaseScreenCameraAccount cameraAccount = cameraAccountMapper.selectOne(new QueryWrapper<BaseScreenCameraAccount>().eq("farm_id", farmId).eq("account_id", userId));