Merge branch 'dw-feature' into 'master'

feat add interface getBookByAdviserId

See merge request rays/pcloud-book!7

pcloud-facade-book/src/main/java/com/pcloud/book/book/dto/BookAdviserDto.java

@@ -28,6 +28,12 @@ public class BookAdviserDto extends BaseDto {
      */
     private Long bookId;
 
+    private String isbn;
+    /**
+     * 封面图
+     */
+    private String coverImg;
+
     /**
      * 编辑标识
      */
@@ -174,14 +180,47 @@ public class BookAdviserDto extends BaseDto {
         this.isDelete = isDelete;
     }
 
-	@Override
-	public String toString() {
-		return "BookAdviserDto [bookAdviserId=" + bookAdviserId + ", bookId=" + bookId + ", adviserId=" + adviserId
-				+ ", adviserName=" + adviserName + ", channelId=" + channelId + ", channelName=" + channelName
-				+ ", count=" + count + ", isMainEditor=" + isMainEditor + ", agentId=" + agentId + ", agentName="
-				+ agentName + ", bookDto=" + bookDto + ", isDelete=" + isDelete + "]";
-	}
+    public String getIsbn() {
+        return isbn;
+    }
+
+    public void setIsbn(String isbn) {
+        this.isbn = isbn;
+    }
+
+    public Boolean getMainEditor() {
+        return isMainEditor;
+    }
 
+    public void setMainEditor(Boolean mainEditor) {
+        isMainEditor = mainEditor;
+    }
 
+    public String getCoverImg() {
+        return coverImg;
+    }
 
+    public void setCoverImg(String coverImg) {
+        this.coverImg = coverImg;
+    }
+
+    @Override
+    public String toString() {
+        return "BookAdviserDto{" +
+                "bookAdviserId=" + bookAdviserId +
+                ", bookId=" + bookId +
+                ", isbn='" + isbn + '\'' +
+                ", coverImg='" + coverImg + '\'' +
+                ", adviserId=" + adviserId +
+                ", adviserName='" + adviserName + '\'' +
+                ", channelId=" + channelId +
+                ", channelName='" + channelName + '\'' +
+                ", count=" + count +
+                ", isMainEditor=" + isMainEditor +
+                ", agentId=" + agentId +
+                ", agentName='" + agentName + '\'' +
+                ", bookDto=" + bookDto +
+                ", isDelete=" + isDelete +
+                '}';
+    }
 }

pcloud-facade-book/src/main/java/com/pcloud/book/book/service/BookAdviserService.java

