Merge branch 'fixbug-rsy' into 'master'

内部接口自动上架

See merge request rays/pcloud-book!243

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

@@ -123,4 +123,8 @@ public interface BookGroupService {
     @GetMapping("getQrcodeIdsByBookGroupId")
     ResponseEntity<ResponseDto<List<Long>>> getQrcodeIdsByBookGroupId(@RequestParam("bookGroupId") Long bookGroupId);
 
+    @ApiOperation("上架所有的个人号配置资源")
+    @GetMapping("dealBookGroupServeOldOnShelves")
+    void dealBookGroupServeOldOnShelves();
+
 }

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

@@ -513,4 +513,9 @@ public interface BookGroupBiz {
      * 获取是否能推送更新的各个状态
      */
     Map<String,Boolean> getStatesForPushUpdate(Long bookGroupId);
+
+    /**
+     * 上架所有的个人号配置资源
+     */
+    void dealBookGroupServeOldOnShelves();
 }

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

@@ -2568,6 +2568,31 @@ public class BookGroupBizImpl implements BookGroupBiz {
         return map;
     }
 
+    @ParamLog("上架所有的个人号配置资源")
+    @Override
+    public void dealBookGroupServeOldOnShelves() {
+        //查询所有的配置资源作品
+        List<BookGroupServe> list = bookGroupServeDao.getProductServeList();
+        if (!ListUtils.isEmpty(list)) {
+            List<Long> bookGroupIds = list.stream().map(BookGroupServe::getBookGroupId).distinct().collect(Collectors.toList());
+            List<BookGroupDTO> dtos = bookGroupDao.getDTOByIds(bookGroupIds);
+            Map<Long, Long> channelMap = new HashMap<>();
+            for (BookGroupDTO bookGroupDTO : dtos) {
+                channelMap.put(bookGroupDTO.getId(), bookGroupDTO.getChannelId());
+            }
+            Map<Long, List<BookGroupServe>> map = list.stream().collect(Collectors.groupingBy(BookGroupServe::getBookGroupId));
+            for (Long bookGroupId : bookGroupIds) {
+                List<BookGroupServe> bookGroupServes = map.get(bookGroupId);
+                Long channelId = channelMap.get(bookGroupId);
+                if (!ListUtils.isEmpty(bookGroupServes) && channelId != null) {
+                    List<Long> productIds = bookGroupServes.stream().filter(s -> s.getServeId() != null).map(BookGroupServe::getServeId).collect(Collectors.toList());
+                    //上架
+                    productConsr.productAutoOnShelves(channelId, productIds);
+                }
+            }
+        }
+    }
+
     @ParamLog("生成暗号")
     private String createBookGroupCipher(){
         //生成暗号规则：abc1234，前三位小写字母，后四位数字

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

@@ -15,4 +15,6 @@ public interface BookGroupServeDao extends BaseDao<BookGroupServe> {
     List<BookGroupServe> getListByServerType(String serveType);
 
     void updateShortUrl(Long id, String shortUrl);
+
+    List<BookGroupServe> getProductServeList();
 }

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

@@ -43,4 +43,9 @@ public class BookGroupServeDaoImpl extends BaseDaoImpl<BookGroupServe> implement
         map.put("shortUrl", shortUrl);
         super.getSqlSession().update(getStatement("updateShortUrl"), map);
     }
+
+    @Override
+    public List<BookGroupServe> getProductServeList() {
+        return super.getSqlSession().selectList(getStatement("getProductServeList"));
+    }
 }

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

@@ -205,4 +205,10 @@ public class BookGroupServiceImpl implements BookGroupService {
         List<Long> qrcodeIds = bookGroupBiz.getQrcodeIdsByBookGroupId(bookGroupId);
         return ResponseHandleUtil.toResponse(qrcodeIds);
     }
+
+    @ApiOperation("上架所有的个人号配置资源")
+    @GetMapping("dealBookGroupServeOldOnShelves")
+    void dealBookGroupServeOldOnShelves(){
+        bookGroupBiz.dealBookGroupServeOldOnShelves();
+    }
 }

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

@@ -96,4 +96,11 @@
         short_url=#{shortUrl}
         where id=#{id}
     </update>
+
+    <!--查询所有作品-->
+    <select id="getProductServeList" resultMap="BaseResultMap">
+        select <include refid="Base_Column_List"/>
+        from book_group_serve
+        where serve_type='PRODUCT'
+    </select>
 </mapper>
\ No newline at end of file