From cefdce5e0a34743e6d9784f858265120e75179a1 Mon Sep 17 00:00:00 2001 From: 648540858 <648540858@qq.com> Date: 星期三, 08 三月 2023 14:46:18 +0800 Subject: [PATCH] 优化兼容接口 --- src/main/java/com/genersoft/iot/vmp/storager/IVideoManagerStorage.java | 6 + src/main/java/com/genersoft/iot/vmp/storager/impl/VideoManagerStorageImpl.java | 10 ++ src/main/java/com/genersoft/iot/vmp/web/gb28181/ApiDeviceController.java | 70 +++++++++------- src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceChannelMapper.java | 74 ++++++++++++----- src/main/java/com/genersoft/iot/vmp/web/gb28181/dto/DeviceChannelExtend.java | 68 +++++----------- 5 files changed, 126 insertions(+), 102 deletions(-) diff --git a/src/main/java/com/genersoft/iot/vmp/storager/IVideoManagerStorage.java b/src/main/java/com/genersoft/iot/vmp/storager/IVideoManagerStorage.java index 938f669..5965678 100644 --- a/src/main/java/com/genersoft/iot/vmp/storager/IVideoManagerStorage.java +++ b/src/main/java/com/genersoft/iot/vmp/storager/IVideoManagerStorage.java @@ -5,6 +5,7 @@ import com.genersoft.iot.vmp.service.bean.GPSMsgInfo; import com.genersoft.iot.vmp.storager.dao.dto.ChannelSourceInfo; import com.genersoft.iot.vmp.vmanager.gb28181.platform.bean.ChannelReduce; +import com.genersoft.iot.vmp.web.gb28181.dto.DeviceChannelExtend; import com.github.pagehelper.PageInfo; import java.util.List; @@ -58,7 +59,7 @@ */ public PageInfo<DeviceChannel> queryChannelsByDeviceId(String deviceId, String query, Boolean hasSubChannel, Boolean online, Boolean catalogUnderDevice, int page, int count); - public List<DeviceChannel> queryChannelsByDeviceIdWithStartAndLimit(String deviceId, String query, Boolean hasSubChannel, Boolean online, int start, int limit,List<String> channelIds); + public List<DeviceChannelExtend> queryChannelsByDeviceIdWithStartAndLimit(String deviceId, List<String> channelIds, String query, Boolean hasSubChannel, Boolean online, int start, int limit); /** @@ -374,4 +375,7 @@ void cleanContentForPlatform(String serverGBId); List<DeviceChannel> queryChannelWithCatalog(String serverGBId); + + List<DeviceChannelExtend> queryChannelsByDeviceId(String serial, List<String> channelIds, Boolean online); + } diff --git a/src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceChannelMapper.java b/src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceChannelMapper.java index 83f9334..e33a63e 100644 --- a/src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceChannelMapper.java +++ b/src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceChannelMapper.java @@ -5,6 +5,7 @@ import com.genersoft.iot.vmp.gb28181.bean.DeviceChannelInPlatform; import com.genersoft.iot.vmp.vmanager.bean.ResourceBaceInfo; import com.genersoft.iot.vmp.vmanager.gb28181.platform.bean.ChannelReduce; +import com.genersoft.iot.vmp.web.gb28181.dto.DeviceChannelExtend; import org.apache.ibatis.annotations.*; import org.springframework.stereotype.Repository; @@ -82,7 +83,56 @@ "</foreach> </if>" + "ORDER BY dc.channelId " + " </script>"}) - List<DeviceChannel> queryChannels(String deviceId, String parentChannelId, String query, Boolean hasSubChannel, Boolean online,List<String> channelIds); + List<DeviceChannel> queryChannels(String deviceId, String parentChannelId, String query, Boolean hasSubChannel, Boolean online, List<String> channelIds); + + @Select(value = {" <script>" + + "SELECT " + + "dc.*, " + + "de.name as deviceName, " + + "de.online as deviceOnline " + + "from " + + "device_channel dc " + + "LEFT JOIN device de ON dc.deviceId = de.deviceId " + + "WHERE 1=1" + + " <if test='deviceId != null'> AND dc.deviceId = #{deviceId} </if> " + + " <if test='query != null'> AND (dc.channelId LIKE '%${query}%' OR dc.name LIKE '%${query}%' OR dc.name LIKE '%${query}%')</if> " + + " <if test='parentChannelId != null'> AND dc.parentId=#{parentChannelId} </if> " + + " <if test='online == true' > AND dc.status=1</if>" + + " <if test='online == false' > AND dc.status=0</if>" + + " <if test='hasSubChannel == true' > AND dc.subCount > 0 </if>" + + " <if test='hasSubChannel == false' > AND dc.subCount = 0 </if>" + + "<if test='channelIds != null'> AND dc.channelId in <foreach item='item' index='index' collection='channelIds' open='(' separator=',' close=')'>" + + "#{item} " + + "</foreach> </if>" + + "ORDER BY dc.channelId ASC" + + " </script>"}) + List<DeviceChannelExtend> queryChannelsWithDeviceInfo(String deviceId, String parentChannelId, String query, Boolean hasSubChannel, Boolean online, List<String> channelIds); + + + @Select(value = {" <script>" + + "SELECT " + + "dc.*, " + + "de.name as deviceName, " + + "de.online as deviceOnline " + + "from " + + "device_channel dc " + + "LEFT JOIN device de ON dc.deviceId = de.deviceId " + + "WHERE 1=1" + + " <if test='deviceId != null'> AND dc.deviceId = #{deviceId} </if> " + + " <if test='query != null'> AND (dc.channelId LIKE '%${query}%' OR dc.name LIKE '%${query}%' OR dc.name LIKE '%${query}%')</if> " + + " <if test='parentChannelId != null'> AND dc.parentId=#{parentChannelId} </if> " + + " <if test='online == true' > AND dc.status=1</if>" + + " <if test='online == false' > AND dc.status=0</if>" + + " <if test='hasSubChannel == true' > AND dc.subCount > 0 </if>" + + " <if test='hasSubChannel == false' > AND dc.subCount = 0 </if>" + + "<if test='channelIds != null'> AND dc.channelId in <foreach item='item' index='index' collection='channelIds' open='(' separator=',' close=')'>" + + "#{item} " + + "</foreach> </if>" + + "ORDER BY dc.channelId ASC " + + "Limit #{limit} OFFSET #{start}" + + " </script>"}) + List<DeviceChannelExtend> queryChannelsByDeviceIdWithStartAndLimit(String deviceId,List<String> channelIds, String parentChannelId, String query, + Boolean hasSubChannel, Boolean online, int start, int limit); @Select("SELECT * FROM device_channel WHERE deviceId=#{deviceId} AND channelId=#{channelId}") DeviceChannel queryChannel(String deviceId, String channelId); @@ -244,28 +294,6 @@ "</script>"}) int batchUpdate(List<DeviceChannel> updateChannels); - - @Select(value = {" <script>" + - "SELECT " + - "dc1.* " + - "from " + - "device_channel dc1 " + - "WHERE " + - "dc1.deviceId = #{deviceId} " + - " <if test='query != null'> AND (dc1.channelId LIKE concat('%',#{query},'%') OR dc1.name LIKE concat('%',#{query},'%') OR dc1.name LIKE concat('%',#{query},'%'))</if> " + - " <if test='parentChannelId != null'> AND dc1.parentId=#{parentChannelId} </if> " + - " <if test='online == true' > AND dc1.status=1</if>" + - " <if test='online == false' > AND dc1.status=0</if>" + - " <if test='hasSubChannel == true' > AND dc1.subCount >0</if>" + - " <if test='hasSubChannel == false' > AND dc1.subCount=0</if>" + - "<if test='channelIds != null'> AND dc1.channelId in <foreach item='item' index='index' collection='channelIds' open='(' separator=',' close=')'>" + - "#{item} " + - "</foreach> </if>" + - "ORDER BY dc1.channelId ASC " + - "Limit #{limit} OFFSET #{start}" + - " </script>"}) - List<DeviceChannel> queryChannelsByDeviceIdWithStartAndLimit(String deviceId, String parentChannelId, String query, - Boolean hasSubChannel, Boolean online, int start, int limit,List<String> channelIds); @Select("SELECT * FROM device_channel WHERE deviceId=#{deviceId} AND status=1") List<DeviceChannel> queryOnlineChannelsByDeviceId(String deviceId); diff --git a/src/main/java/com/genersoft/iot/vmp/storager/impl/VideoManagerStorageImpl.java b/src/main/java/com/genersoft/iot/vmp/storager/impl/VideoManagerStorageImpl.java index 8eefd39..9475abc 100644 --- a/src/main/java/com/genersoft/iot/vmp/storager/impl/VideoManagerStorageImpl.java +++ b/src/main/java/com/genersoft/iot/vmp/storager/impl/VideoManagerStorageImpl.java @@ -14,6 +14,7 @@ import com.genersoft.iot.vmp.storager.dao.dto.ChannelSourceInfo; import com.genersoft.iot.vmp.utils.DateUtil; import com.genersoft.iot.vmp.vmanager.gb28181.platform.bean.ChannelReduce; +import com.genersoft.iot.vmp.web.gb28181.dto.DeviceChannelExtend; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import org.slf4j.Logger; @@ -366,8 +367,8 @@ } @Override - public List<DeviceChannel> queryChannelsByDeviceIdWithStartAndLimit(String deviceId, String query, Boolean hasSubChannel, Boolean online, int start, int limit,List<String> channelIds) { - return deviceChannelMapper.queryChannelsByDeviceIdWithStartAndLimit(deviceId, null, query, hasSubChannel, online, start, limit,channelIds); + public List<DeviceChannelExtend> queryChannelsByDeviceIdWithStartAndLimit(String deviceId, List<String> channelIds, String query, Boolean hasSubChannel, Boolean online, int start, int limit) { + return deviceChannelMapper.queryChannelsByDeviceIdWithStartAndLimit(deviceId, channelIds, null, query, hasSubChannel, online, start, limit); } @@ -377,6 +378,11 @@ } @Override + public List<DeviceChannelExtend> queryChannelsByDeviceId(String deviceId, List<String> channelIds, Boolean online) { + return deviceChannelMapper.queryChannelsWithDeviceInfo(deviceId, null,null, null, online,channelIds); + } + + @Override public PageInfo<DeviceChannel> querySubChannels(String deviceId, String parentChannelId, String query, Boolean hasSubChannel, Boolean online, int page, int count) { PageHelper.startPage(page, count); List<DeviceChannel> all = deviceChannelMapper.queryChannels(deviceId, parentChannelId, query, hasSubChannel, online,null); diff --git a/src/main/java/com/genersoft/iot/vmp/web/gb28181/ApiDeviceController.java b/src/main/java/com/genersoft/iot/vmp/web/gb28181/ApiDeviceController.java index 57c7979..9998960 100644 --- a/src/main/java/com/genersoft/iot/vmp/web/gb28181/ApiDeviceController.java +++ b/src/main/java/com/genersoft/iot/vmp/web/gb28181/ApiDeviceController.java @@ -3,15 +3,17 @@ import com.alibaba.fastjson2.JSONArray; import com.alibaba.fastjson2.JSONObject; import com.genersoft.iot.vmp.gb28181.bean.Device; -import com.genersoft.iot.vmp.gb28181.bean.DeviceChannel; import com.genersoft.iot.vmp.service.IDeviceService; import com.genersoft.iot.vmp.storager.IVideoManagerStorage; +import com.genersoft.iot.vmp.web.gb28181.dto.DeviceChannelExtend; import com.github.pagehelper.PageInfo; 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 org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; import java.util.Arrays; import java.util.List; @@ -96,8 +98,8 @@ @RequestMapping(value = "/channellist") public JSONObject channellist( String serial, - @RequestParam(required = false)String code, @RequestParam(required = false)String channel_type, + @RequestParam(required = false)String code , @RequestParam(required = false)String dir_serial , @RequestParam(required = false)Integer start, @RequestParam(required = false)Integer limit, @@ -109,54 +111,60 @@ // } JSONObject result = new JSONObject(); // 鏌ヨ璁惧鏄惁瀛樺湪 - List<DeviceChannel> deviceChannels; +// Device device = storager.queryVideoDevice(serial); +// if (device == null) { +// result.put("ChannelCount", 0); +// result.put("ChannelList", "[]"); +// return result; +// } + List<DeviceChannelExtend> deviceChannels; 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); + List<DeviceChannelExtend> allDeviceChannelList = storager.queryChannelsByDeviceId(serial,channelIds,online); if (start == null || limit ==null) { deviceChannels = allDeviceChannelList; result.put("ChannelCount", deviceChannels.size()); }else { - deviceChannels = storager.queryChannelsByDeviceIdWithStartAndLimit(serial, null, null, online,start, limit,channelIds); + deviceChannels = storager.queryChannelsByDeviceIdWithStartAndLimit(serial,channelIds, null, null, online,start, limit); int total = allDeviceChannelList.size(); result.put("ChannelCount", total); } JSONArray channleJSONList = new JSONArray(); - for (DeviceChannel deviceChannel : deviceChannels) { + for (DeviceChannelExtend deviceChannelExtend : deviceChannels) { JSONObject deviceJOSNChannel = new JSONObject(); - deviceJOSNChannel.put("ID", deviceChannel.getChannelId()); - deviceJOSNChannel.put("DeviceID", device.getDeviceId()); - deviceJOSNChannel.put("DeviceName", device.getName()); - deviceJOSNChannel.put("DeviceOnline", device.getOnline() == 1); - deviceJOSNChannel.put("Channel", 0); // 鑷畾涔夊簭鍙� - deviceJOSNChannel.put("Name", deviceChannel.getName()); + deviceJOSNChannel.put("ID", deviceChannelExtend.getChannelId()); + deviceJOSNChannel.put("DeviceID", deviceChannelExtend.getDeviceId()); + deviceJOSNChannel.put("DeviceName", deviceChannelExtend.getDeviceName()); + deviceJOSNChannel.put("DeviceOnline", deviceChannelExtend.getDeviceOnline() == 1); + deviceJOSNChannel.put("Channel", 0); // TODO 鑷畾涔夊簭鍙� + deviceJOSNChannel.put("Name", deviceChannelExtend.getName()); deviceJOSNChannel.put("Custom", false); deviceJOSNChannel.put("CustomName", ""); - deviceJOSNChannel.put("SubCount", deviceChannel.getSubCount()); // 瀛愯妭鐐规暟, SubCount > 0 琛ㄧず璇ラ�氶亾涓哄瓙鐩綍 + deviceJOSNChannel.put("SubCount", deviceChannelExtend.getSubCount()); // TODO ? 瀛愯妭鐐规暟, SubCount > 0 琛ㄧず璇ラ�氶亾涓哄瓙鐩綍 deviceJOSNChannel.put("SnapURL", ""); - deviceJOSNChannel.put("Manufacturer ", deviceChannel.getManufacture()); - deviceJOSNChannel.put("Model", deviceChannel.getModel()); - deviceJOSNChannel.put("Owner", deviceChannel.getOwner()); - deviceJOSNChannel.put("CivilCode", deviceChannel.getCivilCode()); - deviceJOSNChannel.put("Address", deviceChannel.getAddress()); - deviceJOSNChannel.put("Parental", deviceChannel.getParental()); // 褰撲负閫氶亾璁惧鏃�, 鏄惁鏈夐�氶亾瀛愯澶�, 1-鏈�,0-娌℃湁 - deviceJOSNChannel.put("ParentID", deviceChannel.getParentId()); // 鐩存帴涓婄骇缂栧彿 - deviceJOSNChannel.put("Secrecy", deviceChannel.getSecrecy()); + deviceJOSNChannel.put("Manufacturer ", deviceChannelExtend.getManufacture()); + deviceJOSNChannel.put("Model", deviceChannelExtend.getModel()); + deviceJOSNChannel.put("Owner", deviceChannelExtend.getOwner()); + deviceJOSNChannel.put("CivilCode", deviceChannelExtend.getCivilCode()); + deviceJOSNChannel.put("Address", deviceChannelExtend.getAddress()); + deviceJOSNChannel.put("Parental", deviceChannelExtend.getParental()); // 褰撲负閫氶亾璁惧鏃�, 鏄惁鏈夐�氶亾瀛愯澶�, 1-鏈�,0-娌℃湁 + deviceJOSNChannel.put("ParentID", deviceChannelExtend.getParentId()); // 鐩存帴涓婄骇缂栧彿 + deviceJOSNChannel.put("Secrecy", deviceChannelExtend.getSecrecy()); deviceJOSNChannel.put("RegisterWay", 1); // 娉ㄥ唽鏂瑰紡, 缂虹渷涓�1, 鍏佽鍊�: 1, 2, 3 - // 1-IETF RFC3261, - // 2-鍩轰簬鍙d护鐨勫弻鍚戣璇�, - // 3-鍩轰簬鏁板瓧璇佷功鐨勫弻鍚戣璇� - deviceJOSNChannel.put("Status", deviceChannel.getStatus() == 1 ? "ON":"OFF"); - deviceJOSNChannel.put("Longitude", deviceChannel.getLongitude()); - deviceJOSNChannel.put("Latitude", deviceChannel.getLatitude()); - deviceJOSNChannel.put("PTZType ", deviceChannel.getPTZType()); // 浜戝彴绫诲瀷, 0 - 鏈煡, 1 - 鐞冩満, 2 - 鍗婄悆, - // 3 - 鍥哄畾鏋満, 4 - 閬ユ帶鏋満 + // 1-IETF RFC3261, + // 2-鍩轰簬鍙d护鐨勫弻鍚戣璇�, + // 3-鍩轰簬鏁板瓧璇佷功鐨勫弻鍚戣璇� + deviceJOSNChannel.put("Status", deviceChannelExtend.getStatus() == 1 ? "ON":"OFF"); + deviceJOSNChannel.put("Longitude", deviceChannelExtend.getLongitude()); + deviceJOSNChannel.put("Latitude", deviceChannelExtend.getLatitude()); + deviceJOSNChannel.put("PTZType ", deviceChannelExtend.getPTZType()); // 浜戝彴绫诲瀷, 0 - 鏈煡, 1 - 鐞冩満, 2 - 鍗婄悆, + // 3 - 鍥哄畾鏋満, 4 - 閬ユ帶鏋満 deviceJOSNChannel.put("CustomPTZType", ""); - deviceJOSNChannel.put("StreamID", deviceChannel.getStreamId()); // StreamID 鐩存挱娴両D, 鏈夊�艰〃绀烘鍦ㄧ洿鎾� + deviceJOSNChannel.put("StreamID", deviceChannelExtend.getStreamId()); // StreamID 鐩存挱娴両D, 鏈夊�艰〃绀烘鍦ㄧ洿鎾� deviceJOSNChannel.put("NumOutputs ", -1); // 鐩存挱鍦ㄧ嚎浜烘暟 channleJSONList.add(deviceJOSNChannel); } diff --git a/src/main/java/com/genersoft/iot/vmp/web/gb28181/dto/DeviceChannelExtent.java b/src/main/java/com/genersoft/iot/vmp/web/gb28181/dto/DeviceChannelExtend.java similarity index 78% rename from src/main/java/com/genersoft/iot/vmp/web/gb28181/dto/DeviceChannelExtent.java rename to src/main/java/com/genersoft/iot/vmp/web/gb28181/dto/DeviceChannelExtend.java index 9494352..972d1a6 100644 --- a/src/main/java/com/genersoft/iot/vmp/web/gb28181/dto/DeviceChannelExtent.java +++ b/src/main/java/com/genersoft/iot/vmp/web/gb28181/dto/DeviceChannelExtend.java @@ -1,165 +1,140 @@ package com.genersoft.iot.vmp.web.gb28181.dto; -import io.swagger.v3.oas.annotations.media.Schema; - -@Schema(description = "閫氶亾淇℃伅") -public class DeviceChannelExtent { +public class DeviceChannelExtend { /** * 鏁版嵁搴撹嚜澧濱D */ - @Schema(description = "鏁版嵁搴撹嚜澧濱D") private int id; /** - * 閫氶亾鍥芥爣缂栧彿 + * 閫氶亾id */ - @Schema(description = "閫氶亾鍥芥爣缂栧彿") private String channelId; /** - * 璁惧鍥芥爣缂栧彿 + * 璁惧id */ - @Schema(description = "璁惧鍥芥爣缂栧彿") private String deviceId; /** * 閫氶亾鍚� */ - @Schema(description = "鍚嶇О") private String name; + + private String deviceName; + + private int deviceOnline; /** * 鐢熶骇鍘傚晢 */ - @Schema(description = "鐢熶骇鍘傚晢") private String manufacture; /** * 鍨嬪彿 */ - @Schema(description = "鍨嬪彿") private String model; /** * 璁惧褰掑睘 */ - @Schema(description = "璁惧褰掑睘") private String owner; /** * 琛屾斂鍖哄煙 */ - @Schema(description = "琛屾斂鍖哄煙") private String civilCode; /** * 璀﹀尯 */ - @Schema(description = "璀﹀尯") private String block; /** * 瀹夎鍦板潃 */ - @Schema(description = "瀹夎鍦板潃") private String address; /** * 鏄惁鏈夊瓙璁惧 1鏈�, 0娌℃湁 */ - @Schema(description = "鏄惁鏈夊瓙璁惧 1鏈�, 0娌℃湁") private int parental; /** * 鐖剁骇id */ - @Schema(description = "鐖剁骇id") private String parentId; /** * 淇′护瀹夊叏妯″紡 缂虹渷涓�0; 0:涓嶉噰鐢�; 2: S/MIME绛惧悕鏂瑰紡; 3: S/ MIME鍔犲瘑绛惧悕鍚屾椂閲囩敤鏂瑰紡; 4:鏁板瓧鎽樿鏂瑰紡 */ - @Schema(description = "淇′护瀹夊叏妯″紡 缂虹渷涓�0; 0:涓嶉噰鐢�; 2: S/MIME绛惧悕鏂瑰紡; 3: S/ MIME鍔犲瘑绛惧悕鍚屾椂閲囩敤鏂瑰紡; 4:鏁板瓧鎽樿鏂瑰紡") private int safetyWay; /** * 娉ㄥ唽鏂瑰紡 缂虹渷涓�1;1:绗﹀悎IETFRFC3261鏍囧噯鐨勮璇佹敞鍐屾ā 寮�; 2:鍩轰簬鍙d护鐨勫弻鍚戣璇佹敞鍐屾ā寮�; 3:鍩轰簬鏁板瓧璇佷功鐨勫弻鍚戣璇佹敞鍐屾ā寮� */ - @Schema(description = "娉ㄥ唽鏂瑰紡 缂虹渷涓�1;1:绗﹀悎IETFRFC3261鏍囧噯鐨勮璇佹敞鍐屾ā 寮�; 2:鍩轰簬鍙d护鐨勫弻鍚戣璇佹敞鍐屾ā寮�; 3:鍩轰簬鏁板瓧璇佷功鐨勫弻鍚戣璇佹敞鍐屾ā寮�") private int registerWay; /** * 璇佷功搴忓垪鍙� */ - @Schema(description = "璇佷功搴忓垪鍙�") private String certNum; /** * 璇佷功鏈夋晥鏍囪瘑 缂虹渷涓�0;璇佷功鏈夋晥鏍囪瘑:0:鏃犳晥1: 鏈夋晥 */ - @Schema(description = "璇佷功鏈夋晥鏍囪瘑 缂虹渷涓�0;璇佷功鏈夋晥鏍囪瘑:0:鏃犳晥1: 鏈夋晥") private int certifiable; /** * 璇佷功鏃犳晥鍘熷洜鐮� */ - @Schema(description = "璇佷功鏃犳晥鍘熷洜鐮�") private int errCode; /** * 璇佷功缁堟鏈夋晥鏈� */ - @Schema(description = "璇佷功缁堟鏈夋晥鏈�") private String endTime; /** * 淇濆瘑灞炴�� 缂虹渷涓�0; 0:涓嶆秹瀵�, 1:娑夊瘑 */ - @Schema(description = "淇濆瘑灞炴�� 缂虹渷涓�0; 0:涓嶆秹瀵�, 1:娑夊瘑") private String secrecy; /** * IP鍦板潃 */ - @Schema(description = "IP鍦板潃") private String ipAddress; /** * 绔彛鍙� */ - @Schema(description = "绔彛鍙�") private int port; /** * 瀵嗙爜 */ - @Schema(description = "瀵嗙爜") private String password; /** * 浜戝彴绫诲瀷 */ - @Schema(description = "浜戝彴绫诲瀷") private int PTZType; /** * 浜戝彴绫诲瀷鎻忚堪瀛楃涓� */ - @Schema(description = "浜戝彴绫诲瀷鎻忚堪瀛楃涓�") private String PTZTypeText; /** * 鍒涘缓鏃堕棿 */ - @Schema(description = "鍒涘缓鏃堕棿") private String createTime; /** * 鏇存柊鏃堕棿 */ - @Schema(description = "鏇存柊鏃堕棿") private String updateTime; /** @@ -171,79 +146,66 @@ * <Status>OFF</Status> * 閬囧埌杩嘚VR涓嬬殑IPC涓嬪彂淇′护鍙互鎺ㄦ祦锛� 浣嗘槸 Status 鍝嶅簲 OFF */ - @Schema(description = "鍦ㄧ嚎/绂荤嚎锛� 1鍦ㄧ嚎,0绂荤嚎") private int status; /** * 缁忓害 */ - @Schema(description = "缁忓害") private double longitude; /** * 绾害 */ - @Schema(description = "绾害") private double latitude; /** * 缁忓害 GCJ02 */ - @Schema(description = "GCJ02鍧愭爣绯荤粡搴�") private double longitudeGcj02; /** * 绾害 GCJ02 */ - @Schema(description = "GCJ02鍧愭爣绯荤含搴�") private double latitudeGcj02; /** * 缁忓害 WGS84 */ - @Schema(description = "WGS84鍧愭爣绯荤粡搴�") private double longitudeWgs84; /** * 绾害 WGS84 */ - @Schema(description = "WGS84鍧愭爣绯荤含搴�") private double latitudeWgs84; /** * 瀛愯澶囨暟 */ - @Schema(description = "瀛愯澶囨暟") private int subCount; /** * 娴佸敮涓�缂栧彿锛屽瓨鍦ㄨ〃绀烘鍦ㄧ洿鎾� */ - @Schema(description = "娴佸敮涓�缂栧彿锛屽瓨鍦ㄨ〃绀烘鍦ㄧ洿鎾�") private String streamId; /** * 鏄惁鍚湁闊抽 */ - @Schema(description = "鏄惁鍚湁闊抽") private boolean hasAudio; /** * 鏍囪閫氶亾鐨勭被鍨嬶紝0->鍥芥爣閫氶亾 1->鐩存挱娴侀�氶亾 2->涓氬姟鍒嗙粍/铏氭嫙缁勭粐/琛屾斂鍖哄垝 */ - @Schema(description = "鏍囪閫氶亾鐨勭被鍨嬶紝0->鍥芥爣閫氶亾 1->鐩存挱娴侀�氶亾 2->涓氬姟鍒嗙粍/铏氭嫙缁勭粐/琛屾斂鍖哄垝") private int channelType; /** * 涓氬姟鍒嗙粍 */ - @Schema(description = "涓氬姟鍒嗙粍") private String businessGroupId; /** * GPS鐨勬洿鏂版椂闂� */ - @Schema(description = "GPS鐨勬洿鏂版椂闂�") private String gpsTime; public int getId() { @@ -574,4 +536,20 @@ public void setGpsTime(String gpsTime) { this.gpsTime = gpsTime; } + + public String getDeviceName() { + return deviceName; + } + + public void setDeviceName(String deviceName) { + this.deviceName = deviceName; + } + + public int getDeviceOnline() { + return deviceOnline; + } + + public void setDeviceOnline(int deviceOnline) { + this.deviceOnline = deviceOnline; + } } -- Gitblit v1.8.0