结构调整

iot-module/iot-module-manage/iot-module-manage-biz/src/main/resources/mapper/IotDeviceMapper.xml

@@ -213,7 +213,7 @@
         WHERE id = #{id,jdbcType=BIGINT}
     </update>
 
-    <select id="devicesQuery" resultType="com.middle.platform.manage.api.pojo.DevicesNameVo">
+    <select id="devicesQuery" resultType="com.middle.platform.manage.api.pojo.DevicesVo">
         select id.id, id.name
         from iot_device id
         <where>

iot-module/iot-module-stream/iot-module-stream-biz/src/main/java/com/middle/platform/stream/biz/controller/RecordController.java

@@ -1,13 +1,15 @@
 package com.middle.platform.stream.biz.controller;
 
+import cn.hutool.core.bean.BeanUtil;
 import com.middle.platform.common.core.utils.Result;
+import com.middle.platform.stream.biz.domain.res.DevicesPathVo;
 import com.middle.platform.stream.biz.pojo.StreamRecordPage;
+import com.middle.platform.stream.biz.service.SDeviceService;
 import com.middle.platform.stream.biz.service.StreamMediaService;
 import jakarta.annotation.Resource;
-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.*;
+
+import java.util.List;
 
 /**
  * 录像回放
@@ -20,6 +22,24 @@ import org.springframework.web.bind.annotation.RestController;
 public class RecordController {
     @Resource
     private StreamMediaService streamMediaService;
+    @Resource
+    private SDeviceService sDeviceService;
+
+    /**
+     * 录像回放- 模糊搜索设备名称
+     *
+     * @param keywords
+     * @return
+     */
+    @GetMapping(value = "/getDevicePathList", name = "获取设备流标签信息")
+    public Result<Object> getDevicePathList(@RequestParam("keywords") String keywords) {
+        List<DevicesPathVo> deviceList = sDeviceService.getDevicePathList(keywords);
+        if (!BeanUtil.isEmpty(deviceList)) {
+            return Result.ok(deviceList, "获取成功");
+        } else {
+            return Result.failed("获取失败");
+        }
+    }
 
     @PostMapping("/page")
     public Result<Object> page(@RequestBody StreamRecordPage streamRecordPage) {

iot-module/iot-module-stream/iot-module-stream-biz/src/main/java/com/middle/platform/stream/biz/controller/VideoController.java

@@ -1,18 +1,14 @@
 package com.middle.platform.stream.biz.controller;
 
-import cn.hutool.core.bean.BeanUtil;
 import com.middle.platform.common.core.utils.Result;
-import com.middle.platform.manage.api.pojo.DevicesVo;
 import com.middle.platform.stream.biz.domain.req.StreamAddRes;
 import com.middle.platform.stream.biz.domain.req.StreamUpdateRes;
 import com.middle.platform.stream.biz.domain.req.StreamUpdateStatusRes;
-import com.middle.platform.stream.biz.domain.res.DevicesPathVo;
+import com.middle.platform.stream.biz.pojo.VideoPage;
 import com.middle.platform.stream.biz.service.SDeviceService;
 import jakarta.annotation.Resource;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.List;
-
 /**
  * 视频列表
  *
@@ -26,26 +22,27 @@ public class VideoController {
     private SDeviceService sDeviceService;
 
 
-    @GetMapping(value = "/getDeviceList", name = "获取设备信息")
-    public Result<Object> getDeviceList(@RequestParam("keywords") String keywords) {
-        List<DevicesVo> deviceList = sDeviceService.getDeviceList(keywords);
-        if (!BeanUtil.isEmpty(deviceList)) {
-            return Result.ok(deviceList, "获取成功");
-        } else {
-            return Result.failed("获取失败");
-        }
-    }
+//    @GetMapping(value = "/getDeviceList", name = "获取设备信息")
+//    public Result<Object> getDeviceList(@RequestParam("keywords") String keywords) {
+//        List<DevicesVo> deviceList = sDeviceService.getDeviceList(keywords);
+//        if (!BeanUtil.isEmpty(deviceList)) {
+//            return Result.ok(deviceList, "获取成功");
+//        } else {
+//            return Result.failed("获取失败");
+//        }
+//    }
 
-    @GetMapping(value = "/getDevicePathList", name = "获取设备流标签信息")
-    public Result<Object> getDevicePathList(@RequestParam("keywords") String keywords) {
-        List<DevicesPathVo> deviceList = sDeviceService.getDevicePathList(keywords);
-        if (!BeanUtil.isEmpty(deviceList)) {
-            return Result.ok(deviceList, "获取成功");
-        } else {
-            return Result.failed("获取失败");
-        }
+    /**
+     * 分页查询
+     * @param videoPage
+     * @return
+     */
+    @PostMapping("/page")
+    public Result<Object> page(@RequestBody VideoPage videoPage) {
+        return Result.ok(sDeviceService.pageQuery(videoPage));
     }
 
+
     @PostMapping(value = "/add", name = "新增拉流信息")
     public Result<Object> add(@RequestBody StreamAddRes streamAddRes) {
         return Result.ok(sDeviceService.add(streamAddRes) != 0 ? "新增成功" : "新增失败");

iot-module/iot-module-stream/iot-module-stream-biz/src/main/java/com/middle/platform/stream/biz/pojo/VideoPage.java

@@ -0,0 +1,15 @@
+package com.middle.platform.stream.biz.pojo;
+
+import com.middle.platform.common.core.modle.BasePara;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @author xucaiqin
+ * @date 2024-04-28 14:26:41
+ */
+@Getter
+@Setter
+public class VideoPage extends BasePara {
+    private Integer type;
+}

iot-module/iot-module-stream/iot-module-stream-biz/src/main/java/com/middle/platform/stream/biz/service/SDeviceService.java

@@ -1,8 +1,10 @@
 package com.middle.platform.stream.biz.service;
 
 import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.github.pagehelper.PageHelper;
 import com.middle.platform.common.core.exception.BusinessException;
 import com.middle.platform.manage.api.feign.DeviceApi;
 import com.middle.platform.manage.api.pojo.DevicesNameVo;
@@ -15,6 +17,7 @@ import com.middle.platform.stream.biz.domain.res.StreamPageRes;
 import com.middle.platform.stream.biz.entity.SDevice;
 import com.middle.platform.stream.biz.mapper.SDeviceMapper;
 import com.middle.platform.stream.biz.pojo.StreamPage;
+import com.middle.platform.stream.biz.pojo.VideoPage;
 import com.middle.platform.stream.biz.properties.StreamMediaProperties;
 import jakarta.annotation.Resource;
 import lombok.AllArgsConstructor;
@@ -40,11 +43,6 @@ public class SDeviceService extends ServiceImpl<SDeviceMapper, SDevice> {
     @Resource
     private DeviceApi deviceApi;
 
-    public List<DevicesVo> getDeviceList(String keywords) {
-        DevicesNameVo devicesNameVo = new DevicesNameVo();
-        devicesNameVo.setKeywords(keywords);
-        return deviceApi.devicesQuery(devicesNameVo);
-    }
 
     public List<DevicesPathVo> getDevicePathList(String keywords) {
         //查询出所有已新增在流表里的设备id
@@ -149,4 +147,9 @@ public class SDeviceService extends ServiceImpl<SDeviceMapper, SDevice> {
         }};
     }
 
+    public Object pageQuery(VideoPage videoPage) {
+        PageHelper.startPage(videoPage.getPage(), videoPage.getPageSize());
+        List<SDevice> sDevices = sDeviceMapper.selectList(new LambdaQueryWrapper<>());
+        return sDevices;
+    }
 }