server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceServiceImpl.java
@@ -54,6 +54,8 @@ private SystemDictDataBiz systemDictDataBiz; @Autowired private PlatformBroadcastLogMapper platformBroadcastLogMapper; @Autowired private InterfaceLogMapper interfaceLogMapper; @Override @@ -279,9 +281,9 @@ String input = ""; model.setSendInfo(param.getSendInfo()); return sendBroadcaseBobaoHttpBiz(model); return sendBroadcaseBobaoHttpBiz(model,interfaceLogMapper); } public static String sendBroadcaseBobaoHttpBiz(Device model){ public static String sendBroadcaseBobaoHttpBiz(Device model,InterfaceLogMapper interfaceLogMapper){ //重新下发计划 JSONObject jsonObject = new JSONObject(); jsonObject.put("command","start"); @@ -298,8 +300,27 @@ log.error("========海康广播播放入参内容 : " + params); String result = HttpsUtil.doPutHk(model.getIp(),Integer.parseInt(StringUtils.defaultString(model.getPort(),"80")),model.getDoorId(), model.getDoorName() ,"/ISAPI/AccessControl/EventCardLinkageCfg/TTSAudio?format=json",params); log.error("========海康广播播放返回内容 : " + result); JSONObject resultJson = JSONObject.parseObject(result); Boolean success = false; if(Constants.equalsInteger(resultJson.getInteger("statusCode"),Constants.ONE)){ success = true; } InterfaceLog log = new InterfaceLog(); log.setCreateDate(new Date()); log.setUrl("/ISAPI/AccessControl/EventCardLinkageCfg/TTSAudio?format=json"); log.setEditDate(log.getCreateDate()); log.setPlat(Constants.ZERO); log.setName("海康广播播放"); log.setIsdeleted(Constants.ZERO); log.setRequest(params); log.setType(Constants.ZERO); log.setSuccess(success?Constants.ZERO:Constants.ONE); log.setRepose(result); interfaceLogMapper.insert(log); return result; } @Override server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkCabinetGridServiceImpl.java
@@ -67,6 +67,9 @@ private DeviceMapper deviceMapper; @Autowired private InterfaceLogMapper interfaceLogMapper; @Autowired private MemberMapper memberMapper; @Autowired @@ -715,9 +718,7 @@ warningEvent.setStatus(Constants.TWO); warningEventMapper.updateById(warningEvent); } } } } } @@ -732,7 +733,7 @@ if(CollectionUtils.isNotEmpty(deviceList)){ for (Device device:deviceList) { device.setSendInfo(warningRule.getDeviceNoticeContent()); DeviceServiceImpl.sendBroadcaseBobaoHttpBiz(device); DeviceServiceImpl.sendBroadcaseBobaoHttpBiz(device,interfaceLogMapper); } } } server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/WarningServiceImpl.java
@@ -315,9 +315,6 @@ model.setSubscribeStatus(Constants.TWO); model.setSubscribeInfo(response.getMsg()); } startCheckThirdDest(eventParam); }else{ model.setSubscribeStatus(Constants.ZERO); } @@ -326,32 +323,6 @@ model.setEditDate(new Date()); model.setEditor(param.getLoginUserInfo().getId()); warningMapper.updateById(model); } /** * 检查三方是否需要订阅海康事件 * @param eventParam */ private void startCheckThirdDest(EventSubRequest eventParam) { try { String thirdpath =systemDictDataBiz.queryByCode(Constants.HK_PARAM, Constants.HK_PUSH_THIRD_URL).getCode(); if(StringUtils.isNotBlank(thirdpath)){ String[] ss = thirdpath.split(";"); for(String s : ss){ eventParam.setEventDest(s); BaseResponse response = HKService.eventSub(eventParam); if(Objects.nonNull(response)&&StringUtils.equals(response.getCode(), HKConstants.RESPONSE_SUCCEE)){ log.error("========订阅其他三方地址成功:"+s); }else{ log.error("========订阅其他三方地址错误:"+s); } } } }catch (Exception e){ log.error("========订阅其他三方地址错误"+e.getMessage()); } }
@@ -506,7 +506,7 @@ if(Objects.nonNull(warningConfig)){ List<Integer> ruleIdList = impl.processWarnFront(warningConfig); Boolean falg = false; Boolean falg = true; if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(ruleIdList)){ for (Integer ruleId:ruleIdList) { WarningRule warningRule = warningRuleMapper.selectById(ruleId); @@ -544,31 +544,21 @@ // dingTalk.getAlarmNoticeMsg(warningPush.getRegion(),DateUtil.getCurrDateTime(),warningConfig.getInfo())); // warningPush.setStatus(noticeFlag?Constants.ONE:Constants.TWO); } warningPushMapper.insert(warningPush); impl.sendDeviceNotice(warningRule); warningPushMapper.insert(warningPush); falg = true; }catch (Exception e){ falg = false; warningEvent.setStatus(Constants.TWO); warningEventMapper.updateById(warningEvent); } } } if(falg){ if(!falg){ warningEvent.setStatus(Constants.ONE); warningEventMapper.updateById(warningEvent); } } } }
