diff --git a/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRESTfulUtils.java b/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRESTfulUtils.java index b41ef6d5..c8aa2455 100644 --- a/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRESTfulUtils.java +++ b/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRESTfulUtils.java @@ -12,7 +12,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Component; -import java.io.IOException; +import java.io.*; import java.net.ConnectException; import java.util.HashMap; import java.util.Map; @@ -26,6 +26,8 @@ public class ZLMRESTfulUtils { @Autowired private MediaConfig mediaConfig; + + public interface RequestCallback{ void run(JSONObject response); } @@ -95,6 +97,53 @@ public class ZLMRESTfulUtils { return responseJSON; } + + public void sendPostForImg(String api, Map param, String targetPath, String fileName) { + OkHttpClient client = new OkHttpClient(); + String url = String.format("http://%s:%s/index/api/%s", mediaConfig.getIp(), mediaConfig.getHttpPort(), api); + JSONObject responseJSON = null; + logger.debug(url); + + FormBody.Builder builder = new FormBody.Builder(); + builder.add("secret",mediaConfig.getSecret()); + if (param != null && param.keySet().size() > 0) { + for (String key : param.keySet()){ + if (param.get(key) != null) { + builder.add(key, param.get(key).toString()); + } + } + } + + FormBody body = builder.build(); + + Request request = new Request.Builder() + .post(body) + .url(url) + .build(); + try { + Response response = client.newCall(request).execute(); + if (response.isSuccessful()) { + if (targetPath != null) { + File snapFolder = new File(targetPath); + if (!snapFolder.exists()) { + snapFolder.mkdirs(); + } + File snapFile = new File(targetPath + "/" + fileName); + FileOutputStream outStream = new FileOutputStream(snapFile); + outStream.write(response.body().bytes()); + outStream.close(); + } + } + } catch (ConnectException e) { + logger.error(String.format("连接ZLM失败: %s, %s", e.getCause().getMessage(), e.getMessage())); + logger.info("请检查media配置并确认ZLM已启动..."); + }catch (IOException e) { + logger.error(String.format("[ %s ]请求失败: %s", url, e.getMessage())); + } + + } + + public JSONObject getMediaList(String app, String stream, String schema, RequestCallback callback){ Map param = new HashMap<>(); if (app != null) param.put("app",app); @@ -201,4 +250,12 @@ public class ZLMRESTfulUtils { param.put("local_port", localPortSStr); sendPost("kick_sessions",param, null); } + + public void getSnap(String flvUrl, int timeout_sec, int expire_sec, String targetPath, String fileName) { + Map param = new HashMap<>(); + param.put("url", flvUrl); + param.put("timeout_sec", timeout_sec); + param.put("expire_sec", expire_sec); + sendPostForImg("getSnap",param, targetPath, fileName); + } } diff --git a/src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java b/src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java index 42c10a79..49412ffd 100644 --- a/src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java +++ b/src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java @@ -15,6 +15,7 @@ import com.genersoft.iot.vmp.media.zlm.ZLMHttpHookSubscribe; import com.genersoft.iot.vmp.media.zlm.ZLMRESTfulUtils; import com.genersoft.iot.vmp.storager.IRedisCatchStorage; import com.genersoft.iot.vmp.storager.IVideoManagerStorager; +import com.genersoft.iot.vmp.vmanager.bean.WVPResult; import com.genersoft.iot.vmp.vmanager.gb28181.play.bean.PlayResult; import com.genersoft.iot.vmp.service.IMediaService; import com.genersoft.iot.vmp.service.IPlayService; @@ -23,14 +24,18 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; +import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.stereotype.Service; +import org.springframework.util.ResourceUtils; import org.springframework.web.context.request.async.DeferredResult; import javax.sip.ClientTransaction; import javax.sip.Dialog; import javax.sip.header.CallIdHeader; import javax.sip.message.Response; +import java.io.File; +import java.io.FileNotFoundException; import java.util.UUID; @Service @@ -82,9 +87,33 @@ public class PlayServiceImpl implements IPlayService { cmder.closeRTPServer(playResult.getDevice(), channelId); RequestMessage msg = new RequestMessage(); msg.setId(DeferredResultHolder.CALLBACK_CMD_PlAY + playResult.getUuid()); - msg.setData("Timeout"); + WVPResult wvpResult = new WVPResult(); + wvpResult.setCode(-1); + wvpResult.setMsg("Timeout"); + msg.setData(wvpResult); resultHolder.invokeResult(msg); }); + result.onCompletion(()->{ + // 点播结束时调用截图接口 + try { + String path = ResourceUtils.getURL("classpath:").getPath()+"static/static/snap/"; + String fileName = deviceId + "_" + channelId + ".jpg"; + ResponseEntity responseEntity = (ResponseEntity)result.getResult(); + if (responseEntity != null && responseEntity.getStatusCode() == HttpStatus.OK) { + WVPResult wvpResult = (WVPResult)responseEntity.getBody(); + if (wvpResult.getCode() == 0) { + StreamInfo streamInfoForSuccess = (StreamInfo)wvpResult.getData(); + String flvUrl = streamInfoForSuccess.getFlv(); + // 请求截图 + zlmresTfulUtils.getSnap(flvUrl, 5, 1, path, fileName); + } + } + + System.out.println(path); + } catch (FileNotFoundException e) { + e.printStackTrace(); + } + }); if (streamInfo == null) { // 发送点播消息 cmder.playStreamCmd(device, channelId, (JSONObject response) -> { @@ -98,7 +127,10 @@ public class PlayServiceImpl implements IPlayService { msg.setId(DeferredResultHolder.CALLBACK_CMD_PlAY + uuid); Response response = event.getResponse(); cmder.closeRTPServer(playResult.getDevice(), channelId); - msg.setData(String.format("点播失败， 错误码： %s, %s", response.getStatusCode(), response.getReasonPhrase())); + WVPResult wvpResult = new WVPResult(); + wvpResult.setCode(-1); + wvpResult.setMsg(String.format("点播失败， 错误码： %s, %s", response.getStatusCode(), response.getReasonPhrase())); + msg.setData(wvpResult); resultHolder.invokeResult(msg); if (errorEvent != null) { errorEvent.response(event); @@ -109,7 +141,10 @@ public class PlayServiceImpl implements IPlayService { if (streamId == null) { RequestMessage msg = new RequestMessage(); msg.setId(DeferredResultHolder.CALLBACK_CMD_PlAY + uuid); - msg.setData(String.format("点播失败， redis缓存streamId等于null")); + WVPResult wvpResult = new WVPResult(); + wvpResult.setCode(-1); + wvpResult.setMsg(String.format("点播失败， redis缓存streamId等于null")); + msg.setData(wvpResult); resultHolder.invokeResult(msg); return playResult; } @@ -117,7 +152,13 @@ public class PlayServiceImpl implements IPlayService { if (rtpInfo != null && rtpInfo.getBoolean("exist")) { RequestMessage msg = new RequestMessage(); msg.setId(DeferredResultHolder.CALLBACK_CMD_PlAY + uuid); - msg.setData(JSON.toJSONString(streamInfo)); + + WVPResult wvpResult = new WVPResult(); + wvpResult.setCode(0); + wvpResult.setMsg("success"); + wvpResult.setData(streamInfo); + msg.setData(wvpResult); + resultHolder.invokeResult(msg); if (hookEvent != null) { hookEvent.response(JSONObject.parseObject(JSON.toJSONString(streamInfo))); @@ -133,7 +174,11 @@ public class PlayServiceImpl implements IPlayService { RequestMessage msg = new RequestMessage(); msg.setId(DeferredResultHolder.CALLBACK_CMD_PlAY + uuid); Response response = event.getResponse(); - msg.setData(String.format("点播失败， 错误码： %s, %s", response.getStatusCode(), response.getReasonPhrase())); + + WVPResult wvpResult = new WVPResult(); + wvpResult.setCode(-1); + wvpResult.setMsg(String.format("点播失败， 错误码： %s, %s", response.getStatusCode(), response.getReasonPhrase())); + msg.setData(wvpResult); resultHolder.invokeResult(msg); }); } @@ -163,6 +208,13 @@ public class PlayServiceImpl implements IPlayService { streamInfo.setTransactionInfo(transactionInfo); redisCatchStorage.startPlay(streamInfo); msg.setData(JSON.toJSONString(streamInfo)); + + WVPResult wvpResult = new WVPResult(); + wvpResult.setCode(0); + wvpResult.setMsg("sucess"); + wvpResult.setData(streamInfo); + msg.setData(wvpResult); + resultHolder.invokeResult(msg); } else { logger.warn("设备预览API调用失败！"); diff --git a/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/play/PlayController.java b/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/play/PlayController.java index dce0732d..5f44e76f 100644 --- a/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/play/PlayController.java +++ b/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/play/PlayController.java @@ -19,6 +19,7 @@ import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; +import org.springframework.util.ResourceUtils; import org.springframework.web.bind.annotation.CrossOrigin; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; @@ -31,6 +32,7 @@ import com.genersoft.iot.vmp.gb28181.transmit.cmd.impl.SIPCommander; import com.genersoft.iot.vmp.storager.IVideoManagerStorager; import org.springframework.web.context.request.async.DeferredResult; +import java.io.FileNotFoundException; import java.util.UUID; import javax.sip.message.Response; diff --git a/web_src/config/index.js b/web_src/config/index.js index 5ab5eacb..cec91b87 100644 --- a/web_src/config/index.js +++ b/web_src/config/index.js @@ -18,6 +18,13 @@ module.exports = { '^/debug': '/' } }, + '/static/snap': { + target: 'http://localhost:18080', + changeOrigin: true, + // pathRewrite: { + // '^/static/snap': '/static/snap' + // } + }, }, diff --git a/web_src/src/components/Login.vue b/web_src/src/components/Login.vue index a507f597..7aff1aed 100644 --- a/web_src/src/components/Login.vue +++ b/web_src/src/components/Login.vue @@ -80,7 +80,7 @@ export default { this.$axios({ method: 'get', - url:"/api/user/login", + url:"/api/user/login", params: loginParam }).then(function (res) { console.log(JSON.stringify(res)); diff --git a/web_src/src/components/channelList.vue b/web_src/src/components/channelList.vue index 324eef46..548bd2cc 100644 --- a/web_src/src/components/channelList.vue +++ b/web_src/src/components/channelList.vue @@ -30,10 +30,28 @@ - + + + + @@ -100,7 +118,8 @@ export default { total: 0, beforeUrl: "/deviceList", isLoging: false, - autoList: true + autoList: true, + loadSnap:{} }; }, @@ -122,7 +141,6 @@ export default { } else { this.showSubchannels(); } - }, initParam: function () { this.deviceId = this.$route.params.deviceId; @@ -174,8 +192,6 @@ export default { }).catch(function (error) { console.log(error); }); - - }, //通知设备上传媒体流 @@ -190,18 +206,22 @@ export default { method: 'get', url: '/api/play/start/' + deviceId + '/' + channelId }).then(function (res) { - console.log(res.data) - let streamId = res.data.streamId; that.isLoging = false; - if (!!streamId) { - // that.$refs.devicePlayer.play(res.data, deviceId, channelId, itemData.hasAudio); - that.$refs.devicePlayer.openDialog("media", deviceId, channelId, { - streamInfo: res.data, - hasAudio: itemData.hasAudio - }); - that.initData(); - } else { - that.$message.error(res.data); + if (res.data.code == 0) { + + setTimeout(()=>{ + console.log("下载截图") + let snapId = deviceId + "_" + channelId; + that.loadSnap[snapId] = 0; + that.getSnapErrorEvent(snapId) + },5000) + that.$refs.devicePlayer.openDialog("media", deviceId, channelId, { + streamInfo: res.data.data, + hasAudio: itemData.hasAudio + }); + that.initData(); + }else { + that.$message.error(res.data.msg); } }).catch(function (e) {}); }, @@ -228,7 +248,24 @@ export default { } }); }, + getSnap: function (row){ + return '/static/snap/' + row.deviceId + '_' + row.channelId + '.jpg' + }, + getSnapErrorEvent: function (id){ + + if (typeof (this.loadSnap[id]) != "undefined") { + console.log("下载截图" + this.loadSnap[id]) + if (this.loadSnap[id] > 5) { + delete this.loadSnap[id]; + return; + } + setTimeout(()=>{ + this.loadSnap[id] ++ + document.getElementById(id).setAttribute("src", '/static/snap/' + id + '.jpg?' + new Date().getTime()) + },1000) + } + }, showDevice: function () { this.$router.push(this.beforeUrl).then(() => { this.initParam(); diff --git a/web_src/src/components/test.vue b/web_src/src/components/test.vue index 603138ce..6d53c541 100644 --- a/web_src/src/components/test.vue +++ b/web_src/src/components/test.vue @@ -24,6 +24,9 @@
{{24/timeNode * index}}
+
    +
  • {{!!item.name?item.name:item.dname}}
    • +
@@ -36,6 +39,7 @@ export default { name: "test", data() { return { + allDataList:[], timeNode: 24, recordData:[ { @@ -58,6 +62,32 @@ export default { }; }, mounted() { + var list1 = [{ + key: Math.random()*10, + name: "人1" + },{ + key: Math.random()*10, + name: "人2" + },{ + key: Math.random()*10, + name: "人3" + }] + var list2 = [{ + key: Math.random()*10, + dname: "部门1" + },{ + key: Math.random()*10, + dname: "部门2" + },{ + key: Math.random()*10, + dname: "部门3" + }] + + var allData = list1.concat(list2) + allData.sort((a, b)=>{ + return a.key-b.key; + }) + this.allDataList = allData; for (let i = 1; i <= 24; i++) { console.log("
") }