Skip to content

M
midjourney-proxy
Commit a92ab2d2 by lili
Options

合并

parents edc82ff7 3b668d13
Showing with 258 additions and 49 deletions
pcloud-facade-book/src/main/java/com/pcloud/book/appeal/dto/BookAppealDto.java
...@@ -130,6 +130,12 @@ public class BookAppealDto extends BaseEntity{ ...@@ -130,6 +130,12 @@ public class BookAppealDto extends BaseEntity{
* 运营名称 * 运营名称
*/ */
private String channelName; private String channelName;
/**
* 是否社群书
*/
private Boolean isBookGroup;
public Long getBookAppealId() { public Long getBookAppealId() {
return bookAppealId; return bookAppealId;
} }
...@@ -307,6 +313,14 @@ public class BookAppealDto extends BaseEntity{ ...@@ -307,6 +313,14 @@ public class BookAppealDto extends BaseEntity{
this.channelName = channelName; this.channelName = channelName;
} }
public Boolean getIsBookGroup() {
return isBookGroup;
}
public void setIsBookGroup(Boolean isBookGroup) {
this.isBookGroup = isBookGroup;
}
@Override @Override
public String toString() { public String toString() {
return "BookAppealDto{" + return "BookAppealDto{" +
...@@ -332,6 +346,7 @@ public class BookAppealDto extends BaseEntity{ ...@@ -332,6 +346,7 @@ public class BookAppealDto extends BaseEntity{
", templetId=" + templetId + ", templetId=" + templetId +
", haveDiffChannel=" + haveDiffChannel + ", haveDiffChannel=" + haveDiffChannel +
", channelName='" + channelName + '\'' + ", channelName='" + channelName + '\'' +
", isBookGroup=" + isBookGroup +
'}'; '}';
} }
} }
pcloud-facade-book/src/main/java/com/pcloud/book/appeal/entity/BookAppeal.java
...@@ -100,6 +100,11 @@ public class BookAppeal extends BaseEntity{ ...@@ -100,6 +100,11 @@ public class BookAppeal extends BaseEntity{
* 被诉方 * 被诉方
*/ */
private List<BookDefendant> defendant; private List<BookDefendant> defendant;
/**
* 是否社群书
*/
private Boolean isBookGroup;
public Long getBookAppealId() { public Long getBookAppealId() {
return bookAppealId; return bookAppealId;
...@@ -230,14 +235,22 @@ public class BookAppeal extends BaseEntity{ ...@@ -230,14 +235,22 @@ public class BookAppeal extends BaseEntity{
this.templetId = templetId; this.templetId = templetId;
} }
@Override public Boolean getIsBookGroup() {
return isBookGroup;
}
public void setIsBookGroup(Boolean isBookGroup) {
this.isBookGroup = isBookGroup;
}
@Override
public String toString() { public String toString() {
return "BookAppeal [bookAppealId=" + bookAppealId + ", bookId=" + bookId + ", channelId=" + channelId return "BookAppeal [bookAppealId=" + bookAppealId + ", bookId=" + bookId + ", channelId=" + channelId
+ ", templetId=" + templetId + ", reason=" + reason + ", declarant=" + declarant + ", phone=" + phone + ", templetId=" + templetId + ", reason=" + reason + ", declarant=" + declarant + ", phone=" + phone
+ ", appealSubmitDate=" + appealSubmitDate + ", appealState=" + appealState + ", auditReason=" + ", appealSubmitDate=" + appealSubmitDate + ", appealState=" + appealState + ", auditReason="
+ auditReason + ", auditUser=" + auditUser + ", createdUser=" + createdUser + ", createdDate=" + auditReason + ", auditUser=" + auditUser + ", createdUser=" + createdUser + ", createdDate="
+ createdDate + ", lastModifiedUser=" + lastModifiedUser + ", lastModifiedDate=" + lastModifiedDate + createdDate + ", lastModifiedUser=" + lastModifiedUser + ", lastModifiedDate=" + lastModifiedDate
+ ", defendant=" + defendant + "]"; + ", defendant=" + defendant + ", isBookGroup=" + isBookGroup + "]";
} }
} }
pcloud-facade-book/src/main/java/com/pcloud/book/base/dto/CountDto.java
...@@ -24,6 +24,11 @@ public class CountDto extends BaseDto { ...@@ -24,6 +24,11 @@ public class CountDto extends BaseDto {
*/ */
private Integer count = 0; private Integer count = 0;
/**
* 社群书数量
*/
private Integer bookGroupCount = 0;
public Integer getCount() { public Integer getCount() {
return count; return count;
} }
...@@ -32,9 +37,19 @@ public class CountDto extends BaseDto { ...@@ -32,9 +37,19 @@ public class CountDto extends BaseDto {
this.count = count; this.count = count;
} }
@Override public Integer getBookGroupCount() {
public String toString() { return bookGroupCount;
return "CountDto [count=" + count + "]"; }
}
public void setBookGroupCount(Integer bookGroupCount) {
this.bookGroupCount = bookGroupCount;
}
@Override
public String toString() {
return "CountDto{" +
"count=" + count +
", bookGroupCount=" + bookGroupCount +
"} ";
}
} }
pcloud-facade-book/src/main/java/com/pcloud/book/book/dto/BookDto.java
...@@ -446,6 +446,11 @@ public class BookDto extends BaseDto { ...@@ -446,6 +446,11 @@ public class BookDto extends BaseDto {
* 社群码数据 * 社群码数据
*/ */
/** /**
* 是否是社群书
*/
private Boolean isBookGroup;
/**
* 社群码ID * 社群码ID
*/ */
private Long bookGroupId; private Long bookGroupId;
...@@ -1259,6 +1264,13 @@ public class BookDto extends BaseDto { ...@@ -1259,6 +1264,13 @@ public class BookDto extends BaseDto {
this.secondTypeCode = secondTypeCode; this.secondTypeCode = secondTypeCode;
} }
public Boolean getIsBookGroup() {
return isBookGroup;
}
public void setIsBookGroup(Boolean isBookGroup) {
this.isBookGroup = isBookGroup;
}
@Override @Override
public String toString() { public String toString() {
return "BookDto{" + return "BookDto{" +
...@@ -1354,6 +1366,7 @@ public class BookDto extends BaseDto { ...@@ -1354,6 +1366,7 @@ public class BookDto extends BaseDto {
", groupPersonCount=" + groupPersonCount + ", groupPersonCount=" + groupPersonCount +
", groupCount=" + groupCount + ", groupCount=" + groupCount +
", totalIncome=" + totalIncome + ", totalIncome=" + totalIncome +
", isBookGroup=" + isBookGroup +
", groupQrcodeLink='" + groupQrcodeLink + '\'' + ", groupQrcodeLink='" + groupQrcodeLink + '\'' +
", secondTempletId=" + secondTempletId + ", secondTempletId=" + secondTempletId +
", secondTypeCode='" + secondTypeCode + '\'' + ", secondTypeCode='" + secondTypeCode + '\'' +
......
pcloud-service-book/src/main/java/com/pcloud/book/book/biz/BookBiz.java
...@@ -123,7 +123,20 @@ public interface BookBiz { ...@@ -123,7 +123,20 @@ public interface BookBiz {
*/ */
BookDto getById(Long bookId, Long adviserId, Long channelId) throws BizException; BookDto getById(Long bookId, Long adviserId, Long channelId) throws BizException;
/** /**
* 获取单个书籍基础信息(包含统计信息)
*
* @param bookId
* 图书标识
* @param adviserId
* 编辑标识
* @param channelId
* 渠道标识
* @return
*/
BookDto getById4Platform(Long bookId, Long adviserId, Long channelId) throws BizException;
/**
* 批量获取书籍信息 * 批量获取书籍信息
* *
* @param bookIds * @param bookIds
......
pcloud-service-book/src/main/java/com/pcloud/book/book/biz/impl/BookAdviserBizImpl.java
...@@ -18,6 +18,7 @@ import com.pcloud.book.consumer.user.AdviserConsr; ...@@ -18,6 +18,7 @@ import com.pcloud.book.consumer.user.AdviserConsr;
import com.pcloud.book.consumer.user.BookcaseConsr; import com.pcloud.book.consumer.user.BookcaseConsr;
import com.pcloud.book.consumer.user.ChannelConsr; import com.pcloud.book.consumer.user.ChannelConsr;
import com.pcloud.book.group.biz.BookGroupBiz; import com.pcloud.book.group.biz.BookGroupBiz;
import com.pcloud.book.group.dao.BookGroupDao;
import com.pcloud.common.core.aspect.ParamLog; import com.pcloud.common.core.aspect.ParamLog;
import com.pcloud.common.core.constant.SceneCode; import com.pcloud.common.core.constant.SceneCode;
import com.pcloud.common.core.constant.SendType; import com.pcloud.common.core.constant.SendType;
...@@ -52,7 +53,7 @@ import java.util.concurrent.Executors; ...@@ -52,7 +53,7 @@ import java.util.concurrent.Executors;
public class BookAdviserBizImpl implements BookAdviserBiz { public class BookAdviserBizImpl implements BookAdviserBiz {
/** /**
* *
*/ */
private static final Logger LOGGER = LoggerFactory.getLogger(BookAdviserBizImpl.class); private static final Logger LOGGER = LoggerFactory.getLogger(BookAdviserBizImpl.class);
...@@ -79,16 +80,19 @@ public class BookAdviserBizImpl implements BookAdviserBiz { ...@@ -79,16 +80,19 @@ public class BookAdviserBizImpl implements BookAdviserBiz {
@Autowired @Autowired
private BookcaseConsr bookcaseConsr; private BookcaseConsr bookcaseConsr;
@Autowired @Autowired
private BookConsr bookConsr; private BookConsr bookConsr;
@Autowired @Autowired
private ChannelConsr channelConsr; private ChannelConsr channelConsr;
@Autowired @Autowired
private BookGroupBiz bookGroupBiz; private BookGroupBiz bookGroupBiz;
@Autowired
private BookGroupDao bookGroupDao;
private static final ExecutorService EXECUTOR_SERVICE = Executors.newFixedThreadPool(5); private static final ExecutorService EXECUTOR_SERVICE = Executors.newFixedThreadPool(5);
/** /**
...@@ -162,7 +166,7 @@ public class BookAdviserBizImpl implements BookAdviserBiz { ...@@ -162,7 +166,7 @@ public class BookAdviserBizImpl implements BookAdviserBiz {
/** /**
* 校验是否同一出版社 * 校验是否同一出版社
* *
* @param channelId * @param channelId
* 运营标识 * 运营标识
* @param adviserId * @param adviserId
...@@ -253,7 +257,7 @@ public class BookAdviserBizImpl implements BookAdviserBiz { ...@@ -253,7 +257,7 @@ public class BookAdviserBizImpl implements BookAdviserBiz {
private BookAdviserDto getByAdviserContainsDelete(BookAdviser bookAdviser) throws BizException { private BookAdviserDto getByAdviserContainsDelete(BookAdviser bookAdviser) throws BizException {
return bookAdviserDao.getByAdviserContainsDelete(bookAdviser); return bookAdviserDao.getByAdviserContainsDelete(bookAdviser);
} }
/** /**
* 统计编辑推广的图书总数 * 统计编辑推广的图书总数
*/ */
...@@ -538,7 +542,7 @@ public class BookAdviserBizImpl implements BookAdviserBiz { ...@@ -538,7 +542,7 @@ public class BookAdviserBizImpl implements BookAdviserBiz {
/** /**
* 填充不存在的日期中的值为0 * 填充不存在的日期中的值为0
* *
* @param bookCounts * @param bookCounts
* @param startTime * @param startTime
* @param endTime * @param endTime
...@@ -588,7 +592,7 @@ public class BookAdviserBizImpl implements BookAdviserBiz { ...@@ -588,7 +592,7 @@ public class BookAdviserBizImpl implements BookAdviserBiz {
LOGGER.info("删除书籍（编辑端）<END>"); LOGGER.info("删除书籍（编辑端）<END>");
} }
/** /**
* 删除主编辑书籍 * 删除主编辑书籍
* @param bookId 图书标识 * @param bookId 图书标识
...@@ -613,10 +617,10 @@ public class BookAdviserBizImpl implements BookAdviserBiz { ...@@ -613,10 +617,10 @@ public class BookAdviserBizImpl implements BookAdviserBiz {
} }
LOGGER.info("删除主编辑书籍<END>."); LOGGER.info("删除主编辑书籍<END>.");
} }
/** /**
* 删除副编辑书籍（编辑端） * 删除副编辑书籍（编辑端）
* *
* @param bookId * @param bookId
* 图书标识 * 图书标识
* @param adviserId * @param adviserId
...@@ -690,6 +694,8 @@ public class BookAdviserBizImpl implements BookAdviserBiz { ...@@ -690,6 +694,8 @@ public class BookAdviserBizImpl implements BookAdviserBiz {
CountDto countDto = new CountDto(); CountDto countDto = new CountDto();
Integer count = bookAdviserDao.getAdviserBookCount(adviserId); Integer count = bookAdviserDao.getAdviserBookCount(adviserId);
countDto.setCount(count); countDto.setCount(count);
Integer bookGroupCount = bookGroupDao.getBookGroupCount(adviserId);
countDto.setBookGroupCount(bookGroupCount);
LOGGER.info("获取编辑的图书总数 ,<END>"); LOGGER.info("获取编辑的图书总数 ,<END>");
return countDto; return countDto;
} }
......
pcloud-service-book/src/main/java/com/pcloud/book/book/dao/BookDao.java
...@@ -291,4 +291,11 @@ public interface BookDao extends BaseDao<Book> { ...@@ -291,4 +291,11 @@ public interface BookDao extends BaseDao<Book> {
* @return * @return
*/ */
List<BookDto> listBookIdAndChannelId4Adviser(Map<String, Object> paramMap); List<BookDto> listBookIdAndChannelId4Adviser(Map<String, Object> paramMap);
/**
* 获取社群书列表
* @param paramMap 参数Map
* @return
*/
List<BookDto> listSimpleBookGroup4Adviser(Map<String, Object> paramMap);
} }
pcloud-service-book/src/main/java/com/pcloud/book/book/dao/impl/BookDaoImpl.java
...@@ -277,4 +277,12 @@ public class BookDaoImpl extends BaseDaoImpl<Book> implements BookDao { ...@@ -277,4 +277,12 @@ public class BookDaoImpl extends BaseDaoImpl<Book> implements BookDao {
public List<BookDto> listBookIdAndChannelId4Adviser(Map<String, Object> paramMap) { public List<BookDto> listBookIdAndChannelId4Adviser(Map<String, Object> paramMap) {
return super.getSqlSession().selectList(getStatement("listBookIdAndChannelId4Adviser"), paramMap); return super.getSqlSession().selectList(getStatement("listBookIdAndChannelId4Adviser"), paramMap);
} }
/**
* 获取社群书列表
*/
@Override
public List<BookDto> listSimpleBookGroup4Adviser(Map<String, Object> paramMap) {
return super.getSqlSession().selectList(getStatement("listSimpleBookGroup4Adviser"), paramMap);
}
} }
pcloud-service-book/src/main/java/com/pcloud/book/book/facade/BookFacade.java
...@@ -400,6 +400,21 @@ public interface BookFacade { ...@@ -400,6 +400,21 @@ public interface BookFacade {
throws BizException, PermissionException, JsonParseException; throws BizException, PermissionException, JsonParseException;
/** /**
* 获取书籍基础信息（平台端）
*/
@ApiOperation(value = "获取书籍基础信息（平台端）", httpMethod = "GET")
@ApiImplicitParams({@ApiImplicitParam(name = "token", value = "token", dataType = "string", paramType = "header"),
@ApiImplicitParam(name = "bookId", value = "图书标识", dataType = "long", paramType = "query"),
@ApiImplicitParam(name = "channelId", value = "渠道标识", dataType = "long", paramType = "query"),
@ApiImplicitParam(name = "adviserId", value = "编辑标识", dataType = "long", paramType = "query")})
@RequestMapping(value = "getById4Platform", method = RequestMethod.GET)
ResponseDto<BookDto> getById4Platform(@RequestHeader("token") String token,
@RequestParam(value = "bookId") Long bookId,
@RequestParam(value = "channelId", required = false) Long channelId,
@RequestParam(value = "adviserId", required = false) Long adviserId)
throws BizException;
/**
* 书刊回收站列表（30天内删除的书刊列表） * 书刊回收站列表（30天内删除的书刊列表）
*/ */
@ApiOperation(value = "书刊回收站列表", httpMethod = "GET") @ApiOperation(value = "书刊回收站列表", httpMethod = "GET")
......
pcloud-service-book/src/main/java/com/pcloud/book/book/facade/impl/BookFacadeImpl.java
...@@ -547,6 +547,19 @@ public class BookFacadeImpl implements BookFacade { ...@@ -547,6 +547,19 @@ public class BookFacadeImpl implements BookFacade {
} }
/** /**
* 获取书籍基础信息（平台端）
*/
@Override
@RequestMapping(value = "getById4Platform", method = RequestMethod.GET)
public ResponseDto<BookDto> getById4Platform(@RequestHeader("token") String token,
@RequestParam(value = "bookId") Long bookId,
@RequestParam(value = "channelId", required = false) Long channelId,
@RequestParam(value = "adviserId", required = false) Long adviserId)
throws BizException {
return new ResponseDto<>(bookBiz.getById4Platform(bookId, adviserId, channelId));
}
/**
* 书刊回收站列表（30天内删除的书刊列表） * 书刊回收站列表（30天内删除的书刊列表）
*/ */
@Override @Override
......
pcloud-service-book/src/main/java/com/pcloud/book/book/set/BookSet.java
...@@ -3,6 +3,24 @@ ...@@ -3,6 +3,24 @@
*/ */
package com.pcloud.book.book.set; package com.pcloud.book.book.set;
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.Optional;
import java.util.stream.Collectors;
import org.apache.commons.collections.MapUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.math.NumberUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.amqp.core.AmqpTemplate;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.google.common.collect.Lists; import com.google.common.collect.Lists;
import com.pcloud.analysisengine.browse.dto.BrowseCacheRecordDto; import com.pcloud.analysisengine.browse.dto.BrowseCacheRecordDto;
...@@ -18,7 +36,15 @@ import com.pcloud.book.book.biz.BookFundBiz; ...@@ -18,7 +36,15 @@ import com.pcloud.book.book.biz.BookFundBiz;
import com.pcloud.book.book.dao.BookAdviserDao; import com.pcloud.book.book.dao.BookAdviserDao;
import com.pcloud.book.book.dao.BookFreezeDao; import com.pcloud.book.book.dao.BookFreezeDao;
import com.pcloud.book.book.dao.BookTypeDao; import com.pcloud.book.book.dao.BookTypeDao;
import com.pcloud.book.book.dto.*; import com.pcloud.book.book.dto.AdviserManageDto;
import com.pcloud.book.book.dto.BookAdviserDto;
import com.pcloud.book.book.dto.BookAppDto;
import com.pcloud.book.book.dto.BookDeleteDto;
import com.pcloud.book.book.dto.BookDto;
import com.pcloud.book.book.dto.BookFreezeDto;
import com.pcloud.book.book.dto.BookProductDto;
import com.pcloud.book.book.dto.BookResourceDto;
import com.pcloud.book.book.dto.BookTypeDto;
import com.pcloud.book.book.entity.BookDefendant; import com.pcloud.book.book.entity.BookDefendant;
import com.pcloud.book.book.tools.BookTools; import com.pcloud.book.book.tools.BookTools;
import com.pcloud.book.book.vo.NoAuthBookVO; import com.pcloud.book.book.vo.NoAuthBookVO;
...@@ -32,8 +58,16 @@ import com.pcloud.book.consumer.content.ResourceConsr; ...@@ -32,8 +58,16 @@ import com.pcloud.book.consumer.content.ResourceConsr;
import com.pcloud.book.consumer.message.MessageConsr; import com.pcloud.book.consumer.message.MessageConsr;
import com.pcloud.book.consumer.resource.ProductConsr; import com.pcloud.book.consumer.resource.ProductConsr;
import com.pcloud.book.consumer.settlement.BookConsr; import com.pcloud.book.consumer.settlement.BookConsr;
import com.pcloud.book.consumer.user.*; import com.pcloud.book.consumer.user.AdviserConsr;
import com.pcloud.book.consumer.user.AgentConsr;
import com.pcloud.book.consumer.user.BookcaseConsr;
import com.pcloud.book.consumer.user.ChannelConsr;
import com.pcloud.book.consumer.user.PartyConsr;
import com.pcloud.book.consumer.voicemessage.MerchantVideoConsr; import com.pcloud.book.consumer.voicemessage.MerchantVideoConsr;
import com.pcloud.book.group.biz.BookGroupClassifyBiz;
import com.pcloud.book.group.dao.BookGroupDao;
import com.pcloud.book.group.dto.BookGroupDTO;
import com.pcloud.book.group.dto.BookGroupStatisticDTO;
import com.pcloud.channelcenter.base.constants.MessageFromTypeEnum; import com.pcloud.channelcenter.base.constants.MessageFromTypeEnum;
import com.pcloud.channelcenter.qrcode.dto.QrcodeLocationDto; import com.pcloud.channelcenter.qrcode.dto.QrcodeLocationDto;
import com.pcloud.channelcenter.qrcode.vo.BookAssocLastQrAskVO; import com.pcloud.channelcenter.qrcode.vo.BookAssocLastQrAskVO;
...@@ -61,18 +95,6 @@ import com.pcloud.usercenter.party.adviser.dto.AdviserBaseInfoDto; ...@@ -61,18 +95,6 @@ import com.pcloud.usercenter.party.adviser.dto.AdviserBaseInfoDto;
import com.pcloud.usercenter.party.adviser.entity.Adviser; import com.pcloud.usercenter.party.adviser.entity.Adviser;
import com.pcloud.usercenter.party.agent.entity.Agent; import com.pcloud.usercenter.party.agent.entity.Agent;
import com.pcloud.voicemessage.party.merchant.entity.MerchantVideo; import com.pcloud.voicemessage.party.merchant.entity.MerchantVideo;
import org.apache.commons.collections.MapUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.math.NumberUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.amqp.core.AmqpTemplate;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import java.math.BigDecimal;
import java.util.*;
import java.util.stream.Collectors;
/** /**
* @描述：图书信息填充 * @描述：图书信息填充
...@@ -131,6 +153,10 @@ public class BookSet { ...@@ -131,6 +153,10 @@ public class BookSet {
private AgentConsr agentConsr; private AgentConsr agentConsr;
@Autowired @Autowired
private AccountSettingService accountSettingService; private AccountSettingService accountSettingService;
@Autowired
private BookGroupDao bookGroupDao;
@Autowired
private BookGroupClassifyBiz bookGroupClassifyBiz;
/** /**
* 检验书号是否合法，包括ISSN,ISBN,CSSN * 检验书号是否合法，包括ISSN,ISBN,CSSN
...@@ -978,7 +1004,7 @@ public class BookSet { ...@@ -978,7 +1004,7 @@ public class BookSet {
// 有二级列表优先展示二级列表,无则展示一级列表 // 有二级列表优先展示二级列表,无则展示一级列表
List<Long> templetIds = recordList.stream() List<Long> templetIds = recordList.stream()
.map(bookDto -> { .map(bookDto -> {
BookDto book = (BookDto)bookDto; BookDto book = (BookDto) bookDto;
if (Objects.nonNull(book.getSecondTempletId())) { if (Objects.nonNull(book.getSecondTempletId())) {
return book.getSecondTempletId(); return book.getSecondTempletId();
} }
...@@ -989,13 +1015,13 @@ public class BookSet { ...@@ -989,13 +1015,13 @@ public class BookSet {
final Map<Long, AssistTempletDTO> assistTempletIds = assistTempletConsr.mapByIds(templetIds); final Map<Long, AssistTempletDTO> assistTempletIds = assistTempletConsr.mapByIds(templetIds);
if(MapUtils.isEmpty(assistTempletIds)){ if (MapUtils.isEmpty(assistTempletIds)) {
LOGGER.info("设置模板名称【END】"); LOGGER.info("设置模板名称【END】");
return; return;
} }
recordList.forEach(bookDto -> { recordList.forEach(bookDto -> {
BookDto book = (BookDto)bookDto; BookDto book = (BookDto) bookDto;
Long secondTempletId = book.getSecondTempletId(); Long secondTempletId = book.getSecondTempletId();
Long templetId = book.getTempletId(); Long templetId = book.getTempletId();
if (Objects.nonNull(secondTempletId)) { if (Objects.nonNull(secondTempletId)) {
...@@ -1057,9 +1083,9 @@ public class BookSet { ...@@ -1057,9 +1083,9 @@ public class BookSet {
} }
List<Long> templetIds = new ArrayList<>(); List<Long> templetIds = new ArrayList<>();
if(Objects.nonNull(bookDto.getSecondTempletId())){ if (Objects.nonNull(bookDto.getSecondTempletId())) {
templetIds.add(bookDto.getSecondTempletId()); templetIds.add(bookDto.getSecondTempletId());
}else if(Objects.nonNull(bookDto.getTempletId())){ } else if (Objects.nonNull(bookDto.getTempletId())) {
templetIds.add(bookDto.getTempletId()); templetIds.add(bookDto.getTempletId());
} }
...@@ -1068,10 +1094,10 @@ public class BookSet { ...@@ -1068,10 +1094,10 @@ public class BookSet {
return; return;
} }
if(Objects.nonNull(bookDto.getSecondTempletId())){ if (Objects.nonNull(bookDto.getSecondTempletId())) {
setBookDtoTempletInfo(assistTempletMap,bookDto,bookDto.getSecondTempletId()); setBookDtoTempletInfo(assistTempletMap, bookDto, bookDto.getSecondTempletId());
}else if(Objects.nonNull(bookDto.getTempletId())){ } else if (Objects.nonNull(bookDto.getTempletId())) {
setBookDtoTempletInfo(assistTempletMap,bookDto,bookDto.getTempletId()); setBookDtoTempletInfo(assistTempletMap, bookDto, bookDto.getTempletId());
} }
LOGGER.info("设置模板名称【END】"); LOGGER.info("设置模板名称【END】");
...@@ -1306,6 +1332,36 @@ public class BookSet { ...@@ -1306,6 +1332,36 @@ public class BookSet {
* 设置二维码相关信息 * 设置二维码相关信息
* @param recordList * @param recordList
*/ */
public void seBookGroupInfo(List<Object> recordList) {
if (ListUtils.isEmpty(recordList)) {
return;
}
for (Object object : recordList) {
BookDto bookDto = (BookDto) object;
if (null != bookDto.getIsBookGroup() && bookDto.getIsBookGroup()) {
BookGroupDTO bookGroupDTO = bookGroupDao.getDTOByBookId(bookDto.getBookId(), bookDto.getChannelId(), bookDto.getAdviserId());
if (null != bookGroupDTO) {
bookDto.setBookGroupId(bookGroupDTO.getId());
bookDto.setGroupQrcodeUrl(bookGroupDTO.getGroupQrcodeUrl());
bookDto.setGroupQrcodeName(bookGroupDTO.getGroupQrcodeName());
Map<Long, BookGroupStatisticDTO> statisMap = bookGroupClassifyBiz.getBookGroupStatistic(Arrays.asList(bookGroupDTO.getId()));
if (!MapUtils.isEmpty(statisMap) && statisMap.containsKey(bookGroupDTO.getId())) {
BookGroupStatisticDTO statisticDTO = statisMap.get(bookGroupDTO.getId());
bookDto.setClassifyCount(null != statisticDTO.getClassifyCount() ? statisticDTO.getClassifyCount().longValue() : 0L);
bookDto.setGroupCount(null != statisticDTO.getGroupNumber() ? statisticDTO.getGroupNumber().longValue() : 0L);
} else {
bookDto.setClassifyCount(0L);
bookDto.setGroupCount(0L);
}
}
}
}
}
/**
* 设置社群书社群码相关信息
* @param recordList
*/
public void setQrInfo(List<Object> recordList) { public void setQrInfo(List<Object> recordList) {
if (ListUtils.isEmpty(recordList)) { if (ListUtils.isEmpty(recordList)) {
return; return;
......
pcloud-service-book/src/main/java/com/pcloud/book/mq/producer/BookMQProducer.java
...@@ -2,7 +2,6 @@ package com.pcloud.book.mq.producer; ...@@ -2,7 +2,6 @@ package com.pcloud.book.mq.producer;
import com.pcloud.book.book.dto.BookCoverImgUpdateDTO; import com.pcloud.book.book.dto.BookCoverImgUpdateDTO;
import com.pcloud.book.book.dto.BookNameUpdateDTO; import com.pcloud.book.book.dto.BookNameUpdateDTO;
import com.pcloud.book.book.dto.BookTypeUpdateDTO;
import com.pcloud.book.group.dto.PushAddUserMessageDTO; import com.pcloud.book.group.dto.PushAddUserMessageDTO;
public interface BookMQProducer { public interface BookMQProducer {
......
pcloud-service-book/src/main/resources/mapper/appeal/BookAppeal.Mapper.xml
...@@ -23,7 +23,8 @@ ...@@ -23,7 +23,8 @@
<result column="BOOK_NAME" property="bookName" jdbcType="VARCHAR" /> <result column="BOOK_NAME" property="bookName" jdbcType="VARCHAR" />
<result column="ISBN" property="isbn" jdbcType="VARCHAR" /> <result column="ISBN" property="isbn" jdbcType="VARCHAR" />
<result column="SERIAL_NUMBER" property="serialNumber" jdbcType="VARCHAR" /> <result column="SERIAL_NUMBER" property="serialNumber" jdbcType="VARCHAR" />
<collection property="defendants" column="BOOK_APPEAL_ID" ofType="bookDefendant" <result column="IS_BOOK_GROUP" property="isBookGroup" jdbcType="BIT" />
<collection property="defendants" column="BOOK_APPEAL_ID" ofType="bookDefendant"
select="com.pcloud.book.appeal.dao.impl.BookDefendantDaoImpl.list" /> select="com.pcloud.book.appeal.dao.impl.BookDefendantDaoImpl.list" />
</resultMap> </resultMap>
...@@ -31,13 +32,13 @@ ...@@ -31,13 +32,13 @@
<insert id="insert" parameterType="bookAppeal" useGeneratedKeys="true" keyProperty="bookAppealId" flushCache="true"> <insert id="insert" parameterType="bookAppeal" useGeneratedKeys="true" keyProperty="bookAppealId" flushCache="true">
INSERT INTO `BOOK_APPEAL` ( INSERT INTO `BOOK_APPEAL` (
BOOK_ID, CHANNEL_ID, TEMPLET_ID,REASON,DECLARANT, PHONE, APPEAL_SUBMIT_DATE, APPEAL_STATE, AUDIT_REASON, AUDIT_USER, BOOK_ID, CHANNEL_ID, TEMPLET_ID,REASON,DECLARANT, PHONE, APPEAL_SUBMIT_DATE, APPEAL_STATE, AUDIT_REASON, AUDIT_USER,
CREATED_USER,CREATED_DATE,LAST_MODIFIED_USER, LAST_MODIFIED_DATE CREATED_USER,CREATED_DATE,LAST_MODIFIED_USER, LAST_MODIFIED_DATE, IS_BOOK_GROUP
) )
VALUES ( VALUES (
#{bookId, jdbcType=BIGINT}, #{channelId, jdbcType=BIGINT}, #{templetId, jdbcType=BIGINT}, #{reason, jdbcType=VARCHAR}, #{declarant, jdbcType=BIGINT}, #{bookId, jdbcType=BIGINT}, #{channelId, jdbcType=BIGINT}, #{templetId, jdbcType=BIGINT}, #{reason, jdbcType=VARCHAR}, #{declarant, jdbcType=BIGINT},
#{phone, jdbcType=VARCHAR}, #{appealSubmitDate, jdbcType=TIMESTAMP}, #{appealState, jdbcType=BIGINT}, #{auditReason, jdbcType=VARCHAR}, #{phone, jdbcType=VARCHAR}, #{appealSubmitDate, jdbcType=TIMESTAMP}, #{appealState, jdbcType=BIGINT}, #{auditReason, jdbcType=VARCHAR},
#{auditUser, jdbcType=BIGINT}, #{createdUser, jdbcType=BIGINT}, NOW(), #{auditUser, jdbcType=BIGINT}, #{createdUser, jdbcType=BIGINT}, NOW(),
#{lastModifiedUser, jdbcType=BIGINT}, NOW() #{lastModifiedUser, jdbcType=BIGINT}, NOW(), #{isBookGroup, jdbcType=BIT}
) )
</insert> </insert>
...@@ -82,7 +83,7 @@ ...@@ -82,7 +83,7 @@
<!-- 获取申诉详情 --> <!-- 获取申诉详情 -->
<select id="getById" resultMap="bookAppealMap" parameterType="long"> <select id="getById" resultMap="bookAppealMap" parameterType="long">
SELECT SELECT
BOOK_APPEAL_ID, PHONE,CHANNEL_ID, DECLARANT,REASON,BOOK_ID,VERSION,APPEAL_STATE,AUDIT_REASON,TEMPLET_ID,CREATED_USER BOOK_APPEAL_ID, PHONE,CHANNEL_ID, DECLARANT,REASON,BOOK_ID,VERSION,APPEAL_STATE,AUDIT_REASON,TEMPLET_ID,CREATED_USER,IS_BOOK_GROUP
FROM FROM
BOOK_APPEAL A BOOK_APPEAL A
WHERE WHERE
......
pcloud-service-book/src/main/resources/mapper/book/Book.Mapper.xml
...@@ -448,14 +448,15 @@ ...@@ -448,14 +448,15 @@
SELECT SELECT
A.BOOK_ID, A.CHANNEL_ID, A.ADVISER_ID, A.IS_MAIN_EDITOR, T.TYPE_CODE, T.TYPE_NAME, B.ISBN, B.BOOK_NAME, B.REMARK, A.BOOK_ID, A.CHANNEL_ID, A.ADVISER_ID, A.IS_MAIN_EDITOR, T.TYPE_CODE, T.TYPE_NAME, B.ISBN, B.BOOK_NAME, B.REMARK,
B.AUTHOR, B.PUBLISH, B.PUBLISH_DATE, B.COVER_IMG, B.ORIGIN_NAME, B.BOOK_PRICE, B.ISSN, B.BOOK_NUM, B.SERIAL_NUMBER, B.AUTHOR, B.PUBLISH, B.PUBLISH_DATE, B.COVER_IMG, B.ORIGIN_NAME, B.BOOK_PRICE, B.ISSN, B.BOOK_NUM, B.SERIAL_NUMBER,
IF(ISNULL(BF.BOOK_FUND_ID),0,1) IS_FUND_SUPPORT,A.TEMPLET_ID, A.LAST_MODIFIED_DATE, A.BOOK_ADVISER_ID,I.BOOK_STATUS, IF(ISNULL(BF.BOOK_FUND_ID),0,1) IS_FUND_SUPPORT,A.TEMPLET_ID, if(G.ID IS NULL, A.LAST_MODIFIED_DATE, G.UPDATE_TIME) LAST_MODIFIED_DATE,
CONCAT('BK',A.BOOK_ID) uniqueNumber A.BOOK_ADVISER_ID,I.BOOK_STATUS, CONCAT('BK',A.BOOK_ID) uniqueNumber, if(G.ID IS NULL, 0, 1) isBookGroup
FROM FROM
BOOK_ADVISER A BOOK_ADVISER A
INNER JOIN BOOK B ON A.BOOK_ID = B.BOOK_ID AND A.ADVISER_ID = #{adviserId} AND A.IS_DELETE = 0 AND B.IS_DELETE = 0 INNER JOIN BOOK B ON A.BOOK_ID = B.BOOK_ID AND A.ADVISER_ID = #{adviserId} AND A.IS_DELETE = 0 AND B.IS_DELETE = 0
LEFT JOIN BOOK_TYPE T ON B.TYPE_CODE = T.TYPE_CODE LEFT JOIN BOOK_TYPE T ON B.TYPE_CODE = T.TYPE_CODE
LEFT JOIN BOOK_FUND BF ON BF.BOOK_ID = A.BOOK_ID AND BF.END_TIME <![CDATA[ > ]]> NOW() AND BF.START_TIME <![CDATA[ < ]]> NOW() LEFT JOIN BOOK_FUND BF ON BF.BOOK_ID = A.BOOK_ID AND BF.END_TIME <![CDATA[ > ]]> NOW() AND BF.START_TIME <![CDATA[ < ]]> NOW()
LEFT JOIN book_auth_info I ON I.BOOK_ID = A.BOOK_ID AND I.ADVISER_ID = #{adviserId} LEFT JOIN book_auth_info I ON I.BOOK_ID = A.BOOK_ID AND I.ADVISER_ID = #{adviserId}
LEFT JOIN book_group G on G.BOOK_ID = A.BOOK_ID AND G.CHANNEL_ID = A.CHANNEL_ID AND G.CREATE_USER = A.ADVISER_ID AND G.IS_DELETE = 0
WHERE WHERE
1=1 1=1
<if test="bookId!=null"> <if test="bookId!=null">
...@@ -511,7 +512,7 @@ ...@@ -511,7 +512,7 @@
</if> </if>
GROUP BY A.BOOK_ID, A.CHANNEL_ID GROUP BY A.BOOK_ID, A.CHANNEL_ID
ORDER BY ORDER BY
A.LAST_MODIFIED_DATE DESC LAST_MODIFIED_DATE DESC
<if test="num != null"> <if test="num != null">
LIMIT ${num} LIMIT ${num}
</if> </if>
...@@ -526,7 +527,7 @@ ...@@ -526,7 +527,7 @@
FROM FROM
BOOK_ADVISER A BOOK_ADVISER A
INNER JOIN BOOK B ON A.BOOK_ID = B.BOOK_ID AND B.IS_DELETE = 0 INNER JOIN BOOK B ON A.BOOK_ID = B.BOOK_ID AND B.IS_DELETE = 0
LEFT JOIN book_group G on G.BOOK_ID = A.BOOK_ID AND G.CHANNEL_ID = A.CHANNEL_ID AND G.CREATE_USER = A.ADVISER_ID LEFT JOIN book_group G on G.BOOK_ID = A.BOOK_ID AND G.CHANNEL_ID = A.CHANNEL_ID AND G.CREATE_USER = A.ADVISER_ID AND G.IS_DELETE = 0
WHERE WHERE
A.ADVISER_ID = #{adviserId} AND A.IS_DELETE = 0 AND G.ID IS NULL A.ADVISER_ID = #{adviserId} AND A.IS_DELETE = 0 AND G.ID IS NULL
<if test="name != null"> <if test="name != null">
...@@ -548,7 +549,7 @@ ...@@ -548,7 +549,7 @@
G.group_qrcode_name groupQrcodeName G.group_qrcode_name groupQrcodeName
FROM FROM
BOOK_ADVISER A BOOK_ADVISER A
INNER JOIN book_group G on G.BOOK_ID = A.BOOK_ID AND G.CHANNEL_ID = A.CHANNEL_ID AND G.CREATE_USER = A.ADVISER_ID INNER JOIN book_group G on G.BOOK_ID = A.BOOK_ID AND G.CHANNEL_ID = A.CHANNEL_ID AND G.CREATE_USER = A.ADVISER_ID AND G.IS_DELETE = 0
INNER JOIN BOOK B ON A.BOOK_ID = B.BOOK_ID AND B.IS_DELETE = 0 INNER JOIN BOOK B ON A.BOOK_ID = B.BOOK_ID AND B.IS_DELETE = 0
LEFT JOIN BOOK_TYPE T ON B.TYPE_CODE = T.TYPE_CODE LEFT JOIN BOOK_TYPE T ON B.TYPE_CODE = T.TYPE_CODE
LEFT JOIN BOOK_FUND BF ON BF.BOOK_ID = A.BOOK_ID AND BF.END_TIME <![CDATA[ > ]]> NOW() AND BF.START_TIME <![CDATA[ < ]]> NOW() LEFT JOIN BOOK_FUND BF ON BF.BOOK_ID = A.BOOK_ID AND BF.END_TIME <![CDATA[ > ]]> NOW() AND BF.START_TIME <![CDATA[ < ]]> NOW()
...@@ -586,11 +587,45 @@ ...@@ -586,11 +587,45 @@
AND AND
BF.BOOK_FUND_ID IS NOT NULL BF.BOOK_FUND_ID IS NOT NULL
</if> </if>
<if test="startDate != null and endDate != null">
AND G.create_time BETWEEN #{startDate} AND #{endDate}
</if>
GROUP BY A.BOOK_ID, A.CHANNEL_ID GROUP BY A.BOOK_ID, A.CHANNEL_ID
ORDER BY ORDER BY
G.UPDATE_TIME DESC G.UPDATE_TIME DESC
</select> </select>
<!-- 获取社群书列表(编辑) -->
<select id="listSimpleBookGroup4Adviser" resultMap="bookMap" parameterType="map">
SELECT
A.BOOK_ID,
A.CHANNEL_ID,
A.ADVISER_ID,
B.ISBN,
B.BOOK_NAME,
CONCAT('BK', A.BOOK_ID) uniqueNumber
FROM
BOOK_ADVISER A
INNER JOIN book_group G ON G.BOOK_ID = A.BOOK_ID
AND G.CHANNEL_ID = A.CHANNEL_ID
AND G.CREATE_USER = A.ADVISER_ID
AND G.IS_DELETE = 0
INNER JOIN BOOK B ON A.BOOK_ID = B.BOOK_ID
AND B.IS_DELETE = 0
WHERE
A.ADVISER_ID = #{adviserId}
AND A.IS_DELETE = 0
<if test="name != null">
AND
(B.BOOK_NAME LIKE CONCAT('%', #{name}, '%') OR G.group_qrcode_name LIKE CONCAT('%', #{name}, '%') OR B.ISBN LIKE CONCAT(#{name},'%') OR CONCAT('BK',A.BOOK_ID) = #{name})
</if>
GROUP BY
A.BOOK_ID,
A.CHANNEL_ID
ORDER BY
G.UPDATE_TIME DESC
</select>
<!-- 获取书籍列表(编辑) --> <!-- 获取书籍列表(编辑) -->
<select id="listBook4Adviser" resultMap="bookMap" parameterType="map"> <select id="listBook4Adviser" resultMap="bookMap" parameterType="map">
SELECT SELECT
......
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