Merge branch 'fixbug/1025505' into 'master'

bug: [1025505] 添加群然后下加群还存在

See merge request rays/pcloud-book!957

pcloud-service-book/src/main/java/com/pcloud/book/rightsSetting/biz/impl/RightsSettingBizImpl.java

@@ -869,7 +869,7 @@ public class RightsSettingBizImpl implements RightsSettingBiz {
                     }
                 }
             }
-            fillProductAndApp(nowItems);
+          /*  fillProductAndApp(nowItems);*/
         }
         Iterator<RightsSettingTitle> iterator = rightsSettingTitles.iterator();
         while (iterator.hasNext()) {

pcloud-service-book/src/main/java/com/pcloud/book/rightsSetting/dao/RightsNowItemDao.java

@@ -45,4 +45,17 @@ public interface RightsNowItemDao extends BaseDao<RightsNowItem> {
      * @return
      */
     List<RightsNowItem> getByNewsIds(List<Long> newsIds);
+
+    /**
+     *
+     * @param newArrayList
+     * @return
+     */
+    List<RightsNowItem> getByActivityGroupIds(List<Long> newArrayList);
+
+    /**
+     * 删除失效的模板群
+     * @param activityIds
+     */
+    void deleteInvalidActivityGroups(List<Long> activityIds);
 }

pcloud-service-book/src/main/java/com/pcloud/book/rightsSetting/dao/RightsSettingItemDetailDao.java

@@ -3,7 +3,6 @@ package com.pcloud.book.rightsSetting.dao;
 import com.pcloud.book.rightsSetting.entity.RightsSettingItemDetail;
 import com.pcloud.common.core.dao.BaseDao;
 
-import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -36,4 +35,17 @@ public interface RightsSettingItemDetailDao extends BaseDao<RightsSettingItemDet
      * @return
      */
     List<RightsSettingItemDetail> getByNewsIds(List<Long> newsIds);
+
+    /**
+     * 获取社群关联了多少权益
+     * @param newArrayList
+     * @return
+     */
+    List<RightsSettingItemDetail> getByActivityIds(List<Long> newArrayList);
+
+    /**
+     * 删除无效的模板群
+     * @param activityIds
+     */
+    void deleteInvalidActivityGroups(List<Long> activityIds);
 }
\ No newline at end of file

pcloud-service-book/src/main/java/com/pcloud/book/rightsSetting/dao/impl/RightsNowItemDaoImpl.java

@@ -83,4 +83,15 @@ public class RightsNowItemDaoImpl  extends BaseDaoImpl<RightsNowItem> implements
     public List<RightsNowItem> getByNewsIds(List<Long> newsIds) {
         return getSqlSession().selectList(getStatement("getByNewsIds"), newsIds);
     }
+
+    @Override
+    public List<RightsNowItem> getByActivityGroupIds(List<Long> activityIds) {
+        return getSessionTemplate().selectList(getStatement("getByActivityGroupIds"), activityIds);
+    }
+
+    @Override
+    public void deleteInvalidActivityGroups(List<Long> activityIds) {
+        getSessionTemplate().delete(getStatement("deleteInvalidActivityGroups"), activityIds);
+
+    }
 }

pcloud-service-book/src/main/java/com/pcloud/book/rightsSetting/dao/impl/RightsSettingItemDetailDaoImpl.java

@@ -4,9 +4,7 @@ import com.pcloud.book.rightsSetting.entity.RightsSettingItemDetail;
 import com.pcloud.book.rightsSetting.dao.RightsSettingItemDetailDao;
 import com.pcloud.common.core.dao.BaseDaoImpl;
 import org.springframework.stereotype.Repository;
-import org.apache.ibatis.annotations.Param;
 
-import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -47,4 +45,14 @@ public class RightsSettingItemDetailDaoImpl extends BaseDaoImpl<RightsSettingIte
     public List<RightsSettingItemDetail> getByNewsIds(List<Long> newsIds) {
         return getSqlSession().selectList(getStatement("getByNewsIds"), newsIds);
     }
