Skip to content

M
midjourney-proxy
Commit 4e569483 by 阮思源
Options

Merge branch 'feat-1002027' into 'master' 

1002027个人号自动切号

See merge request rays/pcloud-book!244
parents 8a4de81b b324d3f4
Showing with 139 additions and 58 deletions
pcloud-service-book/src/main/java/com/pcloud/book/group/biz/BookGroupClassifyBiz.java
......@@ -244,4 +244,8 @@ public interface BookGroupClassifyBiz {
List<ListClassifyVO> getClassifyIngoreDelete(Long bookGroupId);
/**
* 个人号模式获取一个群
*/
String getSelfGroup(Long classifyId, Integer changeNumber, String wxId);
}
pcloud-service-book/src/main/java/com/pcloud/book/group/biz/GroupQrcodeBiz.java
......@@ -4,6 +4,7 @@ import com.pcloud.book.group.dto.GroupAndUserNumberDTO;
import com.pcloud.book.group.dto.GroupQrcodeInfo4Advertising;
import com.pcloud.book.group.dto.GroupQrcodeInfoDTO;
import com.pcloud.book.group.dto.GroupQrcodeServerDTO;
import com.pcloud.book.group.dto.WeixinQrcodeDTO;
import com.pcloud.book.group.entity.GroupQrcode;
import com.pcloud.book.group.vo.ClassifyQrcodeVO;
import com.pcloud.book.group.vo.GroupQrcodeBaseInfoVO;
......@@ -39,11 +40,6 @@ public interface GroupQrcodeBiz {
String getChangeGroupQrCode(Long classifyId);
/**
* 直接切群
*/
String changeGroupQrCode(Long classifyId);
/**
* 测试替换群二维码，不发生产
*/
void updateGroupQrcode(UpdateGroupQrcodeRequestVO vo);
......@@ -207,4 +203,9 @@ public interface GroupQrcodeBiz {
* @return
*/
PageBeanNew<GroupQrcodeBookVO> listQrcodeByPcloud(Integer currentPage, Integer numPerPage, String name);
/**
* 切群之后要做的事
*/
void dealAfterChangeANewGroup(WeixinQrcodeDTO oneQrcode, Long classifyId);
}
pcloud-service-book/src/main/java/com/pcloud/book/group/biz/WeixinQrcodeBiz.java
......@@ -22,7 +22,7 @@ public interface WeixinQrcodeBiz {
* @Desr:从二维码获取一个二维码
* @Date:2019/4/17 16:17
*/
WeixinQrcodeDTO getOneQrcode(Integer generation);
WeixinQrcodeDTO getOneQrcode(Integer joinGroupType, String altId);
/**
* @Author:lili
......
pcloud-service-book/src/main/java/com/pcloud/book/group/biz/impl/BookGroupClassifyBizImpl.java
......@@ -21,9 +21,11 @@ import com.pcloud.book.group.dao.BookGroupCipherUserDao;
import com.pcloud.book.group.dao.BookGroupClassifyDao;
import com.pcloud.book.group.dao.BookGroupDao;
import com.pcloud.book.group.dao.BookQrcodeUserDao;
import com.pcloud.book.group.dao.GroupQrcodeDao;
import com.pcloud.book.group.dao.JoinGroupCipherDao;
import com.pcloud.book.group.dao.LearningReportBrowseRecordDao;
import com.pcloud.book.group.dao.LearningReportTouchRecordDao;
import com.pcloud.book.group.dao.WeixinQrcodeDao;
import com.pcloud.book.group.dto.BookClassifyDTO;
import com.pcloud.book.group.dto.BookGroupDTO;
import com.pcloud.book.group.dto.BookGroupStatisticDTO;
......@@ -42,6 +44,8 @@ import com.pcloud.book.group.dto.WeixinQrcodeDTO;
import com.pcloud.book.group.entity.BookGroupClassify;
import com.pcloud.book.group.entity.BookQrcodeUser;
import com.pcloud.book.group.entity.GroupQrcode;
import com.pcloud.book.group.entity.WeixinQrcode;
import com.pcloud.book.group.enums.JoinGroupTypeEnum;
import com.pcloud.book.group.enums.RankTypeEnum;
import com.pcloud.book.group.set.GroupSet;
import com.pcloud.book.group.tools.SendWeixinRequestTools;
......@@ -84,6 +88,7 @@ import com.pcloud.resourcecenter.product.dto.UpdateAppProductParamDTO;
import com.pcloud.resourcecenter.product.entity.Product;
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 org.apache.commons.collections.MapUtils;
......@@ -169,6 +174,10 @@ public class BookGroupClassifyBizImpl implements BookGroupClassifyBiz {
private BookGroupCipherUserDao bookGroupCipherUserDao;
@Autowired
private BookGroupDao bookGroupDao;
@Autowired
private WeixinQrcodeDao weixinQrcodeDao;
@Autowired
private GroupQrcodeDao groupQrcodeDao;
@Override
......@@ -206,36 +215,39 @@ public class BookGroupClassifyBizImpl implements BookGroupClassifyBiz {
throw new BookBizException(BookBizException.PARAM_IS_NULL, "群二维码数量不足，您可以明天再创建群。");
}
}
Integer generation = null;
if (new Integer(2).equals(qrcodeNameAndProId.getJoinGroupType())) {
generation = 3;
}
WeixinQrcodeDTO oneQrcode = weixinQrcodeBiz.getOneQrcode(generation);
if (oneQrcode == null) {
throw new BookBizException(BookBizException.PARAM_IS_NULL, "系统二维码数量不足，请联系客服人员补充二维码数量！");
}
GroupQrcode groupQrcode = new GroupQrcode();
groupQrcode.setWeixinGroupId(oneQrcode.getWeixinGroupId());
groupQrcode.setQrcodeUrl(oneQrcode.getQrcodeUrl());
groupQrcode.setCreateUser(partyId);
groupQrcode.setWeixinQrcodeId(oneQrcode.getId());
groupQrcode.setUserNumber(oneQrcode.getUserNumber());
groupQrcode.setGroupSeq(1);
// 群长度超过16部分会被截取，导致群名称重复
final String s = "1群";
String groupName = qrcodeNameAndProId.getGroupQrcodeName() + addClassifyVO.getClassify() + s;
if (groupName.length() > 15) {
groupName = addClassifyVO.getClassify() + s;
//添加分类时如果不是普通群则不分配群
if (JoinGroupTypeEnum.GROUP_QRCODE.getCode().equals(qrcodeNameAndProId.getJoinGroupType())) {
WeixinQrcodeDTO oneQrcode = weixinQrcodeBiz.getOneQrcode(null, null);
if (oneQrcode == null) {
throw new BookBizException(BookBizException.PARAM_IS_NULL, "系统二维码数量不足，请联系客服人员补充二维码数量！");
}
GroupQrcode groupQrcode = new GroupQrcode();
groupQrcode.setWeixinGroupId(oneQrcode.getWeixinGroupId());
groupQrcode.setQrcodeUrl(oneQrcode.getQrcodeUrl());
groupQrcode.setCreateUser(partyId);
groupQrcode.setWeixinQrcodeId(oneQrcode.getId());
groupQrcode.setUserNumber(oneQrcode.getUserNumber());
groupQrcode.setGroupSeq(1);
// 群长度超过16部分会被截取，导致群名称重复
final String s = "1群";
String groupName = qrcodeNameAndProId.getGroupQrcodeName() + addClassifyVO.getClassify() + s;
if (groupName.length() > 15) {
groupName = addClassifyVO.getClassify().substring(0, 16 - s.length()) + s;
groupName = addClassifyVO.getClassify() + s;
if (groupName.length() > 15) {
groupName = addClassifyVO.getClassify().substring(0, 16 - s.length()) + s;
}
}
groupQrcode.setGroupName(groupName);
groupQrcode.setClassifyId(bookGroupClassify.getId());
groupQrcode.setQrcodeHeadUrl(readerConsr.getNineHeadUrl());
groupQrcodeBiz.insert(groupQrcode);
//获取该社群书下是否有群公告
groupAnnouncementBiz.setAnForGroup(addClassifyVO.getBookGroupId(), null, oneQrcode.getWeixinGroupId());
final String wechatGroupId = oneQrcode.getWeixinGroupId();
Map<String, BookWxQrcodeDTO> groupVersion = weixinQrcodeBiz.getGroupVersion(Collections.singletonList(wechatGroupId));
String ip = Optional.ofNullable(groupVersion.get(wechatGroupId)).orElse(new BookWxQrcodeDTO()).getWechatGroupIp();
SendWeixinRequestTools.changeGroupName(oneQrcode.getRobotWxId(), oneQrcode.getWeixinGroupId(), groupQrcode.getGroupName(), ip);
}
groupQrcode.setGroupName(groupName);
groupQrcode.setClassifyId(bookGroupClassify.getId());
groupQrcode.setQrcodeHeadUrl(readerConsr.getNineHeadUrl());
groupQrcodeBiz.insert(groupQrcode);
//获取该社群书下是否有群公告
groupAnnouncementBiz.setAnForGroup(addClassifyVO.getBookGroupId(), null, oneQrcode.getWeixinGroupId());
//新增一个规格
Long specId = addSpecification(bookGroupClassify.getPrice(), qrcodeNameAndProId.getProductId(), addClassifyVO.getChannelId(), bookGroupClassify.getClassify());
bookGroupClassify.setProductSpecId(specId);
......@@ -265,10 +277,6 @@ public class BookGroupClassifyBizImpl implements BookGroupClassifyBiz {
bookKeywords.add(bookKeyword);
});
bookKeywordDao.insert(bookKeywords);
final String wechatGroupId = oneQrcode.getWeixinGroupId();
Map<String, BookWxQrcodeDTO> groupVersion = weixinQrcodeBiz.getGroupVersion(Collections.singletonList(wechatGroupId));
String ip = Optional.ofNullable(groupVersion.get(wechatGroupId)).orElse(new BookWxQrcodeDTO()).getWechatGroupIp();
SendWeixinRequestTools.changeGroupName(oneQrcode.getRobotWxId(), oneQrcode.getWeixinGroupId(), groupQrcode.getGroupName(), ip);
}
@ParamLog("新增商品对应规格")
......@@ -1124,5 +1132,44 @@ public class BookGroupClassifyBizImpl implements BookGroupClassifyBiz {
return classifyVOS;
}
@ParamLog("个人号模式获取一个群")
@Override
public String getSelfGroup(Long classifyId, Integer changeNumber, String altId) {
GroupRobotDTO groupRobotDTO = wechatGroupConsr.getGroupRobotByWxId(altId);
if (groupRobotDTO == null) {
return null;
}
ClassifyVO classifyVO = bookGroupClassifyDao.getClassify(classifyId);
if (classifyVO==null){
return null;
}
BookGroupDTO bookGroupDTO = bookGroupDao.getDTOById(classifyVO.getBookGroupId());
if (bookGroupDTO==null){
return null;
}
//先判断有没有已经存在的群
List<GroupQrcode> groupQrcodes = groupQrcodeDao.getUsingGroupQrcodeByClassifyId(classifyId, changeNumber);
log.info("查询到该分类下已经存在的群" + groupQrcodes.toString());
if (!ListUtils.isEmpty(groupQrcodes)) {
for (GroupQrcode groupQrcode:groupQrcodes){
//判断这个群是否跟这个小号对应，如果对应就返回该群，如果不对应证明已经切小号了，重新分配新的群
WeixinQrcode weixinQrcode = weixinQrcodeDao.getByGroupId(groupQrcode.getWeixinGroupId());
if (weixinQrcode != null && groupRobotDTO.getVersion() != null && groupRobotDTO.getVersion().equals(weixinQrcode.getGeneration())) {
log.info("返回已经有的能对应上的群" + groupQrcode.getWeixinGroupId());
return groupQrcode.getWeixinGroupId();
}
}
}
//没有找到合适的群，根据机器人id重新切一个群
WeixinQrcodeDTO weixinQrcodeDTO = weixinQrcodeBiz.getOneQrcode(JoinGroupTypeEnum.ROBOT.getCode(), altId);
if (weixinQrcodeDTO != null) {
log.info("没有找到合适的群，根据机器人id重新切一个群"+weixinQrcodeDTO.toString());
groupQrcodeBiz.dealAfterChangeANewGroup(weixinQrcodeDTO, classifyId);
return weixinQrcodeDTO.getWeixinGroupId();
}
log.info("没有可用的群classifyId="+classifyId+"altId="+altId+"changeNumber="+changeNumber);
return null;
}
}
pcloud-service-book/src/main/java/com/pcloud/book/group/biz/impl/WeixinQrcodeBizImpl.java
......@@ -14,6 +14,7 @@ import com.pcloud.book.group.dto.UpdateQrDTO;
import com.pcloud.book.group.dto.WeixinQrcodeCountDTO;
import com.pcloud.book.group.dto.WeixinQrcodeDTO;
import com.pcloud.book.group.entity.WeixinQrcode;
import com.pcloud.book.group.enums.JoinGroupTypeEnum;
import com.pcloud.book.group.enums.UpdateStatusEnum;
import com.pcloud.book.group.tools.Kit;
import com.pcloud.book.group.tools.QrcodeTools;
......@@ -82,7 +83,15 @@ public class WeixinQrcodeBizImpl implements WeixinQrcodeBiz {
@Override
@ParamLog("从二维码库获取一个二维码")
@Transactional(propagation = Propagation.NOT_SUPPORTED)
public WeixinQrcodeDTO getOneQrcode(Integer generation) {
public WeixinQrcodeDTO getOneQrcode(Integer joinGroupType, String altId) {
Integer generation = null;
if (JoinGroupTypeEnum.ROBOT.getCode().equals(joinGroupType) && !StringUtil.isEmpty(altId)) {
//个人号模式获取群，根据小号是第几套获取是第几个套群
GroupRobotDTO groupRobotDTO = wechatGroupConsr.getGroupRobotByWxId(altId);
if (groupRobotDTO != null) {
generation = groupRobotDTO.getVersion();
}
}
WeixinQrcodeDTO qrcodeVO = weixinQrcodeDao.getOneWechatGroup(generation);
if (qrcodeVO == null) {
return null;
......
pcloud-service-book/src/main/java/com/pcloud/book/group/dao/GroupQrcodeDao.java
......@@ -280,4 +280,9 @@ public interface GroupQrcodeDao extends BaseDao<GroupQrcode> {
* @return
*/
GroupQrcode getByWxGroupId(String wxGroupId);
/**
* 查询正在使用的群
*/
List<GroupQrcode> getUsingGroupQrcodeByClassifyId(Long classifyId, Integer changeNumber);
}
pcloud-service-book/src/main/java/com/pcloud/book/group/dao/impl/GroupQrcodeDaoImpl.java
......@@ -282,4 +282,12 @@ public class GroupQrcodeDaoImpl extends BaseDaoImpl<GroupQrcode> implements Grou
public GroupQrcode getByWxGroupId(String wxGroupId) {
return super.getSessionTemplate().selectOne(getStatement("getByWxGroupId"), wxGroupId);
}
@Override
public List<GroupQrcode> getUsingGroupQrcodeByClassifyId(Long classifyId, Integer changeNumber) {
Map<String, Object> map = new HashMap<>();
map.put("classifyId", classifyId);
map.put("changeNumber", changeNumber);
return this.getSessionTemplate().selectList(getStatement("getUsingGroupQrcodeByClassifyId"), map);
}
}
pcloud-service-book/src/main/java/com/pcloud/book/group/facade/impl/GroupQrcodeFacadeImpl.java
......@@ -73,12 +73,6 @@ public class GroupQrcodeFacadeImpl implements GroupQrcodeFacade {
return new ResponseDto<>(qrCodeUrl);
}
@GetMapping("changeGroupQrCode")
public ResponseDto<String> changeGroupQrCode(@RequestParam("classifyId") Long classifyId) {
String qrCodeUrl = groupQrcodeBiz.changeGroupQrCode(classifyId);
return new ResponseDto<>(qrCodeUrl);
}
@Override
@PostMapping("listQrcodeByClassify")
public ResponseDto<PageBeanNew> listQrcodeByClassify(@RequestHeader("token") String token, @RequestBody ListQrcodeByClassifyParamVO listQrcodeByClassifyParamVO) {
......
pcloud-service-book/src/main/java/com/pcloud/book/group/service/impl/WeixinQrcodeServiceImpl.java
......@@ -97,7 +97,7 @@ public class WeixinQrcodeServiceImpl implements WeixinQrcodeService {
@Override
@GetMapping("getOneQrcode")
public ResponseEntity<ResponseDto<WeixinQrcodeDTO>> getOneQrcode() {
return ResponseHandleUtil.toResponse(weixinQrcodeBiz.getOneQrcode(null));
return ResponseHandleUtil.toResponse(weixinQrcodeBiz.getOneQrcode(null, null));
}
@Override
......
pcloud-service-book/src/main/java/com/pcloud/book/keywords/biz/impl/BookKeywordBizImpl.java
......@@ -625,12 +625,12 @@ public class BookKeywordBizImpl implements BookKeywordBiz {
if (classify == null) {
throw new BookBizException(BookBizException.PARAM_IS_NULL, "分类不存在");
}
//获取群
GroupQrcode4ClassifyVO groupQrcode4ClassifyVO = bookGroupClassifyDao.getClassifyQrcode(classifyId, changeNumber);
if (null == groupQrcode4ClassifyVO) {
throw new BookBizException(BookBizException.ID_NOT_EXIST, "群不存在");
//获取第三套群，先判断这个小号是不是属于这个群的，如果不是，则切下一套
String weixinGroupId = bookGroupClassifyBiz.getSelfGroup(classifyId, changeNumber, sendTextDTO.getWxId());
if (StringUtil.isEmpty(weixinGroupId)) {
throw new BookBizException(BookBizException.ID_NOT_EXIST, "群不存在classifyId=" + classifyId + ",changeNumber=" + changeNumber + ", wxId=" + sendTextDTO.getWxId());
}
sendAndCheckInviteGroup(sendTextDTO,groupQrcode4ClassifyVO.getWeixinGroupId());
sendAndCheckInviteGroup(sendTextDTO,weixinGroupId);
}
@ParamLog("判断冒泡和发送冒泡和发入群链接")
......@@ -699,12 +699,12 @@ public class BookKeywordBizImpl implements BookKeywordBiz {
if (!ListUtils.isEmpty(bookGroupClassifyList)) {
for (BookGroupClassify bookGroupClassify : bookGroupClassifyList) {
if (bookGroupClassify.getClassify().equals(sendTextDTO.getTextContent())) {
//获取群
GroupQrcode4ClassifyVO groupQrcode4ClassifyVO = bookGroupClassifyDao.getClassifyQrcode(bookGroupClassify.getId(), bookGroupClassify.getChangeNumber());
if (null == groupQrcode4ClassifyVO) {
throw new BookBizException(BookBizException.ID_NOT_EXIST, "群不存在");
//获取第三套群，先判断这个小号是不是属于这个群的，如果不是，则切下一套
String weixinGroupId = bookGroupClassifyBiz.getSelfGroup(bookGroupClassify.getId(), bookGroupClassify.getChangeNumber(), sendTextDTO.getWxId());
if (StringUtil.isEmpty(weixinGroupId)) {
throw new BookBizException(BookBizException.ID_NOT_EXIST, "群不存在classifyId=" + bookGroupClassify.getId() + ",changeNumber=" + bookGroupClassify.getChangeNumber() + ", wxId=" + sendTextDTO.getWxId());
}
sendAndCheckInviteGroup(sendTextDTO,groupQrcode4ClassifyVO.getWeixinGroupId());
sendAndCheckInviteGroup(sendTextDTO, weixinGroupId);
}
}
}
......
pcloud-service-book/src/main/resources/mapper/group/BookGroupClassify.Mapper.xml
......@@ -231,10 +231,10 @@
change_number changeNumber,
rank,
count(1) qrcodeNumber,
SUM(user_number) userNumberTotal,
IFNULL(SUM(user_number),0) userNumberTotal,
c.create_time createdTime
from
book_group_classify c join book_group_qrcode q on c.id = q.classify_id
book_group_classify c left join book_group_qrcode q on c.id = q.classify_id
where
book_group_id = #{_parameter,jdbcType=BIGINT} and c.is_delete = 0 group by c.id order by userNumberTotal desc,c.id
</select>
......
pcloud-service-book/src/main/resources/mapper/group/GroupQrcode.Mapper.xml
......@@ -785,4 +785,16 @@
and is_delete = 0
</select>
<!--查询正在使用的群-->
<select id="getUsingGroupQrcodeByClassifyId" parameterType="map" resultMap="BaseResultMap">
SELECT
<include refid="Base_Column_List"/>
FROM
book_group_qrcode
WHERE user_number &lt; #{changeNumber}
AND classify_id = #{classifyId}
AND use_state = 1
AND is_delete = 0
</select>
</mapper>
\ No newline at end of file
pcloud-service-book/src/main/resources/mapper/group/WeixinQrcode.Mapper.xml
......@@ -14,7 +14,7 @@
</resultMap>
<sql id="Base_Column_List">
id, weixin_group_id, robot_id, robot_wx_id, qrcode_url, use_state, update_qr_time
id, weixin_group_id, robot_id, robot_wx_id, qrcode_url, use_state, update_qr_time, generation
</sql>
<!--根据Id查询详情-->
......
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