Merge branch 'feature/listPage4Adviser' into 'release'

Feature/list page4 adviser

See merge request rays/pcloud-book!1637

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

@@ -884,6 +884,20 @@ public class BookDto extends BaseDto {
      */
     private Integer isResShareEnable;
 
+    /**
+     * 书下应用数量
+     */
+    private Integer bookAppCount;
+
+
+    public Integer getBookAppCount() {
+        return bookAppCount;
+    }
+
+    public void setBookAppCount(Integer bookAppCount) {
+        this.bookAppCount = bookAppCount;
+    }
+
     public Date getFreezetime() {
         return freezetime;
     }

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

@@ -1015,7 +1015,7 @@ public class BookBizImpl implements BookBiz {
     @Override
     public PageBean getListPage4Adviser(Map<String, Object> paramMap, PageParam pageParam, Long adviserId, Integer hasQrcode,Integer appointBook) throws BizException {
         LOGGER.info("【书籍应用】获取书籍列表,<START>.[paramMap]=" + paramMap);
-        PageBean pageBean=bookDao.listPage(pageParam, paramMap, "getListPage4Adviser");
+        PageBean pageBean = bookDao.getListPage4AdviserPageBean(pageParam, paramMap);
         LOGGER.info("appointBook=" + appointBook);
         if (null != appointBook) {
             //全是案列书，编辑可以自行删除决定不展示
@@ -1049,7 +1049,7 @@ public class BookBizImpl implements BookBiz {
                 return new PageBean(0, 0, new ArrayList<>());
             }
             paramMap.put("bookIds", bookIds);
-            pageBean = bookDao.listPage(pageParam, paramMap, "getListPage4Adviser");
+            pageBean = bookDao.getListPage4AdviserPageBean(pageParam, paramMap);
             if (pageBean == null || ListUtils.isEmpty(pageBean.getRecordList())) {
                 return new PageBean(0, 0, new ArrayList<>());
             }
@@ -1075,6 +1075,8 @@ public class BookBizImpl implements BookBiz {
         bookSet.setOpenRobotProcess(pageBean.getRecordList());
         //设置Rays码资源数量
         bookSet.setQrcodeMessage(pageBean.getRecordList());
+        //设置书下二维码资源数量
+        bookSet.setBookResourceCount(pageBean.getRecordList());
         return pageBean;
     }
 
@@ -1083,7 +1085,8 @@ public class BookBizImpl implements BookBiz {
     public List<BookDto> getList4Adviser(Long adviserId, Integer num, Boolean isPrint, Boolean isApproval) throws BizException {
         Map<String, Object> paramMap = Maps.newHashMap();
         paramMap.put("adviserId", adviserId);
-        paramMap.put("num", num);
+        paramMap.put("pageNum",0);
+        paramMap.put("numPerPage", num);
         paramMap.put("isPrint", isPrint);
         paramMap.put("isApproval", isApproval);
         paramMap.put("isbns", BookConstant.DEFAULT_BOOK_ISBN);

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

@@ -13,6 +13,8 @@ import com.pcloud.book.book.vo.SearchBookVO;
 import com.pcloud.book.book.dto.BookUniqueNumberDTO;
 import com.pcloud.book.es.entity.ESBookAndAdviser;
 import com.pcloud.common.core.dao.BaseDao;
+import com.pcloud.common.page.PageBean;
+import com.pcloud.common.page.PageParam;
 
 import java.util.List;
 import java.util.Map;
@@ -388,4 +390,10 @@ public interface BookDao extends BaseDao<Book> {
 	List<BookDto> listPage4Agent(Map<String, Object> paramMap);
 
     List<Object> getAppointBooks(Long channelId, List<Long> bookIds);
+
+    PageBean getListPage4AdviserPageBean(PageParam pageParam, Map<String, Object> paramMap);
+
+	List<Object> getListPage4Adviser(Map<String, Object> paramMap);
+
+	Integer getListPage4AdviserCount(Map<String, Object> paramMap);
 }

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

@@ -16,6 +16,8 @@ import com.pcloud.book.book.vo.SearchBookVO;
 import com.pcloud.book.book.dto.BookUniqueNumberDTO;
 import com.pcloud.book.es.entity.ESBookAndAdviser;
 import com.pcloud.common.core.dao.BaseDaoImpl;
+import com.pcloud.common.page.PageBean;
+import com.pcloud.common.page.PageParam;
 import com.pcloud.common.utils.ListForInSQL;
 import com.pcloud.common.utils.ListUtils;
 import io.swagger.models.auth.In;
@@ -478,4 +480,24 @@ public class BookDaoImpl extends BaseDaoImpl<Book> implements BookDao {
         paramMap.put("bookIds", bookIds);
         return getSessionTemplate().selectList(getStatement("getAppointBooks"), paramMap);
     }
+
+    @Override
+    public PageBean getListPage4AdviserPageBean(PageParam pageParam, Map<String, Object> paramMap) {
+        paramMap.put("pageNum",pageParam.getPageNum()*pageParam.getNumPerPage());
+        paramMap.put("numPerPage",pageParam.getNumPerPage());
+        List<Object> list = getListPage4Adviser(paramMap);
+        Integer count = getListPage4AdviserCount(paramMap);
+        PageBean pagebean = new PageBean(pageParam.getPageNum(),pageParam.getNumPerPage(), count, list);
+        return pagebean;
+    }
+
+    @Override
+    public List<Object> getListPage4Adviser(Map<String, Object> paramMap) {
+        return getSessionTemplate().selectList(getStatement("getListPage4Adviser"),paramMap);
+    }
+
+    @Override
+    public Integer getListPage4AdviserCount(Map<String, Object> paramMap) {
+        return getSessionTemplate().selectOne(getStatement("getListPage4AdviserCount"),paramMap);
+    }
 }

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

@@ -307,9 +307,9 @@ public class BookFacadeImpl implements BookFacade {
         paramMap.put("isMainEditor", isMainEditor);
         paramMap.put("isFundSupport", isFundSupport);
         paramMap.put("channelId", channelId);
-        paramMap.put("name", name != null && "".equals(name.trim()) ? null : name);
+        paramMap.put("name", StringUtil.isEmpty(name) ? null : name.trim());
         if(!StringUtil.isEmpty(name)){
-            String [] nameList = name.trim().split("[\u00A0|\u3000|\u0020]");
+            String [] nameList = name.trim().split(" ");
             paramMap.put("nameList", Lists.newArrayList(nameList));
         }
         paramMap.put("isbn", isbn != null && "".equals(isbn.trim()) ? null : isbn);

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

@@ -68,7 +68,9 @@ import com.pcloud.channelcenter.base.constants.ChannelConstants;
 import com.pcloud.channelcenter.base.constants.MessageFromTypeEnum;
 import com.pcloud.channelcenter.qrcode.dto.Book4CatalogDTO;
 import com.pcloud.channelcenter.qrcode.dto.BookSceneIdListDTO;
+import com.pcloud.channelcenter.qrcode.dto.MapResourceCountDTO;
 import com.pcloud.channelcenter.qrcode.dto.QrcodeLocationDto;
+import com.pcloud.channelcenter.qrcode.dto.QrcodeMessageDTO;
 import com.pcloud.channelcenter.qrcode.vo.BookAssocLastQrAskVO;
 import com.pcloud.channelcenter.qrcode.vo.BookAssocLastQrVO;
 import com.pcloud.channelcenter.wechat.dto.AccountSettingDto;
@@ -2161,4 +2163,40 @@ public class BookSet {
             }
         }
     }
+
+    public void setBookResourceCount(List<Object> recordList) {
+        if (ListUtils.isEmpty(recordList)) {
+            return;
+        }
+        List<Long> bookIds = new ArrayList<>();
+        List<Long> channelIds = new ArrayList<>();
+        List<Long> adviserIds = new ArrayList<>();
+        for (Object obj : recordList) {
+            BookDto bookDto = (BookDto) obj;
+            bookIds.add(bookDto.getBookId());
+            if (null != bookDto.getChannelId() && !channelIds.contains(bookDto.getChannelId())) {
+                channelIds.add(bookDto.getChannelId());
+            }
+            if (null != bookDto.getAdviserId() && !adviserIds.contains(bookDto.getAdviserId())) {
+                adviserIds.add(bookDto.getAdviserId());
+            }
+        }
+        //填充应用数量
+        MapResourceCountDTO mapResourceCountDTO = new MapResourceCountDTO();
+        mapResourceCountDTO.setBookIds(bookIds);
+        mapResourceCountDTO.setAdviserIds(adviserIds);
+        mapResourceCountDTO.setChannelIds(channelIds);
+        mapResourceCountDTO.setMessageTypeCode("APP");
+        Map<String, QrcodeMessageDTO> messageDTOMap = qrcodeSceneConsr.mapBookResourceCount(mapResourceCountDTO);
+        for (Object obj : recordList) {
+            BookDto bookDto = (BookDto) obj;
+            String key = String.join("_",bookDto.getBookId().toString(),bookDto.getChannelId()==null?"":bookDto.getChannelId().toString(),
+                    bookDto.getAdviserId()==null?"":bookDto.getAdviserId().toString());
+            bookDto.setBookAppCount(0);
+            if (!MapUtils.isEmpty(messageDTOMap) && messageDTOMap.containsKey(key)) {
+                QrcodeMessageDTO dto = messageDTOMap.get(key);
+                bookDto.setBookAppCount(null==dto.getServeCount()?0:dto.getServeCount());
+            }
+        }
+    }
 }

pcloud-service-book/src/main/java/com/pcloud/book/consumer/channel/QrcodeSceneConsr.java

@@ -12,7 +12,9 @@ import com.pcloud.channelcenter.catalog.service.BookQrCatalogService;
 import com.pcloud.channelcenter.qrcode.dto.BookDto;
 import com.pcloud.channelcenter.qrcode.dto.BookSceneIdListDTO;
 import com.pcloud.channelcenter.qrcode.dto.GroupQrcodeVO;
+import com.pcloud.channelcenter.qrcode.dto.MapResourceCountDTO;
 import com.pcloud.channelcenter.qrcode.dto.OwnMessageDTO;
+import com.pcloud.channelcenter.qrcode.dto.QrcodeMessageDTO;
 import com.pcloud.channelcenter.qrcode.dto.QrcodeSceneDto;
 import com.pcloud.channelcenter.qrcode.entity.QrcodeScene;
 import com.pcloud.channelcenter.qrcode.entity.QrcodeTemp;
@@ -766,4 +768,15 @@ public class QrcodeSceneConsr {
 			LOGGER.error("【修改二维码是否符合一个资源直接跳转,<ERROR>.[qrcodeSceneService.updateQrcodeOneServeRule]:" + e.getMessage(), e);
 		}
 	}
+
+	@ParamLog("书刊资源数量二维码数量")
+    public Map<String, QrcodeMessageDTO> mapBookResourceCount(MapResourceCountDTO mapResourceCountDTO) {
+		try {
+			return ResponseHandleUtil.parseMapResponse(qrcodeSceneService.mapResourceCount(mapResourceCountDTO),String.class,QrcodeMessageDTO.class);
+
+		} catch (Exception e) {
+			LOGGER.error("调用qrcodeSceneService.mapResourceCount失败"+e.getMessage(),e);
+		}
+		return new HashMap<>();
+    }
 }

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

@@ -528,46 +528,26 @@
 				</if>
 			) a
 	</select>
