Merge branch 'feature/2022-0104' into developer

# Conflicts:
#	haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/ExternalClerkRelatedApiServiceImpl.java

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/enums/AlertTypeEnum.java

@@ -8,7 +8,9 @@ public enum AlertTypeEnum {
     QUNFA_MESSAGE(2, "企微群发", null),
     FRIEND_ADD(3, "企微好友添加", null),
     CLOUD_STORE_CHANGE(4, "观云台门店进回收站", null),
-    ES_BID_PAGE(5, "es查询存在大分页", "https://oapi.dingtalk.com/robot/send?access_token=04b381d2b95816d28ed37c73d300537cbd2e67dc6670258ab85a6b3ef227d3b3"),;
+    ES_BID_PAGE(5, "es查询存在大分页", "https://oapi.dingtalk.com/robot/send?access_token=04b381d2b95816d28ed37c73d300537cbd2e67dc6670258ab85a6b3ef227d3b3"),
+    GET_NEW_EXTERNAL_USERID(1, "转换外部联系人id", null),
+    ;
     private Integer type;
     private String name;
     private String dingUrl;

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

@@ -6,14 +6,15 @@ import com.gic.api.base.commons.Page;
 import com.gic.commons.util.EntityUtil;
 import com.gic.commons.util.GICMQClientUtil;
 import com.gic.commons.util.UniqueIdUtils;
+import com.gic.dubbo.entity.ProviderLocalTag;
 import com.gic.haoban.app.customer.enums.GicQywxSyncTypeEnum;
 import com.gic.haoban.app.customer.enums.QywxSyncTaskTypeEnum;
 import com.gic.haoban.base.api.common.BasePageInfo;
 import com.gic.haoban.base.api.common.ServiceResponse;
 import com.gic.haoban.common.utils.PageUtil;
-import com.gic.haoban.manage.api.dto.ClerkStaffWxUserDTO;
-import com.gic.haoban.manage.api.dto.ExternalClerkRelatedDTO;
-import com.gic.haoban.manage.api.dto.ExternalClerkRelatedShortInfoDTO;
+import com.gic.haoban.manage.api.dto.*;
+import com.gic.haoban.manage.api.enums.AlertTypeEnum;
+import com.gic.haoban.manage.api.service.CheckQywxSettingApiService;
 import com.gic.haoban.manage.api.service.ExternalClerkRelatedApiService;
 import com.gic.haoban.manage.service.config.Config;
 import com.gic.haoban.manage.service.dao.mapper.*;
@@ -60,6 +61,8 @@ public class ExternalClerkRelatedApiServiceImpl implements ExternalClerkRelatedA
     private Config config;
     @Autowired
     private ExternalUseridLogMapper externalUseridLogMapper;
+    @Autowired
+    private CheckQywxSettingApiService checkQywxSettingApiService;
 
     /**
      * 查询导购好友关联
@@ -397,6 +400,7 @@ public class ExternalClerkRelatedApiServiceImpl implements ExternalClerkRelatedA
      */
     private void updateNewExUserId(String wxEnterpriseId, String corpid) {
         wxEnterriseMapper.updateExternalFlagById(2, wxEnterpriseId);
+        messageAlert(wxEnterpriseId,"更新新的外部联系人id");
         // 限流器
         RRateLimiter rateLimiter = RedisUtil.getRedisClient().getRateLimiter("haoban:manage3:updateNewExUserId:limit");
         // 每1秒产生5个令牌
@@ -451,6 +455,25 @@ public class ExternalClerkRelatedApiServiceImpl implements ExternalClerkRelatedA
     }
 
 
+    /**
+     * 消息提醒
+     * 告警
+     *
+     * @param wxEnterpriseId wx企业标识
+     * @param titleSub       子标题
+     */
+    private void messageAlert(String wxEnterpriseId,String titleSub) {
+        ProviderLocalTag providerLocalTag = ProviderLocalTag.tag.get();
+        String traceId = providerLocalTag.traceId;
+        AlertMessageDTO messageDTO = new AlertMessageDTO();
+        messageDTO.setTraceId(traceId);
+        messageDTO.setWxEnterpriseId(wxEnterpriseId);
+        messageDTO.setAlertTitle(titleSub);
+        messageDTO.setAlertType(AlertTypeEnum.GET_NEW_EXTERNAL_USERID.getType());
+        checkQywxSettingApiService.alertCallback(JSONObject.toJSONString(messageDTO));
+    }
+
+
     @Override
     public int countFriendCountByClerkId(String wxEnterpriseId, String enterpriseId, String wxUserId, String clerkId) {
         return tabHaobanExternalClerkRelatedMapper.countByClerkId(wxEnterpriseId, enterpriseId, wxUserId, clerkId);