+
+    @Override
+    public List<RightsSettingItemDetail> getByActivityIds(List<Long> activityIds) {
+        return getSessionTemplate().selectList(getStatement("getByActivityIds"), activityIds);
+    }
+
+    @Override
+    public void deleteInvalidActivityGroups(List<Long> activityIds) {
+        getSessionTemplate().delete(getStatement("deleteInvalidActivityGroups"), activityIds);
+    }
 }
\ No newline at end of file

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

@@ -66,7 +66,7 @@ public interface PcloudGroupActivityBiz {
     PageBeanNew<QueryGroupActivityResponseVO> queryGroupActivity(String name, Long proLabelId, Long purLabelId, Long depLabelId, Integer joinType, Long firstClassify,
                                                                  Long secondClassify,
                                                                  Long gradeLabelId,
-                                                                 Long subjectLabelId, Integer numPerPage, Integer currentPage, String cityCode, Long agentId);
+                                                                 Long subjectLabelId, Integer numPerPage, Integer currentPage, String cityCode, Long agentId, Integer isChoose);
 
     /**
      * 获取共读活动列表（弹窗）

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

@@ -32,6 +32,8 @@ import com.pcloud.book.rightsSetting.biz.RightsSettingBiz;
 import com.pcloud.book.rightsSetting.dao.RightsNowItemDao;
 import com.pcloud.book.rightsSetting.dao.RightsSettingItemDetailDao;
 import com.pcloud.book.rightsSetting.entity.BaseTempletClassify;
+import com.pcloud.book.rightsSetting.entity.RightsNowItem;
+import com.pcloud.book.rightsSetting.entity.RightsSettingItemDetail;
 import com.pcloud.book.rightsSetting.entity.RightsSettingTitle;
 import com.pcloud.book.rightsSetting.enums.RightsNowItemType;
 import com.pcloud.book.rightsSetting.mapper.RightsSettingTitleMapper;
@@ -51,6 +53,7 @@ import com.pcloud.book.skill.facade.request.SaveGroupActivityRequestVO;
 import com.pcloud.book.skill.facade.request.UpdateGroupActivityRequestVO;
 import com.pcloud.book.skill.facade.response.ListGroupActivityResponseVO;
 import com.pcloud.book.skill.facade.response.QueryGroupActivityResponseVO;
+import com.pcloud.book.util.common.YesOrNoEnums;
 import com.pcloud.common.core.aspect.ParamLog;
 import com.pcloud.common.exceptions.BizException;
 import com.pcloud.common.page.PageBeanNew;
@@ -72,7 +75,6 @@ import java.util.Arrays;
 import java.util.Iterator;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections.MapUtils;
-import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
@@ -163,6 +165,9 @@ public class PcloudGroupActivityBizImpl implements PcloudGroupActivityBiz {
     public void batchUpdateShowState(GroupActivityShowStateVO groupActivityShowStateVO) {
         pcloudGroupActivityDao.batchUpdateShowState(groupActivityShowStateVO);
         readerConsr.deleteGroupRecore(groupActivityShowStateVO.getIds(), ActivityGroupTypeEnum.THIRD_GROUP.value, GroupUpdateTypeEnum.UPDATE.value, groupActivityShowStateVO.getShowState() ? 1 : 0);
+        if (!groupActivityShowStateVO.getShowState()) {
+            deleteInvalidGroupIds(groupActivityShowStateVO.getIds());
+        }
     }
 
     @ParamLog("批量删除共读模板")
@@ -173,6 +178,7 @@ public class PcloudGroupActivityBizImpl implements PcloudGroupActivityBiz {
         }
         pcloudGroupActivityDao.deleteByIds(ids);
         readerConsr.deleteGroupRecore(ids, ActivityGroupTypeEnum.THIRD_GROUP.value, GroupUpdateTypeEnum.DELETE.value, null);
+        deleteInvalidGroupIds(ids);
     }
 
 
@@ -245,6 +251,7 @@ public class PcloudGroupActivityBizImpl implements PcloudGroupActivityBiz {
         }
         pcloudGroupActivityDao.deleteById(id);
         readerConsr.deleteGroupRecore(Lists.newArrayList(id), ActivityGroupTypeEnum.THIRD_GROUP.value, GroupUpdateTypeEnum.DELETE.value, null);
+        deleteInvalidGroupIds(Lists.newArrayList(id));
     }
 
     @Override
@@ -297,7 +304,7 @@ public class PcloudGroupActivityBizImpl implements PcloudGroupActivityBiz {
     public PageBeanNew<QueryGroupActivityResponseVO> queryGroupActivity(String name, Long proLabelId, Long purLabelId, Long depLabelId, Integer joinType, Long firstClassify,
                                                                         Long secondClassify,
                                                                         Long gradeLabelId,
-                                                                        Long subjectLabelId, Integer numPerPage, Integer currentPage, String cityCode,Long agentId) {
+                                                                        Long subjectLabelId, Integer numPerPage, Integer currentPage, String cityCode, Long agentId, Integer isChoose) {
 
         PageParam pageParam = new PageParam(currentPage, numPerPage);
         BaseTempletClassify baseTempletClassify =new BaseTempletClassify();
@@ -320,6 +327,7 @@ public class PcloudGroupActivityBizImpl implements PcloudGroupActivityBiz {
         paraMap.put("subjectLabelId", baseTempletClassify.getSubjectLabelId());
         paraMap.put("cityCode", cityCode);
         paraMap.put("agentId", agentId);
+        paraMap.put("isChoose", isChoose);
         PageBeanNew<QueryGroupActivityResponseVO> queryGroupActivity = pcloudGroupActivityDao.listPageNew(pageParam, paraMap, "queryGroupActivity");
         if (null == queryGroupActivity || CollectionUtils.isEmpty(queryGroupActivity.getRecordList())) {
             return queryGroupActivity;
@@ -649,9 +657,30 @@ public class PcloudGroupActivityBizImpl implements PcloudGroupActivityBiz {
         }
         byId.setIsShow(showStateDTO.getIsShow());
         pcloudGroupActivityDao.updateByPrimaryKeySelective(byId);
+        if (YesOrNoEnums.NO.getValue().equals(showStateDTO.getIsShow())) {
+            deleteInvalidGroupIds(Lists.newArrayList(showStateDTO.getId()));
+        }
         readerConsr.deleteGroupRecore(Lists.newArrayList(byId.getId()), ActivityGroupTypeEnum.THIRD_GROUP.value, GroupUpdateTypeEnum.UPDATE.value, showStateDTO.getIsShow());
     }
 
+    private void deleteInvalidGroupIds(List<Long> activityIds) {
+        if (ListUtils.isEmpty(activityIds)) {
+            return;
+        }
+        //查询该资讯关联了多少权益
+        List<RightsNowItem> rightsNowItems = rightsNowItemDao.getByActivityGroupIds(activityIds);
+        List<RightsSettingItemDetail> rightsSettingItemDetails = rightsSettingItemDetailDao.getByActivityIds(activityIds);
+        if (!ListUtils.isEmpty(rightsNowItems)) {
+            log.info("删除无效的资源前先查询rightsNowItems:{}", rightsNowItems);
+            rightsNowItemDao.deleteInvalidActivityGroups(activityIds);
+        }
+        if (!ListUtils.isEmpty(rightsSettingItemDetails)) {
+            log.info("删除无效的资源前先查询rightsSettingItemDetails:{}", rightsSettingItemDetails);
+            rightsSettingItemDetailDao.deleteInvalidActivityGroups(activityIds);
+        }
+    }
+
+
     @Override
     public Map<Long, GroupActivity4AppletDTO> getByIds4Now(List<Long> ids) {
         if (ListUtils.isEmpty(ids)) {

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

@@ -109,10 +109,12 @@ public class PcloudGroupActivityFacade {
                                                                                      @RequestParam(value = "subjectLabelId", required = false) Long subjectLabelId,
                                                                                      @RequestParam(value = "cityCode", required = false) String cityCode,
                                                                                      @RequestParam("numPerPage") Integer numPerPage,
-                                                                                     @RequestParam("currentPage")  Integer currentPage){
+                                                                                     @RequestParam("currentPage")  Integer currentPage,
+                                                                                     @RequestParam(value = "isChoose", required = false) Integer isChoose){
         Map<String, Object> map = SessionUtil.getToken4Redis(token);
         Long agentId = (Long) map.get(SessionUtil.RAY_AGENT_ID);
-        return new ResponseDto<>(pcloudGroupActivityBiz.queryGroupActivity(name, proLabelId, purLabelId, depLabelId, joinType,firstClassify,secondClassify, gradeLabelId,subjectLabelId,numPerPage, currentPage,cityCode, agentId));
+        return new ResponseDto<>(pcloudGroupActivityBiz.queryGroupActivity(name, proLabelId, purLabelId, depLabelId, joinType,firstClassify,
+                secondClassify, gradeLabelId,subjectLabelId,numPerPage, currentPage,cityCode, agentId, isChoose));
     }
 
     @ApiOperation("获取共读活动列表（弹窗）")

pcloud-service-book/src/main/resources/mapper/rightssetting/RightNowItem.xml

@@ -233,4 +233,35 @@
             #{item}
         </foreach>
     </select>
+
+    <select id="getByActivityGroupIds" parameterType="list" resultMap="BaseResultMap">
+        select
+        <include refid="Base_Column_List"/>
+        from
+        rights_now_item
+        where
+        serve_type = "GROUP"
+        and
+        group_type &lt;&gt; 2
+        and
+        serve_id in
+        <foreach collection="list" item="item" index="index" open="(" separator="," close=")">
+            #{item}
+        </foreach>
+    </select>
+
+    <delete id="deleteInvalidActivityGroups" parameterType="list">
+        delete
+        from
+        rights_now_item
+        where
+        serve_type = "GROUP"
+        and
+        group_type &lt;&gt; 2
+        and
+        serve_id in
+        <foreach collection="list" item="item" index="index" open="(" separator="," close=")">
+            #{item}
+        </foreach>
+    </delete>
 </mapper>
\ No newline at end of file

pcloud-service-book/src/main/resources/mapper/rightssetting/RightsSettingItemDetail.Mapper.xml

@@ -164,4 +164,35 @@
         </foreach>
     </select>
 
+    <select id="getByActivityIds" parameterType="list" resultMap="BaseResultMap">
+        select
+        <include refid="Base_Column_List"/>
+        from
+        rights_setting_item_detail
+        where
+        serve_type = "GROUP"
+        and
+        group_type &lt;&gt; 2
+        and
+        serve_id in
+        <foreach collection="list" item="item" index="index" open="(" separator="," close=")">
+            #{item}
+        </foreach>
+    </select>
+
+    <delete id="deleteInvalidActivityGroups" parameterType="list">
+        delete
+        from
+        rights_setting_item_detail
+        where
+        serve_type = "GROUP"
+        and
+        group_type &lt;&gt; 2
+        and
+        serve_id in
+        <foreach collection="list" item="item" index="index" open="(" separator="," close=")">
+            #{item}
+        </foreach>
+    </delete>
+
 </mapper>
\ No newline at end of file

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

@@ -138,6 +138,11 @@
         pcloud_group_activity a left join book_group_classify b on a.book_group_classify_id = b.id
         WHERE
         a.is_delete = 0
+        <if test='isChoose == "1"'>
+            and
+            ifnull(b.is_delete, 0) = 0
+            and a.is_Show = 1
+        </if>
         <if test="proLabelId != null">
             and a.pro_label_id = #{proLabelId}
         </if>
@@ -196,8 +201,8 @@
         count(c.classify_id) AS groupCount
         FROM
         pcloud_group_activity a
-        LEFT JOIN book_group_classify b ON a.book_group_classify_id = b.id AND b.is_delete = 0
-        LEFT JOIN book_group_qrcode c ON b.id = c.classify_id AND c.is_delete = 0
+        LEFT JOIN book_group_classify b ON a.book_group_classify_id = b.id
+        LEFT JOIN book_group_qrcode c ON b.id = c.classify_id
         LEFT JOIN book_group d ON b.book_group_id = d.id
         <where>
             <if test="name!=null or bookIds != null and bookIds.size()>0">
@@ -222,7 +227,7 @@
             <if test="joinType != null">
                 AND a.join_type = #{joinType}
             </if>
-            AND a.is_delete = 0
+            AND a.is_delete = 0  and   ifnull(b.is_delete, 0) = 0  and a.is_show = 1
             <choose>
                 <when test="agentId != null">
                     and a.agent_id = #{agentId}