From e23a1db0b60437f17d09d65c65f8fd0c8a5d88c7 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 26 八月 2024 18:11:07 +0800
Subject: [PATCH] 最新版本
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncEmpowerServiceImpl.java | 26 ++++++++++----------------
1 files changed, 10 insertions(+), 16 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..cf669bf 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 ;
// }
@@ -524,21 +526,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){
@@ -562,6 +550,12 @@
cacenList.add(c);
continue;
}
+ if(Constants.equalsInteger(c.getMemberDeleted(),Constants.ONE)
+ && Constants.equalsInteger(c.getIsdeleted(),1)){
+ //濡傛灉浜哄憳宸茬鑱岋紝鏂板鎺堟潈鏃犻渶涓嬪彂锛屽彇娑堜笅鍙�
+ cacenList.add(c);
+ continue;
+ }
if(c.getDeviceOnline() !=null && Constants.equalsInteger(c.getDeviceOnline(),0)){
waitList.add(c);
continue;
@@ -571,7 +565,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())){
--
Gitblit v1.9.3