From 275aa50b1de31ace0cb17fdf0b6f678a63267b3c Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期一, 20 十月 2025 10:14:01 +0800
Subject: [PATCH] 最新版本541200007
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncEmpowerServiceImpl.java | 52 +++++++++++++++++++++++++---------------------------
1 files changed, 25 insertions(+), 27 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 e374a31..550868e 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,17 +16,16 @@
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;
import java.util.ArrayList;
import java.util.Date;
@@ -57,6 +55,7 @@
*/
@Override
public Integer syncEmpowerDetailData(Integer endId){
+ log.error("");
// if(Constants.DEALING_HK_EMPOWER_DETAIL){
// return ;
// }
@@ -83,7 +82,7 @@
//鏌ヨ涓嬪彂鐘舵��
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
@@ -200,7 +199,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);
@@ -435,7 +434,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();
@@ -524,21 +528,7 @@
}
}
- public class TaskRuner implements Runnable{
- private List<Empower> list ;
- @Override
- public void run() {
- dealNewListTask(list);
- }
-
- public List<Empower> getList() {
- return list;
- }
-
- public void setList(List<Empower> list) {
- this.list = list;
- }
- }
+ @Transactional(rollbackFor = {BusinessException.class,Exception.class})
private void dealAllListTask(List<Empower> list) {
//鎸夌収鐖剁骇鐢宠鍒嗘壒澶勭悊姣忔鐢宠鏁版嵁
if(list ==null || list.size()==0){
@@ -555,10 +545,18 @@
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)){
//濡傛灉浜哄摗鎴栬�呰ō鍌欏垹闄わ紝鍙栨秷涓嬪彂
+ cacenList.add(c);
+ continue;
+ }
+ if(Constants.equalsInteger(c.getMemberDeleted(),Constants.ONE)
+ && Constants.equalsInteger(c.getMemberHkStatus(),Constants.ONE)
+ && Constants.equalsInteger(c.getIsdeleted(),Constants.ZERO)){
+ //濡傛灉浜哄憳宸茬鑱岋紝鏂板鎺堟潈鏃犻渶涓嬪彂锛屽彇娑堜笅鍙�
cacenList.add(c);
continue;
}
@@ -571,7 +569,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())){
@@ -794,8 +792,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