feat: [1003414] 优化学舍页面修改为我的社群

pcloud-facade-book/src/main/java/com/pcloud/book/group/dto/ActivityGroupDTO.java

+package com.pcloud.book.group.dto;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.pcloud.book.applet.dto.AppletGroupStatementDTO;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.List;
+
+@Data
+public class ActivityGroupDTO {
+
+        @ApiModelProperty("群类型 1：第三方群")
+        private Integer groupType;
+
+        private Long id;
+
+        private Boolean openStatus;
+
+        @ApiModelProperty("共读活动id")
+        private Long groupActivityId;
+
+        @ApiModelProperty("共度名称")
+        private String name;
+
+        @ApiModelProperty("描述")
+        private String desc;
+
+        @ApiModelProperty("描述")
+        private String cutDesc;
+
+        @ApiModelProperty("群图片，加群方式为图片时有效")
+        private String groupPic;
+
+        @ApiModelProperty("社群码id")
+        private Long bookGroupQrcodeId;
+
+        @ApiModelProperty("社群码名称")
+        private String groupName;
+
+        @ApiModelProperty("群人数")
+        private Integer userNumber;
+
+        @ApiModelProperty("群分类id")
+        private Long classifyId;
+
+        @ApiModelProperty("群id")
+        private Long bookGroupId;
+
+        @ApiModelProperty("头像列表")
+        private List<String> headUrlList;
+
+        @ApiModelProperty("权益标题")
+        private String rightsSettingTitle;
+
+        @ApiModelProperty("权益描述")
+        private String rightsSettingDesc;
+
+        @ApiModelProperty("群分类名称")
+        private String classifyName;
+
+        @ApiModelProperty("入群价格")
+        private BigDecimal price;
+
+        @ApiModelProperty("购买状态 1已购买 0未购买")
+        private Integer status;
+
+        @ApiModelProperty("关联社群书ID")
+        private Long relatedBookGroupId;
+
+        @ApiModelProperty("群链接")
+        private String groupLink;
+
+        @ApiModelProperty("服务类型；GROUP、NEWS、PLAN")
+        private String serveType;
+
+        @ApiModelProperty("serveId")
+        private String serveId;
+
+        @ApiModelProperty("学舍群话语")
+        private List<AppletGroupStatementDTO> statementDTOList;
+
+
+
+}

pcloud-facade-book/src/main/java/com/pcloud/book/group/dto/GroupDetailDTO.java

+package com.pcloud.book.group.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class GroupDetailDTO {
+    @ApiModelProperty("群类型 2:编辑端群")
+    private Integer groupType;
+
+    @ApiModelProperty("社群书ID")
+    private Long bookGroupCId;
+
+    @ApiModelProperty("模板群ID")
+    private Long activityGroupId;
+
+    // 模板群
+    private ActivityGroupDTO activityGroupDTO;
+
+    //群描述
+    private String groupDesc;
+
+    //群名称
+    private String groupName;
+
+    //群图片
+    private String groupQrCode;
+
+
+}

pcloud-facade-book/src/main/java/com/pcloud/book/group/service/BookGroupClassifyService.java

@@ -2,12 +2,14 @@ package com.pcloud.book.group.service;
 
 import com.pcloud.book.group.dto.BookClassifyDTO;
 import com.pcloud.book.group.dto.GroupClassifyQrcodeDTO;
+import com.pcloud.book.group.dto.GroupDetailDTO;
 import com.pcloud.book.group.dto.GroupQrcode4ClassifyDTO;
 import com.pcloud.book.group.dto.GroupQrcodeBaseDTO;
 import com.pcloud.book.group.dto.GroupQrcodeInfo4Advertising;
 import com.pcloud.book.group.dto.ProAssocGroupAndUserNumberDTO;
 import com.pcloud.common.dto.ResponseDto;
 
