Merge branch 'feat-1001733' into 'master'

处理旧数据更新暗号

See merge request rays/pcloud-book!192

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

@@ -105,4 +105,8 @@ public interface BookGroupService {
     @GetMapping("dealSelfBookGroupKeywordToServer")
     void dealSelfBookGroupKeywordToServer();
 
+    @ApiOperation("补充1v1旧数据的暗号")
+    @GetMapping("fillSelfBookGroupCipher")
+    void fillSelfBookGroupCipher();
+
 }

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

@@ -449,4 +449,9 @@ public interface BookGroupBiz {
      * 将1v1旧数据的关键词全部都干掉，有应用或作品的挂在社群书配置资源里面
      */
     void dealSelfBookGroupKeywordToServer();
+
+    /**
+     * 补充1v1旧数据的暗号
+     */
+    void fillSelfBookGroupCipher();
 }

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

@@ -2318,6 +2318,20 @@ public class BookGroupBizImpl implements BookGroupBiz {
         bookKeywordDao.deleteByBookGroupIds(bookGroupIds);
     }
 
+    @ParamLog("补充1v1旧数据的暗号")
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public void fillSelfBookGroupCipher() {
+        List<BookGroup> bookGroups = bookGroupDao.getNoCipherSelfBookGroups();
+        if (ListUtils.isEmpty(bookGroups)) {
+            return;
+        }
+        for (BookGroup bookGroup : bookGroups) {
+            String groupCipher = getBookGroupCipher();
+            bookGroupDao.updateCipher(bookGroup.getId(),groupCipher);
+        }
+    }
+
     @ParamLog("生成暗号")
     private String createBookGroupCipher(){
         //生成暗号规则：abc1234，前三位小写字母，后四位数字

pcloud-service-book/src/main/java/com/pcloud/book/group/dao/BookGroupDao.java

@@ -181,4 +181,14 @@ public interface BookGroupDao extends BaseDao<BookGroup> {
      * 根据入群方式查询社群书集合
      */
     List<BookGroup> getBookGroupByJoinGroupType(Integer joinGroupType);
+
+    /**
+     * 获取1V1的没有暗号的社群书
+     */
+    List<BookGroup> getNoCipherSelfBookGroups();
+
+    /**
+     * 更新暗号
+     */
+    void updateCipher(Long id, String bookGroupCipher);
 }

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

@@ -186,4 +186,17 @@ public class BookGroupDaoImpl extends BaseDaoImpl<BookGroup> implements BookGrou
     public List<BookGroup> getBookGroupByJoinGroupType(Integer joinGroupType) {
         return this.getSqlSession().selectList(getStatement("getBookGroupByJoinGroupType"), joinGroupType);
     }
+
+    @Override
+    public List<BookGroup> getNoCipherSelfBookGroups() {
+        return this.getSqlSession().selectList(getStatement("getNoCipherSelfBookGroups"));
+    }
+
+    @Override
+    public void updateCipher(Long id, String bookGroupCipher) {
+        Map<String, Object> paramMap = new HashMap<>();
+        paramMap.put("id", id);
+        paramMap.put("bookGroupCipher", bookGroupCipher);
+        super.getSqlSession().update(getStatement("updateCipher"), paramMap);
+    }
 }

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

@@ -176,4 +176,11 @@ public class BookGroupServiceImpl implements BookGroupService {
         bookGroupBiz.dealSelfBookGroupKeywordToServer();
     }
 
+    @ApiOperation("补充1v1旧数据的暗号")
+    @GetMapping("fillSelfBookGroupCipher")
+    @Override
+    public void fillSelfBookGroupCipher() {
+        bookGroupBiz.fillSelfBookGroupCipher();
+    }
+
 }

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

@@ -458,4 +458,20 @@
         where join_group_type=#{joinGroupType}
         and is_delete=0
     </select>
+
+    <!--获取1V1的没有暗号的社群书-->
+    <select id="getNoCipherSelfBookGroups" resultMap="BaseResultMap">
+        select <include refid="Base_Column_List"/>
+        from book_group
+        where join_group_type=2
+        and book_group_cipher is null
+    </select>
+
+    <!--更新暗号-->
+    <update id="updateCipher" parameterType="map" >
+        update book_group set
+        book_group_cipher = #{bookGroupCipher},
+        update_time=now()
+        where id=#{id}
+    </update>
 </mapper>
\ No newline at end of file