Merge branch 'feature/xgh/202506迭代' into 'developer'

群活码

See merge request !3037

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/hm/HmLinkChatService.java

@@ -21,7 +21,7 @@ public interface HmLinkChatService {
 
     public List<HmLinkChatDTO> listByLinkId(String wxEnterpriseId, String enterpriseId, Long linkId);
 
-    public int save(Long linkId, List<HmLinkChatDTO> list , Long otherHmId , TabHmLink link);
+    public int save(String wxEnterpriseId,String enterpriseId,Long linkId, List<HmLinkChatDTO> list , Long otherHmId , TabHmLink link);
 
     public Page<HmLinkChatDTO> listPage(HmLinkChatQDTO qdto, BasePageInfo basePageInfo);
 

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/hm/impl/HmLinkChatServiceImpl.java

@@ -46,48 +46,45 @@ public class HmLinkChatServiceImpl implements HmLinkChatService {
     }
 
     @Override
-    public int save(Long linkId, List<HmLinkChatDTO> list, Long otherHmId, TabHmLink link) {
+    public int save(String wxEnterpriseId,String enterpriseId,Long linkId, List<HmLinkChatDTO> list, Long otherHmId, TabHmLink oldLink) {
         log.info("保存群链接={}", JSON.toJSONString(list));
-        List<HmLinkChatDTO> updateList = list.stream().filter(dto -> null != dto.getLinkChatId())
-                .collect(Collectors.toList());
-        List<Long> notDelIdList = updateList.stream().map(dto -> dto.getLinkChatId()).collect(Collectors.toList());
-        log.info("不删除关联群活码={},{}", linkId, notDelIdList);
-        String wxEnterpriseId = list.get(0).getWxEnterpriseId();
-        String enterpriseId = list.get(0).getEnterpriseId();
-        // 先查出历史记录
-        List<HmLinkChatDTO> oldList = this.hmLinkChatMapper.listByLinkId(wxEnterpriseId, enterpriseId, linkId);
-        this.hmLinkChatMapper.delete(linkId, notDelIdList , 0);
-        if (CollectionUtils.isNotEmpty(updateList)) {
-            for (HmLinkChatDTO item : updateList) {
-                TabHmLinkChat entity = EntityUtil.changeEntityByJSON(TabHmLinkChat.class, item);
-                this.hmLinkChatMapper.update(entity);
-                if (item.getMemberType() == 0) {
-                    screeningDetailService.save(HmLinkChatService.ES_ID + entity.getLinkChatId(), item.getSearchJson());
+        List<HmLinkChatDTO> oldList = this.hmLinkChatMapper.listByLinkId(wxEnterpriseId, enterpriseId, linkId) ;
+        if(CollectionUtils.isNotEmpty(list)) {
+            List<HmLinkChatDTO> updateList = list.stream().filter(dto -> null != dto.getLinkChatId()).collect(Collectors.toList());
+            List<Long> notDelIdList = updateList.stream().map(dto -> dto.getLinkChatId()).collect(Collectors.toList());
+            log.info("不删除关联群活码={},{}", linkId, notDelIdList);
+            this.hmLinkChatMapper.delete(linkId, notDelIdList , 0);
+            if (CollectionUtils.isNotEmpty(updateList)) {
+                for (HmLinkChatDTO item : updateList) {
+                    TabHmLinkChat entity = EntityUtil.changeEntityByJSON(TabHmLinkChat.class, item);
+                    this.hmLinkChatMapper.update(entity);
+                    if (item.getMemberType() == 0) {
+                        screeningDetailService.save(HmLinkChatService.ES_ID + entity.getLinkChatId(), item.getSearchJson());
+                    }
                 }
             }
-        }
-        List<HmLinkChatDTO> addList = list.stream().filter(dto -> null == dto.getLinkChatId())
-                .collect(Collectors.toList());
-        if (CollectionUtils.isNotEmpty(addList)) {
-            for (HmLinkChatDTO dto : addList) {
-                TabHmLinkChat entity = EntityUtil.changeEntityByJSON(TabHmLinkChat.class, dto);
-                entity.setLinkChatId(UniqueIdUtils.uniqueLong());
-                entity.setLinkId(linkId);
-                this.hmLinkChatMapper.insert(entity);
-                if (dto.getMemberType() == 0) {
-                    screeningDetailService.save(HmLinkChatService.ES_ID + entity.getLinkChatId(), dto.getSearchJson());
+            List<HmLinkChatDTO> addList = list.stream().filter(dto -> null == dto.getLinkChatId())
+                    .collect(Collectors.toList());
+            if (CollectionUtils.isNotEmpty(addList)) {
+                for (HmLinkChatDTO dto : addList) {
+                    TabHmLinkChat entity = EntityUtil.changeEntityByJSON(TabHmLinkChat.class, dto);
+                    entity.setLinkChatId(UniqueIdUtils.uniqueLong());
+                    entity.setLinkId(linkId);
+                    this.hmLinkChatMapper.insert(entity);
+                    if (dto.getMemberType() == 0) {
+                        screeningDetailService.save(HmLinkChatService.ES_ID + entity.getLinkChatId(), dto.getSearchJson());
+                    }
                 }
             }
         }
-
         // 更新其他链接
         List<Long> chatHmIdList = list.stream().map(dto -> dto.getChatHmId()).collect(Collectors.toList());
         chatHmIdList.add(otherHmId);
         boolean addOther = false;
-        if (null != link) {
-            chatHmIdList.add(link.getOtherChatHmId());
-            if (!otherHmId.equals(link.getOtherChatHmId())) {
-                this.hmLinkChatMapper.delete(linkId, Arrays.asList(link.getOtherChatHmId()) , 1);
+        if (null != oldLink) {
+            chatHmIdList.add(oldLink.getOtherChatHmId());
+            if (!otherHmId.equals(oldLink.getOtherChatHmId())) {
+                this.hmLinkChatMapper.delete(linkId, Arrays.asList(oldLink.getOtherChatHmId()) , 1);
                 addOther = true;
             }
         } else {
@@ -107,7 +104,6 @@ public class HmLinkChatServiceImpl implements HmLinkChatService {
             other.setLinkChatId(UniqueIdUtils.uniqueLong());
             this.hmLinkChatMapper.insert(other);
         }
-
         // 统计活码关联的链接数量
         for (HmLinkChatDTO old : oldList) {
             chatHmIdList.add(old.getChatHmId());

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/hm/impl/HmLinkServiceImpl.java

@@ -169,7 +169,7 @@ public class HmLinkServiceImpl implements HmLinkService {
                 item.setEnterpriseId(dto.getEnterpriseId());
                 item.setSortNum(index++);
             }
-            this.hmLinkChatService.save(linkId, dto.getLinkChatList() , dto.getOtherChatHmId() , oldLink);
+            this.hmLinkChatService.save(dto.getWxEnterpriseId(),dto.getEnterpriseId(),linkId, dto.getLinkChatList() , dto.getOtherChatHmId() , oldLink);
         }
         return dto.getLinkCode();
     }