+import org.omg.CORBA.INTERNAL;
 import org.springframework.cloud.netflix.feign.FeignClient;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -83,4 +85,9 @@ public interface BookGroupClassifyService {
     @ApiOperation("获取群分类入群价格")
     @GetMapping("getClassifyPrice")
     ResponseEntity<ResponseDto<BigDecimal>> getClassifyPrice(@RequestParam("classifyId") Long classifyId);
+
+    @ApiOperation("获取群map")
+    @PostMapping("getGroupMap")
+    ResponseEntity<ResponseDto<Map<Long, GroupDetailDTO>>> getGroupMap(@RequestBody List<Long> groupIds, @RequestParam(value = "groupType") Integer groupType);
+
 }

pcloud-service-book/src/main/java/com/pcloud/book/applet/biz/impl/AppletNewsBizImpl.java

@@ -313,7 +313,7 @@ public class AppletNewsBizImpl implements AppletNewsBiz {
         }
         paramMap.put("classifySelect", classifySelect);
         PageBeanNew<AppletNewsDTO> pageBeanNew = appletNewsDao.listPageNew(
-                new PageParam(currentPage, numPerPage), paramMap, "listAppletNews", "listAppletNewsCount");
+                new PageParam(currentPage, numPerPage), paramMap, "listAppletNews");
        if (null == pageBeanNew || ListUtils.isEmpty(pageBeanNew.getRecordList())) {
             return new PageBeanNew<>(currentPage, numPerPage, 0, new ArrayList<>());
         }

pcloud-service-book/src/main/java/com/pcloud/book/applet/dto/AppletGroupManageDTO.java

