Skip to content

M
midjourney-proxy
Commit 963b9d30 by 田超
Options

Merge branch 'feature/1004406' into 'master' 

feat: [1004406]六个月数据改版

See merge request rays/pcloud-book!1234
parents e044f5b4 07404931
Showing with 121 additions and 29 deletions
pcloud-service-book/src/main/java/com/pcloud/book/book/biz/BookAdviserBiz.java
......@@ -373,8 +373,9 @@ public interface BookAdviserBiz {
* @param agentId
*/
void getBookIdsByAgentId(Long agentId);
void getBookIdsByAgentIdAndMonth(Long agentId,int month);
List<Long> getBooksByAgentToken(Long agentId, int index);
List<Long> getBooksByAgentToken(Long agentId, int index,int month);
BookServeInfo listBookServes4Book(String cursor, Integer limit);
......
pcloud-service-book/src/main/java/com/pcloud/book/book/biz/BookBiz.java
......@@ -747,5 +747,5 @@ public interface BookBiz {
List<BookInfo4ScanCount> fetchBookListByScanCount(List<BookInfo4ScanCountRequestVO> requestVOS);
BookCountsVO getPublishCounts(Long agentId);
BookCountsVO getPublishCounts(Long agentId,int month);
}
pcloud-service-book/src/main/java/com/pcloud/book/book/biz/impl/BookAdviserBizImpl.java
......@@ -2486,16 +2486,38 @@ public class BookAdviserBizImpl implements BookAdviserBiz {
}
}
public void getBookIdsByAgentIdAndMonth(Long agentId,int month) {
if (null == agentId) {
return;
}
List<Long> adviserIds = adviserConsr.getByAgentId(agentId);
if (ListUtils.isEmpty(adviserIds)) {
return;
}
String key = CacheConstant.BOOK + "BOOKIDS4AGENT:" + agentId+"_"+month;
//为空的话从数据库查询并缓存5分钟
if (StringUtil.isEmpty(JedisClusterUtils.get(key))) {
List<ERPPublishNumDTO> erpPublishNumQueryParams = bookAdviserDao.getErpPublishNumQueryParamsByMonth(adviserIds,month);
if (ListUtils.isEmpty(erpPublishNumQueryParams)) {
return;
}
Integer expireTime = 60 * 5;
JedisClusterUtils.setJsonList(key, erpPublishNumQueryParams, expireTime);
}
}
@Override
public List<Long> getBooksByAgentToken(Long agentId, int index) {
public List<Long> getBooksByAgentToken(Long agentId, int index,int month) {
if (null == agentId) {
return new ArrayList<>();
}
List<Long> result = new ArrayList<>();
String key = CacheConstant.BOOK + "BOOKIDS4AGENT:" + agentId;
String key = CacheConstant.BOOK + "BOOKIDS4AGENT:" + agentId+"_"+month;
if (StringUtil.isEmpty(JedisClusterUtils.get(key))) {
List<Long> adviserIds = adviserConsr.getByAgentId(agentId);
List<ERPPublishNumDTO> erpPublishNumQueryParams = bookAdviserDao.getErpPublishNumQueryParams(adviserIds);
List<ERPPublishNumDTO> erpPublishNumQueryParams = bookAdviserDao.getErpPublishNumQueryParamsByMonth(adviserIds,month);
if (ListUtils.isEmpty(erpPublishNumQueryParams)) {
return new ArrayList<>();
}
......
pcloud-service-book/src/main/java/com/pcloud/book/book/biz/impl/BookBizImpl.java
......@@ -105,7 +105,6 @@ import com.pcloud.resourcecenter.product.dto.ProductDto;
import com.pcloud.resourcecenter.product.dto.SpecificationDto;
import com.pcloud.usercenter.party.adviser.dto.AdviserBaseInfoDto;
import com.pcloud.usercenter.party.agent.dto.SaleAgentDTO;
import io.swagger.models.auth.In;
import org.apache.commons.collections.MapUtils;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
......@@ -3995,14 +3994,14 @@ public class BookBizImpl implements BookBiz {
}
@Override
public BookCountsVO getPublishCounts(Long agentId) {
String keyOne = CacheConstant.BOOK + "getPublishCounts:" + agentId;
public BookCountsVO getPublishCounts(Long agentId, int month) {
String keyOne = CacheConstant.BOOK + "getPublishCounts:" + agentId+"_"+month;
if (JedisClusterUtils.exists(keyOne)) {
return JedisClusterUtils.getJson(keyOne, BookCountsVO.class);
} else {
BookCountsVO bookCountsVO = new BookCountsVO();
bookAdviserBiz.getBookIdsByAgentId(agentId);
String key = CacheConstant.BOOK + "BOOKIDS4AGENT:" + agentId;
bookAdviserBiz.getBookIdsByAgentIdAndMonth(agentId,month);
String key = CacheConstant.BOOK + "BOOKIDS4AGENT:" + agentId+"_"+month;
List<ERPPublishNumDTO> bookList = JedisClusterUtils.getJsonList(key, ERPPublishNumDTO.class);
if (bookList == null || bookList.size() == 0) {
return new BookCountsVO();
......@@ -4017,8 +4016,13 @@ public class BookBizImpl implements BookBiz {
}
if (books.size() > 0) {
List<Long> advisers = adviserConsr.getByAgentId(agentId);
int fundBookCounts = bookDao.getFundBookCounts(advisers);
bookCountsVO.setFundBookCounts(fundBookCounts);
if(advisers.size()>0) {
Integer fundBookCounts = bookDao.getFundBookCounts(advisers, month);
if (fundBookCounts == null) {
fundBookCounts = 0;
}
bookCountsVO.setFundBookCounts(fundBookCounts);
}
} else {
bookCountsVO.setFundBookCounts(0);
}
......@@ -4027,11 +4031,23 @@ public class BookBizImpl implements BookBiz {
bookGroupScanStatisticsRequestDTO.setBookIds(new ArrayList<>(books));
bookGroupScanStatisticsRequestDTO.setAdviserIds(adviserIds);
bookGroupScanStatisticsRequestDTO.setChannelIds(channelIds);
bookGroupScanStatisticsRequestDTO.setStart(200001);
Date now = new Date();
String strDateFormat = "yyyyMM";
SimpleDateFormat sdf = new SimpleDateFormat(strDateFormat);
bookGroupScanStatisticsRequestDTO.setEnd(Integer.valueOf(sdf.format(now)));
if(month>0) {
Calendar c = Calendar.getInstance();
String strDateFormat = "yyyyMM";
SimpleDateFormat sdf = new SimpleDateFormat(strDateFormat);
int startTime = Integer.parseInt(sdf.format(c.getTime()));
bookGroupScanStatisticsRequestDTO.setEnd(startTime);
c.add(Calendar.MONTH, -month);
int endTime = Integer.parseInt(sdf.format(c.getTime()));
bookGroupScanStatisticsRequestDTO.setStart(endTime);
}else {
bookGroupScanStatisticsRequestDTO.setStart(202001);
Calendar c = Calendar.getInstance();
String strDateFormat = "yyyyMM";
SimpleDateFormat sdf = new SimpleDateFormat(strDateFormat);
bookGroupScanStatisticsRequestDTO.setEnd(Integer.parseInt(sdf.format(c.getTime())));
}
List<BookGroupScanStatisticsRespDTO> bookGroupScanStatistics = bookGroupBiz.getBookGroupScanStatistics(bookGroupScanStatisticsRequestDTO);
Map<Long, Integer> booksScanCounts = new HashMap<>();
for (BookGroupScanStatisticsRespDTO bookGroupScanStatistic : bookGroupScanStatistics) {
......@@ -4049,8 +4065,16 @@ public class BookBizImpl implements BookBiz {
bookScanStatistics4OfficialAccountsReqDTO.setBookIds(new ArrayList<>(books));
bookScanStatistics4OfficialAccountsReqDTO.setAdviserIds(adviserIds);
bookScanStatistics4OfficialAccountsReqDTO.setChannelIds(channelIds);
bookScanStatistics4OfficialAccountsReqDTO.setStart(new Date("2001/01/01 00:00:00"));
bookScanStatistics4OfficialAccountsReqDTO.setEnd(now);
if(month>0) {
Calendar c2 = Calendar.getInstance();
bookScanStatistics4OfficialAccountsReqDTO.setEnd(c2.getTime());
c2.add(Calendar.MONTH, -month);
bookScanStatistics4OfficialAccountsReqDTO.setStart(c2.getTime());
}else{
bookScanStatistics4OfficialAccountsReqDTO.setStart(new Date("2018/01/01 00:00:00"));
bookScanStatistics4OfficialAccountsReqDTO.setEnd(new Date());
}
List<BookScanStatistics4OfficialAccountsDTO> bookScanStatistics4OfficialAccountsDTOS = ResponseHandleUtil.parseList(sceneRecordService.listBookScanStatistics4OfficialAccounts(bookScanStatistics4OfficialAccountsReqDTO), BookScanStatistics4OfficialAccountsDTO.class);
for (BookScanStatistics4OfficialAccountsDTO bookGroupScanStatistic : bookScanStatistics4OfficialAccountsDTOS) {
Long bookId = bookGroupScanStatistic.getBookId();
......
pcloud-service-book/src/main/java/com/pcloud/book/book/dao/BookAdviserDao.java
......@@ -320,4 +320,6 @@ public interface BookAdviserDao extends BaseDao<BookAdviser> {
BookDto getLatestAdviserBookByIsbn(String isbn);
List<BookServesListDTO> listBookServes4Book(Long cursor, Integer limit);
List<ERPPublishNumDTO> getErpPublishNumQueryParamsByMonth(List<Long> adviserIds, int month);
}
pcloud-service-book/src/main/java/com/pcloud/book/book/dao/BookDao.java
......@@ -379,5 +379,5 @@ public interface BookDao extends BaseDao<Book> {
Integer getBookMinimunSupportCount4Platform(Map<String, Object> paramMap);
int getFundBookCounts(List<Long> advisers);
Integer getFundBookCounts(List<Long> advisers,int month);
}
pcloud-service-book/src/main/java/com/pcloud/book/book/dao/impl/BookAdviserDaoImpl.java
......@@ -350,6 +350,15 @@ public class BookAdviserDaoImpl extends BaseDaoImpl<BookAdviser> implements Book
}
@Override
public List<ERPPublishNumDTO> getErpPublishNumQueryParamsByMonth(List<Long> adviserIds,int month) {
Map<String, Object> paramMap = new HashMap<>();
paramMap.put("adviserIds",adviserIds);
paramMap.put("month", month);
return super.getSqlSession().selectList(getStatement("getErpPublishNumQueryParamsByMonth"),paramMap);
}
@Override
public List<AgentBookStatsDetailVO> getAgentBookStatsDetail(List<ErpBookInfoDTO> raysBookIds, Integer isRay, String name, List<Long> advisers) {
Map<String, Object> map = new HashMap<>();
if (StrUtil.isNotBlank(name) && name.startsWith("BK")){
......
pcloud-service-book/src/main/java/com/pcloud/book/book/dao/impl/BookDaoImpl.java
......@@ -15,10 +15,10 @@ import com.pcloud.book.book.vo.BookSaleVO;
import com.pcloud.book.book.vo.SearchBookVO;
import com.pcloud.book.book.dto.BookUniqueNumberDTO;
import com.pcloud.book.es.entity.ESBookAndAdviser;
import com.pcloud.book.group.vo.BookGroupServeCountVO;
import com.pcloud.common.core.dao.BaseDaoImpl;
import com.pcloud.common.utils.ListForInSQL;
import com.pcloud.common.utils.ListUtils;
import io.swagger.models.auth.In;
import org.springframework.stereotype.Repository;
import java.util.HashMap;
......@@ -449,9 +449,10 @@ public class BookDaoImpl extends BaseDaoImpl<Book> implements BookDao {
}
@Override
public int getFundBookCounts(List<Long> advisers) {
public Integer getFundBookCounts(List<Long> advisers, int month) {
Map<String, Object> paramMap = Maps.newHashMap();
paramMap.put("list", advisers);
return getSessionTemplate().selectOne(getStatement("getFundBookCounts"), advisers);
paramMap.put("month", month);
return getSessionTemplate().selectOne(getStatement("getFundBookCounts"), paramMap);
}
}
pcloud-service-book/src/main/java/com/pcloud/book/book/facade/impl/BookAdviserFacadeImpl.java
......@@ -383,9 +383,12 @@ public class BookAdviserFacadeImpl implements BookAdviserFacade {
}
@PostMapping("getBooksByAgentToken")
public ResponseDto<List<Long>>getBooksByAgentToken(@RequestParam(value = "token") String token,@RequestParam(value = "index") int index){
public ResponseDto<List<Long>>getBooksByAgentToken(@RequestParam(value = "token") String token,@RequestParam(value = "index") int index,@RequestParam(value = "month" ,required = false) Integer month){
Long agentId = (Long)SessionUtil.getVlaue(token, SessionUtil.PARTY_ID);
List<Long>bookIds = bookAdviserBiz.getBooksByAgentToken(agentId,index);
if(month==null){
month=0;
}
List<Long>bookIds = bookAdviserBiz.getBooksByAgentToken(agentId,index,month);
return new ResponseDto<>(bookIds);
}
......
pcloud-service-book/src/main/java/com/pcloud/book/book/facade/impl/BookFacadeImpl.java
......@@ -1319,9 +1319,12 @@ public class BookFacadeImpl implements BookFacade {
}
@GetMapping("getPublishCounts")
public ResponseDto<BookCountsVO>getPublishCounts( @RequestHeader("token") String token){
public ResponseDto<BookCountsVO>getPublishCounts( @RequestHeader("token") String token,@RequestParam(name = "month",required = false)Integer month){
if(month==null){
month=0;
}
Long agentId = (Long) SessionUtil.getVlaue(token,SessionUtil.PARTY_ID);
BookCountsVO bookCountsVO = bookBiz.getPublishCounts(agentId);
BookCountsVO bookCountsVO = bookBiz.getPublishCounts(agentId,month);
return new ResponseDto<>(bookCountsVO);
}
}
pcloud-service-book/src/main/resources/mapper/book/Book.Mapper.xml
......@@ -2888,7 +2888,7 @@
) a
</select>
<select id="getFundBookCounts" resultType="int">
<select id="getFundBookCounts" resultType="Integer">
select count(1) from (
SELECT
A.BOOK_ID, A.CHANNEL_ID
......@@ -2916,7 +2916,11 @@
BF.BOOK_ID = A.BOOK_ID AND BF.END_TIME> NOW() AND NOW()> BF.START_TIME
WHERE
1=1 and
1=1
<if test="month>0">
and BF.CREATED_DATE>= SUBDATE(now(),INTERVAL #{month} month)
</if>
and
BF.BOOK_FUND_ID>0
GROUP BY A.BOOK_ID, A.CHANNEL_ID
......
pcloud-service-book/src/main/resources/mapper/book/BookAdviser.Mapper.xml
......@@ -919,6 +919,29 @@
</select>
<select id="getErpPublishNumQueryParamsByMonth" parameterType="map" resultType="com.pcloud.book.book.dto.ERPPublishNumDTO">
SELECT
ADVISER_ID AS adviserId,
CHANNEL_ID AS channelId,
BOOK_ID AS bookId,
CREATED_DATE AS createDate
FROM
book_adviser
WHERE
ADVISER_ID IN
<foreach collection="adviserIds" item="item" close=")" open="(" separator=",">
#{item}
</foreach>
<if test="month>0">
and CREATED_DATE>= SUBDATE(now(),INTERVAL #{month} month)
</if>
GROUP BY
ADVISER_ID,
CHANNEL_ID,
BOOK_ID
</select>
<select id="getAgentBookStatsDetail" parameterType="map" resultType="com.pcloud.book.book.vo.AgentBookStatsDetailVO">
SELECT
tb.bookAdviserId,
......
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