From 720c137ef8bb03b84ca8a8444a39642762ab29fc Mon Sep 17 00:00:00 2001
From: nidapeng <jp@doumee.com>
Date: 星期五, 22 三月 2024 10:46:26 +0800
Subject: [PATCH] 整理
---
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncEmpowerServiceImpl.java | 2 ++
server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Empower.java | 6 ++++++
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPushServiceImpl.java | 2 +-
3 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Empower.java b/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Empower.java
index 232b0ea..d628089 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Empower.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Empower.java
@@ -158,5 +158,11 @@
@ApiModelProperty(value = "浜哄憳娴峰悍缂栫爜")
@TableField(exist = false)
private String memberHkId;
+ @ApiModelProperty(value = "浜哄憳娴峰悍鍚屾鐘舵�� ")
+ @TableField(exist = false)
+ private Integer memberHkStatus;
+ @ApiModelProperty(value = "浜哄憳鏄惁鍒犻櫎 0鍚� 1鏄�")
+ @TableField(exist = false)
+ private Integer memberDeleted;
}
diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncEmpowerServiceImpl.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncEmpowerServiceImpl.java
index 0ce7b6a..d9c6ddd 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncEmpowerServiceImpl.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncEmpowerServiceImpl.java
@@ -635,6 +635,8 @@
MPJLambdaWrapper<Empower> queryWrapper = new MPJLambdaWrapper<>();
queryWrapper.selectAll(Empower.class);
queryWrapper.selectAs(Device::getChannelNo,Empower::getDeviceChannelNo);
+ queryWrapper.selectAs(Member::getHkStatus,Empower::getMemberHkStatus);
+ queryWrapper.selectAs(Member::getIsdeleted,Empower::getMemberDeleted);
queryWrapper.selectAs(Member::getHkId,Empower::getMemberHkId);
queryWrapper.selectAs(Device::getHkId,Empower::getDeviceIndexCode);
queryWrapper.selectAs(Device::getResourceType,Empower::getDeviceType);
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..987b0de 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
@@ -543,7 +543,7 @@
if(StringUtils.isNotBlank(event.getPlateNos())){
ParkBook cars = parkBookMapper.selectOne(new QueryWrapper<ParkBook>().lambda()
.eq(ParkBook::getCarCode,event.getPlateNos())
- .eq(ParkBook::getIsdeleted,Constants.ONE )
+ .eq(ParkBook::getIsdeleted,Constants.ZERO )
.last("limit 1" ));
if(cars!=null){
event.setMemberId(cars.getMemberId());
--
Gitblit v1.9.3