Skip to content

M
midjourney-proxy
Commit 7e5bcc28 by 田超
Options

Merge branch 'fixbug/linkUrl' into 'master' 

feat: [none] rays码bug

See merge request rays/pcloud-book!1294
parents da6d0c89 c4c27549
Showing with 52 additions and 320 deletions
pcloud-service-book/src/main/java/com/pcloud/book/group/biz/ResourcePageBiz.java
......@@ -66,13 +66,6 @@ public interface ResourcePageBiz {
ResourcePageVO getResourcePageByBookId(Long bookId, Long channelId, Long adviserId, Long wechatUserId);
/**
* 处理旧数据
* @author：zhuyajie
* @date：2021/3/31 11:38
* * @param null
*/
void dealResource(List<Long> bookGroupIdList, List<Long> sceneIdList);
/**
* 栏目分页查询
* @author：zhuyajie
* @date：2021/3/31 19:06
......
pcloud-service-book/src/main/java/com/pcloud/book/group/biz/impl/ResourcePageBizImpl.java
......@@ -73,6 +73,7 @@ import com.pcloud.common.page.PageParam;
import com.pcloud.common.utils.BeanUtils;
import com.pcloud.common.utils.DateUtils;
import com.pcloud.common.utils.ListUtils;
import com.pcloud.common.utils.NumberUtil;
import com.pcloud.common.utils.QrcodeUtils;
import com.pcloud.common.utils.UUIDUitl;
import com.pcloud.common.utils.string.StringUtil;
......@@ -632,6 +633,7 @@ public class ResourcePageBizImpl implements ResourcePageBiz {
if (ListUtils.isEmpty(itemVOS)) {
return;
}
Long adviserId = itemVOS.get(0).getCreateUser();
List<Long> appIds = new ArrayList<>();
List<Long> productIds = new ArrayList<>();
for (ResourcePageItemVO vo : itemVOS) {
......@@ -678,7 +680,8 @@ public class ResourcePageBizImpl implements ResourcePageBiz {
}
Long channelId = getChannelIdFromUrl(itemVO.getLinkUrl());
if (null == channelId) {
throw new BookBizException(BookBizException.ERROR, itemVO.getServeName() + "无运营平台");
log.info(itemVO.getServeName() + "无运营平台, serveId=" + itemVO.getServeId());
channelId = adviserConsr.getDefaultChannel(adviserId);
}
itemVO.setChannelId(channelId);
if (isWechat) {
......@@ -706,7 +709,7 @@ public class ResourcePageBizImpl implements ResourcePageBiz {
if (url.contains("/C")) {
url = url.substring(url.indexOf("/C") + 2);
url = url.substring(0, url.indexOf("/"));
if (!StringUtil.isEmpty(url)) {
if (!StringUtil.isEmpty(url) && NumberUtil.isNumber(url)) {
channelId = Long.valueOf(url);
}
}
......@@ -773,306 +776,6 @@ public class ResourcePageBizImpl implements ResourcePageBiz {
@Override
public void dealResource(List<Long> bookGroupIdList, List<Long> sceneIdList) {
if (!ListUtils.isEmpty(bookGroupIdList)) {
List<BookGroupDTO> list = bookGroupDao.getDTOByIds(bookGroupIdList);
if (ListUtils.isEmpty(list)) {
return;
}
for (BookGroupDTO bookGroupDTO : list) {
Long bookGroupId = bookGroupDTO.getId();
Long adviserId = bookGroupDTO.getCreateUser();
Long bookId = bookGroupDTO.getBookId();
Long channelId = bookGroupDTO.getChannelId();
//创建资源页
ResourcePage resourcePage = resourcePageDao.getByBookGroupId(bookGroupId);
if (null == resourcePage) {
Integer openRays = QrcodeJumpType.H5_RESOURCE.getCode().equals(bookGroupDTO.getJumpType())?0:1;
resourcePage = this.createDefaultResourcePage(bookGroupId, adviserId, null, openRays);
}
Long resourcePageId = resourcePage.getId();
this.dealResourceByBookId(bookId, adviserId, channelId, resourcePageId, bookGroupDTO.getJumpType());
}
}
if (!ListUtils.isEmpty(sceneIdList)) {
Map<Long, QrcodeSceneDto> qrcodeSceneDtoMap = qrcodeSceneConsr.listBaseInfoByIds(sceneIdList);
if (MapUtils.isEmpty(qrcodeSceneDtoMap)) {
return;
}
for (QrcodeSceneDto qrcodeSceneDto : qrcodeSceneDtoMap.values()) {
Long sceneId = qrcodeSceneDto.getSceneId();
Long adviserId = qrcodeSceneDto.getCreatedByUserLogin();
Long bookId = qrcodeSceneDto.getAdviserBookId();
Long channelId = qrcodeSceneDto.getChannelPartyId();
//创建资源页
ResourcePage resourcePage = resourcePageDao.getBySceneId(sceneId);
if (null == resourcePage) {
BookDto bookDto = bookBiz.getAdviserBook(bookId, channelId, adviserId, null);
resourcePage = this.createDefaultResourcePage(null, adviserId, sceneId, bookDto.getIsOpenRobotProcess());
}
Long resourcePageId = resourcePage.getId();
this.dealResourceByBookId(bookId, adviserId, channelId, resourcePageId, null);
}
}
}
private void dealResourceByBookId(Long bookId, Long adviserId, Long channelId, Long resourcePageId, Integer jumpType) {
//权益
Long rightsSettingId = null;
RightsSettingDto rightsSettingDto = rightsSettingBiz.getRightsSettingByBookId4AppletHome(bookId, adviserId, channelId);
if (null != rightsSettingDto) {
rightsSettingId = rightsSettingDto.getId();
}
//大图banner-图片位
this.dealBanner(rightsSettingId, adviserId, resourcePageId);
//资源
List<ResourceColumnAndServeVO> columns = resourcePageColumnDao.getColumnListByPageId(resourcePageId);
if (ListUtils.isEmpty(columns) || (columns.size() == 1 && columns.get(0).getColumnType().equals(ResourcePageConstants.ColumnTypeEnum.PICTURE.getCode()))) {
//1、公众号
this.dealOfficialAccount(adviserId, resourcePageId, jumpType);
RightsSettingQueryDTO queryDTO = new RightsSettingQueryDTO();
queryDTO.setBookId(bookId);
queryDTO.setAdviserId(adviserId);
queryDTO.setChannelId(channelId);
queryDTO.setRightsSettingId(rightsSettingId);
queryDTO.setRightsSettingTypes(Arrays.asList(RightsSettingConstant.RIGHTSSETTING_TYPES_NEW));
RightsSetting rightsSetting = rightsSettingBiz.getRightsSettingItemsByTypeListNew(queryDTO);
for (RightsSettingTitle title : rightsSetting.getRightsSettingNow().getRightsSettingTitles()) {
if (ListUtils.isEmpty(title.getRightsSettingItemList())) {
continue;
}
//创建栏目资源
//2、应用作品
this.dealAppProduct(title, adviserId, resourcePageId);
//3、平台书单
this.dealBooklist(title, adviserId, resourcePageId);
//4、模板群
this.dealGroup(title, adviserId, resourcePageId);
//5、资讯-第三方资源
this.dealNewsThirdResource(title, adviserId, resourcePageId);
}
}
}
private void dealBanner(Long rightsSettingId, Long adviserId, Long resourcePageId) {
List<ResourcePageColumn> columns = resourcePageColumnDao.getByColumnTypeAndPage(resourcePageId, ResourcePageConstants.ColumnTypeEnum.PICTURE.getCode());
if (!ListUtils.isEmpty(columns)) {
return;
}
List<RightsSettingBanner> banners = rightsSettingBannerBiz.getByRightsSettingId(rightsSettingId);
if (ListUtils.isEmpty(banners) || banners.size() > 1) {
//只处理大图
return;
}
RightsSettingBanner banner = banners.get(0);
Integer bannerServeType = banner.getServeType();
//资讯
List<ResourcePageItemVO> itemVOList = new ArrayList<>();
if (AppletRecordTypeEnum.NEWS.value.equals(bannerServeType)) {
List<AppletThirdResources> thirdResourcesList = appletThirdResourcesBiz.getThirdResourcesByNewsId(banner.getServeId());
if (!ListUtils.isEmpty(thirdResourcesList)) {
for (AppletThirdResources resources : thirdResourcesList) {
ResourcePageItemVO vo = new ResourcePageItemVO();
vo.setServeId(resources.getId());
vo.setServeType(ResourcePageConstants.ServeTypeEnum.THIRD_RESOURCE.getValue());
vo.setSeqNum(thirdResourcesList.indexOf(resources));
vo.setLogoUrl(banner.getBannerPic());
itemVOList.add(vo);
}
}
} else {
//应用作品/第三方资源
ResourcePageItemVO vo = new ResourcePageItemVO();
vo.setServeId(banner.getServeId());
if (AppletRecordTypeEnum.APP.value.equals(bannerServeType)) {
vo.setServeType(ResourcePageConstants.ServeTypeEnum.APP.getValue());
AppDto appDto = appConsr.getBaseById(banner.getServeId());
vo.setTypeCode(appDto.getTypeCode());
} else if (AppletRecordTypeEnum.PRODUCT.value.equals(bannerServeType)) {
vo.setServeType(ResourcePageConstants.ServeTypeEnum.PRODUCT.getValue());
ProductDto productDto = productConsr.getProBaseById(banner.getServeId());
vo.setTypeCode(productDto.getProductTypeDto().getTypeCode());
} else if (AppletRecordTypeEnum.THIRD_RESOURCE.value.equals(bannerServeType)) {
vo.setServeType(ResourcePageConstants.ServeTypeEnum.THIRD_RESOURCE.getValue());
} else {
return;
}
vo.setLinkUrl(banner.getJumpUrl());
vo.setSeqNum(1);
vo.setLogoUrl(banner.getBannerPic());
itemVOList.add(vo);
}
if (!ListUtils.isEmpty(itemVOList)) {
UpdateResourceColumnVO columnVO = new UpdateResourceColumnVO();
columnVO.setColumnFormat(1);
columnVO.setColumnType(ResourcePageConstants.ColumnTypeEnum.PICTURE.getCode());
columnVO.setCreateUser(adviserId);
columnVO.setColumnName(banner.getBannerTitle());
columnVO.setItemVOList(itemVOList);
columnVO.setResourcePageId(resourcePageId);
columnVO.setLogoUrl(banner.getBannerPic());
this.updateResourceColumn(columnVO);
}
}
private void dealNewsThirdResource(RightsSettingTitle title, Long adviserId, Long resourcePageId) {
if ("NEWS".equals(title.getServeType())) {
List<ResourcePageItemVO> itemVOList = new ArrayList<>();
List<RightsNowItem> itemList = title.getRightsSettingItemList();
for (RightsNowItem nowItem : itemList) {
List<AppletThirdResources> thirdResourcesList = appletThirdResourcesBiz.getThirdResourcesByNewsId(nowItem.getServeId());
if (ListUtils.isEmpty(thirdResourcesList)) {
continue;
}
for (AppletThirdResources resources : thirdResourcesList) {
ResourcePageItemVO vo = new ResourcePageItemVO();
vo.setServeId(resources.getId());
vo.setServeType(ResourcePageConstants.ServeTypeEnum.THIRD_RESOURCE.getValue());
vo.setSeqNum(itemList.indexOf(nowItem));
itemVOList.add(vo);
}
}
if (!ListUtils.isEmpty(itemVOList)) {
UpdateResourceColumnVO columnVO = new UpdateResourceColumnVO();
columnVO.setColumnFormat(1);
columnVO.setColumnType(ResourcePageConstants.ColumnTypeEnum.THIRD_RESOURCE.getCode());
columnVO.setCreateUser(adviserId);
columnVO.setColumnName(title.getRightsSettingTitle());
columnVO.setItemVOList(itemVOList);
columnVO.setResourcePageId(resourcePageId);
if (itemVOList.size() > 4) {
columnVO.setShowMore(true);
columnVO.setShowCount(4);
} else {
columnVO.setShowMore(false);
}
this.updateResourceColumn(columnVO);
}
}
}
private void dealGroup(RightsSettingTitle title, Long adviserId, Long resourcePageId) {
if ("GROUP".equals(title.getServeType())) {
List<RightsNowItem> itemList = title.getRightsSettingItemList();
UpdateResourceColumnVO columnVO = new UpdateResourceColumnVO();
columnVO.setColumnFormat(1);
columnVO.setColumnType(ResourcePageConstants.ColumnTypeEnum.GROUP.getCode());
columnVO.setCreateUser(adviserId);
columnVO.setColumnName(title.getRightsSettingTitle());
List<ResourcePageItemVO> itemVOList = new ArrayList<>();
for (RightsNowItem nowItem : itemList) {
//只处理第三方群
if (!"1".equals(nowItem.getGroupType())) {
continue;
}
ResourcePageItemVO vo = new ResourcePageItemVO();
vo.setServeId(nowItem.getServeId());
vo.setServeType(ResourcePageConstants.ServeTypeEnum.GROUP_ACTIVITY.getValue());
vo.setSeqNum(itemList.indexOf(nowItem));
itemVOList.add(vo);
}
columnVO.setItemVOList(itemVOList);
columnVO.setResourcePageId(resourcePageId);
if (itemVOList.size() > 4) {
columnVO.setShowMore(true);
columnVO.setShowCount(4);
} else {
columnVO.setShowMore(false);
}
if (!ListUtils.isEmpty(itemVOList)) {
this.updateResourceColumn(columnVO);
}
}
}
private void dealBooklist(RightsSettingTitle title, Long adviserId, Long resourcePageId) {
if ("BOOKLIST".equals(title.getServeType())) {
List<RightsNowItem> itemList = title.getRightsSettingItemList();
UpdateResourceColumnVO columnVO = new UpdateResourceColumnVO();
columnVO.setColumnFormat(1);
columnVO.setColumnType(ResourcePageConstants.ColumnTypeEnum.BOOKLIST.getCode());
columnVO.setCreateUser(adviserId);
columnVO.setColumnName(title.getRightsSettingTitle());
List<ResourcePageItemVO> itemVOList = new ArrayList<>();
for (RightsNowItem nowItem : itemList) {
ResourcePageItemVO vo = new ResourcePageItemVO();
vo.setServeId(nowItem.getServeId());
vo.setServeType(ResourcePageConstants.ServeTypeEnum.BOOKLIST.getValue());
vo.setSeqNum(itemList.indexOf(nowItem));
itemVOList.add(vo);
}
columnVO.setItemVOList(itemVOList);
columnVO.setResourcePageId(resourcePageId);
if (itemVOList.size() > 4) {
columnVO.setShowMore(true);
columnVO.setShowCount(4);
} else {
columnVO.setShowMore(false);
}
if (!ListUtils.isEmpty(itemVOList)) {
this.updateResourceColumn(columnVO);
}
}
}
private void dealOfficialAccount(Long adviserId, Long resourcePageId, Integer jumpType) {
if (null == jumpType) {
return;
}
if (QrcodeJumpType.H5_OFFICIAL_ACCOUNTS.getCode().equals(jumpType)) {
UpdateResourceColumnVO columnVO = new UpdateResourceColumnVO();
columnVO.setColumnFormat(1);
columnVO.setColumnType(ResourcePageConstants.ColumnTypeEnum.OFFICIAL_ACCOUNT.getCode());
columnVO.setCreateUser(adviserId);
columnVO.setColumnName("公众号");
columnVO.setShowMore(false);
columnVO.setResourcePageId(resourcePageId);
columnVO.setColumnSeq(1);
ResourcePageItemVO item = new ResourcePageItemVO();
item.setCreateUser(adviserId);
item.setGuideContent("关注公众号，第一时间获取本书更新动态");
item.setServeType(ResourcePageConstants.ServeTypeEnum.OFFICIAL_ACCOUNT.getValue());
item.setSeqNum(1);
columnVO.setItemVOList(Arrays.asList(item));
this.updateResourceColumn(columnVO);
}
}
private void dealAppProduct(RightsSettingTitle title, Long adviserId, Long resourcePageId) {
List<Integer> rightsSettingNowTypes = Arrays.asList(17,18,19);
if ("APP/PRODUCT".equals(title.getServeType()) || rightsSettingNowTypes.contains(title.getRightsSettingNowType())) {
List<RightsNowItem> itemList = title.getRightsSettingItemList();
UpdateResourceColumnVO columnVO = new UpdateResourceColumnVO();
columnVO.setColumnFormat(1);
columnVO.setColumnType(ResourcePageConstants.ColumnTypeEnum.APP_PRODUCT.getCode());
columnVO.setCreateUser(adviserId);
columnVO.setColumnName(title.getRightsSettingTitle());
List<ResourcePageItemVO> itemVOList = new ArrayList<>();
for (RightsNowItem nowItem : itemList) {
ResourcePageItemVO vo = new ResourcePageItemVO();
vo.setLinkUrl(nowItem.getLinkUrl());
vo.setServeId(nowItem.getServeId());
vo.setServeType(nowItem.getServeType());
vo.setTypeCode(nowItem.getServeTypeCode());
vo.setSeqNum(itemList.indexOf(nowItem));
itemVOList.add(vo);
}
columnVO.setItemVOList(itemVOList);
columnVO.setResourcePageId(resourcePageId);
if (itemVOList.size() > 4) {
columnVO.setShowMore(true);
columnVO.setShowCount(4);
} else {
columnVO.setShowMore(false);
}
if (!ListUtils.isEmpty(itemVOList)) {
this.updateResourceColumn(columnVO);
}
}
}
@Override
public PageBeanNew<ResourcePageItemVO> listPageResourcePageItem(Integer currentPage, Integer numPerPage, Long resourcePageColumnId) {
Map<String, Object> paramMap = new HashMap<>();
paramMap.put("resourcePageColumnId", resourcePageColumnId);
......@@ -1130,6 +833,11 @@ public class ResourcePageBizImpl implements ResourcePageBiz {
resourcePageColumnDao.updateColumnSeqNum(column.getId(), columnSeq);
// 修改该单页面的更新时间
resourcePageDao.updatePageUpdateTime(resourcePageId);
//同步RAYS码资源配置
ThreadPoolUtils.OTHER_POOL.execute(()->{
ResourcePage resourcePage = resourcePageDao.getById(resourcePageId);
this.updateOwnMessage4Qr(null == resourcePage? null : resourcePage.getSceneId());
});
}
@Transactional(rollbackFor = Exception.class)
......@@ -1145,6 +853,11 @@ public class ResourcePageBizImpl implements ResourcePageBiz {
resourcePageColumnDao.deleteById(resourcePageColumnId);
//栏目重新排序
this.updateSeq4Batch(column.getResourcePageId());
//同步RAYS码资源配置
ThreadPoolUtils.OTHER_POOL.execute(()->{
ResourcePage resourcePage = resourcePageDao.getPageByColumnId(resourcePageColumnId);
this.updateOwnMessage4Qr(null == resourcePage? null : resourcePage.getSceneId());
});
}
@Override
......@@ -1429,8 +1142,11 @@ public class ResourcePageBizImpl implements ResourcePageBiz {
resourcePage = resourcePageDao.getByBookGroupId(bookGroupId);
BookGroupDTO bookGroupDTO = bookGroupDao.getDTOById(bookGroupId);
pageOneServe.setJumpType(null == bookGroupDTO? null:bookGroupDTO.getJumpType());
pageOneServe.setQrcodeType("own");
} else if (null != sceneId) {
resourcePage = resourcePageDao.getBySceneId(sceneId);
QrcodeSceneDto qrcodeSceneDto = qrcodeSceneConsr.getById(sceneId);
pageOneServe.setQrcodeType(null == qrcodeSceneDto?"ali":qrcodeSceneDto.getQrcodeType());
}
if (null != resourcePage) {
Long resourcePageId = resourcePage.getId();
......
pcloud-service-book/src/main/java/com/pcloud/book/group/dao/ResourcePageDao.java
......@@ -87,4 +87,12 @@ public interface ResourcePageDao extends BaseDao<ResourcePage>{
* * @param null
*/
void batchUpdateSceneIdByBookGroup(List<AddBookGroupServeDTO> list);
/**
* 查栏目对应的资源页
* @author：zhuyajie
* @date：2021/5/6 17:41
* * @param null
*/
ResourcePage getPageByColumnId(Long resourcePageColumnId);
}
\ No newline at end of file
pcloud-service-book/src/main/java/com/pcloud/book/group/dao/impl/ResourcePageDaoImpl.java
......@@ -68,4 +68,9 @@ public class ResourcePageDaoImpl extends BaseDaoImpl<ResourcePage> implements Re
public void batchUpdateSceneIdByBookGroup(List<AddBookGroupServeDTO> list) {
getSessionTemplate().update(getStatement("batchUpdateSceneIdByBookGroup"), list);
}
@Override
public ResourcePage getPageByColumnId(Long resourcePageColumnId) {
return getSessionTemplate().selectOne(getStatement("getPageByColumnId"), resourcePageColumnId);
}
}
pcloud-service-book/src/main/java/com/pcloud/book/group/facade/impl/ResourcePageFacade.java
......@@ -125,17 +125,6 @@ public class ResourcePageFacade {
return new ResponseDto<>();
}
@ApiOperation("处理旧数据")
@PostMapping("dealResource")
public ResponseDto<?> dealResource(@RequestBody List<Long> qrcodeIdList, @RequestParam("qrcodeType") String qrcodeType){
if ("bookgroup".equals(qrcodeType)) {
resourcePageBiz.dealResource(qrcodeIdList, null);
} else {
resourcePageBiz.dealResource(null, qrcodeIdList);
}
return new ResponseDto<>();
}
@ApiOperation("更新资源页和栏目设置")
@PostMapping("updateResourcePageAndColumn")
public ResponseDto<?> updateResourcePageAndColumn(@RequestHeader("token") String token,
......
pcloud-service-book/src/main/java/com/pcloud/book/group/vo/ResourcePageOneServe.java
......@@ -51,4 +51,6 @@ public class ResourcePageOneServe extends BaseDto {
private Double price;
private Integer jumpType;
private String qrcodeType;
}
pcloud-service-book/src/main/resources/mapper/group/ResourcePageDao.xml
......@@ -167,4 +167,21 @@
</foreach>
</update>
<select id="getPageByColumnId" resultMap="ResourcePageMap" parameterType="long">
SELECT
p.id,
p.book_group_id,
p.style,
p.show_book,
p.open_rays,
p.qrcode_url,
p.scene_id,
p.official_scene_id
FROM
resource_page_column c
LEFT JOIN resource_page p ON c.resource_page_id = p.id
WHERE
c.id = #{resourcePageColumnId}
</select>
</mapper>
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment