Merge branch 'feature/1003185' into 'master'

feat: [1003185] 权益配置选群加社群名字字段，添加拼群开关，立享权益添加排序

See merge request rays/pcloud-book!827

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

@@ -44,6 +44,9 @@ public class PcloudBookGroupClassifyVO {
     @ApiModelProperty("城市名称")
     private String cityName;
 
+    @ApiModelProperty("社群名称")
+    private String groupQrcodeName;
+
     public String getCityName() {
         return cityName;
     }
@@ -148,6 +151,14 @@ public class PcloudBookGroupClassifyVO {
         this.groupPic = groupPic;
     }
 
+    public String getGroupQrcodeName() {
+        return groupQrcodeName;
+    }
+
+    public void setGroupQrcodeName(String groupQrcodeName) {
+        this.groupQrcodeName = groupQrcodeName;
+    }
+
     @Override
     public String toString() {
         return "PcloudBookGroupClassifyVO{" +

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

@@ -51,4 +51,6 @@ public interface RightsSettingItemDao extends BaseDao<RightsSettingItem>{
     Map<Long, RightsSettingClassify> getRightsClassifyMap(ArrayList<Long> longs);
 
     List<RightsSettingItem> getItemsByClassify(Long firstClassify, Long secondClassify, Long gradeLabelId, Long subjectLabelId, Long volLabelId, String rightsType, Integer readType, Long rightsClassifyId);
+
+    List<RightsSettingItem> getRightSettingInfo(String serveType, String rightsType, Long rightsSettingId);
 }
\ No newline at end of file

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

@@ -84,4 +84,13 @@ public class RightsSettingItemDaoImpl extends BaseDaoImpl<RightsSettingItem> imp
         map.put("rightsClassifyId",rightsClassifyId);
         return getSessionTemplate().selectList(getStatement("getItemsByClassify"), map);
     }
+
+    @Override
+    public List<RightsSettingItem> getRightSettingInfo(String serveType, String rightsType, Long rightsSettingId){
+        Map<String,Object> map = new HashMap<>();
+        map.put("serveType",serveType);
+        map.put("rightsType",rightsType);
+        map.put("rightsSettingId",rightsSettingId);
+        return getSessionTemplate().selectList(getStatement("getRightSettingInfo"), map);
+    }
 }

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

@@ -101,4 +101,9 @@ public class RightsSettingItem extends BaseEntity {
      * 阅读方式1轻松2高效3深度
      */
     private Integer readType;
+
+    /**
+     * 拼群开关 0 不拼 1 拼
+     */
+    private Integer collageState;
 }
\ No newline at end of file

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

@@ -63,4 +63,10 @@ public class RightsSettingNow {
 
 
   private Boolean onlineCourseOpen;
+
+  /**
+   * 排序后的settingTitle集合
+   */
+  @ApiModelProperty("排序后的settingTitle集合")
+  private List<RightsSettingTitle> newRightsSettingTitles;
 }
\ No newline at end of file

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

@@ -52,4 +52,10 @@ public class RightsSettingTitle implements Serializable {
      */
     private Boolean deepRead;
 
+    /**
+     * 拼群开关 0 不拼 1 拼
+     */
+    private Integer collageState;
+
+    private Integer seqNum;
 }
\ No newline at end of file

pcloud-service-book/src/main/java/com/pcloud/book/rightsSetting/facade/RightsSettingFacede.java

@@ -65,9 +65,9 @@ public class RightsSettingFacede {
 
     @GetMapping("getRightsSetting")
     public ResponseDto<RightsSetting> getRightsSetting(
-//            @RequestHeader("token") String token,
+            @RequestHeader("token") String token,
             @RequestParam("id") Long id ) throws PermissionException {
-//        SessionUtil.getToken4Redis(token);
+        SessionUtil.getToken4Redis(token);
         return new ResponseDto<RightsSetting>(rightsSettingBiz.getRightsSetting(id));
     }
 

pcloud-service-book/src/main/resources/application.yml

@@ -5,8 +5,8 @@ server:
 eureka:
   instance:
     status-page-url-path: /book/v1.0/swagger-ui.html
-#  client:
-#   register-with-eureka: false #禁止自己当做服务注册
+  client:
+   register-with-eureka: false #禁止自己当做服务注册
 
 spring:
   application:

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

@@ -1126,6 +1126,7 @@
             a.create_user as adviserId,
             count(b.classify_id) AS groupCount,
             c.agent_id as agentId,
+            c.group_qrcode_name as groupQrcodeName,
             city_code cityCode
         FROM
             book_group_classify a

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

@@ -17,6 +17,7 @@
         <result property="easyRead" column="easy_read" jdbcType="TINYINT" />
         <result property="efficientRead" column="efficient_read" jdbcType="TINYINT" />
         <result property="deepRead" column="deep_read" jdbcType="TINYINT" />
+        <result property="collageState" column="collage_state" jdbcType="INTEGER" />
     </resultMap>
 
     <!--通过实体作为筛选条件查询-->
@@ -25,7 +26,7 @@
         i.id, i.rights_setting_id rightsSettingId,
         i.rights_type rightsType, i.rights_classify_id rightsClassifyId,
     i.description, i.create_time createTime, i.title,i.uuid,i.open_state openState,i.service_desc serviceDesc,i.serve_type serveType,
-        c.book_id bookId, i.easy_read easyRead,i.efficient_read efficientRead,i.deep_read deepRead
+        c.book_id bookId, i.easy_read easyRead,i.efficient_read efficientRead,i.deep_read deepRead,i.collage_state collageState
         from book.rights_setting_item i
         LEFT JOIN rights_setting c ON c.id=i.rights_setting_id
         <where>
@@ -107,9 +108,9 @@
     <!--新增所有列-->
     <insert id="insert" keyProperty="id" useGeneratedKeys="true">
         insert into book.rights_setting_item(rights_setting_id, rights_type, rights_classify_id, description, create_time,title,uuid,open_state,service_desc,serve_type,
-        easy_read,efficient_read,deep_read)
+        easy_read,efficient_read,deep_read,collage_state)
         values (#{rightsSettingId}, #{rightsType}, #{rightsClassifyId}, #{description}, NOW(), #{title},#{uuid},#{openState},#{serviceDesc},#{serveType},
-        #{easyRead},#{efficientRead},#{deepRead})
+        #{easyRead},#{efficientRead},#{deepRead},#{collageState})
     </insert>
 
     <!--通过权益主键删除-->
@@ -125,7 +126,7 @@
     <insert id="batchInsert" useGeneratedKeys="true" parameterType="java.util.List">
         insert into book.rights_setting_item (
         rights_setting_id, rights_type, rights_classify_id, description, create_time,title,uuid,open_state,service_desc,serve_type,
-        easy_read,efficient_read,deep_read
+        easy_read,efficient_read,deep_read,collage_state
         )
         values
         <foreach collection="list" item="item" index="index" separator="," >
@@ -140,7 +141,8 @@
             #{item.openState},
             #{item.serviceDesc},
             #{item.serveType},
-            #{item.easyRead},#{item.efficientRead},#{item.deepRead}
+            #{item.easyRead},#{item.efficientRead},#{item.deepRead},
+            #{item.collageState}
             )
         </foreach>
     </insert>
@@ -201,4 +203,19 @@
         </where>
     </select>
 
+    <select id="getRightSettingInfo" parameterType="list" resultMap="RightsSettingItemMap">
+        SELECT id, rights_setting_id, serve_type , rights_type ,collage_state
+        FROM rights_setting_item
+        WHERE 1=1
+        <if test="serveType!=null">
+            and serve_type=#{serveType}
+        </if>
+        <if test="rightsType!=null">
+            and rights_type=#{rightsType}
+        </if>
+        <if test="rightsSettingId!=null">
+            and rights_setting_id=#{rightsSettingId}
+        </if>
+    </select>
+
 </mapper>
\ No newline at end of file

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

@@ -14,12 +14,14 @@
     <result column="easy_read" jdbcType="TINYINT" property="easyRead" />
     <result column="efficient_read" jdbcType="TINYINT" property="efficientRead" />
     <result column="deep_read" jdbcType="TINYINT" property="deepRead" />
+    <result column="seq_num" jdbcType="INTEGER" property="seqNum" />
+    <result column="collage_state" jdbcType="TINYINT" property="collageState" />
   </resultMap>
 
   <sql id="baseSql">
     id, rights_setting_id, rights_setting_title,
     rights_setting_desc, open_state, create_time,
-    update_time,rights_setting_now_type,serve_type,easy_read,efficient_read,deep_read
+    update_time,rights_setting_now_type,serve_type,easy_read,efficient_read,deep_read,seq_num,collage_state
   </sql>
   <insert id="insert" parameterType="com.pcloud.book.rightsSetting.entity.RightsSettingTitle">
     insert into rights_setting_title (id, rights_setting_id, rights_setting_title, 
@@ -97,12 +99,12 @@
   <insert id="batchInsert" parameterType="com.pcloud.book.rightsSetting.entity.RightsSettingTitle" useGeneratedKeys="true" keyProperty="id">
     insert into rights_setting_title (rights_setting_id, rights_setting_title,
     rights_setting_desc, open_state, create_time, update_time,rights_setting_now_type,serve_type,
-    easy_read,efficient_read,deep_read)
+    easy_read,efficient_read,deep_read,seq_num, collage_state)
     values
     <foreach collection="list" item="item" index="index" separator=",">
     (#{item.rightsSettingId,jdbcType=BIGINT}, #{item.rightsSettingTitle,jdbcType=VARCHAR},
     #{item.rightsSettingDesc,jdbcType=VARCHAR}, #{item.openState,jdbcType=TINYINT}, now(), now(),#{item.rightsSettingNowType},#{item.serveType},
-    #{item.easyRead},#{item.efficientRead},#{item.deepRead})
+    #{item.easyRead},#{item.efficientRead},#{item.deepRead},#{item.seqNum}, #{item.collageState})
     </foreach>
   </insert>