From 0ad53b755fb839f3275940530229d4705824e7e0 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 10 七月 2024 14:16:35 +0800
Subject: [PATCH] 修复bug
---
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPushServiceImpl.java | 59 +++++++++++++++++++++++++++++++++++++++--------------------
1 files changed, 39 insertions(+), 20 deletions(-)
diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPushServiceImpl.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPushServiceImpl.java
index b39bf07..128d9b6 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPushServiceImpl.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPushServiceImpl.java
@@ -115,7 +115,7 @@
}catch (Exception e) {
log.error("銆愭捣搴烽棬绂佷簨浠舵帹閫併��========澶辫触=======锛歕n" + e.getMessage());
}finally {
- saveInterfaceLog(param,"/business/hksync/push/acs",result);
+ saveInterfaceLog(param,"/business/hksync/push/acs",result,false);//涓嶈鏃ュ織
}
return null;
@@ -306,7 +306,7 @@
log.error("銆愭捣搴疯瀹簨浠舵帹閫併��========澶辫触=======锛歕n"+e.getMessage());
}
- saveInterfaceLog(param,"/business/hksync/push/visit",result);
+ saveInterfaceLog(param,"/business/hksync/push/visit",result,true);
return null;
}
@@ -478,7 +478,7 @@
log.error("銆愭捣搴峰仠杞﹀満浜嬩欢鎺ㄩ�併��========澶辫触=======锛歕n"+e.getMessage());
}
- saveInterfaceLog(param,"/business/hksync/push/parks",result);
+ saveInterfaceLog(param,"/business/hksync/push/parks",result,false);
return null;
}
@@ -541,14 +541,25 @@
event.setPlatePicUrl(getHkImgUrl(request.getData().getPicUrl().getPlatePicUrl()));
}
if(StringUtils.isNotBlank(event.getPlateNos())){
- ParkBook cars = parkBookMapper.selectOne(new QueryWrapper<ParkBook>().lambda()
- .eq(ParkBook::getCarCode,event.getPlateNos())
- .eq(ParkBook::getIsdeleted,Constants.ONE )
+ ParkBook cars = parkBookMapper.selectOne(new QueryWrapper<ParkBook>().lambda()
+ .eq(ParkBook::getCarCode,event.getPlateNos())
+ .eq(ParkBook::getIsdeleted,Constants.ZERO )
+ .last("limit 1" ));
+ if(cars!=null){
+ event.setMemberId(cars.getMemberId());
+ }else{
+ Visits visits = visitsMapper.selectOne(new QueryWrapper<Visits>().lambda()
+ .eq(Visits::getCarNos,event.getPlateNos())
+ .eq(Visits::getIsdeleted,Constants.ZERO )
+ .in(Visits::getStatus,Constants.VisitStatus.signin,Constants.VisitStatus.signout)//鏈�杩戜竴涓凡鍒拌揪鎴栬�呭凡绛剧
+ .isNull(Visits::getParentId)
+ .orderByDesc(Visits::getId)
.last("limit 1" ));
- if(cars!=null){
- event.setMemberId(cars.getMemberId());
+ if(visits!=null){
+ //鏈�杩戜娇鐢ㄨ杞︾殑鐢宠浜猴紙宸插埌杈撅級
+ event.setMemberId(visits.getMemberId());
}
-
+ }
if(Constants.formatIntegerNum(request.getEventType()) == HKConstants.EventTypes.PARK_PASS_IN.getKey()){
//濡傛灉鏄叆鍘傛斁琛�
delRetentionList.add(event.getPlateNos());
@@ -575,18 +586,26 @@
return retention;
}
- private void saveInterfaceLog(Object param, String path,String result) {
- InterfaceLog hkMonitoryLogDO=new InterfaceLog();
- hkMonitoryLogDO.setType(1);
- hkMonitoryLogDO.setCreateDate(new Date());
- hkMonitoryLogDO.setIsdeleted(0);
- if(param!=null){
- hkMonitoryLogDO.setRequest(JSONObject.toJSONString(param));
+ private void saveInterfaceLog(Object param, String path,String result,boolean need) {
+ if(!need){
+ return;
}
- hkMonitoryLogDO.setRepose(result);
- hkMonitoryLogDO.setName(path);
- hkMonitoryLogDO.setUrl(path);
- interfaceLogMapper.insert(hkMonitoryLogDO);
+ try {
+ InterfaceLog hkMonitoryLogDO=new InterfaceLog();
+ hkMonitoryLogDO.setType(1);
+ hkMonitoryLogDO.setCreateDate(new Date());
+ hkMonitoryLogDO.setIsdeleted(0);
+ if(param!=null){
+ hkMonitoryLogDO.setRequest(JSONObject.toJSONString(param));
+ }
+ hkMonitoryLogDO.setRepose(result);
+ hkMonitoryLogDO.setName(path);
+ hkMonitoryLogDO.setUrl(path);
+ interfaceLogMapper.insert(hkMonitoryLogDO);
+ }catch (Exception e){
+
+ }
+
}
--
Gitblit v1.9.3