From b65171017a7b83620669cf9226397269c249a351 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 30 七月 2024 15:11:34 +0800
Subject: [PATCH] 修复bug
---
admin/src/views/business/cars.vue | 8 +++++---
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/fhk/HkSyncVehicleFromHKServiceImpl.java | 18 +++++++++++-------
admin/vue.config.js | 2 +-
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPushServiceImpl.java | 11 +++++++++--
4 files changed, 26 insertions(+), 13 deletions(-)
diff --git a/admin/src/views/business/cars.vue b/admin/src/views/business/cars.vue
index 29820fb..3dc8e34 100644
--- a/admin/src/views/business/cars.vue
+++ b/admin/src/views/business/cars.vue
@@ -86,9 +86,11 @@
methods: {
// 鍚屾淇℃伅
async syncCars () {
- const message = await sync({})
- this.$message.success(message)
- this.search()
+ sync({}).then(res =>{
+ this.$message.success('瀵煎叆鎴愬姛')
+ this.search()
+ })
+
}
}
}
diff --git a/admin/vue.config.js b/admin/vue.config.js
index 32e4750..69bb9f3 100644
--- a/admin/vue.config.js
+++ b/admin/vue.config.js
@@ -22,7 +22,7 @@
// target: 'http://218.23.218.228:8018/admin_interface',
// http://218.23.218.228:9912/admin_interface
// http://facepay.huasunsolar.com/admin_interface
- target: 'http://localhost/admin_interface ',
+ target: 'http://localhost/admin_interface',
changeOrigin: true,
pathRewrite: {
[`^${[process.env.VUE_APP_API_PREFIX]}`]: ''
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 48571be..dfdd41c 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
@@ -773,11 +773,18 @@
if(StringUtils.isNotBlank(event.getPlateNos())){
ParkBook cars = parkBookMapper.selectOne(new QueryWrapper<ParkBook>().lambda()
.eq(ParkBook::getCarCode,event.getPlateNos())
+ .eq(ParkBook::getParkHkId,event.getParkIndex())
.eq(ParkBook::getIsdeleted,Constants.ZERO )
.last("limit 1" ));
- if(cars!=null){
- event.setMemberId(cars.getMemberId());
+ Cars c = carsMapper.selectOne(new QueryWrapper<Cars>().lambda()
+ .eq(Cars::getCode,event.getPlateNos())
+ .eq(Cars::getIsdeleted,Constants.ZERO)
+ .last("limit 1" ));
+ if(cars!=null || c!=null){
+ //浼樺厛鏌ヨ鍐呴儴杞﹁締淇℃伅
+ event.setMemberId(cars!=null?cars.getMemberId():c.getMemberId());
}else{
+ //鍘昏瀹俊鎭腑鏌ヨ
Visits visits = visitsMapper.selectOne(new QueryWrapper<Visits>().lambda()
.eq(Visits::getCarNos,event.getPlateNos())
.eq(Visits::getIsdeleted,Constants.ZERO )
diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/fhk/HkSyncVehicleFromHKServiceImpl.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/fhk/HkSyncVehicleFromHKServiceImpl.java
index 14a4c4d..4050407 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/fhk/HkSyncVehicleFromHKServiceImpl.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/fhk/HkSyncVehicleFromHKServiceImpl.java
@@ -154,7 +154,6 @@
}
private void dealUpdateByList(List<VehicleTimeRangeInfoResponse> list) {
- List<Cars> newList = new ArrayList<>();
if(list == null || list.size()==0){
return ;
}
@@ -177,17 +176,21 @@
c.setEditDate(DateUtil.getISO8601DateByStr(model.getUpdateTime()));
if(StringUtils.isNotBlank(model.getPersonId())){
//琚闂汉
- Member member = memberMapper.selectOne(new QueryWrapper<Member>().lambda().eq(Member::getHkId,model.getPersonId()).last("limit 1"));
+ Member member = memberMapper.selectOne(new QueryWrapper<Member>().lambda()
+ .eq(Member::getHkId,model.getPersonId())
+ .last("limit 1"));
c.setMemberId(member!=null?member.getId():null);
if(member!=null){
carEventMapper.update(null,new UpdateWrapper<CarEvent>().lambda()
.set(CarEvent::getMemberId,member.getId())
.eq(CarEvent::getPlateNos,c.getCode())
- .apply("member_id is null or member_id=''")
+ .apply("(member_id is null or member_id='')")
);
}
}
- Cars cars = carsMapper.selectOne(new QueryWrapper<Cars>().lambda().eq(Cars::getHkId,model.getVehicleId()).last("limit 1"));
+ Cars cars = carsMapper.selectOne(new QueryWrapper<Cars>().lambda()
+ .eq(Cars::getHkId,model.getVehicleId())
+ .last("limit 1"));
if(cars!=null){
//鏇存柊
c.setId(cars.getId());
@@ -196,7 +199,6 @@
//鏂板
carsMapper.insert(c);
}
-
}
}
@@ -220,13 +222,15 @@
c.setEditDate(DateUtil.getISO8601DateByStr(model.getUpdateTime()));
if(StringUtils.isNotBlank(model.getPersonId())){
//琚闂汉
- Member member = memberMapper.selectOne(new QueryWrapper<Member>().lambda().eq(Member::getHkId,model.getPersonId()).last("limit 1"));
+ Member member = memberMapper.selectOne(new QueryWrapper<Member>().lambda()
+ .eq(Member::getHkId,model.getPersonId())
+ .last("limit 1"));
c.setMemberId(member!=null?member.getId():null);
if(member!=null){
carEventMapper.update(null,new UpdateWrapper<CarEvent>().lambda()
.set(CarEvent::getMemberId,member.getId())
.eq(CarEvent::getPlateNos,c.getCode())
- .apply("member_id is null or member_id=''")
+ .apply("(member_id is null or member_id='')")
);
}
}
--
Gitblit v1.9.3