From 3227dcd082454a1bf85ee623b8d62bbd47d10420 Mon Sep 17 00:00:00 2001 From: 648540858 <648540858@qq.com> Date: 星期二, 28 三月 2023 17:56:43 +0800 Subject: [PATCH] 添加兼容接口预置位添加调用删除,列表查询 --- src/main/java/com/genersoft/iot/vmp/web/gb28181/ApiDeviceController.java | 101 ++++++++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 92 insertions(+), 9 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 9998960..08f79bf 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 @@ -2,21 +2,32 @@ 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.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.util.ObjectUtils; import org.springframework.util.StringUtils; 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.Arrays; -import java.util.List; +import javax.sip.InvalidArgumentException; +import javax.sip.SipException; +import java.text.ParseException; +import java.util.*; /** * API鍏煎锛氳澶囦俊鎭� @@ -31,17 +42,15 @@ @Autowired private IVideoManagerStorage storager; + + @Autowired + private SIPCommander cmder; @Autowired private IDeviceService deviceService; - // @Autowired - // private SIPCommander cmder; + @Autowired + private DeferredResultHolder resultHolder; - // @Autowired - // private DeferredResultHolder resultHolder; - - // @Autowired - // private DeviceOffLineDetector offLineDetector; /** * 鍒嗛〉鑾峰彇璁惧鍒楄〃 鐜板湪鐩存帴杩斿洖锛屽皻鏈疄鐜板垎椤� @@ -171,4 +180,78 @@ 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