From cd2d3c65b9af62cbafa57a835b237a9f193148f2 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期五, 20 九月 2024 14:22:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPushServiceImpl.java | 46 ++++++++++++++++++++++++++++------------------
1 files changed, 28 insertions(+), 18 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 e9716ec..9816597 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
@@ -7,9 +7,7 @@
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.request.CustomBroadcastRequest;
-import com.doumee.core.haikang.model.param.request.TransparentChannelBodyRequest;
-import com.doumee.core.haikang.model.param.request.TransparentChannelHeadRequest;
+import com.doumee.core.haikang.model.param.request.*;
import com.doumee.core.haikang.model.param.request.event.acs.EventAcsInfoRequest;
import com.doumee.core.haikang.model.param.request.event.acs.EventAcsRequest;
import com.doumee.core.haikang.model.param.request.event.acs.EventDeviceDataRequest;
@@ -390,7 +388,7 @@
MPJLambdaWrapper<Visits> queryWrapper = new MPJLambdaWrapper<>();
queryWrapper.selectAll(Visits.class);
queryWrapper.selectAs(Member::getType,Visits::getMemberType);
- queryWrapper.eq(Visits::getHkId,model.getVisitorInvoices().getInvoicesId() );//璁垮鍗曞彿
+ queryWrapper.eq(Visits::getHkId,model.getVisitorInvoices().getInvoicesNo() );//璁垮鍗曞彿
queryWrapper.leftJoin(Member.class,Member::getId,Visits::getMemberId );
queryWrapper.last("limit 1");
Visits visits = visitsMapper.selectJoinOne(Visits.class,queryWrapper);
@@ -459,9 +457,15 @@
if(request.getData().getTargetPerson() ==null){
request.getData().setTargetPerson(new EventVisitIccmTargetParamRequest());
}
+ if(request.getData().getVisitorInvoices() == null){
+ request.getData().setVisitorInvoices(new EventVisitIccmInvoiceParamRequest());
+ }
VisitEvent event = new VisitEvent();
event.setIsdeleted(Constants.ZERO);
- event.setCreateDate(DateUtil.getISO8601DateByStr(request.getHappenTime()));
+ event.setCreateDate(DateUtil.getISO8601DateByStr2(request.getHappenTime()));
+ if(event.getCreateDate() == null){
+ event.setCreateDate(new Date());
+ }
event.setVisitorWorkUint(detail.getUnit());
event.setVisitorId(detail.getVisitorId());
event.setVisitorCode(detail.getAppointmentCode());
@@ -485,7 +489,7 @@
event.setPhotoUrl(getHkImgUrl(detail.getFacePic()));
event.setPersonName(detail.getVisitorName());
event.setCarNo(detail.getPlateNo());
-
+ event.setInvoicesNo(request.getData().getVisitorInvoices().getInvoicesNo());//璁垮鍗曞彿
event.setIdType(detail.getCertType());
String idnum = detail.getCertNo();
if(StringUtils.isNotBlank(idnum)){
@@ -574,6 +578,7 @@
event.setPhotoUrl(getHkImgUrl(request.getData().getPhotoUrl()));
event.setPersonName(request.getData().getPersonName());
event.setCarNo(request.getData().getCarNo());
+ event.setInvoicesNo(request.getData().getVisitorId());
event.setCaptureUrl(request.getData().getCaptureUrl());
if(StringUtils.isNotBlank(request.getData().getCaptureUrl())){
event.setCaptureUrl(HKConstants.IMG_INDEX+request.getData().getCaptureUrl());
@@ -616,7 +621,6 @@
retention.setMemberId(visits.getMemberId());
// retention.setDeviceName(request.getSrcName());
// retention.setDeviceIndex(request.getSrcIndex());
-
return retention;
}
@@ -1037,24 +1041,30 @@
continue;
}
if(Constants.equalsInteger(device.getType(),Constants.ZERO)){
+
//濡傛灉鏄疞ED
- TransparentChannelBodyRequest request = new TransparentChannelBodyRequest();
+ TransparentChannelBodyRequest body = new TransparentChannelBodyRequest();
TransparentChannelHeadRequest head = new TransparentChannelHeadRequest();
+ TransparentChannelBodyParamRequest request = new TransparentChannelBodyParamRequest();
+ TransparentChannelBodyRegionRequest regions = new TransparentChannelBodyRegionRequest();
head.setAbility("cld");//鍥哄畾鍊�
head.setTreatyType("haixuan_led_net");//鍥哄畾鍊�
head.setDeviceIndexCode(device.getHkId());
- request.setMethod("ControlLedGereral");//鍥哄畾鍊�
+ body.setMethod("ControlLedGereral");//鍥哄畾鍊�
request.setIndexCode(device.getHkId());
- request.setActionType(0);
- request.setContent(content);
request.setOperationType(219);//鍥哄畾鍊�
- request.setRegionNo(1);
- request.setRegionType(14);
- request.setFontColor(1);
- request.setCircleTimes(1);//寰幆娆℃暟
- request.setFontSize(16);//
- request.setStayTime(1);//鍗曚綅锛燂紵
- HKService.transparentchannel(head,request);
+ regions.setActionType(0);
+ regions.setContent(content);
+ regions.setRegionNo(1);
+ regions.setRegionType(14);
+ regions.setFontColor(2);
+ regions.setCircleTimes(1);//寰幆娆℃暟
+ regions.setFontSize(31);//
+ regions.setStayTime(1);//鍗曚綅锛燂紵
+ request.setRegions(new ArrayList<>());
+ request.getRegions().add(regions);
+ body.setParams(request);
+ HKService.transparentchannel(head,body);
}else if(Constants.equalsInteger(device.getType(),Constants.ZERO)){
//濡傛灉鏄箍鎾偣
broadcastList.add(device.getHkId());
--
Gitblit v1.9.3