Merge branch 'feature/1004900' into 'master'

feat: [1004900] H5配置企业微信

See merge request rays/pcloud-book!1342

pcloud-facade-book/src/main/java/com/pcloud/book/applet/dto/GroupActivity4AppletDTO.java

@@ -87,4 +87,7 @@ public class GroupActivity4AppletDTO implements Serializable {
 
     @ApiModelProperty("serveId")
     private String serveId;
+
+    @ApiModelProperty("描述")
+    private String groupDesc;
 }

pcloud-service-book/src/main/java/com/pcloud/book/book/vo/response/BookQrcodeWxworkResponseVO.java

@@ -5,6 +5,7 @@ import com.pcloud.common.dto.BaseDto;
 
 import java.util.List;
 
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 /**
@@ -58,4 +59,15 @@ public class BookQrcodeWxworkResponseVO extends BaseDto {
      * 群对话
      */
     private List<AppletGroupStatementDTO> statementDTOList;
+
+    @ApiModelProperty("群名称")
+    private String groupName;
+
+    @ApiModelProperty("群描述")
+    private String groupDesc;
+    /**
+     * 二维码原始链接
+     */
+    private String url;
+
 }

pcloud-service-book/src/main/java/com/pcloud/book/consumer/wechatgroup/WechatGroupConsr.java

@@ -864,10 +864,13 @@ public class WechatGroupConsr {
     @ParamLog("批量查企业微信群活码")
     public Map<Long, WxworkGroupQrcodeBaseDTO> mapWxworkGroupQrcodeBase(List<Long> groupQrcodeIds){
         Map<Long, WxworkGroupQrcodeBaseDTO> map = new HashMap<>();
+        if (ListUtils.isEmpty(groupQrcodeIds)) {
+            return map;
+        }
         try {
             map = ResponseHandleUtil.parseMapResponse(wxWorkService.mapWxworkGroupQrcodeBase(groupQrcodeIds), Long.class, WxworkGroupQrcodeBaseDTO.class);
         } catch (Exception e) {
-            log.error("根据wxWorkService.mapWxworkQrcodeBase查企业微信群活码基本信息" + e.getMessage(), e);
+            log.error("根据wxWorkService.mapWxworkGroupQrcodeBase查企业微信群活码基本信息" + e.getMessage(), e);
         }
         return map;
     }
@@ -902,4 +905,18 @@ public class WechatGroupConsr {
         }
         return null;
     }
+
+    @ParamLog("批量查企业微信群活码-包含群二维码")
+    public Map<Long, WxworkGroupQrcodeBaseDTO> mapWxworkGroupQrcode(List<Long> groupQrcodeIds) {
+        Map<Long, WxworkGroupQrcodeBaseDTO> map = new HashMap<>();
+        if (ListUtils.isEmpty(groupQrcodeIds)) {
+            return map;
+        }
+        try {
+            map = ResponseHandleUtil.parseMapResponse(wxWorkService.mapWxworkGroupQrcode(groupQrcodeIds), Long.class, WxworkGroupQrcodeBaseDTO.class);
+        } catch (Exception e) {
+            log.error("根据wxWorkService.mapWxworkGroupQrcode查企业微信群活码信息" + e.getMessage(), e);
+        }
+        return map;
+    }
 }

pcloud-service-book/src/main/java/com/pcloud/book/group/constant/ResourcePageConstants.java

