Merge branch 'feature/1003414' into 'master'

feat： 【1003414】 优化学舍页面修改为我的社群

See merge request rays/pcloud-book!903

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

@@ -103,7 +103,7 @@ 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.skill.enums.GroupUpdateTypeEnum;
 import com.pcloud.book.util.common.ThreadPoolUtils;
 import com.pcloud.book.util.properties.BookProps;
 import com.pcloud.common.core.aspect.ParamLog;
@@ -143,7 +143,6 @@ 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;
@@ -531,7 +530,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);
+        readerConsr.deleteGroupRecore(Lists.newArrayList(classifyId), ActivityGroupTypeEnum.NORMAL_GROUP.value, GroupUpdateTypeEnum.DELETE.value, null);
     }
 
     @Override

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

@@ -42,7 +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.enums.GroupUpdateTypeEnum;
 import com.pcloud.book.skill.facade.request.GroupActivityClassifyVO;
 import com.pcloud.book.skill.facade.request.GroupActivityShowStateVO;
 import com.pcloud.book.skill.facade.request.SaveGroupActivityRequestVO;
@@ -60,7 +60,6 @@ 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;
@@ -156,7 +155,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);
+        readerConsr.deleteGroupRecore(groupActivityShowStateVO.getIds(), ActivityGroupTypeEnum.THIRD_GROUP.value, GroupUpdateTypeEnum.UPDATE.value, groupActivityShowStateVO.getShowState() ? 1 : 0);
     }
 
     @ParamLog("批量删除共读模板")
@@ -166,7 +165,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);
+        readerConsr.deleteGroupRecore(ids, ActivityGroupTypeEnum.THIRD_GROUP.value, GroupUpdateTypeEnum.DELETE.value, null);
     }
 
 
@@ -234,7 +233,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);
+        readerConsr.deleteGroupRecore(Lists.newArrayList(id), ActivityGroupTypeEnum.THIRD_GROUP.value, GroupUpdateTypeEnum.DELETE.value, null);
     }
 
     @Override
@@ -636,7 +635,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());
+        readerConsr.deleteGroupRecore(Lists.newArrayList(byId.getId()), ActivityGroupTypeEnum.THIRD_GROUP.value, GroupUpdateTypeEnum.UPDATE.value, showStateDTO.getIsShow());
     }
 
     @Override

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

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