-	
-	<!-- 获取书籍列表(编辑) -->
-	<select id="getListPage4Adviser" resultMap="bookMap" parameterType="map">
-		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, 
-			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, CONCAT('BK',A.BOOK_ID) uniqueNumber, if(G.ID IS NULL, 0, 1) isBookGroup, A.IS_PRINT isPrint,
-			G.id BOOK_GROUP_ID, G.group_qrcode_url groupQrcodeUrl,G.group_qrcode_name groupQrcodeName,A.is_approval, A.is_relate,
-			G.join_group_type,G.single_group singleGroup, G.related_book_group_id relatedBookGroupId,
-			IF(ISNULL(s.id),0,1) minimumSupport, A.is_open_catalog,a.CREATED_DATE
-		FROM
-			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
-		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_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
-		LEFT JOIN book_freeze f ON B.BOOK_ID = f.BOOK_ID
-		LEFT JOIN book_minimum_support s ON B.BOOK_ID=s.book_id AND s.end_time <![CDATA[ > ]]> NOW()  AND s.start_time <![CDATA[ < ]]> NOW()
-		WHERE
-			1=1
+
+	<sql id="getListPage4AdviserWhereSql">
 		<if test="bookId!=null">
-		AND
+			AND
 			A.BOOK_ID = #{bookId}
 		</if>
 		<if test="typeCode!=null">
