From 552dcd8d48b4de12046ec90e7e908493b26b4336 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期二, 08 十月 2024 09:48:07 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPushServiceImpl.java | 116 ++++++++++++++++++++++++++++-----------------------------
1 files changed, 57 insertions(+), 59 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPushServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPushServiceImpl.java
index 99b1e0c..c98d012 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPushServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPushServiceImpl.java
@@ -5,8 +5,6 @@
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.doumee.biz.system.SystemDictDataBiz;
import com.doumee.config.DataSyncConfig;
-import com.doumee.config.SpringContextUtil;
-import com.doumee.core.exception.BusinessException;
import com.doumee.core.haikang.model.HKConstants;
import com.doumee.core.haikang.model.param.BaseResponse;
import com.doumee.core.haikang.model.param.request.*;
@@ -22,21 +20,14 @@
import com.doumee.dao.business.*;
import com.doumee.dao.business.join.VisitsJoinMapper;
import com.doumee.dao.business.model.*;
-import com.doumee.dao.system.model.SystemUser;
import com.doumee.dao.web.reqeust.SavePlatformWarnEventDTO;
-import com.doumee.service.business.DeviceEventService;
-import com.doumee.service.business.InterfaceLogService;
-import com.doumee.service.business.MemberService;
import com.doumee.service.business.impl.PlatformWarnEventServiceImpl;
-import com.github.yulichang.interfaces.MPJBaseJoin;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
-import com.hikvision.artemis.sdk.config.ArtemisConfig;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
-import org.yaml.snakeyaml.scanner.Constant;
import javax.servlet.http.HttpServletResponse;
import java.util.ArrayList;
@@ -1066,25 +1057,7 @@
}
if(Constants.equalsInteger(device.getType(),Constants.ZERO)){
//濡傛灉鏄疞ED
- PlatformBroadcastLog log = new PlatformBroadcastLog();
- log.setCreateDate(new Date());
- log.setBizType(Constants.ONE);
- log.setHkDate(new Date());
- log.setObjType(Constants.ONE);
- log.setIds(device.getHkNo());
- log.setRemark(device.getName());
- log.setInfo(content);
- log.setNum(Constants.ONE);
- BaseResponse response = dealLedContentBiz(device.getHkNo(),content,speed,1);
- if(response == null || !StringUtils.equals(response.getCode(), HKConstants.RESPONSE_SUCCEE)){
- log.setHkInfo("璇锋眰澶辫触锛�"+JSONObject.toJSONString(response));
- log.setHkStatus(Constants.THREE);
- }else{
- log.setHkInfo("璇锋眰鎴愬姛");
- log.setHkStatus(Constants.TWO);
- }
- log.setDeviceType(Constants.ONE);
- log.setName("璁剧疆LED灞忔樉鍐呭");
+ PlatformBroadcastLog log = dealLedContentBiz(device.getHkNo(),device.getName(),content,speed,1);
logList.add(log);
ledList.add(device.getHkId());
}else if(Constants.equalsInteger(device.getType(),Constants.ZERO)){
@@ -1093,36 +1066,8 @@
broadcastList.add(device.getHkId());
}
}
-
if(broadcastList.size()>0){
- String content1 =Constants.PlatformBroadcastContent.WRONG_IN.getInfo();
- content1 = content1.replace("${param}",model.getCarCodeFront());
- PlatformBroadcastLog log = new PlatformBroadcastLog();
- log.setCreateDate(new Date());
- log.setBizType(Constants.ONE);
- log.setHkDate(new Date());
- log.setObjType(Constants.ONE);
- log.setInfo(content1);
- log.setRemark(bNames);
- log.setNum(Constants.ONE);
- log.setIds(String.join(",",broadcastList));
- CustomBroadcastRequest request = new CustomBroadcastRequest();
- request.setAudioPointIndexCode(broadcastList);
- request.setPlayDuration(15);//鍗曚綅绉�
- request.setBroadCastMode("tts");
- request.setPriority(1);
- request.setState(1);//鎾斁/鍋滄鏍囪瘑 1-鎾斁锛�0-鍋滄
- request.setPlayTtsContent(content1);
- BaseResponse response = HKService.customBroadcast(request);
- if(response == null || !StringUtils.equals(response.getCode(), HKConstants.RESPONSE_SUCCEE)){
- log.setHkInfo("璇锋眰澶辫触锛�"+JSONObject.toJSONString(response));
- log.setHkStatus(Constants.THREE);
- }else{
- log.setHkInfo("璇锋眰鎴愬姛");
- log.setHkStatus(Constants.TWO);
- }
- log.setDeviceType(Constants.ONE);
- log.setName("鍙戦�佸箍鎾挱鎶ュ唴瀹�");
+ PlatformBroadcastLog log = dealBroadcastBiz(model,broadcastList,bNames);
logList.add(log);
}
if(logList.size()>0){
@@ -1130,7 +1075,50 @@
}
}
- public static BaseResponse dealLedContentBiz(String hkNo, String content,int speed,int color) {
+ private PlatformBroadcastLog dealBroadcastBiz(PlatformJob model, List<String> broadcastList,String bNames) {
+ PlatformBroadcastLog log = new PlatformBroadcastLog();
+ String content1 =Constants.PlatformBroadcastContent.WRONG_IN.getInfo();
+ content1 = content1.replace("${param}",model.getCarCodeFront());
+
+ log.setCreateDate(new Date());
+ log.setBizType(Constants.ONE);
+ log.setHkDate(new Date());
+ log.setObjType(Constants.ONE);
+ log.setInfo(content1);
+ log.setRemark(bNames);
+ log.setNum(Constants.ONE);
+ log.setIds(String.join(",",broadcastList));
+ CustomBroadcastRequest request = new CustomBroadcastRequest();
+ request.setAudioPointIndexCode(broadcastList);
+ request.setPlayDuration(15);//鍗曚綅绉�
+ request.setBroadCastMode("tts");
+ request.setPriority(1);
+ request.setState(1);//鎾斁/鍋滄鏍囪瘑 1-鎾斁锛�0-鍋滄
+ request.setPlayTtsContent(content1);
+ BaseResponse response = HKService.customBroadcast(request);
+ if(response == null || !StringUtils.equals(response.getCode(), HKConstants.RESPONSE_SUCCEE)){
+ log.setHkInfo("璇锋眰澶辫触锛�"+JSONObject.toJSONString(response));
+ log.setHkStatus(Constants.THREE);
+ }else{
+ log.setHkInfo("璇锋眰鎴愬姛");
+ log.setHkStatus(Constants.TWO);
+ }
+ log.setDeviceType(Constants.ONE);
+ log.setName("鍙戦�佸箍鎾挱鎶ュ唴瀹�");
+ return log;
+ }
+
+ public static PlatformBroadcastLog dealLedContentBiz(String hkNo,String hkName, String content,int speed,int color) {
+ PlatformBroadcastLog log = new PlatformBroadcastLog();
+ log.setCreateDate(new Date());
+ log.setBizType(Constants.ONE);
+ log.setHkDate(new Date());
+ log.setObjType(Constants.ONE);
+ log.setIds(hkNo);
+ log.setRemark(hkName);
+ log.setInfo(content);
+ log.setNum(Constants.ONE);
+
TransparentChannelBodyRequest body = new TransparentChannelBodyRequest();
TransparentChannelHeadRequest head = new TransparentChannelHeadRequest();
TransparentChannelBodyParamRequest request = new TransparentChannelBodyParamRequest();
@@ -1157,6 +1145,16 @@
request.getRegions().add(regions);
regions.setSpeed(speed>0?speed:13);
body.setParams(request);
- return HKService.transparentchannel(head,body);
+ BaseResponse response = HKService.transparentchannel(head,body);
+ if(response == null || !StringUtils.equals(response.getCode(), HKConstants.RESPONSE_SUCCEE)){
+ log.setHkInfo("璇锋眰澶辫触锛�"+JSONObject.toJSONString(response));
+ log.setHkStatus(Constants.THREE);
+ }else{
+ log.setHkInfo("璇锋眰鎴愬姛");
+ log.setHkStatus(Constants.TWO);
+ }
+ log.setDeviceType(Constants.ONE);
+ log.setName("璁剧疆LED灞忔樉鍐呭");
+ return log;
}
}
--
Gitblit v1.9.3