Merge branch 'dev-xym-send_time' of Server/we-com-manage into master

we-com-server/src/main/java/com/tzld/piaoquan/wecom/controller/MessageController.java

@@ -3,7 +3,6 @@ package com.tzld.piaoquan.wecom.controller;
 
 import com.tzld.piaoquan.wecom.common.base.CommonResponse;
 import com.tzld.piaoquan.wecom.model.vo.MessageTextVo;
-import com.tzld.piaoquan.wecom.model.vo.MiniprogramVo;
 import com.tzld.piaoquan.wecom.service.MessageAttachmentService;
 import com.tzld.piaoquan.wecom.service.MessageService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -23,8 +22,8 @@ public class MessageController {
 
     //创建保底小程序
     @PostMapping("/miniprogram/guaranteed/create")
-    public CommonResponse<Void> createGuaranteedMiniprogram(@RequestBody List<MiniprogramVo> miniprogramVoList){
-        messageAttachmentService.createGuaranteedMiniprogram(miniprogramVoList);
+    public CommonResponse<Void> createGuaranteedMiniprogram(@RequestBody List<Long> videoIds){
+        messageAttachmentService.createGuaranteedMiniprogram(videoIds);
         return CommonResponse.success();
     }
 

we-com-server/src/main/java/com/tzld/piaoquan/wecom/model/vo/MiniprogramVo.java

@@ -1,12 +0,0 @@
-package com.tzld.piaoquan.wecom.model.vo;
-
-import lombok.Data;
-
-import java.util.Date;
-
-@Data
-public class MiniprogramVo {
-
-    private Long videoId;
-
-}

we-com-server/src/main/java/com/tzld/piaoquan/wecom/service/Impl/MessageAttachmentServiceImpl.java

@@ -10,7 +10,6 @@ import com.tzld.piaoquan.wecom.model.bo.VideoDetail;
 import com.tzld.piaoquan.wecom.model.po.MessageAttachment;
 import com.tzld.piaoquan.wecom.model.po.MessageAttachmentExample;
 import com.tzld.piaoquan.wecom.model.po.Staff;
-import com.tzld.piaoquan.wecom.model.vo.MiniprogramVo;
 import com.tzld.piaoquan.wecom.service.MessageAttachmentService;
 import com.tzld.piaoquan.wecom.utils.DateUtil;
 import com.tzld.piaoquan.wecom.utils.HttpClientUtil;
@@ -26,7 +25,6 @@ import java.io.IOException;
 import java.util.*;
 
 import static com.tzld.piaoquan.wecom.common.constant.MessageConstant.appid;
-import static com.tzld.piaoquan.wecom.common.constant.MessageConstant.carrierIdMap;
 import static com.tzld.piaoquan.wecom.common.constant.OtherServerURL.POST_ADD_TENCENT;
 import static com.tzld.piaoquan.wecom.common.constant.OtherServerURL.POST_VIDEO_DETAIL_URL;
 import static com.tzld.piaoquan.wecom.common.constant.RedisConstant.GUARANTEED_MINIPROGRAM_KEY;
@@ -63,32 +61,27 @@ public class MessageAttachmentServiceImpl implements MessageAttachmentService {
     }
 
     @Override
-    public void createGuaranteedMiniprogram(List<MiniprogramVo> miniprogramVoList) {
+    public void createGuaranteedMiniprogram(List<Long> videoIds) {
+        if (CollectionUtils.isEmpty(videoIds)) {
+            throw new CustomizeException(PARAMS_ERROR);
+        }
+        Map<Long, VideoDetail> coverMap = getVideoDetail(videoIds);
         List<MessageAttachment> messageAttachmentList = new ArrayList<>();
-        List<Long> videoList = new ArrayList<>();
-        for (MiniprogramVo miniprogramVo : miniprogramVoList) {
-            if (miniprogramVo.getVideoId() == null) {
-                throw new CustomizeException(PARAMS_ERROR);
-            }
+        for (Long videoId : videoIds) {
             MessageAttachment messageAttachment = new MessageAttachment();
-            BeanUtils.copyProperties(miniprogramVo, messageAttachment);
-            messageAttachment.setMiniprogramVideoId(miniprogramVo.getVideoId());
-            messageAttachment.setType(MessageAttachmentTypeEnum.MINIPROGRAM.getType());
-            messageAttachmentList.add(messageAttachment);
-            videoList.add(miniprogramVo.getVideoId());
-        }
-        Map<Long, VideoDetail> coverMap = getVideoDetail(videoList);
-        for (MessageAttachment messageAttachment : messageAttachmentList) {
-            VideoDetail videoDetail = coverMap.get(messageAttachment.getMiniprogramVideoId());
+            VideoDetail videoDetail = coverMap.get(videoId);
             if (videoDetail == null || StringUtils.isEmpty(videoDetail.getCover()) || StringUtils.isEmpty(videoDetail.getTitle())) {
                 throw new RuntimeException("获取视频详情异常");
             }
+            messageAttachment.setMiniprogramVideoId(videoId);
+            messageAttachment.setType(MessageAttachmentTypeEnum.MINIPROGRAM.getType());
             messageAttachment.setCover(videoDetail.getCover());
             messageAttachment.setTitle(videoDetail.getTitle());
             messageAttachment.setAppid(appid);
+            messageAttachmentList.add(messageAttachment);
         }
         addMiniprogram(messageAttachmentList);
-        for (Long video : videoList) {
+        for (Long video : videoIds) {
             redisTemplate.opsForList().rightPush(GUARANTEED_MINIPROGRAM_KEY, video);
         }
     }

we-com-server/src/main/java/com/tzld/piaoquan/wecom/service/MessageAttachmentService.java

@@ -2,17 +2,14 @@ package com.tzld.piaoquan.wecom.service;
 
 import com.tzld.piaoquan.wecom.model.po.MessageAttachment;
 import com.tzld.piaoquan.wecom.model.po.Staff;
-import com.tzld.piaoquan.wecom.model.vo.MessageTextVo;
-import com.tzld.piaoquan.wecom.model.vo.MiniprogramVo;
 
-import java.io.IOException;
 import java.util.List;
 
 public interface MessageAttachmentService {
 
     void addMiniprogram(List<MessageAttachment> messageAttachmentList);
 
-    void createGuaranteedMiniprogram(List<MiniprogramVo> miniprogramVoList);
+    void createGuaranteedMiniprogram(List<Long> videos);
 
     String getPage(Staff staff, Long videoId);
 }