Skip to content

M
midjourney-proxy
Commit 1cc541f5 by 田超
Options

Merge branch 'feature/1003034' into 'master' 

feature/1003034

See merge request rays/pcloud-book!765
parents 4328e89a bfd9b84f
Showing with 420 additions and 173 deletions
pcloud-service-book/src/main/java/com/pcloud/book/applet/biz/impl/AppletGroupManageBizImpl.java
package com.pcloud.book.applet.biz.impl;
import com.google.common.collect.Lists;
import com.pcloud.book.applet.biz.AppletGroupManageBiz;
import com.pcloud.book.applet.biz.AppletGroupSearchRecordBiz;
import com.pcloud.book.applet.dao.AppletGroupManageDao;
import com.pcloud.book.applet.dto.AppletGroupManageDTO;
import com.pcloud.book.applet.dto.AppletGroupStatementDTO;
import com.pcloud.book.applet.dto.UpdateAppletGroupManageDTO;
import com.pcloud.book.applet.entity.AppletGroupManage;
import com.pcloud.book.applet.dao.AppletGroupManageDao;
import com.pcloud.book.applet.biz.AppletGroupManageBiz;
import com.pcloud.book.consumer.label.LabelConsr;
import com.pcloud.book.consumer.reader.ReaderConsr;
import com.pcloud.book.group.biz.GroupQrcodeBiz;
import com.pcloud.book.group.vo.ClassifyQrcodeVO;
import com.pcloud.common.exceptions.BizException;
import com.pcloud.common.page.PageBeanNew;
import com.pcloud.common.page.PageParam;
import com.pcloud.common.exceptions.BizException;
import com.pcloud.common.utils.ListUtils;
import com.pcloud.common.utils.NumberUtil;
import com.pcloud.common.utils.string.StringUtilParent;
......@@ -49,6 +50,8 @@ public class AppletGroupManageBizImpl implements AppletGroupManageBiz {
private ReaderConsr readerConsr;
@Autowired
private AppletGroupSearchRecordBiz appletGroupSearchRecordBiz;
@Autowired
private GroupQrcodeBiz groupQrcodeBiz;
@Override
public AppletGroupManage getById(Long id) {
......@@ -63,6 +66,17 @@ public class AppletGroupManageBizImpl implements AppletGroupManageBiz {
if (null == recordList || CollectionUtils.isEmpty(recordList.getRecordList())) {
return recordList;
}
// 平台端共读模板创建修改为选择群分类自更新群 群变更为群分类 需要补充信息
for (AppletGroupManageDTO appletGroupManageDTO : recordList.getRecordList()) {
Long classifyId = appletGroupManageDTO.getClassifyId();
String groupQrCode = groupQrcodeBiz.getChangeGroupQrCode(classifyId);
ClassifyQrcodeVO groupQrcodeInfo = groupQrcodeBiz.getGroupQrcodeInfo(groupQrCode, classifyId);
appletGroupManageDTO.setUserNumber(groupQrcodeInfo.getUserNumber());
appletGroupManageDTO.setBookGroupQrcodeId(groupQrcodeInfo.getId());
appletGroupManageDTO.setGroupPic(groupQrCode);
}
// 组装标签名称
List<Long> labelId = Lists.newArrayList();
for (AppletGroupManageDTO dto : recordList.getRecordList()) {
......@@ -99,6 +113,12 @@ public class AppletGroupManageBizImpl implements AppletGroupManageBiz {
String filterStr = StringUtilParent.replaceHtml(dto.getDesc());
String subStr = filterStr.length() > 60 ? filterStr.substring(0, 60) + "..." : filterStr;
dto.setCutDesc(subStr);
Long classifyId = dto.getClassifyId();
String groupQrCode = groupQrcodeBiz.getChangeGroupQrCode(classifyId);
ClassifyQrcodeVO groupQrcodeInfo = groupQrcodeBiz.getGroupQrcodeInfo(groupQrCode, classifyId);
dto.setUserNumber(groupQrcodeInfo.getUserNumber());
dto.setBookGroupQrcodeId(groupQrcodeInfo.getId());
dto.setGroupPic(groupQrCode);
//头像列表从缓存里取
List<String> headUrlList = appletGroupSearchRecordBiz.getHeadUrlList(dto.getUserNumber(),dto.getBookGroupQrcodeId());
dto.setHeadUrlList(headUrlList);
......
pcloud-service-book/src/main/java/com/pcloud/book/applet/dto/AppletGroupManageDTO.java
......@@ -42,8 +42,8 @@ public class AppletGroupManageDTO extends BaseEntity {
@ApiModelProperty("社群码id")
private Long bookGroupQrcodeId;
@ApiModelProperty("社群码名称")
private String groupName;
@ApiModelProperty("群分类名称")
private String classifyName;
@ApiModelProperty("专业标签id")
private Long proLabelId;
......
pcloud-service-book/src/main/java/com/pcloud/book/group/biz/BookGroupClassifyBiz.java
......@@ -25,6 +25,7 @@ import com.pcloud.book.group.vo.ListBookGroupQrcodeParamVO;
import com.pcloud.book.group.vo.ListClassify4WechatVO;
import com.pcloud.book.group.vo.ListClassifyVO;
import com.pcloud.book.group.vo.ListGroupClassifyParam;
import com.pcloud.book.group.vo.PcloudBookGroupClassifyVO;
import com.pcloud.book.group.vo.StatisticVO;
import com.pcloud.book.group.vo.UpdateClassifyVO;
import com.pcloud.book.group.vo.UpdateRankVO;
......@@ -271,4 +272,9 @@ public interface BookGroupClassifyBiz {
List<GroupQrcode4ClassifyDTO> getQrcodeByClassifyId4Heals(Long classifyId);
GroupQrcode4ClassifyVO getGroupQrcodeByClassify(Long classifyId, Long wechatUserId);
/**
* 平台端分页获取群分类
*/
PageBeanNew<PcloudBookGroupClassifyVO> listGroupClassify4Pcloud(String name, Long proLabelId, Long depLabelId, Integer currentPage, Integer numPerPage);
}
pcloud-service-book/src/main/java/com/pcloud/book/group/biz/GroupQrcodeBiz.java
......@@ -240,4 +240,5 @@ public interface GroupQrcodeBiz {
void updateRoomManager(UpdateRoomManagerVO updateRoomManagerVO);
ClassifyQrcodeVO getGroupQrcodeInfo(String groupQrCode, Long classifyId);
}
pcloud-service-book/src/main/java/com/pcloud/book/group/biz/impl/BookGroupClassifyBizImpl.java
package com.pcloud.book.group.biz.impl;
import com.google.common.collect.Maps;
import com.pcloud.book.base.exception.BookBizException;
import com.pcloud.book.book.constant.BookConstant;
import com.pcloud.book.book.dao.BookDao;
import com.pcloud.book.consumer.common.ExportConsr;
import com.pcloud.book.consumer.message.MessageConsr;
import com.pcloud.book.consumer.promotion.PromotionConsr;
......@@ -67,6 +69,7 @@ import com.pcloud.book.group.vo.ListBookGroupQrcodeParamVO;
import com.pcloud.book.group.vo.ListClassify4WechatVO;
import com.pcloud.book.group.vo.ListClassifyVO;
import com.pcloud.book.group.vo.ListGroupClassifyParam;
import com.pcloud.book.group.vo.PcloudBookGroupClassifyVO;
import com.pcloud.book.group.vo.StatisticVO;
import com.pcloud.book.group.vo.SyncKeyworsVO;
import com.pcloud.book.group.vo.UpdateClassifyVO;
......@@ -96,7 +99,7 @@ import com.pcloud.resourcecenter.product.entity.Specification;
import com.pcloud.wechatgroup.group.dto.GroupMemberStatisDTO;
import com.pcloud.wechatgroup.group.dto.GroupRobotDTO;
import com.pcloud.wechatgroup.message.dto.GroupChatCountDTO;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections.MapUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
......@@ -109,7 +112,6 @@ import org.springframework.util.CollectionUtils;
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.Date;
import java.util.HashMap;
......@@ -119,8 +121,6 @@ import java.util.Objects;
import java.util.Optional;
import java.util.stream.Collectors;
import lombok.extern.slf4j.Slf4j;
/**
* @author lily
* @date 2019/4/17 11:20
......@@ -189,6 +189,8 @@ public class BookGroupClassifyBizImpl implements BookGroupClassifyBiz {
private BookGroupAppBiz bookGroupAppBiz;
@Autowired
private KeywordDao keywordDao;
@Autowired
private BookDao bookDao;
@Override
......@@ -1329,31 +1331,44 @@ public class BookGroupClassifyBizImpl implements BookGroupClassifyBiz {
throw new BookBizException(BookBizException.PARAM_IS_NULL, "社群码不存在，请刷新后重试");
}
//获取用户是否分配过二维码
GroupQrcode4ClassifyVO groupQrcode4ClassifyVO = bookQrcodeUserDao.getUserQrcode(classifyId, wechatUserId);
//获取分类对应的二维码
GroupQrcode4ClassifyVO groupQrcode4ClassifyVO = bookGroupClassifyDao.getClassifyQrcode(classifyId, classify.getChangeNumber());
if (groupQrcode4ClassifyVO == null) {
//获取分类对应的二维码
groupQrcode4ClassifyVO = bookGroupClassifyDao.getClassifyQrcode(classifyId, classify.getChangeNumber());
if (groupQrcode4ClassifyVO == null) {
groupQrcode4ClassifyVO = new GroupQrcode4ClassifyVO();
groupQrcode4ClassifyVO.setClassifyId(classifyId);
} else {
BookQrcodeUser bookQrcodeUser = new BookQrcodeUser();
bookQrcodeUser.setClassifyId(classifyId);
bookQrcodeUser.setGroupQrcodeId(groupQrcode4ClassifyVO.getGroupQrcodeId());
bookQrcodeUser.setWechatUserId(wechatUserId);
bookQrcodeUser.setCreateUser(wechatUserId);
bookQrcodeUser.setFromType(QrcodeUsedEnum.RAYS.value);
try {
bookQrcodeUserDao.insert(bookQrcodeUser);
} catch (DataIntegrityViolationException e) {
LOGGER.error("已存在该用户！");
}
groupQrcode4ClassifyVO = new GroupQrcode4ClassifyVO();
groupQrcode4ClassifyVO.setClassifyId(classifyId);
} else {
BookQrcodeUser bookQrcodeUser = new BookQrcodeUser();
bookQrcodeUser.setClassifyId(classifyId);
bookQrcodeUser.setGroupQrcodeId(groupQrcode4ClassifyVO.getGroupQrcodeId());
bookQrcodeUser.setWechatUserId(wechatUserId);
bookQrcodeUser.setCreateUser(wechatUserId);
bookQrcodeUser.setFromType(QrcodeUsedEnum.RAYS.value);
try {
bookQrcodeUserDao.insert(bookQrcodeUser);
} catch (DataIntegrityViolationException e) {
LOGGER.error("已存在该用户！");
}
}
String spareQr = getSpareQr(classify.getBookGroupId());
groupQrcode4ClassifyVO.setSpareQr(spareQr);
groupQrcode4ClassifyVO.setClassify(classify.getClassify());
return groupQrcode4ClassifyVO;
}
@Override
public PageBeanNew<PcloudBookGroupClassifyVO> listGroupClassify4Pcloud(String name, Long proLabelId, Long depLabelId, Integer currentPage, Integer numPerPage) {
// 根据数命查bookid
List<Long> ids = new ArrayList<>();
if (!StringUtil.isEmpty(name)){
ids = bookDao.getBookIdsByBookName(name);
}
PageParam pageParam = new PageParam(currentPage, numPerPage);
final Map<String, Object> map = Maps.newHashMap();
map.put("list",ids);
map.put("name", StringUtil.isEmpty(name) ? null : name);
map.put("proLabelId", proLabelId);
map.put("depLabelId", depLabelId);
return bookGroupClassifyDao.listPageNew(pageParam, map, "listGroupClassify4Pcloud");
}
}
pcloud-service-book/src/main/java/com/pcloud/book/group/biz/impl/GroupQrcodeBizImpl.java
......@@ -259,8 +259,8 @@ public class GroupQrcodeBizImpl implements GroupQrcodeBiz {
if (qrcodeVO.getUserNumber() < classify.getChangeNumber()) {
return qrcodeVO.getQrcodeUrl();
} else {
//将二维码修改为已满群状态
if (qrcodeVO.getUserNumber() >= 100) {
//将二维码修改为已满群状态 微信将群人数限制扩充到200
if (qrcodeVO.getUserNumber() >= 200) {
changeToOverNumber(qrcodeVO.getWeixinQrcodeId(), qrcodeVO.getId());
}
// 更新二维码状态
......@@ -275,8 +275,8 @@ public class GroupQrcodeBizImpl implements GroupQrcodeBiz {
List<ClassifyQrcodeVO> canUserQrcode = Lists.newArrayList();
for (ClassifyQrcodeVO vo : collect) {
if (vo.getUserNumber() >= classify.getChangeNumber()) {
//将二维码修改为已满群状态
if (vo.getUserNumber() >= 100) {
//将二维码修改为已满群状态 微信将群人数限制扩充到200
if (vo.getUserNumber() >= 200) {
changeToOverNumber(vo.getWeixinQrcodeId(), vo.getId());
}
// 更新二维码状态
......@@ -981,4 +981,22 @@ public class GroupQrcodeBizImpl implements GroupQrcodeBiz {
momentsDTO.setMomentType(BusinessConstant.MomentTypeEnum.SET_GROUP_ADMIN);
WxGroupSDK.sendMessageToPhone(momentsDTO);
}
@Override
public ClassifyQrcodeVO getGroupQrcodeInfo(String groupQrCode, Long classifyId) {
List<ClassifyQrcodeVO> qrcodeVOS = groupQrcodeDao.getQrcodeByClassifyId(classifyId);
for (ClassifyQrcodeVO qrcodeVO : qrcodeVOS) {
if (!StringUtil.isEmpty(groupQrCode) && qrcodeVO.getQrcodeUrl().equals(groupQrCode)){
return qrcodeVO;
}
}
ClassifyQrcodeVO ret = qrcodeVOS.get(0);
for (ClassifyQrcodeVO qrcodeVO : qrcodeVOS) {
if (ret.getCreatedTime() != null && qrcodeVO.getCreatedTime()!=null && ret.getCreatedTime().before(qrcodeVO.getCreatedTime())){
ret = qrcodeVO;
}
}
return ret;
}
}
pcloud-service-book/src/main/java/com/pcloud/book/group/facade/BookGroupClassifyFacade.java
......@@ -17,6 +17,7 @@ import com.pcloud.book.group.vo.ListBookGroupQrcodeParamVO;
import com.pcloud.book.group.vo.ListClassify4WechatVO;
import com.pcloud.book.group.vo.ListClassifyVO;
import com.pcloud.book.group.vo.ListGroupClassifyParam;
import com.pcloud.book.group.vo.PcloudBookGroupClassifyVO;
import com.pcloud.book.group.vo.StatisticVO;
import com.pcloud.book.group.vo.UpdateClassifyVO;
import com.pcloud.book.group.vo.UpdateRankVO;
......@@ -24,10 +25,11 @@ import com.pcloud.common.dto.ResponseDto;
import com.pcloud.common.exceptions.BizException;
import com.pcloud.common.page.PageBeanNew;
import com.pcloud.common.permission.PermissionException;
import com.pcloud.common.utils.ResponseHandleUtil;
import org.springframework.beans.BeanUtils;
import org.springframework.http.ResponseEntity;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.springframework.web.bind.annotation.CookieValue;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
......@@ -40,12 +42,6 @@ import org.springframework.web.bind.annotation.RequestParam;
import java.util.List;
import java.util.Map;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
/**
* @author lily
* @date 2019/4/16 21:00
......@@ -268,4 +264,18 @@ public interface BookGroupClassifyFacade {
@GetMapping("getQrcodeInfo4Heals")
ResponseDto<GroupQrcode4ClassifyDTO> getQrcodeInfo4Heals(@RequestParam("wechatUserId") Long wechatUserId,
@RequestParam("classifyId") Long classifyId) throws BizException;
@ApiOperation("平台端获取群分类")
@GetMapping("listGroupClassify4Pcloud")
ResponseDto<PageBeanNew<PcloudBookGroupClassifyVO>> listGroupClassify4Pcloud(
@RequestHeader("token") @ApiParam("token信息") String token,
@RequestParam(value = "name", required = false) @ApiParam("群分类名 | 书刊名") String name,
@RequestParam(value = "proLabelId", required = false) @ApiParam("专业标签") Long proLabelId,
@RequestParam(value = "depLabelId", required = false) @ApiParam("深度标签") Long depLabelId,
@RequestParam("currentPage") Integer currentPage,
@RequestParam("numPerPage") Integer numPerPage) throws BizException, PermissionException;
@ApiOperation("根据群分类ID获取群二维码")
@GetMapping("getGroupQrcodeByClassify")
ResponseDto<String> getGroupQrcodeByClassify(@RequestHeader("token") String token,@RequestParam("classifyId") Integer classifyId) throws BizException,PermissionException;
}
pcloud-service-book/src/main/java/com/pcloud/book/group/facade/impl/BookGroupClassifyFacadeImpl.java
......@@ -2,6 +2,7 @@ package com.pcloud.book.group.facade.impl;
import com.pcloud.book.group.biz.BookGroupBiz;
import com.pcloud.book.group.biz.BookGroupClassifyBiz;
import com.pcloud.book.group.biz.GroupQrcodeBiz;
import com.pcloud.book.group.dto.BookGroupClassifyDTO;
import com.pcloud.book.group.dto.GroupQrcode4ClassifyDTO;
import com.pcloud.book.group.facade.BookGroupClassifyFacade;
......@@ -44,6 +45,8 @@ public class BookGroupClassifyFacadeImpl implements BookGroupClassifyFacade {
private BookGroupClassifyBiz bookGroupClassifyBiz;
@Autowired
private BookGroupBiz bookGroupBiz;
@Autowired
private GroupQrcodeBiz groupQrcodeBiz;
@Override
@GetMapping("listAllClassify")
......@@ -289,4 +292,25 @@ public class BookGroupClassifyFacadeImpl implements BookGroupClassifyFacade {
}
return new ResponseDto<>(groupQrcode4ClassifyDTO);
}
@Override
@GetMapping("listGroupClassify4Pcloud")
public ResponseDto<PageBeanNew<PcloudBookGroupClassifyVO>> listGroupClassify4Pcloud(
@RequestHeader("token") @ApiParam("token信息") String token,
@RequestParam(value = "name", required = false) @ApiParam("群分类名 | 书刊名") String name,
@RequestParam(value = "proLabelId", required = false) @ApiParam("专业标签") Long proLabelId,
@RequestParam(value = "depLabelId", required = false) @ApiParam("深度标签") Long depLabelId,
@RequestParam("currentPage") Integer currentPage,
@RequestParam("numPerPage") Integer numPerPage
) throws BizException, PermissionException {
SessionUtil.getVlaue(token, SessionUtil.PARTY_ID);
return new ResponseDto<>(bookGroupClassifyBiz.listGroupClassify4Pcloud(name, proLabelId, depLabelId, currentPage, numPerPage));
}
@Override
@GetMapping("getGroupQrcodeByClassify")
public ResponseDto<String> getGroupQrcodeByClassify(@RequestHeader("token") String token, @RequestParam("classifyId") Integer classifyId) throws BizException, PermissionException {
SessionUtil.getVlaue(token, SessionUtil.PARTY_ID);
return new ResponseDto<>(groupQrcodeBiz.getChangeGroupQrCode(Long.valueOf(classifyId)));
}
}
pcloud-service-book/src/main/java/com/pcloud/book/group/vo/PcloudBookGroupClassifyVO.java 0 → 100644
package com.pcloud.book.group.vo;
import com.fasterxml.jackson.annotation.JsonInclude;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import java.math.BigDecimal;
/**
* @ClassName com.pcloud.book.group.vo.PcloudBookGroupClassifyVO
* @Author guiq
* @Description 平台获取群分类信息
* @Date 2020/6/10 15:54
* @Version 1.0
**/
@ApiModel
@JsonInclude(JsonInclude.Include.NON_NULL)
public class PcloudBookGroupClassifyVO {
@ApiModelProperty("群分类ID")
private Integer id;
@ApiModelProperty("群分类名称")
private String classify;
@ApiModelProperty("群分类介绍")
private String classifyIntroduce;
@ApiModelProperty("销售价")
private BigDecimal price;
@ApiModelProperty("群个数")
private Integer groupCount;
public Integer getId() {
return id;
}
public void setId(Integer id) {
this.id = id;
}
public String getClassify() {
return classify;
}
public void setClassify(String classify) {
this.classify = classify;
}
public String getClassifyIntroduce() {
return classifyIntroduce;
}
public void setClassifyIntroduce(String classifyIntroduce) {
this.classifyIntroduce = classifyIntroduce;
}
public BigDecimal getPrice() {
return price;
}
public void setPrice(BigDecimal price) {
this.price = price;
}
public Integer getGroupCount() {
return groupCount;
}
public void setGroupCount(Integer groupCount) {
this.groupCount = groupCount;
}
@Override
public String toString() {
return "PcloudBookGroupClassifyVO{" +
"id=" + id +
", classify='" + classify + '\'' +
", classifyIntroduce='" + classifyIntroduce + '\'' +
", price=" + price +
", groupCount=" + groupCount +
'}';
}
}
pcloud-service-book/src/main/java/com/pcloud/book/rightsSetting/biz/impl/RightsSettingBizImpl.java
......@@ -2,7 +2,6 @@ package com.pcloud.book.rightsSetting.biz.impl;
import com.google.common.collect.Lists;
import com.pcloud.appcenter.app.dto.AppDto;
import com.pcloud.appcenter.assist.dto.AssistTempletDTO;
import com.pcloud.book.applet.biz.AppletGroupSearchRecordBiz;
......@@ -32,9 +31,11 @@ import com.pcloud.book.custom.entity.CustomPlan;
import com.pcloud.book.custom.mapper.CustomPlanMapper;
import com.pcloud.book.giftcoupon.dao.GiftReceiveDao;
import com.pcloud.book.group.biz.BookGroupBiz;
import com.pcloud.book.group.biz.GroupQrcodeBiz;
import com.pcloud.book.group.dto.BookServeDTO;
import com.pcloud.book.group.enums.AppAndProductTypeEnum;
import com.pcloud.book.group.tools.SendWeixinRequestTools;
import com.pcloud.book.group.vo.ClassifyQrcodeVO;
import com.pcloud.book.rightsSetting.biz.RightsSettingBiz;
import com.pcloud.book.rightsSetting.check.RightsSettingCheck;
import com.pcloud.book.rightsSetting.constants.RightsSettingConstant;
......@@ -82,8 +83,7 @@ import com.pcloud.common.utils.cache.redis.JedisClusterUtils;
import com.pcloud.common.utils.string.StringUtil;
import com.pcloud.common.utils.string.StringUtilParent;
import com.pcloud.resourcecenter.product.dto.ProductDto;
import java.util.Iterator;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.collections.MapUtils;
import org.apache.commons.lang3.ArrayUtils;
......@@ -96,6 +96,7 @@ import java.util.ArrayList;
import java.util.Collections;
import java.util.Date;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Objects;
......@@ -103,8 +104,6 @@ import java.util.Random;
import java.util.function.Function;
import java.util.stream.Collectors;
import lombok.extern.slf4j.Slf4j;
@Service
@Slf4j
public class RightsSettingBizImpl implements RightsSettingBiz {
......@@ -172,6 +171,8 @@ public class RightsSettingBizImpl implements RightsSettingBiz {
private AppletUserBookcaseBiz appletUserBookcaseBiz;
@Autowired
private RightsSettingBookRelationMapper rightsSettingBookRelationMapper;
@Autowired
private GroupQrcodeBiz groupQrcodeBiz;
@Override
@ParamLog("新增权益设置")
......@@ -844,6 +845,15 @@ public class RightsSettingBizImpl implements RightsSettingBiz {
String filterStr = StringUtilParent.replaceHtml(groupActivity4AppletDTO.getDesc());
String subStr = filterStr.length() > 60 ? filterStr.substring(0, 60) + "..." : filterStr;
groupActivity4AppletDTO.setCutDesc(subStr);
// 通过群分类ID获取群二维码
Long classifyId = groupActivity4AppletDTO.getClassifyId();
String groupQrCode = groupQrcodeBiz.getChangeGroupQrCode(classifyId);
// 通过群二维码链接反查群ID 并补充信息
ClassifyQrcodeVO groupQrcodeInfo = groupQrcodeBiz.getGroupQrcodeInfo(groupQrCode, classifyId);
groupActivity4AppletDTO.setBookGroupQrcodeId(groupQrcodeInfo.getId());
groupActivity4AppletDTO.setGroupName(groupQrcodeInfo.getGroupName());
groupActivity4AppletDTO.setGroupPic(groupQrcodeInfo.getQrcodeUrl());
groupActivity4AppletDTO.setUserNumber(groupQrcodeInfo.getUserNumber());
//头像列表从缓存里取
List<String> headUrlList = appletGroupSearchRecordBiz
.getHeadUrlList(groupActivity4AppletDTO.getUserNumber(), groupActivity4AppletDTO.getBookGroupQrcodeId());
......@@ -1163,9 +1173,9 @@ public class RightsSettingBizImpl implements RightsSettingBiz {
if (groupActivity4AppletDTO != null) {
item.setGroupName(groupActivity4AppletDTO.getName());
item.setGroupDesc(groupActivity4AppletDTO.getCutDesc());
item.setGroupQrCode(groupActivity4AppletDTO.getGroupPic());
// 填充头像
fillGroupActivityHead(Collections.singletonList(groupActivity4AppletDTO));
item.setGroupQrCode(groupActivity4AppletDTO.getGroupPic());
item.setGroupActivity4AppletDTO(groupActivity4AppletDTO);
}
}
......@@ -1476,59 +1486,6 @@ public class RightsSettingBizImpl implements RightsSettingBiz {
return list;
}
private void setGroupActivity(List<RightsSettingItem> list, List<Long> rightsSettingItemIds) {
if (ListUtils.isEmpty(list)) {
return;
}
List<GroupActivity4AppletDTO> groupActivity4AppletDTOList = null;
// 书刊分类
BookAdviserDto bookAdviserDto = bookAdviserBiz.getOneMainBook(list.get(0).getBookId());
if (bookAdviserDto != null && NumberUtil.isNumber(bookAdviserDto.getTempletId())) {
BaseTempletClassify baseTempletClassify = new BaseTempletClassify();
baseTempletClassify.setFirstClassify(bookAdviserDto.getTempletId());
baseTempletClassify.setSecondClassify(bookAdviserDto.getSecondTempletId());
baseTempletClassify.setGradeLabelId(bookAdviserDto.getGraLabelId());
baseTempletClassify.setSubjectLabelId(bookAdviserDto.getSubLabelId());
baseTempletClassify.setVolLabelId(bookAdviserDto.getVolLabelId());
setClassifyAndLabel(baseTempletClassify);
if (NumberUtil.isNumber(baseTempletClassify.getFirstClassify())) {
// 通过书刊分类拿群
groupActivity4AppletDTOList = pcloudGroupActivityDao.getTishBookSchoolList(baseTempletClassify, 3);
}
}
if (ListUtils.isEmpty(groupActivity4AppletDTOList)) {
// 如果书刊没拿到群，则通过权益分类拿群
RightsSetting rightsSetting = rightsSettingDAO.selectByPrimaryKey(list.get(0).getRightsSettingId());
setClassifyAndLabel(rightsSetting);
if (NumberUtil.isNumber(rightsSetting.getFirstClassify())) {
groupActivity4AppletDTOList = pcloudGroupActivityDao.getTishBookSchoolList(rightsSetting, 3);
}
}
if (!ListUtils.isEmpty(groupActivity4AppletDTOList)) {
for (GroupActivity4AppletDTO groupActivity4AppletDTO : groupActivity4AppletDTOList) {
String filterStr = StringUtilParent.replaceHtml(groupActivity4AppletDTO.getDesc());
String subStr = filterStr.length() > 60 ? filterStr.substring(0, 60) + "..." : filterStr;
groupActivity4AppletDTO.setCutDesc(subStr);
//头像列表从缓存里取
List<String> headUrlList = appletGroupSearchRecordBiz
.getHeadUrlList(groupActivity4AppletDTO.getUserNumber(), groupActivity4AppletDTO.getBookGroupQrcodeId());
groupActivity4AppletDTO.setHeadUrlList(headUrlList);
List<AppletGroupStatementDTO> statementDTOS = appletGroupSearchRecordBiz
.getStatementList(groupActivity4AppletDTO.getUserNumber(), headUrlList,
groupActivity4AppletDTO.getBookGroupQrcodeId());
groupActivity4AppletDTO.setStatementDTOList(statementDTOS);
}
for (RightsSettingItem rightsSettingItem : list) {
if (rightsSettingItemIds.contains(rightsSettingItem.getId())) {
rightsSettingItem.setGroupActivity4AppletList(groupActivity4AppletDTOList);
}
// 小程序兼容处理，新版发布后，可删除
rightsSettingItem.setGroupActivity4AppletDTO(groupActivity4AppletDTOList.get(0));
}
}
}
private List<RightsSettingItem> setReadPlan4Week(List<RightsCustomRelation> rightsCustomRelations, List<RightsSettingItem> list) {
log.info("为每周权益设置读书计划");
if (ListUtils.isEmpty(list) || ListUtils.isEmpty(rightsCustomRelations)) {
......@@ -1735,7 +1692,7 @@ public class RightsSettingBizImpl implements RightsSettingBiz {
}
if (NumberUtil.isNumber(baseTempletClassify.getFirstClassify())) {
// 通过书刊分类拿群
groupActivity4AppletDTOList = pcloudGroupActivityDao.getTishBookSchoolList(baseTempletClassify, top);
groupActivity4AppletDTOList = pcloudGroupActivityBiz.getTishBookSchoolListWrap(baseTempletClassify, top);
}
}
......@@ -1744,7 +1701,7 @@ public class RightsSettingBizImpl implements RightsSettingBiz {
RightsSetting rightsSetting = rightsSettingDAO.selectByPrimaryKey(rightsSettingId);
setClassifyAndLabel(rightsSetting);
if (NumberUtil.isNumber(rightsSetting.getFirstClassify())) {
groupActivity4AppletDTOList = pcloudGroupActivityDao.getTishBookSchoolList(rightsSetting, top);
groupActivity4AppletDTOList = pcloudGroupActivityBiz.getTishBookSchoolListWrap(rightsSetting, top);
}
}
if (!ListUtils.isEmpty(groupActivity4AppletDTOList)) {
......
pcloud-service-book/src/main/java/com/pcloud/book/skill/biz/PcloudGroupActivityBiz.java
package com.pcloud.book.skill.biz;
import com.pcloud.book.applet.dto.AppletGroupManageDTO;
import com.pcloud.book.rightsSetting.entity.BaseTempletClassify;
import com.pcloud.book.skill.dto.GroupActivity4AppletDTO;
import com.pcloud.book.skill.dto.UpdateActivityShowStateDTO;
import com.pcloud.book.skill.facade.request.SaveGroupActivityRequestVO;
import com.pcloud.book.skill.facade.request.UpdateGroupActivityRequestVO;
import com.pcloud.book.skill.facade.response.QueryGroupActivityResponseVO;
......@@ -60,4 +62,8 @@ public interface PcloudGroupActivityBiz {
* * @param null
*/
PageBeanNew<AppletGroupManageDTO> getGroupListByBookTemplet(Long firstClassify, Long secondClassify, Long gradeLabelId, Long subjectLabelId, Integer currentPage, Integer numPerPage);
List<GroupActivity4AppletDTO> getTishBookSchoolListWrap(BaseTempletClassify baseTempletClassify, Integer limit);
void updateActivityShowState(UpdateActivityShowStateDTO showStateDTO);
}
pcloud-service-book/src/main/java/com/pcloud/book/skill/biz/impl/PcloudGroupActivityBizImpl.java
package com.pcloud.book.skill.biz.impl;
import com.alibaba.fastjson.JSON;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import com.alibaba.fastjson.JSON;
import com.pcloud.appcenter.assist.dto.AssistTempletDTO;
import com.pcloud.book.applet.biz.AppletGroupSearchRecordBiz;
import com.pcloud.book.applet.dto.AppletGroupManageDTO;
......@@ -18,6 +17,7 @@ import com.pcloud.book.consumer.label.LabelConsr;
import com.pcloud.book.consumer.reader.ReaderConsr;
import com.pcloud.book.consumer.wechatgroup.WechatGroupConsr;
import com.pcloud.book.group.biz.GroupQrcodeBiz;
import com.pcloud.book.group.vo.ClassifyQrcodeVO;
import com.pcloud.book.group.vo.GroupQrcodeBaseInfoVO;
import com.pcloud.book.reading.biz.ReadingActivityBiz;
import com.pcloud.book.rightsSetting.biz.RightsSettingBiz;
......@@ -29,6 +29,7 @@ import com.pcloud.book.skill.biz.PcloudGroupActivityBiz;
import com.pcloud.book.skill.dao.PcloudGroupActivityDao;
import com.pcloud.book.skill.dao.PcloudSkillDao;
import com.pcloud.book.skill.dto.GroupActivity4AppletDTO;
import com.pcloud.book.skill.dto.UpdateActivityShowStateDTO;
import com.pcloud.book.skill.entity.PcloudGroupActivity;
import com.pcloud.book.skill.entity.PcloudSkill;
import com.pcloud.book.skill.enums.SkillTypeEnum;
......@@ -43,12 +44,13 @@ import com.pcloud.common.utils.string.StringUtilParent;
import com.sdk.wxgroup.RobotProcessTypeEnum;
import com.sdk.wxgroup.SendGroupInviteVO;
import com.sdk.wxgroup.SendPicMessageVO;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections.MapUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.Date;
import java.util.HashMap;
......@@ -58,10 +60,6 @@ import java.util.Objects;
import java.util.Optional;
import java.util.UUID;
import javax.annotation.Resource;
import lombok.extern.slf4j.Slf4j;
@Slf4j
@Service
public class PcloudGroupActivityBizImpl implements PcloudGroupActivityBiz {
......@@ -149,8 +147,10 @@ public class PcloudGroupActivityBizImpl implements PcloudGroupActivityBiz {
String messageGroup = UUID.randomUUID().toString();
Integer index = 0;
if (0 == byId.getJoinType()) {
GroupQrcodeBaseInfoVO groupQrcode = groupQrcodeBiz.getBaseById(byId.getBookGroupQrcodeId());
if (Objects.isNull(groupQrcode)) {
// 更新获取群二维码的方式
String groupQrCode = groupQrcodeBiz.getChangeGroupQrCode(byId.getBookGroupClassifyId());
ClassifyQrcodeVO groupQrcodeInfo = groupQrcodeBiz.getGroupQrcodeInfo(groupQrCode, byId.getBookGroupClassifyId());
if (Objects.isNull(groupQrcodeInfo)) {
log.error("[processGroup] error 共读对应社群不存在");
return;
}
......@@ -158,7 +158,7 @@ public class PcloudGroupActivityBizImpl implements PcloudGroupActivityBiz {
vo.setWxId(wxId);
vo.setAltId(robotWxId);
vo.setIp(readingActivityBiz.getIP(robotWxId));
vo.setWxGroupId(groupQrcode.getWeixinGroupId());
vo.setWxGroupId(groupQrcodeInfo.getWeixinGroupId());
vo.setCounts(count);
vo.setMessageGroupId(messageGroup);
vo.setIndex(index);
......@@ -168,7 +168,8 @@ public class PcloudGroupActivityBizImpl implements PcloudGroupActivityBiz {
}
if (1 == byId.getJoinType()) {
SendPicMessageVO vo = new SendPicMessageVO();
vo.setPicUrl(byId.getGroupPic());
// 更新获取群二维码的方式
vo.setPicUrl(groupQrcodeBiz.getChangeGroupQrCode(byId.getBookGroupClassifyId()));
vo.setWxGroupId(wxId);
vo.setAltId(robotWxId);
vo.setIp(readingActivityBiz.getIP(robotWxId));
......@@ -314,9 +315,13 @@ public class PcloudGroupActivityBizImpl implements PcloudGroupActivityBiz {
String subStr = filterStr.length() > 60 ? filterStr.substring(0, 60) + "..." : filterStr;
groupActivity4AppletDTO.setCutDesc(subStr);
//头像列表从缓存里取
List<String> headUrlList = appletGroupSearchRecordBiz.getHeadUrlList(groupActivity4AppletDTO.getUserNumber(),groupActivity4AppletDTO.getBookGroupQrcodeId());
// 通过 classifyId 获取群二维码链接
String groupQrCode = groupQrcodeBiz.getChangeGroupQrCode(groupActivity4AppletDTO.getClassifyId());
// 通过群二维码链接反查群ID
ClassifyQrcodeVO groupQrcodeInfo = groupQrcodeBiz.getGroupQrcodeInfo(groupQrCode, groupActivity4AppletDTO.getClassifyId());
List<String> headUrlList = appletGroupSearchRecordBiz.getHeadUrlList(groupQrcodeInfo.getUserNumber(),groupQrcodeInfo.getId());
groupActivity4AppletDTO.setHeadUrlList(headUrlList);
List<AppletGroupStatementDTO> statementDTOS = appletGroupSearchRecordBiz.getStatementList(groupActivity4AppletDTO.getUserNumber(),headUrlList,groupActivity4AppletDTO.getBookGroupQrcodeId());
List<AppletGroupStatementDTO> statementDTOS = appletGroupSearchRecordBiz.getStatementList(groupQrcodeInfo.getUserNumber(),headUrlList,groupQrcodeInfo.getId());
groupActivity4AppletDTO.setStatementDTOList(statementDTOS);
return groupActivity4AppletDTO;
}
......@@ -363,12 +368,47 @@ public class PcloudGroupActivityBizImpl implements PcloudGroupActivityBiz {
String filterStr = StringUtilParent.replaceHtml(activity4AppletDTO.getDesc());
String subStr = filterStr.length() > 60 ? filterStr.substring(0, 60) + "..." : filterStr;
activity4AppletDTO.setCutDesc(subStr);
// 通过 classifyId 获取群二维码链接
String groupQrCode = groupQrcodeBiz.getChangeGroupQrCode(activity4AppletDTO.getClassifyId());
// 通过群二维码链接反查群ID
ClassifyQrcodeVO groupQrcodeInfo = groupQrcodeBiz.getGroupQrcodeInfo(groupQrCode, activity4AppletDTO.getClassifyId());
//头像、对话
List<String> headUrlList = appletGroupSearchRecordBiz.getHeadUrlList(activity4AppletDTO.getUserNumber(), activity4AppletDTO.getBookGroupQrcodeId());
List<String> headUrlList = appletGroupSearchRecordBiz.getHeadUrlList(groupQrcodeInfo.getUserNumber(), groupQrcodeInfo.getId());
activity4AppletDTO.setHeadUrlList(headUrlList);
List<AppletGroupStatementDTO> statementDTOS = appletGroupSearchRecordBiz.getStatementList(activity4AppletDTO.getUserNumber(), headUrlList, activity4AppletDTO.getBookGroupQrcodeId());
List<AppletGroupStatementDTO> statementDTOS = appletGroupSearchRecordBiz.getStatementList(groupQrcodeInfo.getUserNumber(), headUrlList, groupQrcodeInfo.getId());
activity4AppletDTO.setStatementDTOList(statementDTOS);
}
return list;
}
@Override
public List<GroupActivity4AppletDTO> getTishBookSchoolListWrap(BaseTempletClassify baseTempletClassify, Integer limit) {
List<GroupActivity4AppletDTO> list = pcloudGroupActivityDao.getTishBookSchoolList(baseTempletClassify, limit);
if (!ListUtils.isEmpty(list)) {
for (GroupActivity4AppletDTO dto : list) {
Long classifyId = dto.getClassifyId();
// 通过 classifyId 获取群二维码链接
String groupQrCode = groupQrcodeBiz.getChangeGroupQrCode(classifyId);
// 通过群二维码链接反查群ID
ClassifyQrcodeVO groupQrcodeInfo = groupQrcodeBiz.getGroupQrcodeInfo(groupQrCode, classifyId);
if (groupQrcodeInfo != null) {
dto.setBookGroupQrcodeId(groupQrcodeInfo.getId());
dto.setGroupName(groupQrcodeInfo.getGroupName());
dto.setGroupPic(groupQrcodeInfo.getQrcodeUrl());
dto.setUserNumber(groupQrcodeInfo.getUserNumber());
}
}
}
return list;
}
@Override
public void updateActivityShowState(UpdateActivityShowStateDTO showStateDTO) {
PcloudGroupActivity byId = pcloudGroupActivityDao.getById(showStateDTO.getId());
if (byId==null || byId.getId() == null){
throw new BookBizException(BookBizException.PARAM_IS_ERROR,"不存在的共读活动！");
}
byId.setIsShow(showStateDTO.getIsShow());
pcloudGroupActivityDao.updateByPrimaryKeySelective(byId);
}
}
pcloud-service-book/src/main/java/com/pcloud/book/skill/dto/GroupActivity4AppletDTO.java
......@@ -64,6 +64,7 @@ public class GroupActivity4AppletDTO implements Serializable {
@ApiModelProperty("学舍群话语")
private List<AppletGroupStatementDTO> statementDTOList;
@ApiModelProperty("群分类名称")
private String classifyName;
}
pcloud-service-book/src/main/java/com/pcloud/book/skill/dto/UpdateActivityShowStateDTO.java 0 → 100644
package com.pcloud.book.skill.dto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* @ClassName com.pcloud.book.skill.dto.UpdateActivityShowStateDTO
* @Author guiq
* @Description 上下架
* @Date 2020/6/11 15:04
* @Version 1.0
**/
@Data
@ApiModel("更新上下架状态")
public class UpdateActivityShowStateDTO {
@ApiModelProperty("主键ID")
private Long id;
@ApiModelProperty("上下架状态 1上架 0 下架")
private Integer isShow;
}
pcloud-service-book/src/main/java/com/pcloud/book/skill/entity/PcloudGroupActivity.java
package com.pcloud.book.skill.entity;
import com.pcloud.book.rightsSetting.entity.BaseTempletClassify;
import com.pcloud.common.entity.BaseEntity;
import java.util.Date;
public class PcloudGroupActivity extends BaseTempletClassify {
private static final long serialVersionUID = -2579070770051745966L;
......@@ -21,7 +18,7 @@ public class PcloudGroupActivity extends BaseTempletClassify {
private Long purLabelId;
private Long bookGroupQrcodeId;
private Long bookGroupClassifyId;
private String groupName;
......@@ -31,6 +28,16 @@ public class PcloudGroupActivity extends BaseTempletClassify {
private Integer isDelete;
private Integer isShow;
public Integer getIsShow() {
return isShow;
}
public void setIsShow(Integer isShow) {
this.isShow = isShow;
}
public String getName() {
return name;
}
......@@ -87,12 +94,12 @@ public class PcloudGroupActivity extends BaseTempletClassify {
this.purLabelId = purLabelId;
}
public Long getBookGroupQrcodeId() {
return bookGroupQrcodeId;
public Long getBookGroupClassifyId() {
return bookGroupClassifyId;
}
public void setBookGroupQrcodeId(Long bookGroupQrcodeId) {
this.bookGroupQrcodeId = bookGroupQrcodeId;
public void setBookGroupClassifyId(Long bookGroupClassifyId) {
this.bookGroupClassifyId = bookGroupClassifyId;
}
public String getGroupName() {
......
pcloud-service-book/src/main/java/com/pcloud/book/skill/facade/PcloudGroupActivityFacade.java
package com.pcloud.book.skill.facade;
import com.pcloud.book.skill.biz.PcloudGroupActivityBiz;
import com.pcloud.book.skill.dto.UpdateActivityShowStateDTO;
import com.pcloud.book.skill.facade.request.SaveGroupActivityRequestVO;
import com.pcloud.book.skill.facade.request.UpdateGroupActivityRequestVO;
import com.pcloud.book.skill.facade.response.QueryGroupActivityResponseVO;
......@@ -8,7 +9,6 @@ import com.pcloud.common.dto.ResponseDto;
import com.pcloud.common.page.PageBeanNew;
import com.pcloud.common.permission.PermissionException;
import com.pcloud.common.utils.SessionUtil;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
......@@ -44,7 +44,7 @@ public class PcloudGroupActivityFacade {
}
@GetMapping("deleteGroupActivity")
public ResponseDto<Void> queryGroupActivity(@RequestHeader("token") String token, @RequestParam(value = "id") Long id) throws PermissionException {
public ResponseDto<Void> deleteGroupActivity(@RequestHeader("token") String token, @RequestParam(value = "id") Long id) throws PermissionException {
Long partyId = (Long) SessionUtil.getVlaue(token, SessionUtil.PARTY_ID);
pcloudGroupActivityBiz.deleteGroupActivity(id, partyId);
return new ResponseDto<>();
......@@ -65,4 +65,11 @@ public class PcloudGroupActivityFacade {
return new ResponseDto<>(pcloudGroupActivityBiz.queryGroupActivity(name, proLabelId, purLabelId, depLabelId, joinType,firstClassify,secondClassify, gradeLabelId,subjectLabelId,numPerPage, currentPage));
}
@PostMapping("updateActivityShowState")
public ResponseDto<Void> updateActivityShowState(@RequestHeader("token") String token, @RequestBody UpdateActivityShowStateDTO showStateDTO) throws PermissionException {
SessionUtil.getVlaue(token, SessionUtil.PARTY_ID);
pcloudGroupActivityBiz.updateActivityShowState(showStateDTO);
return new ResponseDto<>();
}
}
pcloud-service-book/src/main/java/com/pcloud/book/skill/facade/request/SaveGroupActivityRequestVO.java
......@@ -3,13 +3,9 @@ package com.pcloud.book.skill.facade.request;
import com.pcloud.book.base.exception.BookBizException;
import com.pcloud.book.rightsSetting.entity.BaseTempletClassify;
import com.pcloud.book.skill.entity.PcloudGroupActivity;
import com.pcloud.common.entity.BaseRequestVO;
import com.pcloud.common.utils.string.StringUtil;
import org.springframework.beans.BeanUtils;
import org.springframework.util.CollectionUtils;
import java.util.List;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
......@@ -47,14 +43,14 @@ public class SaveGroupActivityRequestVO extends BaseTempletClassify {
@ApiModelProperty("目的标签")
private Long purLabelId;
@ApiModelProperty("社群码id")
private Long bookGroupQrcodeId;
@ApiModelProperty("群分类id")
private Long bookGroupClassifyId;
public void checkParam() {
if (StringUtil.isBlank(this.getName())
|| null == this.getProLabelId() || null == this.getDepLabelId()
|| null == this.getJoinType() || (this.getJoinType() == 1 && StringUtil.isBlank(this.getGroupPic()))
|| null == this.getPurLabelId() || null == this.getBookGroupQrcodeId()) {
|| null == this.getJoinType() || null == this.getPurLabelId()
|| null == this.getBookGroupClassifyId()) {
throw new BookBizException(BookBizException.PARAM_IS_NULL, "请求参数缺失");
}
}
......
pcloud-service-book/src/main/java/com/pcloud/book/skill/facade/request/UpdateGroupActivityRequestVO.java
......@@ -3,7 +3,6 @@ package com.pcloud.book.skill.facade.request;
import com.pcloud.book.base.exception.BookBizException;
import com.pcloud.book.rightsSetting.entity.BaseTempletClassify;
import com.pcloud.book.skill.entity.PcloudGroupActivity;
import com.pcloud.common.entity.BaseRequestVO;
import com.pcloud.common.utils.string.StringUtil;
import org.springframework.beans.BeanUtils;
......@@ -47,14 +46,17 @@ public class UpdateGroupActivityRequestVO extends BaseTempletClassify {
@ApiModelProperty("目的标签")
private Long purLabelId;
@ApiModelProperty("社群码id")
private Long bookGroupQrcodeId;
@ApiModelProperty("群分类id")
private Long bookGroupClassifyId;
@ApiModelProperty("上下架")
private Long isShow;
public void checkParam() {
if (null == id || StringUtil.isBlank(this.getName())
|| null == this.getProLabelId() || null == this.getDepLabelId()
|| null == this.getJoinType() || (this.getJoinType() == 1 && StringUtil.isBlank(this.getGroupPic()))
|| null == this.getPurLabelId() || null == this.getBookGroupQrcodeId()) {
|| null == this.getJoinType() || null == this.getPurLabelId()
|| null == this.getBookGroupClassifyId()) {
throw new BookBizException(BookBizException.PARAM_IS_NULL, "请求参数缺失");
}
}
......
pcloud-service-book/src/main/java/com/pcloud/book/skill/facade/response/QueryGroupActivityResponseVO.java
package com.pcloud.book.skill.facade.response;
import com.pcloud.book.rightsSetting.entity.BaseTempletClassify;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
......@@ -25,11 +24,11 @@ public class QueryGroupActivityResponseVO {
@ApiModelProperty("加群类型（0：邀请 1：图片）")
private Integer joinType;
@ApiModelProperty("社群码id")
private Long bookGroupQrcodeId;
@ApiModelProperty("群分类ID")
private Long bookGroupClassifyId;
@ApiModelProperty("社群码名称")
private String groupName;
@ApiModelProperty("群分类名称")
private String classifyName;
@ApiModelProperty("专业标签id")
private Long proLabelId;
......@@ -70,4 +69,7 @@ public class QueryGroupActivityResponseVO {
@ApiModelProperty("科目标签名称")
private String subjectLabelName;
@ApiModelProperty("上下架")
private Integer isShow;
}
pcloud-service-book/src/main/resources/mapper/applet/AppletGroupManage.Mapper.xml
......@@ -31,17 +31,15 @@
a.seq_num seqNum,
b.`name`,
b.description as `desc`,
b.group_pic AS groupPic,
b.book_group_qrcode_id AS bookGroupQrcodeId,
b.book_group_classify_id AS classifyId,
b.pro_label_id AS proLabelId,
b.dep_label_id AS depLabelId,
b.pur_label_id AS purLabelId,
c.group_name AS groupName,
c.user_number userNumber
c.classify AS classifyName
FROM
applet_group_manage a
INNER JOIN pcloud_group_activity b ON a.group_activity_id = b.id AND b.is_delete = 0
LEFT JOIN book_group_qrcode c on b.book_group_qrcode_id = c.id AND c.is_delete = 0
LEFT JOIN book_group_classify c on b.book_group_classify_id = c.id AND c.is_delete = 0
WHERE 1=1
<if test="name!=null">
AND b.name like concat('%',#{name},'%')
......@@ -57,28 +55,23 @@
<select id="getList4Applet" resultType="com.pcloud.book.applet.dto.AppletGroupManageDTO">
SELECT
a.id,
a.group_activity_id groupActivityId,
b.`name`,
b.description as `desc`,
b.group_pic AS groupPic,
b.book_group_qrcode_id AS bookGroupQrcodeId,
c.group_name AS groupName,
c.user_number userNumber,
c.classify_id classifyId,
d.book_group_id bookGroupId
a.id,
a.group_activity_id groupActivityId,
b.`name`,
b.description as `desc`,
b.book_group_classify_id AS classifyId,
c.book_group_id bookGroupId
FROM
applet_group_manage a
INNER JOIN pcloud_group_activity b ON a.group_activity_id = b.id AND b.is_delete = 0
INNER JOIN book_group_qrcode c ON b.book_group_qrcode_id = c.id AND c.is_delete = 0
INNER JOIN book_group_classify d ON c.classify_id = d.id AND d.is_delete = 0
applet_group_manage a
INNER JOIN pcloud_group_activity b ON a.group_activity_id = b.id AND b.is_delete = 0
INNER JOIN book_group_classify c ON b.book_group_classify_id = c.id AND c.is_delete = 0
WHERE a.enable=1
<if test="recommend!=null">
AND a.recommend=#{recommend}
</if>
<if test="name!=null">
AND b.name like concat('%',#{name},'%')
</if>
<if test="recommend!=null">
AND a.recommend=#{recommend}
</if>
<if test="name!=null">
AND b.name like concat('%',#{name},'%')
</if>
ORDER BY a.seq_num, a.id DESC
</select>
......
pcloud-service-book/src/main/resources/mapper/group/BookGroupClassify.Mapper.xml
......@@ -1088,4 +1088,41 @@
WHERE user_number <![CDATA[ < ]]> #{changeNumber} AND classify_id = #{classifyId} AND use_state = 1 AND is_delete = 0 order by user_number asc
</select>
<select id="listGroupClassify4Pcloud" parameterType="map" resultType="com.pcloud.book.group.vo.PcloudBookGroupClassifyVO">
SELECT
a.id,
a.classify,
a.classify_introduce AS classifyIntroduce,
a.price,
count(b.classify_id) AS groupCount
FROM
book_group_classify a LEFT JOIN book_group_qrcode b ON a.id = b.classify_id AND b.is_delete = 0 AND a.is_delete = 0
LEFT JOIN book_group c ON a.book_group_id = c. id
<where>
<if test="name!=null or list.size()>0">
<trim prefix="(" suffix=")" prefixOverrides="OR">
<if test="name!=null">
a.classify LIKE CONCAT("%",#{name},"%")
</if>
<if test="list.size()>0">
OR a.book_id IN
<foreach collection="list" open="(" separator="," close=")" index="index" item="item">
${item}
</foreach>
</if>
</trim>
</if>
<if test="proLabelId!=null">
AND c.pro_label_id = #{proLabelId}
</if>
<if test="depLabelId!=null">
AND c.dep_label_id = #{depLabelId}
</if>
</where>
GROUP BY b.classify_id
HAVING groupCount > 0
ORDER BY a.create_time DESC
</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