Skip to content

M
midjourney-proxy
Commit 64ffa3cd by zhuyajie
Options

1002651小睿社群书

parent 8c878638
Showing with 308 additions and 52 deletions
pcloud-facade-book/src/main/java/com/pcloud/book/group/enums/JoinGroupTypeEnum.java
......@@ -19,7 +19,12 @@ public enum JoinGroupTypeEnum {
/**
* AI客服机器人
*/
AI_ROBOT(3, "AI客服机器人");
AI_ROBOT(3, "AI客服机器人"),
/**
* 小睿机器人
*/
XIAORUI(4,"小睿机器人");
private final Integer code;
......
pcloud-service-book/src/main/java/com/pcloud/book/book/biz/impl/BookBizImpl.java
......@@ -1501,6 +1501,8 @@ public class BookBizImpl implements BookBiz {
bookCache.clearRedisByBook(book.getBookId(), book.getIsbn(), book.getSerialNumber());
//修改图书类型
bookAdviserBiz.updateBookTemplet(book);
//更新小睿分类
bookGroupBiz.updateBookGroupRaysClassify(book);
LOGGER.info("修改图书基本信息与类型[END]");
}
......@@ -1760,7 +1762,8 @@ public class BookBizImpl implements BookBiz {
if (adviserId != null) {
paramMap.put("adviserId", adviserId);
}
paramMap.put("joinGroupTypes", Arrays.asList(JoinGroupTypeEnum.ROBOT.getCode(),JoinGroupTypeEnum.AI_ROBOT.getCode()));
paramMap.put("joinGroupTypes", Arrays.asList(JoinGroupTypeEnum.ROBOT.getCode(),JoinGroupTypeEnum.AI_ROBOT.getCode(),
JoinGroupTypeEnum.XIAORUI.getCode()));
paramMap.put("graLabelId",graLabelId);
paramMap.put("subLabelId",subLabelId);
paramMap.put("verLabelId",verLabelId);
......
pcloud-service-book/src/main/java/com/pcloud/book/consumer/wechat/WechatConsr.java 0 → 100644
package com.pcloud.book.consumer.wechat;
import com.pcloud.common.core.aspect.ParamLog;
import com.pcloud.common.utils.ResponseHandleUtil;
import com.pcloud.facade.wechat.service.QrcodeService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
@Slf4j
@Component("wechatConsr")
public class WechatConsr {
@Autowired
private QrcodeService qrcodeService;
@ParamLog("生成小程序二维码")
public String create4MiniApp(Long officialAccountId, String scene, Integer width, String page){
String url="";
try {
url = ResponseHandleUtil.parseResponse(qrcodeService.create4MiniApp(officialAccountId, scene, width, page),String.class);
}catch (Exception e){
log.error("qrcodeService.create4MiniApp调用失败"+e.getMessage(),e);
}
return url;
}
}
pcloud-service-book/src/main/java/com/pcloud/book/group/biz/BookGroupBiz.java
package com.pcloud.book.group.biz;
import com.pcloud.book.book.dto.BookDto;
import com.pcloud.book.group.dto.AgentStatisticsInfoDTO;
import com.pcloud.book.group.dto.AltAndCountDTO;
import com.pcloud.book.group.dto.AppStatisticsDTO;
import com.pcloud.book.group.dto.BookGroupCountDTO;
import com.pcloud.book.group.dto.BookGroupDTO;
import com.pcloud.book.group.dto.BookGroupKeywordResourceDTO;
import com.pcloud.book.group.dto.BookGroupStatistic4AgentDTO;
import com.pcloud.book.group.dto.BookGroupStatisticsDTO;
import com.pcloud.book.group.dto.ChangeQrCodeTypeDto;
import com.pcloud.book.group.dto.ClassifyKeywordDTO;
import com.pcloud.book.group.dto.CountAndTimeDTO;
import com.pcloud.book.group.dto.ErpBookGroupDTO;
import com.pcloud.book.group.dto.ErpGroupQrcodeDTO;
import com.pcloud.book.group.dto.GroupCipherDTO;
import com.pcloud.book.group.dto.GroupStoreMyPayDto;
import com.pcloud.book.group.dto.GroupUseDTO;
import com.pcloud.book.group.dto.JoinGroupCipherDTO;
import com.pcloud.book.group.dto.LabelUserCountDTO;
import com.pcloud.book.group.dto.LargeTempletDTO;
import com.pcloud.book.group.dto.OwnAltQrcodeInfoDTO;
import com.pcloud.book.group.dto.PersonalQrcodeDTO;
import com.pcloud.book.group.dto.QrcodeNameAndProIdDTO;
import com.pcloud.book.group.dto.ResourceBrowseParamDto;
import com.pcloud.book.group.dto.SelfBookGroupStDTO;
import com.pcloud.book.group.dto.SelfBookGroupStParamDTO;
import com.pcloud.book.group.dto.SelfRobotBookGroupDTO;
import com.pcloud.book.group.dto.SelfRobotUserDTO;
import com.pcloud.book.group.dto.SelfRobtParamDTO;
import com.pcloud.book.group.dto.TopAgentBookGroupDTO;
import com.pcloud.book.group.dto.UserBookBaseInfoDTO;
import com.pcloud.book.group.dto.UserSelectParamDTO;
import com.pcloud.book.book.entity.Book;
import com.pcloud.book.group.dto.*;
import com.pcloud.book.group.entity.BookGroup;
import com.pcloud.book.group.entity.BookGroupServe;
import com.pcloud.book.group.dto.AgentStatisticsInfoDTO;
......@@ -768,7 +739,22 @@ public interface BookGroupBiz {
PageBeanNew<UserBookInfoVO> listUser4ReadingActivity(UserSelectParamDTO userSelectParamDTO);
/**
* 旧标签转换为新标签
*根据小程序ID获取
* @param appletId
* @return
*/
public BookAppletSceneDTO getBookGroupAppletByAppletId(String appletId);
/**
* 获取小程序码
* @param bookGroupId
* @return
*/
public BookAppletSceneDTO getBookGroupAppletByBookGroupId(Long bookGroupId);
/**
* 更新小睿分类
* @param book
*/
void updateNewLabel();
public void updateBookGroupRaysClassify(Book book);
}
pcloud-service-book/src/main/java/com/pcloud/book/group/dao/BookAppletSceneDao.java 0 → 100644
package com.pcloud.book.group.dao;
import com.pcloud.book.group.entity.BookAppletScene;
import com.pcloud.common.core.dao.BaseDao;
/**
* 社群书小程序码
*/
public interface BookAppletSceneDao extends BaseDao<BookAppletScene> {
/**
* 根据小程序id获取关联信息
* @param appletId
* @return
*/
public BookAppletScene getByAppletId(String appletId);
/**
* 根据bookGroupId获取
* @param bookGroupId
* @return
*/
public BookAppletScene getByBookGroupId(Long bookGroupId);
/**
* 更新分类
* @param raysClassifyId
* @param bookGroupId
*/
public void updateRaysClassifyIdByBookGroupId(Long raysClassifyId,Long bookGroupId);
/**
* 删除
* @param bookGroupId
*/
public void deleteByBookGroupId(Long bookGroupId);
}
pcloud-service-book/src/main/java/com/pcloud/book/group/dao/impl/BookAppletSceneDaoImpl.java 0 → 100644
package com.pcloud.book.group.dao.impl;
import com.pcloud.book.group.dao.BookAppletSceneDao;
import com.pcloud.book.group.entity.BookAppletScene;
import com.pcloud.common.core.dao.BaseDaoImpl;
import org.springframework.stereotype.Component;
import java.util.HashMap;
import java.util.Map;
/**
* 社群书小程序码
*/
@Component("bookGroupAppletDao")
public class BookAppletSceneDaoImpl extends BaseDaoImpl<BookAppletScene> implements BookAppletSceneDao {
@Override
public BookAppletScene getByAppletId(String appletId) {
return getSessionTemplate().selectOne(getStatement("getByAppletId"), appletId);
}
@Override
public BookAppletScene getByBookGroupId(Long bookGroupId) {
return getSessionTemplate().selectOne(getStatement("getByBookGroupId"), bookGroupId);
}
@Override
public void updateRaysClassifyIdByBookGroupId(Long raysClassifyId, Long bookGroupId) {
Map<String,Object> map = new HashMap<>();
map.put("raysClassifyId", raysClassifyId);
map.put("bookGroupId", bookGroupId);
getSessionTemplate().update(getStatement("updateRaysClassifyIdByBookGroupId"),map);
}
@Override
public void deleteByBookGroupId(Long bookGroupId) {
getSessionTemplate().update(getStatement("deleteByBookGroupId"), bookGroupId);
}
}
pcloud-service-book/src/main/java/com/pcloud/book/group/dto/BookAppletSceneDTO.java 0 → 100644
package com.pcloud.book.group.dto;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.pcloud.common.dto.BaseDto;
import lombok.Data;
import java.util.Date;
/**
* 社群书小程序码
*/
@Data
public class BookAppletSceneDTO extends BaseDto {
/**
* 社群书id
*/
private Long bookGroupId;
/**
* 小睿分类
*/
private Long raysClassifyId;
/**
* 小程序id
*/
private String appletId;
/**
* 小程序url
*/
private String appletUrl;
/**
* 书名
*/
private String bookName;
}
pcloud-service-book/src/main/java/com/pcloud/book/group/entity/BookAppletScene.java 0 → 100644
package com.pcloud.book.group.entity;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.pcloud.common.entity.BaseEntity;
import lombok.Data;
import java.util.Date;
/**
* 社群书小程序码
*/
@Data
public class BookAppletScene extends BaseEntity {
/**
* 社群书id
*/
private Long bookGroupId;
/**
* 小睿分类
*/
private Long raysClassifyId;
/**
* 小程序id
*/
private String appletId;
/**
* 小程序url
*/
private String appletUrl;
@JsonFormat(
pattern = "yyyy-MM-dd HH:mm:ss",
timezone = "GMT+8"
)
private Date createTime;
@JsonFormat(
pattern = "yyyy-MM-dd HH:mm:ss",
timezone = "GMT+8"
)
private Date updateTime;
private Boolean isDelete;
}
pcloud-service-book/src/main/java/com/pcloud/book/group/facade/BookGroupFacade.java
package com.pcloud.book.group.facade;
import com.pcloud.book.group.dto.BookGroupDTO;
import com.pcloud.book.group.dto.ChangeQrCodeTypeDto;
import com.pcloud.book.group.dto.SelfBookGroupStParamDTO;
import com.pcloud.book.group.dto.UserSelectParamDTO;
import com.pcloud.book.group.dto.*;
import com.pcloud.book.group.entity.BookGroup;
import com.pcloud.book.group.entity.BookGroupClassify;
import com.pcloud.book.group.entity.BookGroupServe;
......@@ -694,8 +691,9 @@ public interface BookGroupFacade {
public ResponseDto<PageBeanNew<UserBookInfoVO>> listUser4ReadingActivity(
@RequestHeader("token") String token, @RequestBody @ApiParam UserSelectParamDTO userSelectParamDTO) throws PermissionException;
@ApiOperation("旧标签转换为新标签")
@GetMapping("updateNewLabel")
ResponseDto<?> updateNewLabel();
@ApiOperation("根据获取社群书小程序信息")
@ApiImplicitParam(name = "bookGroupId", value = "bookGroupId", required = true, dataType = "long", paramType = "query")
@GetMapping("getBookGroupAppletByBookGroupId")
ResponseDto<BookAppletSceneDTO> getBookGroupAppletByBookGroupId(@RequestParam("bookGroupId") Long bookGroupId);
}
pcloud-service-book/src/main/java/com/pcloud/book/group/facade/impl/BookGroupFacadeImpl.java
......@@ -3,11 +3,7 @@ package com.pcloud.book.group.facade.impl;
import com.pcloud.book.base.exception.BookBizException;
import com.pcloud.book.group.biz.BookGroupBiz;
import com.pcloud.book.group.biz.BookGroupClassifyBiz;
import com.pcloud.book.group.dto.BookGroupDTO;
import com.pcloud.book.group.dto.ChangeQrCodeTypeDto;
import com.pcloud.book.group.dto.GroupStoreMyPayDto;
import com.pcloud.book.group.dto.SelfBookGroupStParamDTO;
import com.pcloud.book.group.dto.UserSelectParamDTO;
import com.pcloud.book.group.dto.*;
import com.pcloud.book.group.entity.BookGroup;
import com.pcloud.book.group.entity.BookGroupClassify;
import com.pcloud.book.group.entity.BookGroupServe;
......@@ -221,6 +217,7 @@ public class BookGroupFacadeImpl implements BookGroupFacade {
if ("ROBOT".equals(joinGroupType)) {
joinGroupTypes.add(JoinGroupTypeEnum.ROBOT.getCode());
joinGroupTypes.add(JoinGroupTypeEnum.AI_ROBOT.getCode());
joinGroupTypes.add(JoinGroupTypeEnum.XIAORUI.getCode());
}
paramMap.put("joinGroupTypes", joinGroupTypes);
if (!StringUtil.isEmpty(startDate) && !StringUtil.isEmpty(endDate)) {
......@@ -1109,10 +1106,12 @@ public class BookGroupFacadeImpl implements BookGroupFacade {
}
@Override
@GetMapping("updateNewLabel")
public ResponseDto<?> updateNewLabel(){
//社群书标签
bookGroupBiz.updateNewLabel();
return new ResponseDto<>();
@GetMapping("getBookGroupAppletByBookGroupId")
public ResponseDto<BookAppletSceneDTO> getBookGroupAppletByBookGroupId(@RequestParam("bookGroupId") Long bookGroupId){
if (null==bookGroupId){
throw new BookBizException(BookBizException.PARAM_IS_ERROR, "bookGroupId不能为空！");
}
return new ResponseDto<>(bookGroupBiz.getBookGroupAppletByBookGroupId(bookGroupId));
}
}
pcloud-service-book/src/main/resources/mapper/book/Book.Mapper.xml
......@@ -585,6 +585,7 @@
WHEN 1 then bk.id
WHEN 2 THEN bgs.id
WHEN 3 THEN srk.id
WHEN 4 THEN bgs.id
else null END,0)=0,0,1)as has_serve, A.IS_PRINT isPrint
FROM
book_group G
......
pcloud-service-book/src/main/resources/mapper/group/BookAppletScene.xml 0 → 100644
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "mybatis-3-mapper.dtd" >
<mapper namespace="com.pcloud.book.group.dao.impl.BookAppletSceneDaoImpl">
<resultMap id="BaseResultMap" type="com.pcloud.book.group.entity.BookAppletScene">
<id column="id" property="id" jdbcType="BIGINT"/>
<result column="book_group_id" property="bookGroupId" jdbcType="BIGINT"/>
<result column="rays_classify_id" property="raysClassifyId" jdbcType="BIGINT"/>
<result column="applet_id" property="appletId" jdbcType="VARCHAR"/>
<result column="applet_url" property="appletUrl" jdbcType="VARCHAR"/>
<result column="create_time" property="createTime" jdbcType="TIMESTAMP"/>
<result column="update_time" property="updateTime" jdbcType="TIMESTAMP"/>
<result column="is_delete" property="isDelete" jdbcType="BIT"/>
</resultMap>
<sql id="Base_Column_List">
id, book_group_id, rays_classify_id, applet_id, applet_url, create_time, update_time, is_delete
</sql>
<insert id="insert" parameterType="com.pcloud.book.group.entity.BookAppletScene" useGeneratedKeys="true"
keyProperty="id">
insert into book_applet_scene
<trim prefix="(" suffix=")" suffixOverrides=",">
book_group_id,
rays_classify_id,
applet_id,
applet_url,
create_time,
update_time,
is_delete
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
#{bookGroupId,jdbcType=BIGINT},
#{raysClassifyId,jdbcType=BIGINT},
#{appletId,jdbcType=VARCHAR},
#{appletUrl,jdbcType=VARCHAR},
NOW(),
NOW(),
0
</trim>
</insert>
<select id="getByAppletId" parameterType="string" resultMap="BaseResultMap">
SELECT <include refid="Base_Column_List"/>
FROM book_applet_scene
WHERE applet_id=#{appletId}
limit 1
</select>
<select id="getByBookGroupId" parameterType="long" resultMap="BaseResultMap">
SELECT <include refid="Base_Column_List"/>
FROM book_applet_scene
WHERE book_group_id=#{bookGroupId}
AND is_delete = 0
</select>
<select id="updateRaysClassifyIdByBookGroupId" parameterType="map">
UPDATE book_applet_scene
SET rays_classify_id = #{raysClassifyId},
update_time = NOW()
WHERE book_group_id=#{bookGroupId}
</select>
<update id="deleteByBookGroupId" parameterType="long">
UPDATE book_applet_scene
SET is_delete = 1,
update_time = NOW()
WHERE book_group_id=#{bookGroupId}
</update>
</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