会员标签同步-告警

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/AlertMessageDTO.java

@@ -21,7 +21,6 @@ public class AlertMessageDTO implements Serializable {
     private String alertTitle;
     private Map<String, Object> contentMap;
 
-    private LinkedHashMap<String, Object> contentLinkMap;
 
     public String getKey() {
         return key;
@@ -79,11 +78,4 @@ public class AlertMessageDTO implements Serializable {
         this.contentMap = contentMap;
     }
 
-    public LinkedHashMap<String, Object> getContentLinkMap() {
-        return contentLinkMap;
-    }
-
-    public void setContentLinkMap(LinkedHashMap<String, Object> contentLinkMap) {
-        this.contentLinkMap = contentLinkMap;
-    }
 }

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

@@ -847,14 +847,14 @@ public class QywxTagApiServiceImpl implements QywxTagApiService {
 
                 List<TabQywxTagRelation> qywxTagRelations = tagRelations.stream().filter(dto -> dto.getRelationType() == QywxTagRelationTypeEnum.TAG_GROUP.getType()).collect(Collectors.toList());
                 for (TabQywxTagRelation qywxTagRelation : qywxTagRelations) {
-                    LinkedHashMap<String, Object> map = checkQywxSyncByQywxTag(qywxTagRelation, wxEnterprise, pojo);
+                    Map<String, Object> map = checkQywxSyncByQywxTag(qywxTagRelation, wxEnterprise, pojo);
                     if (MapUtils.isNotEmpty(map)) {
                         AlertMessageDTO messageDTO = new AlertMessageDTO();
                         messageDTO.setAlertTitle("企微与好办同步标签不相同");
                         messageDTO.setEnterpriseId(qywxTagRelation.getEnterpriseId());
                         messageDTO.setAlertType(AlertTypeEnum.QYWX_TAG_SYNC.getType());
                         messageDTO.setWxEnterpriseId(wxEnterprise.getWxEnterpriseId());
-                        messageDTO.setContentLinkMap(map);
+                        messageDTO.setContentMap(map);
                         messageDTO.setTraceId(traceId);
                         GicMQClient clientInstance = GICMQClientUtil.getClientInstance();
                         try {
@@ -940,8 +940,8 @@ public class QywxTagApiServiceImpl implements QywxTagApiService {
         //企业微信存在 gic不存在
         Sets.SetView<String> gicUnHaves = Sets.difference(qywxKeysSet, gicQywxKeysSet);
 
-        ret.put("企微标签项", tagItems.stream().filter(dto -> dto.isDeleted() == false).map(dto -> dto.getName()).collect(Collectors.joining("],[", "[", "]")));
-        ret.put("gic标签项", gicTagItems.stream().map(dto -> dto.getTagItemName()).collect(Collectors.joining("],[", "[", "]")));
+        ret.put("现企微标签项", tagItems.stream().filter(dto -> dto.isDeleted() == false).map(dto -> dto.getName()).collect(Collectors.joining("],[", "[", "]")));
+        ret.put("现gic标签项", gicTagItems.stream().map(dto -> dto.getTagItemName()).collect(Collectors.joining("],[", "[", "]")));
 
         //企业微信缺少
         if (!CollectionUtils.isEmpty(qywxUnHaves)) {