From cd2d3c65b9af62cbafa57a835b237a9f193148f2 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期五, 20 九月 2024 14:22:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncEmpowerServiceImpl.java | 38 +++++++++++++++++++-------------------
1 files changed, 19 insertions(+), 19 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 cc23ef9..cfaa688 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
@@ -28,6 +28,7 @@
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 +58,7 @@
*/
@Override
public Integer syncEmpowerDetailData(Integer endId){
+ log.error("");
// if(Constants.DEALING_HK_EMPOWER_DETAIL){
// return ;
// }
@@ -435,7 +437,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 +531,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 +548,16 @@
List<Empower> faceErrorList = new ArrayList<>();
for(Empower c : list) {
//鍚戜换鍔℃坊鍔犱汉鍛樸�佽澶囦俊鎭暟鎹�
- if((Constants.equalsInteger(c.getMemberDeleted(),1) &&
+ if((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.getIsdeleted(),1)){
+ //濡傛灉浜哄憳宸茬鑱岋紝鏂板鎺堟潈鏃犻渶涓嬪彂锛屽彇娑堜笅鍙�
cacenList.add(c);
continue;
}
@@ -571,7 +570,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,7 +793,8 @@
queryWrapper.selectAs(Device::getChannelNo,Empower::getDeviceChannelNo);
queryWrapper.selectAs(Member::getHkId,Empower::getMemberHkId);
queryWrapper.selectAs(Member::getFaceStatus,Empower::getMemberFaceStatus);
- queryWrapper.selectAs(Device::getOnline,Empower::getDeviceOnline);
+ queryWrapper.selectAs(Member::getHkStatus,Empower::getMemberFaceStatus);
+ queryWrapper.selectAs(Device::getOnline,Empower::getMemberHkStatus);
queryWrapper.selectAs(Device::getIsdeleted,Empower::getDeviceDeleted);
queryWrapper.selectAs(Member::getIsdeleted,Empower::getMemberDeleted);
queryWrapper.selectAs(Device::getHkId,Empower::getDeviceIndexCode);
--
Gitblit v1.9.3