| fzzy-igdss-inte/src/main/java/com/fzzy/igds/api/v1/ApiV1Controller.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| fzzy-igdss-inte/src/main/java/com/fzzy/igds/api/v1/service/ApiV1Service3030.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| fzzy-igdss-inte/src/main/java/com/fzzy/igds/api/v1/service/ApiV1Service3031.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| fzzy-igdss-web/src/main/java/com/fzzy/inout/InoutApiController.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| fzzy-igdss-web/src/main/java/com/fzzy/inout/InoutController.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| fzzy-igdss-web/src/main/java/com/fzzy/inout/manager/InoutManager.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| fzzy-igdss-web/src/main/resources/static/common/constant.js | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| fzzy-igdss-web/src/main/resources/static/inout/video-play.js | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
fzzy-igdss-inte/src/main/java/com/fzzy/igds/api/v1/ApiV1Controller.java
@@ -50,7 +50,7 @@ @ResponseBody public ApiV1Resp<Object> gateway(@RequestBody ApiV1Req<Object> req) { log.debug("è´¨æ¼ç管æ¥å£V1ï¼æ¶å°åºåºç½å ³ä¿¡æ¯={}", req); log.debug("è´¨æ¼ç管æ¥å£V1ï¼æ¶å°åºåºç½å ³ä¿¡æ¯={}", req.getFunctionId()); try { //åæ°æ ¡éª fzzy-igdss-inte/src/main/java/com/fzzy/igds/api/v1/service/ApiV1Service3030.java
@@ -14,6 +14,7 @@ import org.apache.commons.lang3.time.DateUtils; import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Component; import javax.annotation.Resource; import java.util.List; @@ -32,54 +33,52 @@ private FileService fileService; /** * * @param req * @param gatewaySer * @return */ public ApiV1Resp<Object> analysis(ApiV1Req<Object> req, GatewaySer gatewaySer) throws Exception{ public ApiV1Resp<Object> analysis(ApiV1Req<Object> req, GatewaySer gatewaySer) throws Exception { //转å为对象 List<Param3030> list = JSONObject.parseArray(JSONObject.toJSONString(req.getData()), Param3030.class); Param3030 param = JSONObject.parseObject(JSONObject.toJSONString(req.getData()), Param3030.class); if(null == list || list.isEmpty()){ if (null == param) { return ApiV1Resp.error("ææä¿¡æ¯ä¸ºç©ºï¼ä¸è§£æï¼", req); } step1(list, gatewaySer); step1(param, gatewaySer); return ApiV1Resp.success(null, req); } /** * 弿¥è§£æ * @param list * * @param param3030 */ @Async public void step1(List<Param3030> list, GatewaySer gatewaySer) throws Exception { public void step1(Param3030 param3030, GatewaySer gatewaySer) throws Exception { SnapRecord snapRecord; for (Param3030 param3030 : list) { snapRecord = new SnapRecord(); snapRecord.setId(ContextUtil.generateId()); snapRecord.setCompanyId(gatewaySer.getCompanyId()); snapRecord.setDeptId(gatewaySer.getDeptId()); snapRecord.setCameraId(param3030.getCameraId()); snapRecord.setResult(param3030.getResult()); snapRecord.setTags(param3030.getTags()); snapRecord.setSnapTime(DateUtils.parseDate(param3030.getSnapTime(),"yyyy-MM-dd HH:mm:ss")); SnapRecord snapRecord = new SnapRecord(); snapRecord.setId(ContextUtil.generateId()); snapRecord.setCompanyId(gatewaySer.getCompanyId()); snapRecord.setDeptId(gatewaySer.getDeptId()); snapRecord.setCameraId(param3030.getCameraId()); snapRecord.setResult(param3030.getResult()); snapRecord.setTags(param3030.getTags()); snapRecord.setSnapTime(DateUtils.parseDate(param3030.getSnapTime(), "yyyy-MM-dd HH:mm:ss")); //base64转å为å¾çä¿å String savePath = fileService.getFileSavePath("SNAP"); String fileName = ContextUtil.UUID() + ".jpg"; String filePath = savePath+fileName; fileService.baseImg2Disk(filePath, param3030.getImgBase64()); //base64转å为å¾çä¿å String savePath = fileService.getFileSavePath("SNAP"); String fileName = ContextUtil.UUID() + ".jpg"; String filePath = savePath + fileName; fileService.baseImg2Disk(filePath, param3030.getImgBase64()); //设置ä¿åå¾çè·¯å¾ snapRecord.setImgName(filePath.replace(FrameworkConfig.getProfile(), "/profile/")); //设置ä¿åå¾çè·¯å¾ snapRecord.setImgName(filePath.replace(FrameworkConfig.getProfile(), "/profile/")); snapRecordService.addData(snapRecord); } snapRecordService.addData(snapRecord); log.info("è´¨æ¼ç管æ¥å£V1ï¼3030æ¥å£è§£æå®æ"); } fzzy-igdss-inte/src/main/java/com/fzzy/igds/api/v1/service/ApiV1Service3031.java
@@ -33,7 +33,6 @@ private FileService fileService; /** * * @param req * @param gatewaySer * @return @@ -41,13 +40,13 @@ public ApiV1Resp<Object> analysis(ApiV1Req<Object> req, GatewaySer gatewaySer) throws Exception { //转å为对象 List<Param3031> list = JSONObject.parseArray(JSONObject.toJSONString(req.getData()), Param3031.class); Param3031 param = JSONObject.parseObject(JSONObject.toJSONString(req.getData()), Param3031.class); if (null == list || list.isEmpty()) { if (null == param) { return ApiV1Resp.error("ææä¿¡æ¯ä¸ºç©ºï¼ä¸è§£æï¼", req); } step1(list, gatewaySer); step1(param, gatewaySer); return ApiV1Resp.success(null, req); @@ -56,38 +55,34 @@ /** * 弿¥è§£æ * * @param list * @param param */ @Async public void step1(List<Param3031> list, GatewaySer gatewaySer) throws Exception { public void step1(Param3031 param, GatewaySer gatewaySer) throws Exception { EventInfo info; for (Param3031 param : list) { EventInfo info = new EventInfo(); info.setId(ContextUtil.generateId()); info.setCompanyId(gatewaySer.getCompanyId()); info.setDeptId(gatewaySer.getDeptId()); info.setSerId(param.getCameraId()); info.setName(param.getName()); info.setBizType(param.getBizType()); info.setType(param.getType()); info.setLevel(param.getLevel()); info.setInfo(param.getInfo()); info.setTime(DateUtils.parseDate(param.getTime(), "yyyy-MM-dd HH:mm:ss")); info.setTags(param.getTags()); info = new EventInfo(); info.setId(ContextUtil.generateId()); info.setCompanyId(gatewaySer.getCompanyId()); info.setDeptId(gatewaySer.getDeptId()); info.setSerId(param.getCameraId()); info.setName(param.getName()); info.setBizType(param.getBizType()); info.setType(param.getType()); info.setLevel(param.getLevel()); info.setInfo(param.getInfo()); info.setTime(DateUtils.parseDate(param.getTime(), "yyyy-MM-dd HH:mm:ss")); info.setTags(param.getTags()); //base64转å为å¾çä¿å String savePath = fileService.getFileSavePath("EVENT"); String fileName = ContextUtil.UUID() + ".jpg"; String filePath = savePath + fileName; fileService.baseImg2Disk(filePath, param.getImgBase64()); //base64转å为å¾çä¿å String savePath = fileService.getFileSavePath("EVENT"); String fileName = ContextUtil.UUID() + ".jpg"; String filePath = savePath + fileName; fileService.baseImg2Disk(filePath, param.getImgBase64()); //设置ä¿åå¾çè·¯å¾ info.setImgName(filePath.replace(FrameworkConfig.getProfile(), "/profile/")); //设置ä¿åå¾çè·¯å¾ info.setImgName(filePath.replace(FrameworkConfig.getProfile(), "/profile/")); eventInfoService.addData(info); } eventInfoService.addData(info); log.info("è´¨æ¼ç管æ¥å£V1ï¼3031æ¥å£è§£æå®æ"); fzzy-igdss-web/src/main/java/com/fzzy/inout/InoutApiController.java
ÎļþÒÑɾ³ý fzzy-igdss-web/src/main/java/com/fzzy/inout/InoutController.java
@@ -1,6 +1,8 @@ package com.fzzy.inout; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.fzzy.igds.camera.data.ApiCameraData; import com.fzzy.igds.camera.data.ApiCameraResp; import com.fzzy.igds.constant.Constant; import com.fzzy.igds.data.*; import com.fzzy.igds.domain.*; @@ -470,4 +472,20 @@ return prefix + "/inout-img"; } /** * è·åè§é¢ææ¾å°å * * @param param * @return */ @RequestMapping("/get-media") @ResponseBody public ApiCameraResp getMedia(@RequestBody InoutConf param) { //è·åè¯·æ±æ¹IP return inoutManager.getPlayAddr(param); } } fzzy-igdss-web/src/main/java/com/fzzy/inout/manager/InoutManager.java
@@ -2,6 +2,9 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.fzzy.common.manager.CommonManager; import com.fzzy.igds.camera.ApiCameraManager; import com.fzzy.igds.camera.data.ApiCameraData; import com.fzzy.igds.camera.data.ApiCameraResp; import com.fzzy.igds.constant.Constant; import com.fzzy.igds.constant.RespCodeEnum; import com.fzzy.igds.data.*; @@ -44,6 +47,8 @@ private InoutNoticeService inoutNoticeService; @Resource private CommonManager commonManager; @Resource private ApiCameraManager apiCameraManager; /** * æ ¹æ®ç¨æ·è¯·æ±ä¿¡æ¯ï¼æ ¹æ®å½å客æ·çµèIPï¼è·ååºå ¥åºç§°é䏿¬¡éæ©çå°ç£ @@ -564,4 +569,39 @@ } return files; } /** * è·åææ¾ä¿¡æ¯ * * @param camera * @return */ public ApiCameraResp getPlayAddr(InoutConf camera) { //éè¿ç»ä¸å ¥å£è·åææ¾å°å ApiCameraData apiCameraData = new ApiCameraData(); apiCameraData.setCompanyId(camera.getCompanyId()); apiCameraData.setDeptId(camera.getDeptId()); apiCameraData.setCameraId(camera.getSn()); apiCameraData.setIp(camera.getIp()); apiCameraData.setCtrlPort(camera.getPortCtrl()); apiCameraData.setWebPort(camera.getPort()); apiCameraData.setPlayType(camera.getPlayType()); apiCameraData.setSnapType(camera.getSnapType()); apiCameraData.setSn(camera.getSn()); apiCameraData.setChannel(camera.getChanNum()); apiCameraData.setLoginId(camera.getLoginId()); apiCameraData.setPwd(camera.getPwd()); apiCameraData.setUrlIn(camera.getUrlIn()); apiCameraData.setUrlOut(camera.getUrlOut()); apiCameraData.setMediaAddr(camera.getMediaAddr()); //æ ¹æ®ææ¾æ¹å¼è·å对åºçææ¾å°å ApiCameraResp resp = apiCameraManager.getApiCameraService(apiCameraData.getPlayType()).getPlayAddr(apiCameraData); resp.setPlayType(camera.getPlayType()); resp.setSnapType(camera.getSnapType()); resp.setCameraId(camera.getSn()); return resp; } } fzzy-igdss-web/src/main/resources/static/common/constant.js
@@ -84,6 +84,7 @@ EASY_GBS: "EASY_GBS",//fzzy-easyæµåªä½ææ¾ EASY_DSS: "EASY_DSS",//è¤ç³äºææ¾ MEDIA_HIK: "MEDIA_HIK",//海康æµåªä½ PLAY_TYPE_YD_QLY: "YD_QLY",//海康æµåªä½ HIK_YS: "HIK_YS",//海康-è¤ç³äº HIK_WEB4: "HIK_WEB4",//海康-WEBæä»¶ IMOU: "IMOU",///乿©äº fzzy-igdss-web/src/main/resources/static/inout/video-play.js
@@ -21,9 +21,15 @@ initVideo2(snapParam2, snapPram3); return; } var url = "http://" + gatewaySer.ip + ":" + gatewaySer.apiPort + gatewaySer.playUrl; //车çè¯å«ææ¾ if (snapParam1) { var url = ""; if (PlayType.PLAY_TYPE_WEB_RTC == snapParam1.playType) { url = "http://" + gatewaySer.ip + ":" + gatewaySer.apiPort + gatewaySer.playUrl; } if (PlayType.PLAY_TYPE_YD_QLY == snapParam1.playType) { url = "/basic/inout/get-media"; } $.ajax({ type: "POST", url: url, @@ -56,8 +62,14 @@ initVideo3(snapParam3) return; } var url = "http://" + gatewaySer.ip + ":" + gatewaySer.apiPort + gatewaySer.playUrl; if (snapParam2) { var url = ""; if (PlayType.PLAY_TYPE_WEB_RTC == snapParam2.playType) { url = "http://" + gatewaySer.ip + ":" + gatewaySer.apiPort + gatewaySer.playUrl; } if (PlayType.PLAY_TYPE_YD_QLY == snapParam2.playType) { url = "/basic/inout/get-media"; } $.ajax({ type: "POST", url: url, @@ -90,7 +102,13 @@ return; } if (!snapParam3) return; var url = "http://" + gatewaySer.ip + ":" + gatewaySer.apiPort + gatewaySer.playUrl; var url = ""; if (PlayType.PLAY_TYPE_WEB_RTC == snapParam3.playType) { url = "http://" + gatewaySer.ip + ":" + gatewaySer.apiPort + gatewaySer.playUrl; } if (PlayType.PLAY_TYPE_YD_QLY == snapParam3.playType) { url = "/basic/inout/get-media"; } $.ajax({ type: "POST", url: url, @@ -126,6 +144,9 @@ videoId = data.cameraId; htm = '<video class="video" id="video' + playNum + '" autoplay="" muted="" playsinline=""></video>'; } if (PlayType.PLAY_TYPE_YD_QLY == data.playType) { htm = '<iframe src="' + data.playUrl + '" width="100%" height="100%" frameborder="0" allowfullscreen></iframe>'; } if (1 == order) { $("#kccz-r-video1").append(htm);