From eaf4587b47701f3df0559e64362d6ea413d782f3 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期五, 11 十月 2024 10:41:49 +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/PlatformJobServiceImpl.java | 52 +++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 41 insertions(+), 11 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformJobServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformJobServiceImpl.java
index 5957712..6341d06 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformJobServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformJobServiceImpl.java
@@ -1035,47 +1035,67 @@
);
//骞挎挱 led閫氱煡
- this.broadcastAndLEed(platformJob,Constants.PlatformBroadcastContent.CALLING.getInfo().replace("{param2}",platform.getName()));
+ platformJob.setPlatformName(platform.getName());
+ this.broadcastAndLEed(platformJob,Constants.PlatformLedContent.CALLING.getInfo(),
+ Constants.PlatformBroadcastContent.CALLING.getInfo()
+ );
return platformJob;
}
- public void broadcastAndLEed(PlatformJob model,String content){
+ public void broadcastAndLEed(PlatformJob model,String ledContent,String broadcastContent){
int speed = 13;
try {
speed = Integer.parseInt(systemDictDataBiz.queryByCode(Constants.HK_PARAM,Constants.LED_CONTENT_SPEED).getCode());
}catch (Exception e){
}
+ log.error("鏌ヨLED涓庡箍鎾暟鎹�------------------------------------------------------------------------------------------");
List<PlatformDevice> deviceList = platformDeviceMapper.selectList(new QueryWrapper<PlatformDevice>().lambda()
.eq(PlatformDevice::getPlatformId,model.getPlatformId())
.eq(PlatformDevice::getIsdeleted,Constants.ZERO));
if(deviceList ==null || deviceList.size() == 0){
return;
}
- content = content.replace("${param}",model.getPlatformName());
- content = content.replace("${param2}",model.getCarCodeFront());
+
+ Boolean sendLed = StringUtils.isBlank(ledContent)?false:true;
+ Boolean sendBroadcast = StringUtils.isBlank(broadcastContent)?false:true;
+
+ if (sendLed) {
+ //骞挎挱 param2 = 杞︾墝鍙� param = 鏈堝彴
+ ledContent = ledContent.replace("${param}",model.getPlatformName());
+ ledContent = ledContent.replace("${param2}",model.getCarCodeFront());
+ }
+ if(sendBroadcast){
+ //骞挎挱 param2 = 鏈堝彴 param = 杞︾墝鍙�
+ broadcastContent = broadcastContent.replace("${param2}",model.getPlatformName());
+ broadcastContent = broadcastContent.replace("${param}",model.getCarCodeFront());
+ }
+
List<String> broadcastList = new ArrayList<>();
List<String> ledList = new ArrayList<>();
String bNames = "";
List<PlatformBroadcastLog> logList = new ArrayList<>();
+ log.error("寰幆璋冭捣led涓庡箍鎾�------------------------------------------------------------------------------------------");
for(PlatformDevice device : deviceList){
- if(StringUtils.isNotBlank(device.getHkId())){
+ if(StringUtils.isBlank(device.getHkId())){
continue;
}
- if(Constants.equalsInteger(device.getType(),Constants.ZERO)){
+ if(Constants.equalsInteger(device.getType(),Constants.ZERO)&&sendLed){
+ log.error("璋冭捣led------------------------------------------------------------------------------------------");
//濡傛灉鏄疞ED
- PlatformBroadcastLog log = HkSyncPushServiceImpl.dealLedContentBiz(device.getHkNo(),device.getName(),content,speed,1);
+ PlatformBroadcastLog log = HkSyncPushServiceImpl.dealLedContentBiz(device.getHkNo(),device.getName(),ledContent,speed,1);
logList.add(log);
ledList.add(device.getHkId());
- }else if(Constants.equalsInteger(device.getType(),Constants.ZERO)){
+ }else if(Constants.equalsInteger(device.getType(),Constants.TWO)&&sendBroadcast){
+ log.error("璋冭捣骞挎挱------------------------------------------------------------------------------------------");
//濡傛灉鏄箍鎾偣
bNames += device.getName()+";";
broadcastList.add(device.getHkId());
}
}
if(broadcastList.size()>0){
- PlatformBroadcastLog log = HkSyncPushServiceImpl.dealBroadcastBiz(model,broadcastList,bNames,Constants.PlatformBroadcastContent.WRONG_IN.getInfo());
+ PlatformBroadcastLog log = HkSyncPushServiceImpl.dealBroadcastBiz(model,broadcastList,bNames,broadcastContent);
logList.add(log);
}
if(logList.size()>0){
@@ -1261,7 +1281,13 @@
emayService,smsEmailMapper,smsConfigMapper,platformJobMapper,platformJob.getId(),
SmsConstants.platformJobContent.platformJobWorking,platform.getName(),null
);
-
+
+ //骞挎挱 led閫氱煡
+ platformJob.setPlatformName(platform.getName());
+ this.broadcastAndLEed(platformJob,Constants.PlatformLedContent.WORKING.getInfo(),
+ null
+ );
+
return platformJob;
}
@@ -1317,7 +1343,9 @@
);
//骞挎挱 led閫氱煡
- this.broadcastAndLEed(platformJob,Constants.PlatformBroadcastContent.DONE.getInfo());
+ platformJob.setPlatformName(platform.getName());
+ this.broadcastAndLEed(platformJob,null,
+ Constants.PlatformBroadcastContent.DONE.getInfo());
return platformJob;
}
@@ -1875,6 +1903,8 @@
);
if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(platformJobList)){
for (PlatformJob platformJob:platformJobList) {
+ //杞︾墝鍙疯劚鏁�
+ platformJob.setCarCodeFront(Constants.carCodeTuominStr(platformJob.getCarCodeFront()));
if(Constants.equalsInteger(platformJob.getStatus(),Constants.PlatformJobStatus.WORKING.getKey())){
//璁＄畻宸蹭綔涓氭椂闀� 鏍规嵁鏈堝彴宸ヤ綔鏁堢巼 璁＄畻浠诲姟閲忛渶瑕佹椂闂�
if(Objects.isNull(platformJob.getWorkNum()) || Objects.isNull(platformJob.getWorkRate())){
--
Gitblit v1.9.3