Merge branch 'master' of http://192.168.89.173/rays/pcloud-book

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

+package com.pcloud.book.book.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * 图书详细信息
+ */
+public class BookDetialDTO implements Serializable {
+
+    @ApiModelProperty("编辑ID")
+    private Long adviserId;
+    @ApiModelProperty("图书ID集合")
+    private List<Long> bookIds;
+    @ApiModelProperty("渠道ID集合")
+    private List<Long> channelId;
+
+    public Long getAdviserId() {
+        return adviserId;
+    }
+
+    public void setAdviserId(Long adviserId) {
+        this.adviserId = adviserId;
+    }
+
+    public List<Long> getBookIds() {
+        return bookIds;
+    }
+
+    public void setBookIds(List<Long> bookIds) {
+        this.bookIds = bookIds;
+    }
+
+    public List<Long> getChannelId() {
+        return channelId;
+    }
+
+    public void setChannelId(List<Long> channelId) {
+        this.channelId = channelId;
+    }
+
+    @Override
+    public String toString() {
+        return "BookDetialDTO{" +
+                "adviserId=" + adviserId +
+                ", bookIds=" + bookIds +
+                ", channelId=" + channelId +
+                '}';
+    }
+}

pcloud-facade-book/src/main/java/com/pcloud/book/book/facade/BookFacade.java

@@ -252,6 +252,7 @@ public interface BookFacade {
 			@ApiImplicitParam(name = "templetId", value = "图书类型标识", dataType = "long", paramType = "query")})
 	@RequestMapping(value = "listPage4Adviser", method = RequestMethod.GET)
 	public ResponseDto<PageBean> getListPage4Adviser(@RequestHeader("token") String token,
+			@RequestParam(value = "name", required = false) String name,
 			@RequestParam(value = "bookName", required = false) String bookName,
 			@RequestParam(value = "isbn", required = false) String isbn,
 			@RequestParam(value = "channelId", required = false) Long channelId,

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

@@ -4,6 +4,7 @@
 package com.pcloud.book.book.service;
 
 import com.pcloud.book.book.dto.BookAdviserUpdateTimeDTO;
+import com.pcloud.book.book.dto.BookDetialDTO;
 import com.pcloud.book.book.dto.BookDto;
 import com.pcloud.common.dto.ResponseDto;
 import com.pcloud.common.exceptions.BizException;
@@ -72,6 +73,13 @@ public interface BookService {
     ResponseEntity<ResponseDto<Map<Long, BookDto>>> listBaseByIds(@RequestBody(required = false) List<Long> bookIds)
             throws BizException;
 
+    @ApiOperation(value = "批量获取书籍信息（书名 模板ID ）", httpMethod = "POST")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "bookDetialDTO", value = "图书id集合", dataType = "BookDetialDTO", paramType = "body")})
+    @RequestMapping(value = "/listDetailByIds", method = RequestMethod.POST)
+    ResponseEntity<ResponseDto<Map<String, BookDto>>> listDetailByIds(@RequestBody(required = false) BookDetialDTO bookDetialDTO)
+            throws BizException;
+
     /**
      * 根据名称获取ID
      *

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

@@ -9,6 +9,7 @@ import java.util.Map;
 
 import com.pcloud.book.book.dto.BookAdviserUpdateTimeDTO;
 import com.pcloud.book.book.dto.BookAssocCount;
+import com.pcloud.book.book.dto.BookDetialDTO;
 import com.pcloud.book.book.dto.BookDto;
 import com.pcloud.book.book.entity.Book;
 import com.pcloud.common.exceptions.BizException;
@@ -139,6 +140,14 @@ public interface BookBiz {
 	Map<Long, BookDto> listBaseByIds(List<Long> bookIds) throws BizException;
 
 	/**
+	 * 批量获取书籍信息（书名 分类ID）
+	 * @param bookDetialDTO
+	 * @return
+	 * @throws BizException
+	 */
+	Map<String,BookDto> listDetailByIds(BookDetialDTO bookDetialDTO)throws BizException;
+
+	/**
 	 * 获取书籍列表
 	 * 
 	 * @param isbn

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

@@ -521,6 +521,25 @@ public class BookBizImpl implements BookBiz {
 		return bookMap;
 	}
 
+	@Override
+	public Map<String, BookDto> listDetailByIds(BookDetialDTO bookDetialDTO) throws BizException {
+		Map<String, BookDto> bookMap = null;
+		if(null != bookDetialDTO && !(null == bookDetialDTO || ListUtils.isEmpty(bookDetialDTO.getBookIds()) || ListUtils.isEmpty(bookDetialDTO.getChannelId()))){
+			Map<String, Object> paramMap = Maps.newHashMap();
+			paramMap.put("bookIds",bookDetialDTO.getBookIds());
+			paramMap.put("channelIds",bookDetialDTO.getChannelId());
+			paramMap.put("adviserId",bookDetialDTO.getAdviserId());
+			List<BookDto> bookDtos = bookDao.listDetailByIds(paramMap);
+			if(!ListUtils.isEmpty(bookDtos)){
+				bookMap = Maps.newHashMap();
+				for(BookDto bookDto:bookDtos){
+					bookMap.put(bookDto.getChannelId()+"_"+bookDto.getBookId(),bookDto);
+				}
+			}
+		}
+		return bookMap;
+	}
+
 	/**
 	 * 获取书籍列表
 	 */

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

