Merge branch 'feat-1002376' into 'master'

技能图文介绍

See merge request rays/pcloud-book!427

pcloud-facade-book/src/main/java/com/pcloud/book/timecontrol/dto/TaskDto.java

@@ -20,6 +20,8 @@ public class TaskDto implements Serializable {
 
     private String taskIntroduce;
 
+    private String cutTaskIntroduce;
+
     private String taskKeyWord;
 
     private String subscribeWord;

pcloud-service-book/src/main/java/com/pcloud/book/keywords/biz/impl/SelfRobotKeywordBizImpl.java

@@ -57,6 +57,7 @@ import com.pcloud.common.utils.DateUtils;
 import com.pcloud.common.utils.ListUtils;
 import com.pcloud.common.utils.ResponseHandleUtil;
 import com.pcloud.common.utils.string.StringUtil;
+import com.pcloud.common.utils.string.StringUtilParent;
 import com.pcloud.contentcenter.resource.dto.ResourceDTO;
 import com.pcloud.labelcenter.label.service.LabelService;
 import com.pcloud.resourcecenter.product.dto.ProductDto;
@@ -334,6 +335,15 @@ public class SelfRobotKeywordBizImpl implements SelfRobotKeywordBiz {
             skillList = pcloudSkillDao.getSkillList4Resource(type,labelId);
         }
 
+        // 截取字符串
+        if(!ListUtils.isEmpty(skillList)){
+            for(RobotSkill4H5 robotSkill4H5 : skillList){
+                String filterStr = StringUtilParent.replaceHtml(robotSkill4H5.getRelSkillIntroduce());
+                String subStr = filterStr.length() > 100 ? filterStr.substring(0, 100) + "..." : filterStr;
+                robotSkill4H5.setRelSkillIntroduce(subStr);
+            }
+        }
+
         return skillList;
     }
 
@@ -670,6 +680,11 @@ public class SelfRobotKeywordBizImpl implements SelfRobotKeywordBiz {
             }
 
         }
+        if(null != robotSkillDetail){
+            String filterStr = StringUtilParent.replaceHtml(robotSkillDetail.getRelSkillIntroduce());
+            //String subStr = filterStr.length() > 100 ? filterStr.substring(0, 100) + "..." : filterStr;
+            robotSkillDetail.setCutRelSkillIntroduce(filterStr);
+        }
         PcloudSubRemind pcloudSubRemind = pcloudSubRemindDao.getByMap(relSkillId, type, wxUserId, skillId);
         if(null==pcloudSubRemind) {
             PcloudSubRemind subRemind = new PcloudSubRemind();

pcloud-service-book/src/main/java/com/pcloud/book/keywords/entity/RobotSkill4H5.java

@@ -14,6 +14,8 @@ public class RobotSkill4H5 {
 
     private String relSkillIntroduce;
 
+    private String cutRelSkillIntroduce;
+
     private String keyWord;
 
     private String guideWord;

pcloud-service-book/src/main/java/com/pcloud/book/keywords/entity/RobotSkillDetail.java

@@ -14,6 +14,8 @@ public class RobotSkillDetail {
 
     private String relSkillIntroduce;
 
+    private String cutRelSkillIntroduce;
+
     private String keyWord;
 
     private String guideWord;

pcloud-service-book/src/main/java/com/pcloud/book/skill/biz/impl/PcloudGroupActivityBizImpl.java

@@ -20,6 +20,7 @@ import com.pcloud.book.skill.facade.response.QueryGroupActivityResponseVO;
 import com.pcloud.common.core.aspect.ParamLog;
 import com.pcloud.common.page.PageBeanNew;
 import com.pcloud.common.page.PageParam;
+import com.pcloud.common.utils.string.StringUtilParent;
 import com.sdk.wxgroup.SendGroupInviteVO;
 import com.sdk.wxgroup.SendPicMessageVO;
 import com.sdk.wxgroup.WxGroupSDK;
@@ -149,6 +150,14 @@ public class PcloudGroupActivityBizImpl implements PcloudGroupActivityBiz {
             responseVO.setProLabelName(labelName.get(responseVO.getProLabelId()));
             responseVO.setDepLabelName(labelName.get(responseVO.getDepLabelId()));
         }
+
+        // 截取字符串
+        for(QueryGroupActivityResponseVO vo : queryGroupActivity.getRecordList()){
+            String filterStr = StringUtilParent.replaceHtml(vo.getDesc());
+            String subStr = filterStr.length() > 60 ? filterStr.substring(0, 60) + "..." : filterStr;
+            vo.setCutDesc(subStr);
+        }
+
         return queryGroupActivity;
     }
 }

pcloud-service-book/src/main/java/com/pcloud/book/skill/biz/impl/PcloudResourceBizImpl.java

@@ -15,6 +15,7 @@ import com.pcloud.common.core.aspect.ParamLog;
 import com.pcloud.common.page.PageBeanNew;
 import com.pcloud.common.page.PageParam;
 import com.pcloud.common.utils.string.StringUtil;
+import com.pcloud.common.utils.string.StringUtilParent;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -90,6 +91,13 @@ public class PcloudResourceBizImpl implements PcloudResourceBiz {
         }
         // 组装标签名称
         fillLabels(pageBeanNew.getRecordList());
+        // 截取字符串
+        for(QueryPcloudResponseVO vo : pageBeanNew.getRecordList()){
+            String filterStr = StringUtilParent.replaceHtml(vo.getDescription());
+            String subStr = filterStr.length() > 60 ? filterStr.substring(0, 60) + "..." : filterStr;
+            vo.setCutDescription(subStr);
+        }
+
         return pageBeanNew;
     }
 