@@ -5,7 +5,6 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.math.BigDecimal;
-import java.util.Date;
 import java.util.List;
 
 /**

pcloud-service-book/src/main/java/com/pcloud/book/consumer/reader/ReaderConsr.java

@@ -225,6 +225,16 @@ public class ReaderConsr {
         }
         return map;
     }
+
+    public void deleteGroupRecore(List<Long> groupIds, Integer groupType, Integer updateType, Integer showState) {
+        LOGGER.info("根据deleteGroupRecore groupIds:{},groupType:{},updateType:{}, showState:{}", groupIds, groupType, updateType, showState);
+        try {
+            wechatUserService.deleteGroupRecore(groupIds, groupType, updateType, showState);
+            LOGGER.info("根据deleteGroupRecore结束");
+        } catch (BizException e) {
+            throw new BizException(e.getCode(), e.getMessage());
+        }
+    }
 }
 
 

pcloud-service-book/src/main/java/com/pcloud/book/group/biz/BookGroupClassifyBiz.java

@@ -6,6 +6,7 @@ import com.pcloud.book.group.dto.BookGroupStatisticDTO;
 import com.pcloud.book.group.dto.ClassifyDTO;
 import com.pcloud.book.group.dto.ClassifyLearningReportDto;
 import com.pcloud.book.group.dto.GroupClassifyQrcodeDTO;
+import com.pcloud.book.group.dto.GroupDetailDTO;
 import com.pcloud.book.group.dto.GroupNameAndMaxSeqDTO;
 import com.pcloud.book.group.dto.GroupQrcode4ClassifyDTO;
 import com.pcloud.book.group.dto.GroupQrcodeBaseDTO;
@@ -289,4 +290,6 @@ public interface BookGroupClassifyBiz {
     List<BookGroupClassifyDTO> getBookGroupClassifyByClassifyIds(List<Long> classifyIds);
 
     PageBeanNew<BookGroupClassifyAnalysisVO> listGroupClassify4Analysis(String name, Long proLabelId, Long depLabelId, Long purLabelId, Long firstClassify, Long secondClassify, Long gradeLabelId, Long subjectLabelId, Integer linkOnly, Integer browseQty, Integer clickQty, Integer currentPage, Integer numPerPage, String cityCode);
+
+    Map<Long, GroupDetailDTO> getGroupMap(List<Long> groupIds, Integer groupType);
 }

pcloud-service-book/src/main/java/com/pcloud/book/group/biz/impl/BookGroupClassifyBizImpl.java

@@ -3,7 +3,9 @@ package com.pcloud.book.group.biz.impl;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import com.pcloud.appcenter.assist.dto.AssistTempletDTO;
+import com.pcloud.book.applet.biz.AppletGroupSearchRecordBiz;
 import com.pcloud.book.applet.dao.AppletLinkClickDao;
+import com.pcloud.book.applet.dto.AppletGroupStatementDTO;
 import com.pcloud.book.applet.dto.PvuvDTO;
 import com.pcloud.book.applet.enums.DataRecordTypeEnum;
 import com.pcloud.book.applet.enums.DataTypeEnum;
@@ -39,6 +41,7 @@ import com.pcloud.book.group.dao.JoinGroupCipherDao;
 import com.pcloud.book.group.dao.LearningReportBrowseRecordDao;
 import com.pcloud.book.group.dao.LearningReportTouchRecordDao;
 import com.pcloud.book.group.dao.WeixinQrcodeDao;
+import com.pcloud.book.group.dto.ActivityGroupDTO;
 import com.pcloud.book.group.dto.BookClassifyDTO;
 import com.pcloud.book.group.dto.BookGroupClassifyDTO;
 import com.pcloud.book.group.dto.BookGroupDTO;
@@ -49,6 +52,7 @@ import com.pcloud.book.group.dto.ClassifyLearningCountDto;
 import com.pcloud.book.group.dto.ClassifyLearningReportDto;
 import com.pcloud.book.group.dto.GroupAndUserNumberDTO;
 import com.pcloud.book.group.dto.GroupClassifyQrcodeDTO;
+import com.pcloud.book.group.dto.GroupDetailDTO;
 import com.pcloud.book.group.dto.GroupNameAndMaxSeqDTO;
 import com.pcloud.book.group.dto.GroupQrcode4ClassifyDTO;
 import com.pcloud.book.group.dto.GroupQrcodeBaseDTO;
@@ -75,6 +79,7 @@ import com.pcloud.book.group.vo.BookGroupQrcodeStatisticVO;
 import com.pcloud.book.group.vo.ClassifyAndGroupCountVO;
 import com.pcloud.book.group.vo.ClassifyAndUserCountVO;
 import com.pcloud.book.group.vo.ClassifyNameVO;
+import com.pcloud.book.group.vo.ClassifyQrcodeVO;
 import com.pcloud.book.group.vo.ClassifyVO;
 import com.pcloud.book.group.vo.GroupQrcode4ClassifyVO;
 import com.pcloud.book.group.vo.GroupQrcodeBaseInfoVO;
@@ -95,12 +100,15 @@ import com.pcloud.book.record.biz.BookBrowseRecordBiz;
 import com.pcloud.book.record.entity.RegionMap;
 import com.pcloud.book.rightsSetting.biz.RightsSettingBiz;
 import com.pcloud.book.rightsSetting.entity.BaseTempletClassify;
+import com.pcloud.book.skill.dao.PcloudGroupActivityDao;
+import com.pcloud.book.skill.dto.GroupActivity4AppletDTO;
+import com.pcloud.book.skill.enums.ActivityGroupTypeEnum;
+import com.pcloud.book.skill.enums.UpdateTypeEnum;
 import com.pcloud.book.util.common.ThreadPoolUtils;
 import com.pcloud.book.util.properties.BookProps;
 import com.pcloud.common.core.aspect.ParamLog;
 import com.pcloud.common.core.constant.SystemCode;
 import com.pcloud.common.core.enums.NotifyOriginTypeEnum;
-import com.pcloud.common.dto.ResponseDto;
 import com.pcloud.common.page.PageBeanNew;
 import com.pcloud.common.page.PageParam;
 import com.pcloud.common.utils.DateUtils;
@@ -123,7 +131,6 @@ import com.pcloud.wechatgroup.group.dto.GroupMemberStatisDTO;
 import com.pcloud.wechatgroup.group.dto.GroupRobotDTO;
 import com.pcloud.wechatgroup.message.dto.GroupChatCountDTO;
 import lombok.extern.slf4j.Slf4j;
-import sun.management.resources.agent;
 
 import org.apache.commons.collections.MapUtils;
 import org.slf4j.Logger;
@@ -131,12 +138,12 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.dao.DataIntegrityViolationException;
-import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
 import java.math.BigDecimal;
+import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Date;
@@ -233,6 +240,10 @@ public class BookGroupClassifyBizImpl implements BookGroupClassifyBiz {
     private AssistTempletConsr assistTempletConsr;
     @Autowired
     private BookLabelDao bookLabelDao;
+    @Autowired
+    private PcloudGroupActivityDao pcloudGroupActivityDao;
+    @Autowired
+    private AppletGroupSearchRecordBiz appletGroupSearchRecordBiz;
 
 
     @Override
@@ -520,6 +531,7 @@ public class BookGroupClassifyBizImpl implements BookGroupClassifyBiz {
         deleteSpecification(classifyDTO.getProductId(), classifyDTO.getChannelId(), classifyDTO.getProductSpecId());
         //发送topic
         groupSet.sendGroupClassifyDeleteTopic(classifyId);
+        readerConsr.deleteGroupRecore(Lists.newArrayList(classifyId), ActivityGroupTypeEnum.NORMAL_GROUP.value, UpdateTypeEnum.DELETE.value, null);
     }
 
     @Override
@@ -1596,6 +1608,84 @@ public class BookGroupClassifyBizImpl implements BookGroupClassifyBiz {
         return pageBeanNew;
     }
 
+    @Override
+    public Map<Long, GroupDetailDTO> getGroupMap(List<Long> groupIds, Integer groupType) {
+        if (ListUtils.isEmpty(groupIds) || null == groupType) {
+            return  new HashMap<>();
+        }
+        Map<Long, GroupDetailDTO> groupDetailDTOMap = new HashMap<>();
+        Map<Long, GroupActivity4AppletDTO> appletDTOMap = new HashMap<>();
+        if (ActivityGroupTypeEnum.THIRD_GROUP.value.equals(groupType)) {
+            //第三方群
+            appletDTOMap  = pcloudGroupActivityDao.getThridPartByIds(groupIds);
+        } else {
+            //群分类
+            appletDTOMap = pcloudGroupActivityDao.getGroupClassifyByIds(groupIds);
+        }
+        for(GroupActivity4AppletDTO groupActivity4AppletDTO: appletDTOMap.values()){
+            GroupDetailDTO groupDetailDTO = new GroupDetailDTO();
+            ActivityGroupDTO activityGroupDTO = new ActivityGroupDTO();
+            // 填充头像
+            fillGroupActivityHead(Collections.singletonList(groupActivity4AppletDTO));
+            BeanUtils.copyProperties(groupActivity4AppletDTO, activityGroupDTO);
+            String filterStr = StringUtilParent.replaceHtml(groupActivity4AppletDTO.getDesc());
+            String subStr = filterStr.length() > 60 ? filterStr.substring(0, 60) + "..." : filterStr;
+            //填充简介
+            groupDetailDTO.setGroupDesc(subStr);
+            groupActivity4AppletDTO.setCutDesc(subStr);
+            //填充群名称
+            groupDetailDTO.setGroupName(groupActivity4AppletDTO.getName());
+            groupDetailDTO.setActivityGroupDTO(activityGroupDTO);
+            groupDetailDTOMap.put(groupActivity4AppletDTO.getId(), groupDetailDTO);
+        }
+        return groupDetailDTOMap;
+    }
+
+    private void fillGroupActivityHead(List<GroupActivity4AppletDTO> groupActivity4AppletList) {
+        if (!ListUtils.isEmpty(groupActivity4AppletList)) {
+            for (GroupActivity4AppletDTO groupActivity4AppletDTO : groupActivity4AppletList) {
+                //第三方群获取头像 end  add by Pansy
+                Integer integer = 1;
+                if(null != groupActivity4AppletDTO.getGroupType() && groupActivity4AppletDTO.getGroupType().intValue() == integer.intValue()){
+                    //头像列表从缓存里取
+                    List<String> headUrlList = appletGroupSearchRecordBiz
+                            .getHeadUrlList(3, 3l);
+                    groupActivity4AppletDTO.setHeadUrlList(headUrlList);
+                    continue;
+                }
+                //第三方群获取头像 end
+
+
+                String filterStr = StringUtilParent.replaceHtml(groupActivity4AppletDTO.getDesc());
+                String subStr = filterStr.length() > 60 ? filterStr.substring(0, 60) + "..." : filterStr;
+                groupActivity4AppletDTO.setCutDesc(subStr);
+                // 通过群分类ID获取群二维码
+                Long classifyId = groupActivity4AppletDTO.getClassifyId();
+                if(classifyId != null && classifyId != 0) {
+                    String groupQrCode = groupQrcodeBiz.getChangeGroupQrCode(classifyId);
+                    // 通过群二维码链接反查群ID 并补充信息
+                    if (!StringUtil.isEmpty(groupQrCode)){ //2020/06/30 add by pansy 第三方群为空
+                        ClassifyQrcodeVO groupQrcodeInfo = groupQrcodeBiz.getGroupQrcodeInfo(groupQrCode, classifyId);
+                        groupActivity4AppletDTO.setBookGroupQrcodeId(groupQrcodeInfo.getId());
+                        groupActivity4AppletDTO.setGroupName(groupQrcodeInfo.getGroupName());
+                        groupActivity4AppletDTO.setGroupPic(groupQrcodeInfo.getQrcodeUrl());
+                        groupActivity4AppletDTO.setUserNumber(groupQrcodeInfo.getUserNumber());
+
+                        //头像列表从缓存里取
+                        List<String> headUrlList = appletGroupSearchRecordBiz
+                                .getHeadUrlList(groupActivity4AppletDTO.getUserNumber(), groupActivity4AppletDTO.getBookGroupQrcodeId());
+
+                        groupActivity4AppletDTO.setHeadUrlList(headUrlList);
+
+                        List<AppletGroupStatementDTO> statementDTOS = appletGroupSearchRecordBiz
+                                .getStatementList(groupActivity4AppletDTO.getUserNumber(), headUrlList,
+                                        groupActivity4AppletDTO.getBookGroupQrcodeId());
+                        groupActivity4AppletDTO.setStatementDTOList(statementDTOS);
+                    }
+                }
+            }
+        }
+    }
     private void setLabelContent(List<BookGroupClassifyAnalysisVO> recordList) {
         log.info("权益设置标签具体内容");
         if (ListUtils.isEmpty(recordList)){

pcloud-service-book/src/main/java/com/pcloud/book/group/service/impl/BookGroupClassifyServiceImpl.java

@@ -4,6 +4,7 @@ import com.pcloud.book.group.biz.BookGroupClassifyBiz;
 import com.pcloud.book.group.biz.GroupQrcodeBiz;
 import com.pcloud.book.group.dto.BookClassifyDTO;
 import com.pcloud.book.group.dto.GroupClassifyQrcodeDTO;
+import com.pcloud.book.group.dto.GroupDetailDTO;
 import com.pcloud.book.group.dto.GroupQrcode4ClassifyDTO;
 import com.pcloud.book.group.dto.GroupQrcodeBaseDTO;
 import com.pcloud.book.group.dto.GroupQrcodeInfo4Advertising;
@@ -150,4 +151,11 @@ public class BookGroupClassifyServiceImpl implements BookGroupClassifyService {
         }
         return ResponseHandleUtil.toResponse(bigDecimal);
     }
+
+    @Override
+    @PostMapping("getGroupMap")
+    public ResponseEntity<ResponseDto<Map<Long, GroupDetailDTO>>> getGroupMap(@RequestBody List<Long> groupIds, @RequestParam(value = "groupType") Integer groupType) {
+        Map<Long, GroupDetailDTO> groupDetailDTOMap = bookGroupClassifyBiz.getGroupMap(groupIds, groupType);
+        return  ResponseHandleUtil.toResponse(groupDetailDTOMap);
+    }
 }

pcloud-service-book/src/main/java/com/pcloud/book/rightsSetting/entity/RightsSettingItem.java

@@ -8,7 +8,6 @@ import com.pcloud.book.skill.dto.GroupActivity4AppletDTO;
 import com.pcloud.common.entity.BaseEntity;
 
 import java.util.Date;
-import java.io.Serializable;
 import java.util.List;
 
 import io.swagger.annotations.ApiModelProperty;

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

@@ -8,9 +8,6 @@ import com.pcloud.book.applet.biz.AppletGroupSearchRecordBiz;
 import com.pcloud.book.applet.dao.AppletLinkClickDao;
 import com.pcloud.book.applet.dto.AppletGroupManageDTO;
 import com.pcloud.book.applet.dto.AppletGroupStatementDTO;
-import com.pcloud.book.applet.dto.PvuvDTO;
-import com.pcloud.book.applet.enums.DataRecordTypeEnum;
-import com.pcloud.book.applet.enums.DataTypeEnum;
 import com.pcloud.book.base.exception.BookBizException;
 import com.pcloud.book.book.biz.BookBiz;
 import com.pcloud.book.book.dao.BookDao;
@@ -45,6 +42,7 @@ import com.pcloud.book.skill.entity.PcloudGroupActivity;
 import com.pcloud.book.skill.entity.PcloudSkill;
 import com.pcloud.book.skill.enums.ActivityGroupTypeEnum;
 import com.pcloud.book.skill.enums.SkillTypeEnum;
+import com.pcloud.book.skill.enums.UpdateTypeEnum;
 import com.pcloud.book.skill.facade.request.GroupActivityClassifyVO;
 import com.pcloud.book.skill.facade.request.GroupActivityShowStateVO;
 import com.pcloud.book.skill.facade.request.SaveGroupActivityRequestVO;
@@ -62,6 +60,7 @@ import com.pcloud.common.utils.httpclient.UrlUtils;
 import com.pcloud.common.utils.string.StringUtil;
 import com.pcloud.common.utils.string.StringUtilParent;
 import com.pcloud.readercenter.common.enums.YesOrNoNumEnum;
+import com.pcloud.usercenter.common.enums.GroupTypeEnum;
 import com.pcloud.usercenter.party.adviser.service.AdviserService;
 import com.pcloud.usercenter.party.agent.service.AgentService;
 import com.sdk.wxgroup.RobotProcessTypeEnum;
@@ -157,6 +156,7 @@ public class PcloudGroupActivityBizImpl implements PcloudGroupActivityBiz {
     @Override
     public void batchUpdateShowState(GroupActivityShowStateVO groupActivityShowStateVO) {
         pcloudGroupActivityDao.batchUpdateShowState(groupActivityShowStateVO);
+        readerConsr.deleteGroupRecore(groupActivityShowStateVO.getIds(), ActivityGroupTypeEnum.THIRD_GROUP.value, UpdateTypeEnum.UPDATE.value, groupActivityShowStateVO.getShowState() ? 1 : 0);
     }
 
     @ParamLog("批量删除共读模板")
@@ -166,6 +166,7 @@ public class PcloudGroupActivityBizImpl implements PcloudGroupActivityBiz {
             throw new BookBizException(BookBizException.PARAM_IS_ERROR, "参数有误！");
         }
         pcloudGroupActivityDao.deleteByIds(ids);
+        readerConsr.deleteGroupRecore(ids, ActivityGroupTypeEnum.THIRD_GROUP.value, UpdateTypeEnum.DELETE.value, null);
     }
 
 
@@ -233,6 +234,7 @@ public class PcloudGroupActivityBizImpl implements PcloudGroupActivityBiz {
             throw new BookBizException(BookBizException.PARAM_IS_EXIST, "该共读活动已经关联技能，无法删除！");
         }
         pcloudGroupActivityDao.deleteById(id);
+        readerConsr.deleteGroupRecore(Lists.newArrayList(id), ActivityGroupTypeEnum.THIRD_GROUP.value, UpdateTypeEnum.DELETE.value, null);
     }
 
     @Override
@@ -634,6 +636,7 @@ public class PcloudGroupActivityBizImpl implements PcloudGroupActivityBiz {
         }
         byId.setIsShow(showStateDTO.getIsShow());
         pcloudGroupActivityDao.updateByPrimaryKeySelective(byId);
+        readerConsr.deleteGroupRecore(Lists.newArrayList(byId.getId()), ActivityGroupTypeEnum.THIRD_GROUP.value, UpdateTypeEnum.UPDATE.value, showStateDTO.getIsShow());
     }
 
     @Override
@@ -664,7 +667,7 @@ public class PcloudGroupActivityBizImpl implements PcloudGroupActivityBiz {
         PageBeanNew<AppletGroupManageDTO> pageBeanNew = pcloudGroupActivityDao
                 .listPageNew(new PageParam(currentPage, numPerPage), map, "getLocalGroup");
         if (null == pageBeanNew || ListUtils.isEmpty(pageBeanNew.getRecordList())) {
-            return new PageBeanNew<>(currentPage, numPerPage, 0, new ArrayList<>());
+            return new PageBeanNew<>(currentPage, numPerPage, pageBeanNew.getTotalCount(), new ArrayList<>());
         }
         for (AppletGroupManageDTO activity4AppletDTO : pageBeanNew.getRecordList()) {
             activity4AppletDTO.setStatus(0);

pcloud-service-book/src/main/java/com/pcloud/book/skill/dto/GroupActivity4AppletDTO.java

@@ -4,7 +4,6 @@ import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
 import com.pcloud.book.applet.dto.AppletGroupStatementDTO;
 
-import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiModelProperty;
 import java.io.Serializable;
 import java.math.BigDecimal;

pcloud-service-book/src/main/java/com/pcloud/book/skill/enums/UpdateTypeEnum.java

+package com.pcloud.book.skill.enums;
+
+public enum UpdateTypeEnum {
+    DELETE(0),
+    UPDATE(1);
+
+    public final Integer value;
+
+    UpdateTypeEnum(Integer value) {
+        this.value = value;
+    }
+}
\ No newline at end of file

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

 package com.pcloud.book.timecontrol.biz.impl;
 
-import static com.pcloud.book.guide.constant.PcloudGuideRedisConstant.PCLOUD_WAKE_UP_CRON_JOB;
-
 import com.alibaba.fastjson.JSON;
 import com.dcg.util.MapUtils;
 import com.google.common.collect.Lists;
@@ -67,8 +65,7 @@ import com.sdk.wxgroup.SendFileVO;
 import com.sdk.wxgroup.SendMessageTypeEnum;
 import com.sdk.wxgroup.SendPicMessageVO;
 import com.sdk.wxgroup.SendTextMessageVO;
-import io.swagger.models.auth.In;
-import java.sql.Struct;
+
 import java.util.HashMap;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;

pcloud-service-book/src/main/resources/mapper/applet/AppletNews.xml

@@ -207,6 +207,7 @@
     c.news_classify newsClassify,
     n.create_time createTime,
     n.update_time updateTime,
+    n.content content,
     n.rights_classify_id rightsClassifyId,
     d.classify rightsClassifyContent,
     n.jump_type jumpType,

pcloud-service-book/src/main/resources/mapper/skill/PcloudGroupActivityDao.xml

@@ -361,7 +361,6 @@
         a.join_type AS joinType,
         a.`name` AS groupName,
         null userNumber,
-        null classifyId,
         null bookGroupId,
         a.first_classify AS firstClassify,
         a.second_classify AS secondClassify,
@@ -370,12 +369,12 @@
         null AS price,
         null relatedBookGroupId,
         a.group_type as groupType,
-        a.group_extLink as groupLink
+        a.group_extLink as groupLink,
+        a.book_group_classify_id classifyId
         FROM
         pcloud_group_activity a
         WHERE
         a.is_delete = 0 AND a.is_show = 1
-        and group_type ='1'
         AND a.id IN
         <foreach collection="list" item="item" open="(" close=")" separator=",">
             ${item}