@@ -83,6 +83,13 @@ public interface BookDao extends BaseDao<Book> {
 	Map<Long, BookDto> listBaseMapByIds(List<Long> bookIds);
 
 	/**
+	 * 获取详细信息
+	 * @param paramMap
+	 * @return
+	 */
+	List<BookDto> listDetailByIds(Map<String,Object> paramMap);
+
+	/**
 	 * 根据名称获取ID
 	 * 
 	 * @param bookName

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

@@ -84,7 +84,12 @@ public class BookDaoImpl extends BaseDaoImpl<Book> implements BookDao {
 	public Map<Long, BookDto> listBaseMapByIds(List<Long> bookIds) {
 		return super.getSqlSession().selectMap(super.getStatement("listBaseMapByIds"), bookIds, "bookId");
 	}
-	
+
+	@Override
+	public List<BookDto> listDetailByIds(Map<String, Object> paramMap) {
+		return super.getSqlSession().selectList(super.getStatement("listDetailByIds"),paramMap);
+	}
+
 	/**
 	 * 根据名称获取ID
 	 */

pcloud-service-book/src/main/java/com/pcloud/book/book/facade/impl/BookFacadeImpl.java

@@ -235,6 +235,7 @@ public class BookFacadeImpl implements BookFacade {
 	@Override
 	@RequestMapping(value = "listPage4Adviser", method = RequestMethod.GET)
 	public ResponseDto<PageBean> getListPage4Adviser(@RequestHeader("token") String token,
+			@RequestParam(value = "name", required = false) String name,
 			@RequestParam(value = "bookName", required = false) String bookName,
 			@RequestParam(value = "isbn", required = false) String isbn,
 			@RequestParam(value = "channelId", required = false) Long channelId,
@@ -255,8 +256,9 @@ public class BookFacadeImpl implements BookFacade {
 		paramMap.put("isMainEditor", isMainEditor);
 		paramMap.put("isFundSupport", isFundSupport);
 		paramMap.put("channelId", channelId);
-		paramMap.put("isbn", isbn != null && "".equals(isbn.trim()) ? null : isbn);
 		paramMap.put("bookName", bookName != null && "".equals(bookName.trim()) ? null : bookName);
+		paramMap.put("isbn", isbn != null && "".equals(isbn.trim()) ? null : isbn);
+		paramMap.put("name", name != null && "".equals(name.trim()) ? null : name);
 		paramMap.put("typeCode", typeCode != null && "".equals(typeCode.trim()) ? null : typeCode);
 		paramMap.put("bookId", bookId);
 		paramMap.put("templetId", templetId);

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

@@ -3,24 +3,20 @@
  */
 package com.pcloud.book.book.service.impl;
 
-import java.util.List;
-import java.util.Map;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-
 import com.pcloud.book.book.biz.BookBiz;
 import com.pcloud.book.book.dto.BookAdviserUpdateTimeDTO;
+import com.pcloud.book.book.dto.BookDetialDTO;
 import com.pcloud.book.book.dto.BookDto;
 import com.pcloud.book.book.service.BookService;
 import com.pcloud.common.dto.ResponseDto;
 import com.pcloud.common.exceptions.BizException;
 import com.pcloud.common.utils.ResponseHandleUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+import java.util.Map;
 
 /**
  * @描述：
@@ -69,6 +65,13 @@ public class BookServiceImpl implements BookService {
 		return ResponseHandleUtil.toResponse(bookBiz.listBaseByIds(bookIds));
 	}
 
+
+	@Override
+	@RequestMapping(value = "/listDetailByIds", method = RequestMethod.POST)
+	public ResponseEntity<ResponseDto<Map<String, BookDto>>> listDetailByIds(@RequestBody(required = false)BookDetialDTO bookDetialDTO) throws BizException {
+		return ResponseHandleUtil.toResponse(bookBiz.listDetailByIds(bookDetialDTO));
+	}
+
 	/**
 	 * 根据名称获取ID
 	 */

pcloud-service-book/src/main/java/com/pcloud/book/book/set/BookSet.java

@@ -3,22 +3,6 @@
  */
 package com.pcloud.book.book.set;
 
-import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import com.google.common.collect.Maps;
-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.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
 import com.alibaba.fastjson.JSONObject;
 import com.google.common.collect.Lists;
 import com.pcloud.analysisengine.browse.dto.BrowseCacheRecordDto;
@@ -34,15 +18,7 @@ import com.pcloud.book.book.biz.BookFundBiz;
 import com.pcloud.book.book.dao.BookAdviserDao;
 import com.pcloud.book.book.dao.BookFreezeDao;
 import com.pcloud.book.book.dao.BookTypeDao;
-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.dto.*;
 import com.pcloud.book.book.entity.BookDefendant;
 import com.pcloud.book.book.tools.BookTools;
 import com.pcloud.book.consumer.analysisengine.BookScanCountConsr;
@@ -83,6 +59,16 @@ import com.pcloud.usercenter.party.adviser.dto.AdviserBaseInfoDto;
 import com.pcloud.usercenter.party.adviser.entity.Adviser;
 import com.pcloud.usercenter.party.agent.entity.Agent;
 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.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.math.BigDecimal;
+import java.util.*;
 
 /**
  * @描述：图书信息填充
@@ -1074,7 +1060,10 @@ public class BookSet {
 			return;
 		}
 		AssistTempletDTO assistTempletDTO = assistTempletMap.get(templetId);
-		bookDto.setTempletName(assistTempletDTO == null ? null : assistTempletDTO.getTempletName());
+		if (assistTempletDTO != null) {
+			bookDto.setTempletName(assistTempletDTO.getTempletName());
+			bookDto.setQrRemark(assistTempletDTO.getRemark());
+		}
 		LOGGER.info("设置模板名称【END】");
 	}
 

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

@@ -315,7 +315,29 @@
 				${item}
 			</foreach>
 	</select>
-	
+
+	<select id="listDetailByIds" resultMap="bookMap" parameterType="map">
+
+		SELECT
+			b.BOOK_ID,b.BOOK_NAME,ba.TEMPLET_ID FROM book b LEFT JOIN book_adviser ba ON b.BOOK_ID = ba.BOOK_ID
+		WHERE
+			b.BOOK_ID IN
+		<foreach collection="bookIds" index="i" item="item" open="(" separator="," close=")">
+			${item}
+		</foreach>
+		<if test="channelIds != null">
+			AND
+			ba.CHANNEL_ID in
+			<foreach collection="channelIds" index="i" item="item" open="(" separator="," close=")">
+				${item}
+			</foreach>
+		</if>
+		<if test="adviserId != null">
+			AND
+			ba.ADVISER_ID = #{adviserId}
+		</if>
+
+	</select>
 	
 	<!-- 获取书籍列表 (平台端)-->
 	<select id="getListPage4Platform" resultMap="bookListPageMap" parameterType="map">
@@ -460,7 +482,10 @@
 		AND
 			B.ISBN LIKE CONCAT(#{isbn},'%')
 		</if>
-
+		<if test="name != null">
+		  AND
+			(B.BOOK_NAME LIKE CONCAT('%', #{name}, '%') OR  B.ISBN LIKE CONCAT(#{name},'%'))
+		</if>
 		<if test="isMainEditor != null">
 		  AND
 			A.IS_MAIN_EDITOR = 1