From 1dd0a2bb164658031c5e2db4f215424b86dcd0b5 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期四, 13 十一月 2025 14:49:02 +0800
Subject: [PATCH] 最新版本541200007
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncEmpowerServiceImpl.java | 83 ++++++++++++++++++++++++++++++-----------
1 files changed, 61 insertions(+), 22 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncEmpowerServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncEmpowerServiceImpl.java
index 1ba7e34..267814e 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncEmpowerServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncEmpowerServiceImpl.java
@@ -4,7 +4,6 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.doumee.biz.system.SystemDictDataBiz;
-import com.doumee.core.constants.ResponseStatus;
import com.doumee.core.exception.BusinessException;
import com.doumee.core.haikang.model.HKConstants;
import com.doumee.core.haikang.model.HKResponseCode;
@@ -17,16 +16,14 @@
import com.doumee.core.utils.DateUtil;
import com.doumee.dao.business.DeviceMapper;
import com.doumee.dao.business.MemberCardMapper;
-import com.doumee.dao.business.MemberMapper;
+import com.doumee.dao.business.dao.MemberMapper;
import com.doumee.dao.business.join.EmpowerJoinMapper;
-import com.doumee.dao.business.join.VisitsJoinMapper;
import com.doumee.dao.business.model.*;
+import com.doumee.dao.business.model.Member;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.scheduling.annotation.Async;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -73,7 +70,13 @@
public void run() {
try {
for(Empower c : list){
- TaskPersonDetailRequest param = new TaskPersonDetailRequest();
+ AuthResultPageRequest param = new AuthResultPageRequest();
+ param.setPageNo(1);
+ param.setPageSize(999);
+ param.setBusinessNo(c.getHkId());
+ BaseResponse<AuthResultPageResponse> response =HKService.authResultPage(param);
+
+ /* TaskPersonDetailRequest param = new TaskPersonDetailRequest();
param.setPageNo(1);
param.setPageSize(10);
param.setPersonIds(new String[]{c.getMemberHkId()});
@@ -83,22 +86,24 @@
rec.setResourceType(c.getDeviceType());
param.setResourceInfo(rec);
//鏌ヨ涓嬪彂鐘舵��
- BaseResponse<TaskPersonDetailListResponse> response = HKService.taskPersoDetail(param);
+ BaseResponse<TaskPersonDetailListResponse> response = HKService.taskPersoDetail(param);*/
if(response!=null
- && StringUtils.equals(response.getCode(),HKConstants.RESPONSE_SUCCEE)
+ && StringUtils.equals(response.getCode(), HKConstants.RESPONSE_SUCCEE)
&& response.getData()!=null
&& response.getData().getList() != null
&& response.getData().getList().size() > 0
&&response.getData().getList().get(0) !=null){
- TaskPersonDetailResponse model = response.getData().getList().get(0);
- if (model.getPersonDownloadDetail()!=null ) {
+// TaskPersonDetailResponse model = response.getData().getList().get(0);
+
+ AuthResultPageDetailResponse model = getAuthDetailByUserAndDevice(c,response.getData().getList());
+// if (model.getPersonDownloadDetail()!=null ) {
+ if (model!=null ) {
boolean isface = false;//鏄惁浜鸿劯涓嬪彂鎴愬姛
boolean iscard = false;//鏄惁鏈夊崱鐗囦笅鍙戞垚鍔�
//鏇存柊宸插畬鎴愪笅杞戒换鍔�
String remark = "";
String cardInfo ="";
- TaskPersonDetailCardFaceResponse d = model.getPersonDownloadDetail();
- if (d.getCards() != null && d.getCards().size() > 0) {
+ /* if (d.getCards() != null && d.getCards().size() > 0) {
for (TaskPersonDetailCardInfoResponse card : d.getCards()) {
if(StringUtils.equals(card.getErrorCode(),HKResponseCode.ReturnCode.RESPONSE_SUCCEE.getKey())){
cardInfo += card.getId() + " ";
@@ -141,13 +146,31 @@
}
}
//濡傛灉杩斿洖涓嬪彂鎴愬姛 鎴栬�� 浜鸿劯涓嬪彂鎴愬姛骞朵笖鍗＄墖涓嬪彂鎴愬姛
- boolean isSuccess =StringUtils.equals(model.getPersondownloadResult(), "0") || (iscard&&isface);
+ boolean isSuccess =StringUtils.equals(model.getPersondownloadResult(), "0") || (iscard&&isface);*/
+
+ if (Constants.equalsInteger(model.getDownCardStatus(),0)) {
+ cardInfo = "鍗＄墖涓嬪彂鏈彉鏇�";
+ }else if (!Constants.equalsInteger(model.getDownCardStatus(),1)) {
+ cardInfo = "鍗＄墖涓嬪彂鎴愬姛";
+ }else {
+ cardInfo = "鍗＄墖涓嬪彂澶辫触";
+ }
+
+ if ( Constants.equalsInteger(model.getDownFaceStatus(),0)) {
+ remark = "浜鸿劯涓哄彉鏇达紒";
+ } else if (!Constants.equalsInteger(model.getDownFaceStatus(),1)) {
+ remark = "浜鸿劯涓嬪彂鎴愬姛锛�";
+ }else{
+ remark = "浜鸿劯涓嬪彂澶辫触锛�";
+ }
+ //涓嬪彂鎴愬姛鎴栬�呮湭鍙樻洿
+ boolean isSuccess = Constants.equalsInteger(model.getDownPersonStatus(),1)|| Constants.equalsInteger(model.getDownPersonStatus(),0) ;
empowerMapper.update(null, new UpdateWrapper<Empower>()
.lambda()
.eq(Empower::getId, c.getId())
- .set(Empower::getRemark, remark)
+ .set(Empower::getRemark,cardInfo+ remark)
.set(Empower::getEditDate,new Date())
- .set(Empower::getSendInfo, remark)
+ .set(Empower::getSendInfo,cardInfo+remark)
.set(Empower::getSendStatus, isSuccess?Constants.EmpowerStatus.pass:Constants.EmpowerStatus.fail));
if(isSuccess && Constants.equalsInteger(c.getMemberDeleted(), Constants.ONE)&& Constants.equalsInteger(c.getIsdeleted(), Constants.ONE) ){
//濡傛灉鏄垹闄ゆ潈闄愭垚鍔燂紝妫�鏌ユ槸鍚﹀垹闄や汉鍛�
@@ -187,6 +210,15 @@
}
+ private AuthResultPageDetailResponse getAuthDetailByUserAndDevice(Empower c, List<AuthResultPageDetailResponse> list) {
+ for(AuthResultPageDetailResponse t : list){
+ if(StringUtils.equals(t.getPersonId(),c.getMemberHkId()) && StringUtils.equals(t.getDeviceIndexCode(),c.getDeviceIndexCode())){
+ return t;
+ }
+ }
+ return null;
+ }
+
/**
* 瀵规捣搴峰垹闄ょ粍缁囦俊鎭�
@@ -202,7 +234,7 @@
request.setPersonIds(new String[]{delHkIds});
BaseResponse<List<UserDelResponse>> result = HKService.delBatchUser(request);
boolean succes = false;
- if(result !=null && StringUtils.equals(result.getCode(),HKConstants.RESPONSE_SUCCEE)){
+ if(result !=null && StringUtils.equals(result.getCode(), HKConstants.RESPONSE_SUCCEE)){
//鏍囪鍒犻櫎鎴愬姛鐨勬暟鎹紙娴峰悍瀵规帴鐘舵�佷负宸插悓姝ワ紝锛屽悓姝ュけ璐ョ殑浠嶄负寰呭悓姝ワ紝绛変笅涓�娆＄户缁鐞嗭紝鐭ラ亾鍏ㄩ儴鍒犻櫎瀹屾瘯锛�
if(result.getData()!=null && result.getData().size()>0){
UserDelResponse tem = result.getData().get(0);
@@ -437,7 +469,12 @@
Thread t1=new Thread(new Runnable() {
@Override
public void run() {
- dealAllListTask(allList);
+ try {
+ dealAllListTask(allList);
+ }catch (Exception e){
+ log.info("======================涓嬪彂鎺堟潈寮傚父锛�"+e.getMessage());
+ e.printStackTrace();
+ }
}
});
t1.start();
@@ -543,7 +580,8 @@
List<Empower> faceErrorList = new ArrayList<>();
for(Empower c : list) {
//鍚戜换鍔℃坊鍔犱汉鍛樸�佽澶囦俊鎭暟鎹�
- if((Constants.equalsInteger(c.getMemberDeleted(),Constants.ONE) &&
+ if((Constants.equalsInteger(c.getIsdeleted(),Constants.ZERO) &&
+ Constants.equalsInteger(c.getMemberDeleted(),Constants.ONE) &&
Constants.equalsInteger(c.getMemberHkStatus(),Constants.ONE))
|| Constants.equalsInteger(c.getDeviceDeleted(),1)){
//濡傛灉浜哄摗鎴栬�呰ō鍌欏垹闄わ紝鍙栨秷涓嬪彂
@@ -551,7 +589,8 @@
continue;
}
if(Constants.equalsInteger(c.getMemberDeleted(),Constants.ONE)
- && Constants.equalsInteger(c.getIsdeleted(),1)){
+ && Constants.equalsInteger(c.getMemberHkStatus(),Constants.ONE)
+ && Constants.equalsInteger(c.getIsdeleted(),Constants.ZERO)){
//濡傛灉浜哄憳宸茬鑱岋紝鏂板鎺堟潈鏃犻渶涓嬪彂锛屽彇娑堜笅鍙�
cacenList.add(c);
continue;
@@ -565,7 +604,7 @@
continue;
}
HKConstants.OPERA_TYPE flag = HKConstants.OPERA_TYPE.ADD;
- if(Constants.equalsObject(c.getIsdeleted(),Constants.ONE)){
+ if(Constants.equalsInteger(c.getIsdeleted(),Constants.ONE)){
flag = HKConstants.OPERA_TYPE.DEL;
}
if(addTaskData(c,taskId,flag.getKey())){
@@ -788,8 +827,8 @@
queryWrapper.selectAs(Device::getChannelNo,Empower::getDeviceChannelNo);
queryWrapper.selectAs(Member::getHkId,Empower::getMemberHkId);
queryWrapper.selectAs(Member::getFaceStatus,Empower::getMemberFaceStatus);
- queryWrapper.selectAs(Member::getHkStatus,Empower::getMemberFaceStatus);
- queryWrapper.selectAs(Device::getOnline,Empower::getMemberHkStatus);
+ queryWrapper.selectAs(Member::getHkStatus,Empower::getMemberHkStatus);
+ queryWrapper.selectAs(Device::getOnline,Empower::getDeviceOnline);
queryWrapper.selectAs(Device::getIsdeleted,Empower::getDeviceDeleted);
queryWrapper.selectAs(Member::getIsdeleted,Empower::getMemberDeleted);
queryWrapper.selectAs(Device::getHkId,Empower::getDeviceIndexCode);
--
Gitblit v1.9.3