log

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

@@ -99,37 +99,34 @@ public class DealSyncOperationApiServiceImpl implements DealSyncOperationApiServ
 
     @Override
     public void departmentDealMq(String params) {
-        logger.info("部门同步处理mq处理中:{}", params);
         DealParamMqDTO dealParamMqDTO = JSONObject.parseObject(params, DealParamMqDTO.class);
         TabHaobanPreDealLog dataPre = preDealService.getByDataId(dealParamMqDTO.getTaskId(), dealParamMqDTO.getData(), dealParamMqDTO.getType() - 1, PreDealStatusEnum.all.getVal());
+        logger.info("好办同步处理mq处理开始:{}，dataPre={}", params,JSON.toJSONString(dataPre));
         if (dataPre == null) {
-            logger.info("待处理数据不存在:{}", params);
             return;
         }
-        logger.info("dataPre：{}", JSON.toJSONString(dataPre));
         Integer dataType = dataPre.getDataType();
         logger.info("同步类型,dataType:{}",dataType);
         if (dataType.equals(PreDealTypeEnum.dept.getVal())) {
-            //部门处理
+            logger.info("0 部门处理：{}", params);
             operationMap.get("qywxDeptSyncOperation").dealSingleByMq(dealParamMqDTO, dataPre);
         } else if (dataType.equals(PreDealTypeEnum.clerk.getVal())) {
-            //成员处理
-            logger.info("成员处理：{}", params);
+            logger.info("2 成员处理：{}", params);
             operationMap.get("qywxStaffSyncOperation").dealSingleByMq(dealParamMqDTO, dataPre);
         } else if (dataType.equals(PreDealTypeEnum.friend_clerk.getVal())) {
-            logger.info("好友导购处理：{}", params);
+            logger.info("6 好友导购处理：{}", params);
             operationMap.get("friendClerkSyncNewOperation").dealSingleByMq(dealParamMqDTO, dataPre);
         } else if (dataType.equals(PreDealTypeEnum.friend.getVal())) {
-            logger.info("第三方好友处理：{}", params);
+            logger.info("8 第三方好友处理：{}", params);
             operationMap.get("friendSyncNewOperation").dealSingleByMq(dealParamMqDTO, dataPre);
         } else if (dataType.equals(PreDealTypeEnum.self_friend.getVal())) {
-            logger.info("自建好友处理：{}", params);
+            logger.info("7 自建好友处理：{}", params);
             operationMap.get("selfFriendSyncNewOperation").dealSingleByMq(dealParamMqDTO, dataPre);
         } else if (dataType.equals(PreDealTypeEnum.tag.getVal())) {
-            logger.info("会员标签处理：{}", params);
+            logger.info("10 会员标签处理：{}", params);
             operationMap.get("friendTagSyncOperation").dealSingleByMq(dealParamMqDTO, dataPre);
         } else if (dataType.equals(PreDealTypeEnum.tag_member.getVal())) {
-            logger.info("会员标签处理标签项：{}", params);
+            logger.info("11 会员标签处理标签项：{}", params);
             operationMap.get("friendMemberTagSyncOperation").dealSingleByMq(dealParamMqDTO, dataPre);
         } else {
             logger.info("不是正常数据类型:{}", params);

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

@@ -1450,7 +1450,7 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
     @Override
     public List<String> listSelfExterialList(String wxEnterpriseId, String wxUserId) {
         try {
-            log.info("【查询自建应用好友】wxEnterpriseId={},wxUserId={}", wxEnterpriseId, wxUserId);
+            log.info("【查询代开应用好友】wxEnterpriseId={},wxUserId={}", wxEnterpriseId, wxUserId);
             WxEnterpriseQwDTO qwDTO = this.wxEnterpriseService.getQwInfo(wxEnterpriseId);
             List<String> list = new ArrayList<>();
             SecretSettingDTO secretSetting = secretSettingService.getSecretSetting(wxEnterpriseId, SecretTypeEnum.CUSTOMIZED_APP.getVal());

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/task/friend/FriendClerkSyncNewOperation.java

 package com.gic.haoban.manage.service.task.friend;
 
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+import java.util.concurrent.TimeUnit;
+import java.util.stream.Collectors;
+
+import org.apache.commons.collections.CollectionUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.gic.commons.util.GICMQClientUtil;
@@ -9,23 +21,14 @@ import com.gic.haoban.manage.api.enums.PreDealTypeEnum;
 import com.gic.haoban.manage.api.enums.SyncTaskStatusEnum;
 import com.gic.haoban.manage.api.service.MemberUnionidRelatedApiService;
 import com.gic.haoban.manage.service.entity.TabHaobanPreDealLog;
+import com.gic.haoban.manage.service.entity.TabHaobanStaff;
 import com.gic.haoban.manage.service.entity.TabHaobanSyncTask;
 import com.gic.haoban.manage.service.service.PreDealService;
+import com.gic.haoban.manage.service.service.StaffService;
 import com.gic.haoban.manage.service.service.SyncTaskService;
 import com.gic.haoban.manage.service.task.BaseSyncOperation;
 import com.gic.mq.sdk.GicMQClient;
 import com.gic.redis.data.util.RedisUtil;
-import org.apache.commons.collections.CollectionUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-import java.util.concurrent.TimeUnit;
-import java.util.stream.Collectors;
 
 /**
  * 微信好友
@@ -40,6 +43,8 @@ public class FriendClerkSyncNewOperation implements BaseSyncOperation {
     private MemberUnionidRelatedApiService memberUnionidRelatedApiService;
     @Autowired
     private SyncTaskService syncTaskService;
+    @Autowired
+    private StaffService staffService ;
 
     private static final String FRIEND_LOCK = "haoban_fresh_wx_friend_lock_";
 
@@ -53,7 +58,8 @@ public class FriendClerkSyncNewOperation implements BaseSyncOperation {
         try {
             String wxEnterpriseId = dataPre.getWxEnterpriseId();
             String wxUserId = dataPre.getDataId();
-
+            TabHaobanStaff staff = this.staffService.selectByUserIdAndEnterpriseId(wxUserId, wxEnterpriseId) ;
+            //
             //获取所有外部联系人的外部联系人ids
             List<String> selfUserIdList = memberUnionidRelatedApiService.listSelfExterialList(wxEnterpriseId, wxUserId);
             logger.info("selfUserIdList={}", JSONObject.toJSONString(selfUserIdList));

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/task/friend/FriendSyncNewOperation.java

@@ -74,7 +74,7 @@ public class FriendSyncNewOperation implements BaseSyncOperation {
 
     @Override
     public void dealSingleByMq(DealParamMqDTO dealParamMqDTO, TabHaobanPreDealLog dataPre) {
-        logger.info("第三方好友合并：{}", JSONObject.toJSONString(dataPre));
+        logger.info("同步好友开始,第三方={}", JSONObject.toJSONString(dataPre));
         String reason = "成功";
         boolean dealFlag = true;
         String relationKey = "-1";

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/task/friend/SelfFriendSyncNewOperation.java

 package com.gic.haoban.manage.service.task.friend;
 
 import cn.hutool.crypto.SecureUtil;
+
+import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
+import com.esotericsoftware.minlog.Log;
 import com.gic.commons.util.GICMQClientUtil;
 import com.gic.haoban.manage.api.dto.DealParamMqDTO;
 import com.gic.haoban.manage.api.dto.ExternalUserDTO;
@@ -52,7 +55,7 @@ public class SelfFriendSyncNewOperation implements BaseSyncOperation {
 
     @Override
     public void dealSingleByMq(DealParamMqDTO dealParamMqDTO, TabHaobanPreDealLog dataPre) {
-        logger.info("自建好友处理：{}", JSONObject.toJSONString(dataPre));
+        logger.info("同步好友开始,自建代开发={}", JSONObject.toJSONString(dataPre));
         String reason = "成功";
         boolean dealFlag = true;
         try {
@@ -154,6 +157,7 @@ public class SelfFriendSyncNewOperation implements BaseSyncOperation {
         //校验是否都已经处理完成
         boolean b = preDealService.checkFriendTaskByPDataId(taskId, pDataId, PreDealTypeEnum.self_friend.getVal());
         if (!b) {
+            logger.info("校验直接返回");
             return;
         }
         logger.info("同步第三方服务商好友开始：{},{}", taskId, pDataId);
@@ -203,6 +207,7 @@ public class SelfFriendSyncNewOperation implements BaseSyncOperation {
 
         GicMQClient clientInstance = GICMQClientUtil.getClientInstance();
         try {
+            Log.info("发送队列SelfFriendSyncNewOperation={}",JSON.toJSONString(ret));
             clientInstance.sendBatchMessages("departmentSyncDealMq", ret);
         } catch (Exception e) {
             logger.info("发送失败:{},{}", taskId);