-		AND
+			AND
 			B.TYPE_CODE = #{typeCode}
 		</if>
 		<if test="channelId!=null">
-		AND
+			AND
 			A.CHANNEL_ID = #{channelId}
 		</if>
 		<if test="bookName!=null">
-		AND
+			AND
 			B.BOOK_NAME LIKE CONCAT('%', #{bookName}, '%')
 		</if>
 		<if test="isbn!=null">
-		AND
+			AND
 			B.ISBN LIKE CONCAT(#{isbn},'%')
 		</if>
 		<if test="name != null">
@@ -585,13 +565,13 @@
 			)
 		</if>
 		<if test="isMainEditor != null">
-		  AND
+			AND
 			A.IS_MAIN_EDITOR = 1
 		</if>
 		<if test="isFundSupport != null">
 			AND (
-				BF.BOOK_FUND_ID IS NOT NULL
-				OR f.IS_FREEZE = 1
+			BF.BOOK_FUND_ID IS NOT NULL
+			OR f.IS_FREEZE = 1
 			)
 		</if>
 		<if test="minimumSupport != null">
@@ -602,7 +582,7 @@
 			A.TEMPLET_ID = #{templetId}
 		</if>
 		<if test="secondTempletIds!=null and secondTempletIds.size()>0">
-		AND
+			AND
 			A.SECOND_TEMPLET_ID in
 			<foreach collection="secondTempletIds" item="item" open="(" separator="," close=")">
 				${item}
@@ -616,7 +596,7 @@
 			</foreach>
 		</if>
 		<if test="isbns != null">
-		  AND
+			AND
 			B.ISBN <![CDATA[ <> ]]> ${isbns}
 		</if>
 		<if test="bookStatus != null">
@@ -664,14 +644,62 @@
 		<if test="openRaysCode != null and openRaysCode == 1">
 			AND A.open_rays_code = 1
 		</if>
+	</sql>
+	
+	<!-- 获取书籍列表(编辑) -->
+	<select id="getListPage4Adviser" resultMap="bookMap" parameterType="map">
+		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, 
+			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, CONCAT('BK',A.BOOK_ID) uniqueNumber, if(G.ID IS NULL, 0, 1) isBookGroup, A.IS_PRINT isPrint,
+			G.id BOOK_GROUP_ID, G.group_qrcode_url groupQrcodeUrl,G.group_qrcode_name groupQrcodeName,A.is_approval, A.is_relate,
+			G.join_group_type,G.single_group singleGroup, G.related_book_group_id relatedBookGroupId,
+			IF(ISNULL(s.id),0,1) minimumSupport, A.is_open_catalog,a.CREATED_DATE
+		FROM
+			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
+		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_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
+		LEFT JOIN book_freeze f ON B.BOOK_ID = f.BOOK_ID
+		LEFT JOIN book_minimum_support s ON B.BOOK_ID=s.book_id AND s.end_time <![CDATA[ > ]]> NOW()  AND s.start_time <![CDATA[ < ]]> NOW()
+		WHERE
+			1=1
+		<include refid="getListPage4AdviserWhereSql"/>
 		GROUP BY A.BOOK_ID, A.CHANNEL_ID
 		ORDER BY
 			LAST_MODIFIED_DATE DESC
-		<if test="num != null">
-			LIMIT ${num}
+		<if test="pageNum != null and numPerPage != null">
+			LIMIT #{pageNum}, #{numPerPage}
 		</if>
 	</select>
 
+	<select id="getListPage4AdviserCount" resultType="integer" parameterType="map">
+		SELECT
+		COUNT(1)
+		FROM
+		(
+		SELECT
+		A.BOOK_ID,
+		A.CHANNEL_ID
+		FROM
+		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
+		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_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
+		LEFT JOIN book_freeze f ON B.BOOK_ID = f.BOOK_ID
+		LEFT JOIN book_minimum_support s ON B.BOOK_ID=s.book_id AND s.end_time <![CDATA[ > ]]> NOW()  AND s.start_time <![CDATA[ < ]]> NOW()
+		WHERE
+		1=1
+		<include refid="getListPage4AdviserWhereSql"/>
+		GROUP BY A.BOOK_ID, A.CHANNEL_ID
+		) AS a
+	</select>
+
 	<select id="getListPage4AdviserAndAppoint" resultMap="bookMap" parameterType="map">
 		(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,
@@ -1592,7 +1620,7 @@
 		</if>
 		<if test="thirdTempletIds!=null and thirdTempletIds.size()>0">
 			AND
-			ba.third_TEMPLET_ID in
+			A.third_TEMPLET_ID in
 			<foreach collection="thirdTempletIds" item="item" open="(" separator="," close=")">
 				${item}
 			</foreach>