From 1c20c8231980a8d4b91688ff8641a06d3b2f68ab Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期二, 14 十月 2025 16:34:22 +0800
Subject: [PATCH] 改bug
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPushServiceImpl.java | 45 ++++++++++++++++++++++++++-------------------
1 files changed, 26 insertions(+), 19 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 617c8fd..525300d 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
@@ -560,8 +560,11 @@
updateVistis.setOutInfo("璁垮姝ｅ父绛剧");
}
delRetentionLis.add(visits.getMemberId());
- }else{
- //濡傛灉浜哄憳淇℃伅瀛樺湪锛屽垏鏄瀹㈤�氳锛屽垯鍒犻櫎涔嬪墠鐨勬墍鏈夎繘鍦烘暟鎹紙鏃犺姝ゆ鎺ㄩ�佹槸杩涘巶杩樻槸鍑哄満鎺ㄩ�佷簨浠讹級
+ }else if(!(request.getData().getParamValues()!=null
+ && StringUtils.isNotBlank(request.getData().getParamValues().getPlateNos())
+ && StringUtils.isNotBlank(request.getData().getParamValues().getParkIndex()))){
+ //鍙鐞嗚瀹㈤棬绂侀�氳閫氳锛�
+ //濡傛灉浜哄憳淇℃伅瀛樺湪锛屽垯鍒犻櫎涔嬪墠鐨勬墍鏈夎繘鍦烘暟鎹紙鏃犺姝ゆ鎺ㄩ�佹槸杩涘巶杩樻槸鍑哄満鎺ㄩ�佷簨浠讹級
delRetentionLis.add(visits.getMemberId());
InoutRecord record = new InoutRecord();
record.setDeviceName((request.getData()!=null &&request.getData().getParamValues()!=null)?
@@ -603,23 +606,23 @@
}
if( request.getData().getParamValues()!=null
&& StringUtils.isNotBlank(request.getData().getParamValues().getPlateNos())
- && StringUtils.isNotBlank(request.getData().getParamValues().getParkIndex())){
+ && StringUtils.isNotBlank(request.getData().getParamValues().getParkIndex())) {
//濡傛灉鏄仠杞﹀満浜嬩欢锛岃褰曡溅杈嗙被鍨�
Category category = null;
record.setCarCode(request.getData().getParamValues().getPlateNos());
- if(StringUtils.isNotBlank(record.getCarCode())){
+ if (StringUtils.isNotBlank(record.getCarCode())) {
category = categoryMapper.selectJoinOne(Category.class, new MPJLambdaWrapper<Category>()
.selectAll(Category.class)
- .select("t4.name",Category::getParentName)
+ .select("t4.name", Category::getParentName)
.leftJoin("category t4 on t.parent_id=t4.id")
- .eq(Category::getIsdeleted,Constants.ZERO)
- .eq(Category::getBizType,Constants.RetentionCarType.fkCar)
+ .eq(Category::getIsdeleted, Constants.ZERO)
+ .eq(Category::getBizType, Constants.RetentionCarType.fkCar)
.last("limit 1"));
- if(category ==null){
+ if (category == null) {
category = new Category();
category.setName("璁垮杞﹁締");
}
- category.setParentName(StringUtils.defaultString(category.getParentName(),"璁垮杞﹁締"));
+ category.setParentName(StringUtils.defaultString(category.getParentName(), "璁垮杞﹁締"));
}
record.setCarBizType(Constants.RetentionCarType.fkCar);
record.setCategoryId(category.getId());
@@ -627,17 +630,17 @@
record.setCategoryName(category.getName());
record.setCategoryParentId(category.getParentId());
record.setCategoryParentName(category.getParentName());
- if(Constants.equalsInteger(record.getInOrOut(),Constants.ONE)){
+ if (Constants.equalsInteger(record.getInOrOut(), Constants.ONE)) {
record.setRemark("璁垮璺熼殢杞﹁締绂诲洯骞惰嚜鍔ㄧ绂�");
try {
//璁垮鐢宠鑷姩绛剧
visitsService.visitLevelForCarOut(visits);
- }catch (Exception e){
- log.error("璁垮璺熼殢杞﹁締鍑哄洯鑷姩绛剧澶辫触锛�==========="+e.getMessage());
+ } catch (Exception e) {
+ log.error("璁垮璺熼殢杞﹁締鍑哄洯鑷姩绛剧澶辫触锛�===========" + e.getMessage());
}
}
}
- inoutRecordList.add(record);
+ inoutRecordList.add(record);//杩涘嚭璁板綍
}
updateVistis.setEditDate(new Date());
//鏇存柊璁垮鏉ヨ鎴栬�呯绂绘椂闂翠俊鎭�
@@ -863,7 +866,9 @@
String result = null;
log.info("銆愭捣搴峰仠杞﹀満浜嬩欢鎺ㄩ�併��========寮�濮�=========锛歕n"+JSONObject.toJSONString(param));
try {
- if(param == null || param.getParams() == null || param.getParams().getEvents()==null){
+ if(param == null
+ || param.getParams() == null
+ || param.getParams().getEvents()==null){
return null;
}
//闂ㄧ浜嬩欢闆嗗悎
@@ -1079,9 +1084,9 @@
carrecord.setCategoryParentId(category.getParentId());
}
}
- //澶勭悊鑷湁杞﹁嚜鍔ㄧ鍒颁笟鍔�
- dealSelTruckAutoSignBiz(request,event);
if(Constants.formatIntegerNum(request.getEventType()) == HKConstants.EventTypes.PARK_PASS_IN.getKey()){
+ //澶勭悊鑷湁杞﹁嚜鍔ㄧ鍒颁笟鍔�
+ dealSelTruckAutoSignBiz(request,event);
//濡傛灉鏄叆鍘傛斁琛�
delRetentionList.add(event.getPlateNos());
Retention dm = new Retention();
@@ -1126,7 +1131,7 @@
carrecord.setCategoryParentName(StringUtils.defaultString(category.getParentName(),"璁垮杞﹁締"));
carrecord.setCategoryParentId(category.getParentId());
for(Visits v :visitsList){
- if(v.getEndtime()!=null && v.getEndtime().getTime() < System.currentTimeMillis()){
+// if(v.getEndtime()!=null && v.getEndtime().getTime() < System.currentTimeMillis()){
Retention dm = new Retention();
dm.setMemberId(event.getMemberId());
dm.setPhone(carrecord.getMemberPhone());
@@ -1163,7 +1168,7 @@
inoutDayCount.setInVisitorNum(Constants.formatIntegerNum(inoutDayCount.getInVisitorNum())+1);
}
}
- }
+// }
}
}
if(isCarInOrOutEvent(request) && event.getCarType() !=null && !event.getCarType().equals(Constants.RetentionCarType.fkCar)){
@@ -1235,7 +1240,7 @@
Category category = new Category();
category.setName(tempname);
category.setParentName(pName);
- return null;
+ return category;
}
private void dealSelTruckAutoSignBiz(EventParkInfoRequest request, CarEvent event) {
@@ -1259,8 +1264,10 @@
.in(PlatformJob::getStatus,
Constants.PlatformJobStatus.IN_WAIT.getKey(),
Constants.PlatformJobStatus.CALLED.getKey(),
+ Constants.PlatformJobStatus.WAIT_CALL.getKey(),
Constants.PlatformJobStatus.WORKING.getKey(),
Constants.PlatformJobStatus.TRANSFERING.getKey(),
+ Constants.PlatformJobStatus.OVER_NUMBER.getKey(),
Constants.PlatformJobStatus.EXCEPTION.getKey()
)
)==Constants.ZERO){//濡傛灉娌¤繘琛屼腑浠诲姟
--
Gitblit v1.9.3