Merge branch 'youhua-zcy' into 'master'

接口优化

See merge request rays/pcloud-book!499

pcloud-service-book/src/main/java/com/pcloud/book/guide/biz/impl/PcloudGuideBizImpl.java

@@ -171,6 +171,7 @@ public class PcloudGuideBizImpl implements PcloudGuideBiz {
         }
         list = pcloudGuideMapper.listPcloudGuide(currentPage * numPerPage, numPerPage, robotWxId, search, pcloudClassfyId);
         if (!ListUtils.isEmpty(list)){
+            List<PcloudGuideMessageDTO> all = new ArrayList<>();
             for (PcloudGuideDTO guideDTO : list){
                 List<PcloudGuideMessageDTO> messageDTOS = new ArrayList<>();
                 List<PcloudGuideMessageVO> messageList=pcloudGuideMessageMapper.listByGuideId(guideDTO.getPcloudGuideId());
@@ -180,10 +181,11 @@ public class PcloudGuideBizImpl implements PcloudGuideBiz {
                         BeanUtils.copyProperties(messageVO, messageDTO);
                         messageDTOS.add(messageDTO);
                     }
-                    fillFile(messageDTOS);
                 }
                 guideDTO.setMessageDTOS(messageDTOS);
+                all.addAll(messageDTOS);
             }
+            fillFile(all);
         }
         return new PageBeanNew<>(currentPage, numPerPage, count, list);
     }

pcloud-service-book/src/main/java/com/pcloud/book/timecontrol/biz/impl/TaskBizImpl.java

@@ -210,21 +210,14 @@ public class TaskBizImpl implements TaskBiz {
                     item.setProLabelName(labelMap.get(item.getProLabelId()));
                     item.setDepLabelName(labelMap.get(item.getDepLabelId()));
                     item.setPurLabelName(labelMap.get(item.getPurLabelId()));
+                    String filterStr = StringUtilParent.replaceHtml(item.getTaskIntroduce());
+                    String subStr = filterStr.length() > 60 ? filterStr.substring(0, 60) + "..." : filterStr;
+                    item.setCutTaskIntroduce(subStr);
                 });
             } catch (Exception e) {
                 log.error("labelService.getLabelName 批量获取标签名称失败" + e.getMessage());
             }
         }
-
-        if(!ListUtils.isEmpty(list)){
-            // 截取字符串
-            for(TaskDto taskDto : list){
-                String filterStr = StringUtilParent.replaceHtml(taskDto.getTaskIntroduce());
-                String subStr = filterStr.length() > 60 ? filterStr.substring(0, 60) + "..." : filterStr;
-                taskDto.setCutTaskIntroduce(subStr);
-            }
-        }
-
         return new PageBeanNew<>(currentPage, numPerPage, count, list);
     }
 

pcloud-service-book/src/main/java/com/pcloud/book/timecontrol/biz/impl/TaskCompletedBizImpl.java

@@ -22,9 +22,11 @@ import com.pcloud.book.timecontrol.mapper.TimeControlTaskItemMapper;
 import com.pcloud.book.timecontrol.mapper.TimeControlTaskMapper;
 import com.pcloud.book.timecontrol.mapper.TimeControlTaskSendMapper;
 import com.pcloud.book.timecontrol.mapper.TimeControlTaskSubscribeMapper;
+import com.pcloud.common.constant.CacheConstant;
 import com.pcloud.common.exceptions.BizException;
 import com.pcloud.common.page.PageBeanNew;
 import com.pcloud.common.utils.ListUtils;
+import com.pcloud.common.utils.cache.redis.JedisClusterUtils;
 import com.pcloud.common.utils.string.StringUtil;
 import com.pcloud.contentcenter.resource.dto.ResourceDTO;
 import com.pcloud.labelcenter.label.service.LabelService;
@@ -188,8 +190,15 @@ public class TaskCompletedBizImpl implements TaskCompletedBiz {
                     replyMessageDtoList.forEach(message -> {
                         if (ReplyTypeEnum.RESOURCE.value.equals(message.getReplyType())) {
                             Long resourceId = message.getResourceId();
-                            Map<Long, ResourceDTO> map = resourceConsr.mapByIds(Arrays.asList(resourceId));
-                            ResourceDTO resourceDTO = map.get(resourceId);
+                            String key = CacheConstant.BOOK + "GET_RESOURCE_INFO:" + resourceId;
+                            ResourceDTO resourceDTO = JedisClusterUtils.getJson(key, ResourceDTO.class);
+                            if (null == resourceDTO) {
+                                Map<Long, ResourceDTO> map = resourceConsr.mapByIds(Arrays.asList(resourceId));
+                                resourceDTO = map.get(resourceId);
+                                if (null != resourceDTO) {
+                                    JedisClusterUtils.setJson(key, resourceDTO);
+                                }
+                            }
                             if (resourceDTO != null) {
                                 message.setResourceName(resourceDTO.getResourceName());
                                 message.setResourceUrl(resourceDTO.getFileUrl());

pcloud-service-book/src/main/resources/mapper/guide/PcloudGuideMapper.xml

@@ -157,7 +157,6 @@
     SELECT
         a.id pcloudGuideId,
         a.type,
-        a.create_time createTime,
         a.time_span timeSpan,
         a.seq_num seqNum
     FROM

pcloud-service-book/src/main/resources/mapper/timecontrol/TimeControlTaskMapper.xml

@@ -60,9 +60,6 @@
         a.task_id taskId,
         task_name taskName,
         task_introduce taskIntroduce,
-        task_key_word taskKeyWord,
-        subscribe_word subscribeWord,
-        a.create_time createTime,
         COUNT(b.id) taskItemCount,
         a.pur_label_id purLabelId,
         a.pro_label_id proLabelId,