社群群发-终止

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

@@ -8,7 +8,7 @@ public class CommonMQDTO implements Serializable {
     * @Fields serialVersionUID : TODO(用一句话描述这个变量表示什么)
     */
     private static final long serialVersionUID = -5681421708810402425L;
-    // 1删除日报定时 2无部门成员修复
+    // 1删除日报定时 2无部门成员修复 3 通知会员好友关系 4社群终止
     private int type;
     private Object params;
 

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/chat/GroupChatPlanService.java

@@ -37,4 +37,6 @@ public interface GroupChatPlanService {
     void cancelSendTimer(String params);
 
     void staffSendResult(StaffSendResultQDTO qdto);
+
+    void stopByMsgid(Long planId);
 }
\ No newline at end of file

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/chat/impl/GroupChatPlanServiceImpl.java

@@ -9,6 +9,7 @@ import java.util.stream.Collectors;
 
 import com.gic.enterprise.api.dto.EnterpriseDTO;
 import com.gic.enterprise.api.service.EnterpriseService;
+import com.gic.haoban.manage.api.dto.CommonMQDTO;
 import com.gic.haoban.manage.api.dto.ContentMaterialDTO;
 import com.gic.haoban.manage.api.dto.StaffClerkRelationDTO;
 import com.gic.haoban.manage.api.dto.chat.*;
@@ -16,6 +17,7 @@ import com.gic.haoban.manage.api.dto.qdto.chat.GroupChatSearchQDTO;
 import com.gic.haoban.manage.api.dto.qdto.chat.OwnerSearchQDTO;
 import com.gic.haoban.manage.api.enums.NoticeMessageTypeEnum;
 import com.gic.haoban.manage.api.qdto.StaffSendResultQDTO;
+import com.gic.haoban.manage.api.service.HaobanCommonMQApiService;
 import com.gic.haoban.manage.api.util.notify.NoticeMessageUtil;
 import com.gic.haoban.manage.service.dao.mapper.TabHaobanStaffClerkRelationMapper;
 import com.gic.haoban.manage.service.dao.mapper.chat.*;
@@ -121,6 +123,8 @@ public class GroupChatPlanServiceImpl implements GroupChatPlanService {
     private TabHaobanStaffClerkRelationMapper tabHaobanStaffClerkRelationMapper ;
     @Autowired
     private GroupChatMapper groupChatMapper ;
+    @Autowired
+    private HaobanCommonMQApiService haobanCommonMQApiService ;
 
     private static GicMQClient mqClient = GICMQClientUtil.getClientInstance();
 
@@ -651,6 +655,15 @@ public class GroupChatPlanServiceImpl implements GroupChatPlanService {
             modifyStartTimeFlag = 1;
         }
         this.groupChatPlanMapper.stopById(planId, clerkId, clerkName, modifyStartTimeFlag);
+        // 停止企微发送
+        if(plan.getExecType()==0) {
+            CommonMQDTO dto = new CommonMQDTO();
+            dto.setType(4);
+            Map<String,String> map = new HashMap<>() ;
+            map.put("planId", planId+"") ;
+            dto.setParams(map);
+            this.haobanCommonMQApiService.putCommonMessage(dto);
+        }
         this.putMQForData(planId);
     }
 
@@ -765,6 +778,20 @@ public class GroupChatPlanServiceImpl implements GroupChatPlanService {
         }
     }
 
+    @Override
+    public void stopByMsgid(Long planId) {
+        logger.info("终止群群发送={}",planId);
+        List<Long> list = this.groupChatPlanOwnerLogMapper.listForTimer(planId);
+        if(CollectionUtils.isNotEmpty(list)) {
+            for(Long ownerLogId : list) {
+                TabGroupChatPlanOwnerLog tab = this.groupChatPlanOwnerLogService.getById(ownerLogId) ;
+                if(null != tab) {
+                    GroupChatPlanOwnerLogDTO dto = EntityUtil.changeEntityByJSON(GroupChatPlanOwnerLogDTO.class, tab);
+                    this.cancelSend(dto);
+                }
+            }
+        }
+    }
 
     private void cancelSend(GroupChatPlanOwnerLogDTO dto) {
         try {

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

@@ -11,6 +11,7 @@ import com.gic.haoban.manage.service.service.StaffClerkRelationService;
 import com.gic.commons.util.StringUtil;
 import com.gic.haoban.manage.api.dto.MemberUnionidWechatAccountQDTO;
 import com.gic.haoban.manage.api.service.ExternalClerkRelatedApiService;
+import com.gic.haoban.manage.service.service.chat.GroupChatPlanService;
 import com.gic.haoban.manage.service.service.role.HaobanMenuService;
 import com.gic.haoban.manage.service.util.EventUtils;
 import com.gic.member.api.dto.MemberInfoChangeNotifyDTO;
@@ -56,6 +57,8 @@ public class HaobanCommonMQApiServiceImpl implements HaobanCommonMQApiService {
     private HaobanMenuService haobanMenuService ;
     @Autowired
     private TabHaobanExternalClerkRelatedMapper externalClerkRelatedMapper ;
+    @Autowired
+    private GroupChatPlanService groupChatPlanService ;
 
     @Override
     public void putCommonMessage(CommonMQDTO dto) {
@@ -135,6 +138,10 @@ public class HaobanCommonMQApiServiceImpl implements HaobanCommonMQApiService {
             String clerkId = map.get("clerkId") ;
             this.memberOpenCardBusinessService.memberClerkByQywx(enterpriseId, memberId, clerkId);
             break ;
+        case 4:
+            Long planId = Long.valueOf(map.get("planId")) ;
+            this.groupChatPlanService.stopByMsgid(planId);
+            break ;
         default:
             break;
         }