test

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/DealSyncOperationApiServiceImpl.java

@@ -813,7 +813,7 @@ public class DealSyncOperationApiServiceImpl implements DealSyncOperationApiServ
     public void taskStatusTimer(String params) {
         try {
             RSet<String> set = RedisUtil.getRedisClient().getSet(PreDealServiceImpl.HAOBAN_TASK_ID_SET_CACHE);
-            logger.info("好办任务状态开始={}",set);
+            logger.info("好办任务状态开始={},{}",set.size(),set);
             Iterator<String> it = set.iterator() ;
             while(it.hasNext()) {
                 String taskId = it.next();
@@ -846,7 +846,7 @@ public class DealSyncOperationApiServiceImpl implements DealSyncOperationApiServ
     public void staffTaskStatusTimer(String params) {
         try {
             RSet<String> set = RedisUtil.getRedisClient().getSet(PreDealServiceImpl.HAOBAN_TASK_STAFF_ID_SET_CACHE);
-            logger.info("好办任务状态开始staff={}",set);
+            logger.info("好办任务状态开始staff={},{}",set.size(),set);
             Iterator<String> it = set.iterator() ;
             while(it.hasNext()) {
                 String v = it.next() ;
@@ -893,11 +893,11 @@ public class DealSyncOperationApiServiceImpl implements DealSyncOperationApiServ
     }
 
     private boolean updateStaffTaskStatus(String taskId ,String stffId , int type) {
+        boolean b = preDealService.checkFriendTaskByPDataId(taskId, stffId, type);
+        if (!b) {
+            return false;
+        }
         if(type == 7) {
-            boolean b = preDealService.checkFriendTaskByPDataId(taskId, stffId, PreDealTypeEnum.self_friend.getVal());
-            if (!b) {
-                return false;
-            }
             logger.info("代开发完成,开始第三方好友：{},{}", taskId, stffId);
             String key = "haoban_sync_self_friend_task_" + taskId + ":" + stffId;
             String lockKey = "haoban_sync_self_friend_task_lock_" + taskId + ":" + stffId;
@@ -910,7 +910,7 @@ public class DealSyncOperationApiServiceImpl implements DealSyncOperationApiServ
             RedisUtil.setCache(key, stffId, 30L, TimeUnit.SECONDS);
             List<String> dataIds = preDealService.listReDataIdByPDataId(taskId, stffId, PreDealTypeEnum.friend.getVal());
             if (CollectionUtils.isEmpty(dataIds)) {
-                logger.info("无第三方的数据");
+                logger.info("无第三方的数据/自建");
                 preDealService.updateStatusByDataId(taskId, stffId, PreDealTypeEnum.friend_clerk.getVal(), PreDealStatusEnum.computed.getVal(), "成功");
             } else {
                 dealDepartmentToMq(taskId, new HashSet<>(dataIds), SyncTaskStatusEnum.friend_sync);
@@ -918,10 +918,6 @@ public class DealSyncOperationApiServiceImpl implements DealSyncOperationApiServ
             RedisUtil.unlock(lockKey);
         }
         if(type == 8) {
-            boolean b = preDealService.checkFriendTaskByPDataId(taskId, stffId, PreDealTypeEnum.friend.getVal());
-            if (!b) {
-                return false ;
-            }
             String staffLockKey = DealSyncOperationApiServiceImpl.FRIEND_LOCK + stffId;
             RedisUtil.delCache(staffLockKey);
             logger.info("第三方好友结束：{},{},{}", taskId, stffId,staffLockKey);