From 01c13248f347b4bc7091fb70ba92d03676abaa8b Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期日, 29 九月 2024 11:30:32 +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 | 29 ++++++++++++++++++++++-------
1 files changed, 22 insertions(+), 7 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 9816597..1b26bdc 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
@@ -21,9 +21,11 @@
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;
@@ -82,6 +84,8 @@
private PlatformEventMapper platformEventMapper;
@Autowired
private PlatformLogMapper platformLogMapper;
+ @Autowired
+ private PlatformWarnEventServiceImpl platformWarnEventService;
/**
* 娴峰悍闂ㄧ浜嬩欢鎺ㄩ��
* @param param
@@ -1007,6 +1011,7 @@
.orderByDesc(PlatformLog::getCreateDate)
.last(" limit 1"));
String v = Long.toString(job.getDoneDate().getTime() - lastBeginPlatform.getCreateDate().getTime() / 1000) ;
+ lastBeginPlatform.setRemark(job.getPlatformId().toString());
lastBeginPlatform.setParam3(v);
lastBeginPlatform.setParam2(DateUtil.getDate(lastBeginPlatform.getCreateDate(),"yyyy-MM-dd HH:mm:ss"));
platformLogMapper.updateById(lastBeginPlatform);//鏇存柊涓婁竴娆′綔涓氱殑瀹屾垚鏃堕棿鍜屼綔涓氭椂闀�
@@ -1026,7 +1031,13 @@
* @param status
*/
private void dealCarsInErrorPlatformBiz( PlatformJob model,EventPlatformCarsStatusInfoRequest status) {
- //TODO-----------------澶勭悊杞﹁締杩涘叆閿欒鏈堝彴涓氬姟閫昏緫
+ //澶勭悊杞﹁締杩涘叆閿欒鏈堝彴涓氬姟閫昏緫
+ SavePlatformWarnEventDTO savePlatformWarnEventDTO = new SavePlatformWarnEventDTO();
+ savePlatformWarnEventDTO.setPlatformJobId(model.getId());
+ savePlatformWarnEventDTO.setPlatformId(model.getPlatformId());
+ savePlatformWarnEventDTO.setCarCode(model.getCarCodeFront());
+ savePlatformWarnEventDTO.setEventType(Constants.PlatformWarnEvent.STOP_ERROR.getKey());
+ platformWarnEventService.savePlatformWarnEvent(savePlatformWarnEventDTO);
List<PlatformDevice> deviceList = platformDeviceMapper.selectList(new QueryWrapper<PlatformDevice>().lambda()
.eq(PlatformDevice::getPlatformId,model.getPlatformId())
@@ -1041,7 +1052,6 @@
continue;
}
if(Constants.equalsInteger(device.getType(),Constants.ZERO)){
-
//濡傛灉鏄疞ED
TransparentChannelBodyRequest body = new TransparentChannelBodyRequest();
TransparentChannelHeadRequest head = new TransparentChannelHeadRequest();
@@ -1053,16 +1063,21 @@
body.setMethod("ControlLedGereral");//鍥哄畾鍊�
request.setIndexCode(device.getHkId());
request.setOperationType(219);//鍥哄畾鍊�
- regions.setActionType(0);
+ regions.setActionType(32);
regions.setContent(content);
regions.setRegionNo(1);
regions.setRegionType(14);
- regions.setFontColor(2);
+ regions.setFontColor(1);
regions.setCircleTimes(1);//寰幆娆℃暟
- regions.setFontSize(31);//
+ regions.setFontSize(32);//
regions.setStayTime(1);//鍗曚綅锛燂紵
+ regions.setRegionLeftTopXPos(0);
+ regions.setRegionLeftTopYPos(0);
+ regions.setRegionRightBottomXPos(255);
+ regions.setRegionRightBottomYPos(31);
request.setRegions(new ArrayList<>());
request.getRegions().add(regions);
+ regions.setSpeed(13);
body.setParams(request);
HKService.transparentchannel(head,body);
}else if(Constants.equalsInteger(device.getType(),Constants.ZERO)){
@@ -1073,9 +1088,9 @@
if(broadcastList.size()>0){
CustomBroadcastRequest request = new CustomBroadcastRequest();
request.setAudioPointIndexCode(broadcastList);
- request.setPlayDuration(60);//鍗曚綅绉�
+ request.setPlayDuration(15);//鍗曚綅绉�
request.setBroadCastMode("tts");
- request.setPriority(15);
+ request.setPriority(1);
request.setState(1);//鎾斁/鍋滄鏍囪瘑 1-鎾斁锛�0-鍋滄
request.setPlayTtsContent(content);
HKService.customBroadcast(request);
--
Gitblit v1.9.3