@@ -28,6 +28,15 @@ import java.util.Map;
 public interface BookAdviserService {
 
     /**
+     * 获取某个编辑3个月内新创建的图书
+     * @param adviserId
+     * @return
+     * @throws BizException
+     */
+    @GetMapping(value = "/listByAdviserId")
+    ResponseEntity<ResponseDto<List<BookDto>>> listByAdviserId(@RequestParam("adviserId") Long adviserId) throws BizException;
+
+    /**
      * 获取编辑的推广书籍总数
      *
      * @return

pcloud-service-book/src/main/java/com/pcloud/book/book/biz/BookAdviserBiz.java

@@ -19,6 +19,8 @@ import java.util.Map;
  */
 public interface BookAdviserBiz {
 
+
+	List<BookDto> listByAdviserId(Long adviserId);
 	/**
 	 * 创建编辑管理书籍关系
 	 * 

pcloud-service-book/src/main/java/com/pcloud/book/book/biz/impl/BookAdviserBizImpl.java

 package com.pcloud.book.book.biz.impl;
 
+import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
+
 import com.pcloud.book.base.dto.CountDto;
 import com.pcloud.book.base.exception.BookBizException;
 import com.pcloud.book.book.biz.BookAdviserBiz;
 import com.pcloud.book.book.biz.BookBiz;
 import com.pcloud.book.book.constant.BookConstant;
 import com.pcloud.book.book.dao.BookAdviserDao;
-import com.pcloud.book.book.dto.*;
+import com.pcloud.book.book.dto.AdviserBookInfoDTO;
+import com.pcloud.book.book.dto.AdviserManageDto;
+import com.pcloud.book.book.dto.AviserBookInfoParam;
+import com.pcloud.book.book.dto.BookAdviserDto;
+import com.pcloud.book.book.dto.BookCountAndAdviserIdDTO;
+import com.pcloud.book.book.dto.BookCountByAdvisersDto;
+import com.pcloud.book.book.dto.BookCountDto;
+import com.pcloud.book.book.dto.BookDto;
 import com.pcloud.book.book.entity.BookAdviser;
 import com.pcloud.book.book.set.BookSet;
 import com.pcloud.book.consumer.channel.QrcodeSceneConsr;
@@ -28,6 +37,7 @@ import com.pcloud.common.utils.DateUtils;
 import com.pcloud.common.utils.ListUtils;
 import com.pcloud.common.utils.string.StringUtil;
 import com.pcloud.raystask.entity.AdviserDefault;
+
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -35,14 +45,13 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.dao.DataIntegrityViolationException;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
 
 import java.math.BigDecimal;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
 
 /**
  * @描述：编辑管理书籍逻辑层接口实现类
@@ -93,9 +102,23 @@ public class BookAdviserBizImpl implements BookAdviserBiz {
     @Autowired
     private BookGroupDao bookGroupDao;
 
-	private static final ExecutorService EXECUTOR_SERVICE = Executors.newFixedThreadPool(5);
+    @Override
+    public List<BookDto> listByAdviserId(Long adviserId) {
+		if(null == adviserId) {
+			return Lists.newArrayList();
+		}
+		final List<Long> bookIds = bookAdviserDao.listBookIdsByAdviser(adviserId);
+		if(CollectionUtils.isEmpty(bookIds)) {
+			return Lists.newArrayList();
+		}
+		final Map<Long, BookDto> map = bookBiz.listBaseByIds(bookIds);
+		if(CollectionUtils.isEmpty(map)) {
+			return Lists.newArrayList();
+		}
+		return Lists.newArrayList(map.values());
+    }
 
-	/**
+    /**
 	 * 创建编辑管理书籍关系
 	 */
 	@Override

pcloud-service-book/src/main/java/com/pcloud/book/book/dao/BookAdviserDao.java

@@ -17,6 +17,8 @@ import java.util.Map;
  */
 public interface BookAdviserDao extends BaseDao<BookAdviser> {
 
+
+	List<Long> listBookIdsByAdviser(Long adviserId);
 	/**
 	 * 删除编辑和书籍的推广信息
 	 * 

pcloud-service-book/src/main/java/com/pcloud/book/book/dao/impl/BookAdviserDaoImpl.java

 /**
- * 
+ *
  */
 package com.pcloud.book.book.dao.impl;
 
@@ -22,6 +22,11 @@ import java.util.Map;
 @Repository("bookAdviserDao")
 public class BookAdviserDaoImpl extends BaseDaoImpl<BookAdviser> implements BookAdviserDao {
 
+	@Override
+	public List<Long> listBookIdsByAdviser(Long adviserId) {
+		return this.getSqlSession().selectList(this.getStatement("listBookIdsByAdviser"), adviserId);
+	}
+
 	/**
 	 * 删除编辑和书籍的推广信息
 	 */

pcloud-service-book/src/main/java/com/pcloud/book/book/service/impl/BookAdviserServiceImpl.java

@@ -30,6 +30,13 @@ public class BookAdviserServiceImpl implements BookAdviserService {
 	@Autowired
 	private BookAdviserBiz bookAdviserBiz;
 
+
+	@Override
+	@GetMapping(value = "/listByAdviserId")
+	public ResponseEntity<ResponseDto<List<BookDto>>> listByAdviserId(@RequestParam("adviserId") Long adviserId) throws BizException {
+		return ResponseHandleUtil.toResponse(bookAdviserBiz.listByAdviserId(adviserId));
+	}
+
 	/**
 	 * 获取编辑的推广书籍总数
 	 */

pcloud-service-book/src/main/resources/mapper/book/BookAdviser.Mapper.xml

@@ -25,6 +25,12 @@
 	
 	</resultMap>
 
+
+	<!-- 查询编辑的书刊信息 -->
+	<select id="listBookIdsByAdviser" resultType="long">
+		select BOOK_ID from BOOK_ADVISER where IS_DELETE = 0 and ADVISER_ID = #{adviserId} and CREATED_DATE >= DATE_SUB(CURDATE(), INTERVAL 3 MONTH)
+	</select>
+
 		<!-- 新增书籍和编辑关联信息-->
 	<insert id="insert" parameterType="bookAdviser" useGeneratedKeys="true" keyProperty="bookAdviserId" flushCache="true">
 		INSERT INTO BOOK_ADVISER (