优化兼容接口

648540858

2023-03-08 c5ff8113780960c55de98c0b9f3b1f895dd828e2

 src/main/java/com/genersoft/iot/vmp/web/gb28181/ApiDeviceController.java

@@ -10,15 +10,17 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.StringUtils;
import org.springframework.web.bind.annotation.*;

import java.util.Arrays;
import java.util.List;

/**
 * API兼容：设备信息
 */
@SuppressWarnings("unchecked")
@CrossOrigin

@RestController
@RequestMapping(value = "/api/v1/device")
public class ApiDeviceController {
@@ -59,10 +61,10 @@
        JSONObject result = new JSONObject();
        List<Device> devices;
        if (start == null || limit ==null) {
            devices = storager.queryVideoDeviceList();
            devices = storager.queryVideoDeviceList(online);
            result.put("DeviceCount", devices.size());
        }else {
            PageInfo<Device> deviceList = storager.queryVideoDeviceList(start/limit, limit);
            PageInfo<Device> deviceList = storager.queryVideoDeviceList(start/limit, limit,online);
            result.put("DeviceCount", deviceList.getTotal());
            devices = deviceList.getList();
        }
@@ -107,19 +109,18 @@
//        }
        JSONObject result = new JSONObject();
        // 查询设备是否存在
        Device device = storager.queryVideoDevice(serial);
        if (device == null) {
            result.put("ChannelCount", 0);
            result.put("ChannelList", "[]");
            return result;
        }
        List<DeviceChannel> deviceChannels;
        List<DeviceChannel> allDeviceChannelList = storager.queryChannelsByDeviceId(serial);
        List<String> channelIds = null;
        if (!StringUtils.isEmpty(code)) {
            String[] split = code.trim().split(",");
            channelIds = Arrays.asList(split);
        }
        List<DeviceChannel> allDeviceChannelList = storager.queryChannelsByDeviceId(serial,online,channelIds);
        if (start == null || limit ==null) {
            deviceChannels = allDeviceChannelList;
            result.put("ChannelCount", deviceChannels.size());
        }else {
            deviceChannels = storager.queryChannelsByDeviceIdWithStartAndLimit(serial, null, null, null,start, limit);
            deviceChannels = storager.queryChannelsByDeviceIdWithStartAndLimit(serial, null, null, online,start, limit,channelIds);
            int total = allDeviceChannelList.size();
            result.put("ChannelCount", total);
        }