@@ -23,7 +23,7 @@ public class ResourcePageConstants {
         APP_PRODUCT(1, "应用作品", new String[]{ServeTypeEnum.APP.getValue(), ServeTypeEnum.PRODUCT.getValue()}),
         OFFICIAL_ACCOUNT(2, "公众号", new String[]{ServeTypeEnum.OFFICIAL_ACCOUNT.getValue()}),
         BOOKLIST(3, "书单", new String[]{ServeTypeEnum.BOOKLIST.getValue(),ServeTypeEnum.ADVISER_BOOK.getValue()}),
-        GROUP(4, "社群", new String[]{ServeTypeEnum.GROUP_ACTIVITY.getValue()}),
+        GROUP(4, "社群", new String[]{ServeTypeEnum.GROUP_ACTIVITY.getValue(), ServeTypeEnum.WXWORK_GROUP.getValue()}),
         THIRD_RESOURCE(5, "第三方资源", new String[]{ServeTypeEnum.THIRD_RESOURCE.getValue()}),
         PICTURE(6, "图片位", new String[]{ServeTypeEnum.APP.getValue(), ServeTypeEnum.PRODUCT.getValue(),
                 ServeTypeEnum.GROUP_ACTIVITY.getValue(), ServeTypeEnum.THIRD_RESOURCE.getValue()});
@@ -77,7 +77,8 @@ public class ResourcePageConstants {
         BOOKLIST("BOOKLIST", "平台书单"),
         ADVISER_BOOK("ADVISER_BOOK", "书刊"),
         GROUP_ACTIVITY("GROUP_ACTIVITY", "模板群"),
-        THIRD_RESOURCE("THIRD_RESOURCE", "第三方资源");
+        THIRD_RESOURCE("THIRD_RESOURCE", "第三方资源"),
+        WXWORK_GROUP("WXWORK_GROUP","企业微信群");
 
         private String value;
 

pcloud-service-book/src/main/java/com/pcloud/book/group/vo/ResourcePageItemVO.java

@@ -5,7 +5,9 @@ import com.pcloud.book.applet.dto.AppletOuterBooklistDTO;
 import com.pcloud.book.applet.dto.GroupActivity4AppletDTO;
 import com.pcloud.book.applet.entity.AppletThirdResources;
 import com.pcloud.book.book.vo.BookLinkVO;
+import com.pcloud.book.book.vo.response.BookQrcodeWxworkResponseVO;
 import com.pcloud.common.dto.BaseDto;
+import com.pcloud.wechatgroup.wxwork.dto.WxworkGroupQrcodeBaseDTO;
 
 import java.math.BigDecimal;
 
@@ -91,7 +93,8 @@ public class ResourcePageItemVO extends BaseDto{
     private GroupActivity4AppletDTO activity4AppletDTO;
     @ApiModelProperty("第三方资源")
     private AppletThirdResources appletThirdResources;
-
+    @ApiModelProperty("企业微信群")
+    private BookQrcodeWxworkResponseVO bookQrcodeWxworkResponseVO;
 
     private Long sceneId;
 

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

@@ -363,6 +363,8 @@ public class PcloudGroupActivityBizImpl implements PcloudGroupActivityBiz {
             String filterStr = StringUtilParent.replaceHtml(vo.getDesc());
             String subStr = filterStr.length() > 60 ? filterStr.substring(0, 60) + "..." : filterStr;
             vo.setCutDesc(subStr);
+            vo.setGroupDesc(subStr);
+            vo.setGroupName(vo.getName());
         }
         //设置城市名称
         setCityNames(queryGroupActivity.getRecordList());
@@ -830,7 +832,7 @@ public class PcloudGroupActivityBizImpl implements PcloudGroupActivityBiz {
     public Map<Long, GroupActivity4AppletDTO> getGroupActivityMap(List<Long> activityGroupIds) {
         Map<Long, GroupActivity4AppletDTO> localMap = new HashMap<>();
         if (!ListUtils.isEmpty(activityGroupIds)) {
-            localMap = pcloudGroupActivityDao.getByIds(activityGroupIds, null);
+            localMap = pcloudGroupActivityDao.getByIds(activityGroupIds, 1);
         }
         for(GroupActivity4AppletDTO groupActivity4AppletDTO: localMap.values()){
             String filterStr = StringUtilParent.replaceHtml(groupActivity4AppletDTO.getDesc());

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

@@ -7,6 +7,7 @@ import java.util.List;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+
 @Data
 public class QueryGroupActivityResponseVO {
 
@@ -124,4 +125,10 @@ public class QueryGroupActivityResponseVO {
 
     @ApiModelProperty("群人数")
     private Integer userNumber;
+
+    @ApiModelProperty("群名称")
+    private String groupName;
+
+    @ApiModelProperty("群描述")
+    private String groupDesc;
 }

pcloud-service-book/src/main/resources/mapper/group/ResourcePageDao.xml

@@ -68,6 +68,12 @@
             <if test="bookGroupId != null">
                 book_group_id = #{bookGroupId},
             </if>
+            <if test="bookId != null">
+                book_id = #{bookId},
+            </if>
+            <if test="channelId != null">
+                channel_id = #{channelId},
+            </if>
                 book_cover = #{bookCover},
                 update_time = NOW(),
                 background_img = #{backgroundImg},