From b5ccb1636fc0efb0ea9d87c38995fee14cfd45d3 Mon Sep 17 00:00:00 2001
From: AlphaWu <wp@zafu.edu.cn>
Date: 星期日, 20 八月 2023 15:50:24 +0800
Subject: [PATCH] 修正Database拼写错误。
---
src/main/java/com/genersoft/iot/vmp/web/gb28181/ApiDeviceController.java | 194 +++++++++++++++++++++++++++++++++++-------------
1 files changed, 140 insertions(+), 54 deletions(-)
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 2e96fbe..7b59f7f 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
@@ -1,23 +1,38 @@
package com.genersoft.iot.vmp.web.gb28181;
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson2.JSONArray;
+import com.alibaba.fastjson2.JSONObject;
+import com.genersoft.iot.vmp.conf.exception.ControllerException;
import com.genersoft.iot.vmp.gb28181.bean.Device;
-import com.genersoft.iot.vmp.gb28181.bean.DeviceChannel;
-import com.genersoft.iot.vmp.storager.IVideoManagerStorager;
+import com.genersoft.iot.vmp.gb28181.bean.PresetQuerySipReq;
+import com.genersoft.iot.vmp.gb28181.transmit.callback.DeferredResultHolder;
+import com.genersoft.iot.vmp.gb28181.transmit.callback.RequestMessage;
+import com.genersoft.iot.vmp.gb28181.transmit.cmd.impl.SIPCommander;
+import com.genersoft.iot.vmp.service.IDeviceService;
+import com.genersoft.iot.vmp.storager.IVideoManagerStorage;
+import com.genersoft.iot.vmp.vmanager.bean.DeferredResultEx;
+import com.genersoft.iot.vmp.vmanager.bean.ErrorCode;
+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.web.bind.annotation.*;
+import org.springframework.util.ObjectUtils;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.context.request.async.DeferredResult;
-import java.util.List;
+import javax.sip.InvalidArgumentException;
+import javax.sip.SipException;
+import java.text.ParseException;
+import java.util.*;
/**
* API鍏煎锛氳澶囦俊鎭�
*/
@SuppressWarnings("unchecked")
-@CrossOrigin
+
@RestController
@RequestMapping(value = "/api/v1/device")
public class ApiDeviceController {
@@ -25,19 +40,19 @@
private final static Logger logger = LoggerFactory.getLogger(ApiDeviceController.class);
@Autowired
- private IVideoManagerStorager storager;
+ private IVideoManagerStorage storager;
- // @Autowired
- // private SIPCommander cmder;
+ @Autowired
+ private SIPCommander cmder;
+ @Autowired
+ private IDeviceService deviceService;
- // @Autowired
- // private DeferredResultHolder resultHolder;
+ @Autowired
+ private DeferredResultHolder resultHolder;
- // @Autowired
- // private DeviceOffLineDetector offLineDetector;
/**
- * 鍒嗛〉鑾峰彇璁惧鍒楄〃 TODO 鐜板湪鐩存帴杩斿洖锛屽皻鏈疄鐜板垎椤�
+ * 鍒嗛〉鑾峰彇璁惧鍒楄〃 鐜板湪鐩存帴杩斿洖锛屽皻鏈疄鐜板垎椤�
* @param start
* @param limit
* @param q
@@ -56,10 +71,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();
}
@@ -74,7 +89,7 @@
deviceJsonObject.put("RecvStreamIP", "");
deviceJsonObject.put("CatalogInterval", 3600); // 閫氶亾鐩綍鎶撳彇鍛ㄦ湡
deviceJsonObject.put("SubscribeInterval", device.getSubscribeCycleForCatalog()); // 璁㈤槄鍛ㄦ湡(绉�), 0 琛ㄧず鍚庡彴涓嶅懆鏈熻闃�
- deviceJsonObject.put("Online", device.getOnline() == 1);
+ deviceJsonObject.put("Online", device.isOnLine());
deviceJsonObject.put("Password", "");
deviceJsonObject.put("MediaTransport", device.getTransport());
deviceJsonObject.put("RemoteIP", device.getIp());
@@ -92,70 +107,141 @@
@RequestMapping(value = "/channellist")
public JSONObject channellist( String serial,
@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,
@RequestParam(required = false)String q,
@RequestParam(required = false)Boolean online ){
-// if (logger.isDebugEnabled()) {
-// logger.debug("鏌ヨ鎵�鏈夎棰戣澶嘇PI璋冪敤");
-// }
+
JSONObject result = new JSONObject();
- // 鏌ヨ璁惧鏄惁瀛樺湪
- 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 (!ObjectUtils.isEmpty(code)) {
+ String[] split = code.trim().split(",");
+ channelIds = Arrays.asList(split);
}
- List<DeviceChannel> deviceChannels;
- List<DeviceChannel> allDeviceChannelList = storager.queryChannelsByDeviceId(serial);
+ 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, null,start, limit);
+ 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("ID", deviceChannelExtend.getChannelId());
+ deviceJOSNChannel.put("DeviceID", deviceChannelExtend.getDeviceId());
+ deviceJOSNChannel.put("DeviceName", deviceChannelExtend.getDeviceName());
+ deviceJOSNChannel.put("DeviceOnline", deviceChannelExtend.isDeviceOnline());
deviceJOSNChannel.put("Channel", 0); // TODO 鑷畾涔夊簭鍙�
- deviceJOSNChannel.put("Name", deviceChannel.getName());
+ deviceJOSNChannel.put("Name", deviceChannelExtend.getName());
deviceJOSNChannel.put("Custom", false);
deviceJOSNChannel.put("CustomName", "");
- deviceJOSNChannel.put("SubCount", deviceChannel.getSubCount()); // TODO ? 瀛愯妭鐐规暟, 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-鍩轰簬鍙ｄ护鐨勫弻鍚戣璇�,
- // 3-鍩轰簬鏁板瓧璇佷功鐨勫弻鍚戣璇�
- deviceJOSNChannel.put("Status", deviceChannel.getStatus());
- deviceJOSNChannel.put("Longitude", deviceChannel.getLongitude());
- deviceJOSNChannel.put("Latitude", deviceChannel.getLatitude());
- deviceJOSNChannel.put("PTZType ", deviceChannel.getPTZType()); // 浜戝彴绫诲瀷, 0 - 鏈煡, 1 - 鐞冩満, 2 - 鍗婄悆,
- // 3 - 鍥哄畾鏋満, 4 - 閬ユ帶鏋満
+ // 1-IETF RFC3261,
+ // 2-鍩轰簬鍙ｄ护鐨勫弻鍚戣璇�,
+ // 3-鍩轰簬鏁板瓧璇佷功鐨勫弻鍚戣璇�
+ deviceJOSNChannel.put("Status", deviceChannelExtend.isStatus() ? "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);
}
result.put("ChannelList", channleJSONList);
return result;
}
+
+ /**
+ * 璁惧淇℃伅 - 鑾峰彇涓嬬骇閫氶亾棰勭疆浣�
+ * @param serial 璁惧缂栧彿
+ * @param code 閫氶亾缂栧彿,閫氳繃 /api/v1/device/channellist 鑾峰彇鐨� ChannelList.ID, 璇ュ弬鏁板拰 channel 浜岄�変竴浼犻�掑嵆鍙�
+ * @param channel 閫氶亾搴忓彿, 榛樿鍊�: 1
+ * @param fill 鏄惁濉厖绌虹疆棰勭疆浣嶏紝褰撲笅绾ц繑鍥為缃綅锛屼絾涓嶅255涓椂锛岃嚜鍔ㄥ～鍏呯┖缃缃綅鍒�255涓紝 榛樿鍊�: true锛� 鍏佽鍊�: true, false
+ * @param timeout 瓒呮椂鏃堕棿(绉�) 榛樿鍊�: 15
+ * @return
+ */
+ @RequestMapping(value = "/fetchpreset")
+ private DeferredResult<Object> list(String serial,
+ @RequestParam(required = false)Integer channel,
+ @RequestParam(required = false)String code,
+ @RequestParam(required = false)Boolean fill,
+ @RequestParam(required = false)Integer timeout){
+
+ if (logger.isDebugEnabled()) {
+ logger.debug("<妯℃嫙鎺ュ彛> 鑾峰彇涓嬬骇閫氶亾棰勭疆浣� API璋冪敤锛宒eviceId锛歿} 锛宑hannel锛歿} 锛宑ode锛歿} 锛宖ill锛歿} 锛宼imeout锛歿} ",
+ serial, channel, code, fill, timeout);
+ }
+
+ Device device = storager.queryVideoDevice(serial);
+ String uuid = UUID.randomUUID().toString();
+ String key = DeferredResultHolder.CALLBACK_CMD_PRESETQUERY + (ObjectUtils.isEmpty(code) ? serial : code);
+ DeferredResult<Object> result = new DeferredResult<> (timeout * 1000L);
+ DeferredResultEx<Object> deferredResultEx = new DeferredResultEx<>(result);
+ result.onTimeout(()->{
+ logger.warn("<妯℃嫙鎺ュ彛> 鑾峰彇璁惧棰勭疆浣嶈秴鏃�");
+ // 閲婃斁rtpserver
+ RequestMessage msg = new RequestMessage();
+ msg.setId(uuid);
+ msg.setKey(key);
+ msg.setData("wait for presetquery timeout["+timeout+"s]");
+ resultHolder.invokeResult(msg);
+ });
+ if (resultHolder.exist(key, null)) {
+ return result;
+ }
+
+ deferredResultEx.setFilter(filterResult->{
+ List<PresetQuerySipReq> presetQuerySipReqList = (List<PresetQuerySipReq>)filterResult;
+ HashMap<String, Object> resultMap = new HashMap<>();
+ resultMap.put("DeviceID", code);
+ resultMap.put("Result", "OK");
+ resultMap.put("SumNum", presetQuerySipReqList.size());
+ ArrayList<Map<String, Object>> presetItemList = new ArrayList<>(presetQuerySipReqList.size());
+ for (PresetQuerySipReq presetQuerySipReq : presetQuerySipReqList) {
+ Map<String, Object> item = new HashMap<>();
+ item.put("PresetID", presetQuerySipReq.getPresetId());
+ item.put("PresetName", presetQuerySipReq.getPresetName());
+ item.put("PresetEnable", true);
+ presetItemList.add(item);
+ }
+ resultMap.put("PresetItemList",presetItemList );
+ return resultMap;
+ });
+
+ resultHolder.put(key, uuid, deferredResultEx);
+
+ try {
+ cmder.presetQuery(device, code, event -> {
+ RequestMessage msg = new RequestMessage();
+ msg.setId(uuid);
+ msg.setKey(key);
+ msg.setData(String.format("鑾峰彇璁惧棰勭疆浣嶅け璐ワ紝閿欒鐮侊細 %s, %s", event.statusCode, event.msg));
+ resultHolder.invokeResult(msg);
+ });
+ } catch (InvalidArgumentException | SipException | ParseException e) {
+ logger.error("[鍛戒护鍙戦�佸け璐 鑾峰彇璁惧棰勭疆浣�: {}", e.getMessage());
+ throw new ControllerException(ErrorCode.ERROR100.getCode(), "鍛戒护鍙戦�佸け璐�: " + e.getMessage());
+ }
+ return result;
+ }
}
--
Gitblit v1.8.0