ruoyi-service/ruoyi-dataInterchange/src/main/java/com/ruoyi/dataInterchange/controller/HaiKangContent.java
@@ -73,18 +73,18 @@ indexCode1 = jsonObject1.getString("indexCode"); } } //根据监控点编号获取监控预览url PreviewURLsRequest previewURLsRequest = new PreviewURLsRequest(); previewURLsRequest.setCameraIndexCode(indexCode1); String s = Artemis.previewURLs(previewURLsRequest); jsonObject = JSONObject.parseObject(s); code = jsonObject.getString("code"); if(!"0".equals(code)){ return R.fail("获取海康实时视频预览地址失败"); } data = jsonObject.getJSONObject("data"); String url = data.getString("url"); return R.ok(url); // //根据监控点编号获取监控预览url // PreviewURLsRequest previewURLsRequest = new PreviewURLsRequest(); // previewURLsRequest.setCameraIndexCode(indexCode1); // String s = Artemis.previewURLs(previewURLsRequest); // jsonObject = JSONObject.parseObject(s); // code = jsonObject.getString("code"); // if(!"0".equals(code)){ // return R.fail("获取海康实时视频预览地址失败"); // } // data = jsonObject.getJSONObject("data"); // String url = data.getString("url"); return R.ok(indexCode1); }catch (Exception e){ return R.fail("获取海康实时视频预览地址失败"); } ruoyi-service/ruoyi-dataInterchange/src/main/java/com/ruoyi/dataInterchange/server/WarnMsgService.java
@@ -132,6 +132,9 @@ */ public void up_warn_msg_adpt_info(ChannelHandlerContext ctx, int inferiorPlatformId, WarnMsg warnMsg) { UPWarnMsgAdptInfo upWarnMsgAdptInfo = enterprise.contains(inferiorPlatformId) ? new UPWarnMsgAdptInfo().decode2(warnMsg) : new UPWarnMsgAdptInfo().decode1(warnMsg); if(!warnType.contains(upWarnMsgAdptInfo.getWarnType())){ return; } upWarnMsgAdptInfo.setResult(0x00); upWarnMsgAdptInfo.setInferiorPlatformId(inferiorPlatformId); upWarnMsgAdptInfo.setCreateTime(LocalDateTime.now().toEpochSecond(ZoneOffset.ofHours(8))); @@ -143,8 +146,6 @@ upWarnMsgAdptInfo.setLongitude(gnssData.getLon()); upWarnMsgAdptInfo.setLatitude(gnssData.getLat()); } }else if(!warnType.contains(upWarnMsgAdptInfo.getWarnType())){ return; } upWarnMsgAdptInfoDao.save(upWarnMsgAdptInfo); }