pcloud-service-book/src/main/java/com/pcloud/book/skill/biz/impl/PcloudSkillBizImpl.java

@@ -33,6 +33,7 @@ import com.pcloud.common.page.PageBeanNew;
 import com.pcloud.common.page.PageParam;
 import com.pcloud.common.utils.ListUtils;
 import com.pcloud.common.utils.string.StringUtil;
+import com.pcloud.common.utils.string.StringUtilParent;
 import com.pcloud.contentcenter.resource.dto.ResourceDTO;
 import com.pcloud.wechatgroup.group.dto.GroupRobotDTO;
 import com.sdk.wxgroup.*;
@@ -200,6 +201,11 @@ public class PcloudSkillBizImpl implements PcloudSkillBiz  {
                     pcloudSkill.setDetail(pcloudResource.getDescription());
                 }
             }
+            if(null != pcloudSkill){
+                String filterStr = StringUtilParent.replaceHtml(pcloudSkill.getDetail());
+                //String subStr = filterStr.length() > 100 ? filterStr.substring(0, 100) + "..." : filterStr;
+                pcloudSkill.setDetailString(filterStr);
+            }
         }
     }
 
@@ -230,6 +236,11 @@ public class PcloudSkillBizImpl implements PcloudSkillBiz  {
                 pcloudSkill.setDetail(pcloudResource.getDescription());
             }
         }
+        if(null != pcloudSkill){
+            String filterStr = StringUtilParent.replaceHtml(pcloudSkill.getDetail());
+            //String subStr = filterStr.length() > 100 ? filterStr.substring(0, 100) + "..." : filterStr;
+            pcloudSkill.setDetailString(filterStr);
+        }
     }
 
     @Transactional(rollbackFor = Exception.class)

pcloud-service-book/src/main/java/com/pcloud/book/skill/entity/PcloudSkill.java

@@ -38,4 +38,7 @@ public class PcloudSkill extends BaseEntity {
     @ApiModelProperty("点击未订阅回复集合")
     private List<PcloudSubReply> noSubReplies;
 
+    @ApiModelProperty("技能简介文字")
+    private String detailString;
+
 }

pcloud-service-book/src/main/java/com/pcloud/book/skill/facade/response/QueryGroupActivityResponseVO.java

@@ -15,6 +15,9 @@ public class QueryGroupActivityResponseVO {
     @ApiModelProperty("描述")
     private String desc;
 
+    @ApiModelProperty("描述")
+    private String cutDesc;
+
     @ApiModelProperty("群图片，加群方式为图片时有效")
     private String groupPic;
 

pcloud-service-book/src/main/java/com/pcloud/book/skill/facade/response/QueryPcloudResponseVO.java

@@ -18,6 +18,9 @@ public class QueryPcloudResponseVO implements Serializable {
     @ApiModelProperty("资源介绍")
     private String description;
 
+    @ApiModelProperty("资源介绍(截取)")
+    private String cutDescription;
+
     @ApiModelProperty("专业标签id")
     private Long proLabelId;
 

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

@@ -19,6 +19,7 @@ import com.pcloud.common.page.PageBeanNew;
 import com.pcloud.common.utils.ListUtils;
 import com.pcloud.common.utils.ResponseHandleUtil;
 import com.pcloud.common.utils.string.StringUtil;
+import com.pcloud.common.utils.string.StringUtilParent;
 import com.pcloud.labelcenter.label.service.LabelService;
 import com.pcloud.wechatgroup.base.exception.WechatGroupBizException;
 import lombok.extern.slf4j.Slf4j;
@@ -155,6 +156,16 @@ public class TaskBizImpl implements TaskBiz {
                 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);
     }