From 51e18e190dafdec70dc1f4a3a9ecd76fb2116726 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期六, 12 十月 2024 16:25:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPushServiceImpl.java | 9 +++++----
1 files changed, 5 insertions(+), 4 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 d9cf7a7..0047699 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
@@ -1086,7 +1086,7 @@
}
if(Constants.equalsInteger(device.getType(),Constants.ZERO)){
//濡傛灉鏄疞ED
- PlatformBroadcastLog log = dealLedContentBiz(device.getHkNo(),device.getName(),content,speed,1);
+ PlatformBroadcastLog log = dealLedContentBiz(model.getId(),device.getHkNo(),device.getName(),content,speed,1);
logList.add(log);
ledList.add(device.getHkId());
}else if(Constants.equalsInteger(device.getType(),Constants.TWO)){
@@ -1115,7 +1115,7 @@
public static PlatformBroadcastLog dealBroadcastBiz(PlatformJob model, List<String> broadcastList,String bNames , String content1) {
PlatformBroadcastLog log = new PlatformBroadcastLog();
content1 = content1.replace("${param}",model.getCarCodeFront());
-
+ log.setObjId(model.getId().toString());
log.setCreateDate(new Date());
log.setBizType(Constants.ONE);
log.setHkDate(new Date());
@@ -1139,12 +1139,12 @@
log.setHkInfo("璇锋眰鎴愬姛");
log.setHkStatus(Constants.TWO);
}
- log.setDeviceType(Constants.ONE);
+ log.setDeviceType(Constants.ZERO);
log.setName("鍙戦�佸箍鎾挱鎶ュ唴瀹�");
return log;
}
- public static PlatformBroadcastLog dealLedContentBiz(String hkNo,String hkName, String content,int speed,int color) {
+ public static PlatformBroadcastLog dealLedContentBiz(Integer platformId,String hkNo,String hkName, String content,int speed,int color) {
PlatformBroadcastLog log = new PlatformBroadcastLog();
log.setCreateDate(new Date());
log.setBizType(Constants.ONE);
@@ -1154,6 +1154,7 @@
log.setRemark(hkName);
log.setInfo(content);
log.setNum(Constants.ONE);
+ log.setObjId(platformId.toString());
TransparentChannelBodyRequest body = new TransparentChannelBodyRequest();
TransparentChannelHeadRequest head = new TransparentChannelHeadRequest();
--
Gitblit v1.9.3