From c0f4b90b5b6a45f044a694b5e3837cabfdcbf3aa Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期三, 07 五月 2025 18:57:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPushServiceImpl.java | 24 +++++++++++++-----------
1 files changed, 13 insertions(+), 11 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 3a0dbe1..18f39cc 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
@@ -239,12 +239,13 @@
record.setCreateDate(DateUtil.getISO8601DateByStr2(request.getHappenTime()));
record.setTimeInfo(Utils.Date.getStart(record.getCreateDate()));
record.setType(Constants.ONE);//浜哄憳
+ record.setDeviceName(request.getSrcName());
record.setMemberType(Constants.RetentionMemberType.fk);//榛樿涓烘湭鐭ヤ汉鍛橈紙璁垮锛�
record.setIsdeleted(Constants.ZERO);
record.setHkEventId(request.getEventId());
record.setHkId(userNo);
if(d!=null && Constants.equalsInteger(d.getIsEntrance(),Constants.ONE)){
- if(Constants.formatIntegerNum(request.getData().getExtEventInOut()) != Constants.ONE){
+ if(Constants.formatIntegerNum(request.getData().getExtEventInOut()) == Constants.ONE){
//濡傛灉鏄繘闂紝褰曞叆浜哄憳鐨勫湪鍦烘暟鎹褰�
record.setInOrOut(Constants.ZERO);
inoutDayCount.setInMemberNum(Constants.formatIntegerNum(inoutDayCount.getInMemberNum())+1);//鍏ュ満浜烘
@@ -567,6 +568,8 @@
//濡傛灉浜哄憳淇℃伅瀛樺湪锛屽垏鏄瀹㈤�氳锛屽垯鍒犻櫎涔嬪墠鐨勬墍鏈夎繘鍦烘暟鎹紙鏃犺姝ゆ鎺ㄩ�佹槸杩涘巶杩樻槸鍑哄満鎺ㄩ�佷簨浠讹級
delRetentionLis.add(visits.getMemberId());
InoutRecord record = new InoutRecord();
+ record.setDeviceName((request.getData()!=null &&request.getData().getParamValues()!=null)?
+ request.getData().getParamValues().getSrcName():request.getSrcName());
record.setCreateDate(DateUtil.getISO8601DateByStr2(request.getHappenTime()));
record.setTimeInfo(Utils.Date.getStart(record.getCreateDate()));
record.setType(Constants.ONE);//浜哄憳
@@ -899,6 +902,7 @@
carrecord.setType(Constants.ZERO);//杞﹁締
carrecord.setIsdeleted(Constants.ZERO);
carrecord.setObjType(Constants.ZERO);
+ carrecord.setDeviceName(request.getData().getGateName()+request.getData().getRoadwayName());//鍋滆溅鍦哄拰鍑哄叆鍙�
carrecord.setHkEventId(request.getEventId());
carrecord.setCarCode(event.getPlateNos());
Cars carModel = carsMapper.selectJoinOne(Cars.class,new MPJLambdaWrapper<Cars>()
@@ -928,7 +932,7 @@
event.setMemberId(carModel.getMemberId());
event.setCompanyId(carModel.getGroupId());
//-----------------20250429鏀归��----start---------------
- event.setCarType(carModel.getBizType());//杞﹁締涓氬姟绫诲瀷
+ event.setCarType(carModel.getBizType()==null?Constants.RetentionCarType.self : carModel.getBizType());//杞﹁締涓氬姟绫诲瀷
carrecord.setObjType(Constants.FOUR);
carrecord.setMemberName(carModel.getMemberName());//鍙告満
carrecord.setMemberPhone(carModel.getMemberPhone());//鍙告満
@@ -1031,7 +1035,7 @@
delRetentionList.add(event.getPlateNos());
delMemberRetentionList.add(event.getMemberId());
inoutDayCount.setOutCarNum(Constants.formatIntegerNum(inoutDayCount.getOutCarNum())+1);
- carrecord.setInOrOut(Constants.ZERO);
+ carrecord.setInOrOut(Constants.ONE);
}
//杞﹁締杩涘叆璁板綍瀵瑰簲涓氬姟绫诲瀷
if(isCarInOrOutEvent(request) &&( event.getCarType() ==null || event.getCarType().equals(Constants.RetentionCarType.other))){
@@ -1124,7 +1128,7 @@
}
//缁熻浠婃棩鍏ュ洯鎬讳汉娆�
inoutDayCount.setInMemberNum(Constants.formatIntegerNum(inoutDayCount.getInMemberNum())+1);
- }else if(carrecord.getMemberId()!=null && Constants.equalsInteger(carrecord.getInOrOut(),Constants.ONE)) {
+ }else if( Constants.equalsInteger(carrecord.getInOrOut(),Constants.ONE)) {
//濡傛灉鏄嚭鍥尯
if(Constants.equalsInteger(carrecord.getMemberType(),Constants.RetentionMemberType.relMember)){
//濡傛灉鏄浉鍏虫柟锛岀粺璁′粖鏃ョ疮璁℃暟
@@ -1137,13 +1141,11 @@
inoutDayCount.setOutMemberNum(Constants.formatIntegerNum(inoutDayCount.getOutMemberNum())+1);
}
}
- if(carrecord.getInOrOut() !=null) {//濡傛灉鏄嚭鍏ヨ褰�
- if(Constants.equalsInteger(carrecord.getCarBizType(),Constants.RetentionCarType.other)){
- carrecord.setCategoryName("鏈煡杞﹁締");//榛樿鏈煡杞﹁締
- carrecord.setCategoryParentName("鏈煡杞﹁締");//榛樿鏈煡杞﹁締
- }
- inoutRecordList.add(carrecord);//褰曞叆杞﹁締浠ュ強鎼哄甫浜哄憳鐨勫叆鍥槑缁嗚褰曪紙闈炶瀹級
+ if(Constants.equalsInteger(carrecord.getCarBizType(),Constants.RetentionCarType.other)){
+ carrecord.setCategoryName("鏈煡杞﹁締");//榛樿鏈煡杞﹁締
+ carrecord.setCategoryParentName("鏈煡杞﹁締");//榛樿鏈煡杞﹁締
}
+ inoutRecordList.add(carrecord);//褰曞叆杞﹁締浠ュ強鎼哄甫浜哄憳鐨勫叆鍥槑缁嗚褰曪紙闈炶瀹級
}
private Category findCategoryByBizType(Integer carType,String tempname, String pName,List<Category> categoryList) {
@@ -1232,7 +1234,6 @@
event.setSrcName(request.getSrcName());
event.setSrcIndex(request.getSrcIndex());
event.setRoadwayType(request.getData().getRoadwayType());
- event.setRoadwayName(request.getData().getRoadwayName());
event.setRoadwayIndex(request.getData().getRoadwayIndex());
event.setPlateType(request.getData().getPlateType());
event.setTimeout(request.getTimeout());
@@ -1245,6 +1246,7 @@
event.setInoutType(request.getData().getInoutType());
event.setHappenTime(request.getHappenTime());
event.setGateName(request.getData().getGateName());
+ event.setRoadwayName(request.getData().getRoadwayName());
event.setGateIndex(request.getData().getGateIndex());
event.setEventType(request.getEventType());
event.setEventIndex(request.getData().getEventIndex());
--
Gitblit v1.9.3