Merge branch 'feature/mofang' into 'release'

Feature/mofang

See merge request rays/pcloud-book!1697

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

+/**
+ *
+ */
+package com.pcloud.book.book.dto;
+
+import com.pcloud.common.dto.BaseDto;
+
+import lombok.Data;
+
+/**
+ * 魔方书刊
+ */
+@Data
+public class MoFangBookDto extends BaseDto {
+
+    /**
+     *
+     */
+    private static final long serialVersionUID = -162839217433038629L;
+
+    /**
+     * 书籍标识
+     */
+    private Long bookId;
+
+    private String bookName;
+
+    /**
+     * 资源数量
+     */
+    private Integer resourceCount;
+
+    /**
+     * 跳转地址
+     */
+    private String jumpUrl;
+
+    /**
+     * 封面图
+     */
+    private String coverImg;
+}

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

@@ -837,4 +837,9 @@ public interface BookBiz {
 	 * @return
 	 */
 	BookDto getBookFromRedis(Long bookId);
+
+	/**
+	 * 查询魔方书刊
+	 */
+	PageBeanNew<MoFangBookDto> listMoFangBook(String keyWords,Integer currentPage,Integer numPerPage);
 }

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

@@ -81,6 +81,7 @@ import com.pcloud.book.book.dto.EditionAnalysisResultVO;
 import com.pcloud.book.book.dto.EditionAnalysisVO;
 import com.pcloud.book.book.dto.ErpBookApprovalDTO;
 import com.pcloud.book.book.dto.MapResourceTotalCountDTO;
+import com.pcloud.book.book.dto.MoFangBookDto;
 import com.pcloud.book.book.dto.ProjectOrderSheetDTO;
 import com.pcloud.book.book.dto.ProjectRelateVO;
 import com.pcloud.book.book.dto.ProjectUploaderDTO;
@@ -4777,4 +4778,12 @@ public class BookBizImpl implements BookBiz {
         }
         return bookDto;
     }
+
+    @Override
+    public PageBeanNew<MoFangBookDto> listMoFangBook(String keyWords, Integer currentPage, Integer numPerPage) {
+        Map<String, Object> paramMap = new HashMap<>();
+        paramMap.put("keyWords",keyWords);
+        PageBeanNew<MoFangBookDto> listPageNew = bookDao.listPageNew(new PageParam(currentPage, numPerPage), paramMap, "listMoFangBook");
+        return listPageNew;
+    }
 }

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

@@ -3,17 +3,28 @@
  */
 package com.pcloud.book.book.facade.impl;
 
-import cn.hutool.core.collection.CollUtil;
 import com.google.common.collect.Lists;
+
 import com.pcloud.book.base.exception.BookBizException;
 import com.pcloud.book.book.biz.BookBiz;
 import com.pcloud.book.book.biz.BookLabelBiz;
 import com.pcloud.book.book.biz.impl.BookElasticSearchBizImpl;
-import com.pcloud.book.book.dto.*;
+import com.pcloud.book.book.dto.AdviserBookInfoDTO;
+import com.pcloud.book.book.dto.BookAssocCount;
+import com.pcloud.book.book.dto.BookDto;
+import com.pcloud.book.book.dto.BookUniqueNumberDTO;
+import com.pcloud.book.book.dto.CreateBookVO;
+import com.pcloud.book.book.dto.MapResourceTotalCountDTO;
+import com.pcloud.book.book.dto.RelateAdviserVO;
 import com.pcloud.book.book.entity.Book;
 import com.pcloud.book.book.entity.SeriesBookRecord;
 import com.pcloud.book.book.facade.BookFacade;
-import com.pcloud.book.book.vo.*;
+import com.pcloud.book.book.vo.BookCountsVO;
+import com.pcloud.book.book.vo.BookInfo4ScanCount;
+import com.pcloud.book.book.vo.BookQualifyVO;
+import com.pcloud.book.book.vo.ListNoAuthBookParam;
+import com.pcloud.book.book.vo.ListNoAuthGroupBookParam;
+import com.pcloud.book.book.vo.SearchBookVO;
 import com.pcloud.book.book.vo.request.BookInfo4ScanCountRequestVO;
 import com.pcloud.book.book.vo.request.BookQualifyInfoVO;
 import com.pcloud.book.book.vo.request.BookSearchParamVO;
@@ -36,15 +47,31 @@ import com.pcloud.common.utils.cookie.Cookie;
 import com.pcloud.common.utils.nginx.NginxUtils;
 import com.pcloud.common.utils.string.StringUtil;
 import com.pcloud.wechatgroup.message.enums.IsSystem;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
+
 import org.codehaus.jackson.JsonParseException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.CookieValue;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestHeader;
+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 java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
 
 import javax.servlet.http.HttpServletRequest;
-import java.util.*;
+
+import cn.hutool.core.collection.CollUtil;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
 
 /**
  * @描述：书籍接口实现类
@@ -1516,4 +1543,15 @@ public class BookFacadeImpl implements BookFacade {
         return new ResponseDto<>(bookBiz.listBookCover(isbn,bookName,author,publish));
     }
 
+    /**
+     * 魔方书刊列表
+     */
+    @RequestMapping(value = "listMoFangBook", method = RequestMethod.GET)
+    public ResponseDto<?> listMoFangBook(@RequestParam(value = "keyWords", required = false) String keyWords,
+                                         @RequestParam(value = "currentPage", required = false) Integer currentPage,
+                                         @RequestParam(value = "numPerPage", required = false) Integer numPerPage)
+            throws BizException, PermissionException {
+        return new ResponseDto<>(bookBiz.listMoFangBook(keyWords, currentPage, numPerPage));
+    }
+
 }

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

@@ -3438,4 +3438,18 @@
 	ORDER BY
 	LAST_MODIFIED_DATE DESC
 	</select>
+
+	<select id="listMoFangBook" parameterType="map" resultType="com.pcloud.book.book.dto.MoFangBookDto">
+		select
+		a.book_id bookId,
+		a.resource_count resourceCount,
+		a.jump_url jumpUrl,
+		b.book_name bookName,
+		b.cover_img coverImg
+		from mofang_book a inner join book b on a.book_id=b.book_id
+		where 1=1
+		<if test="keyWords !=null and keyWords!=''">
+			and b.book_name like concat('%',#{keyWords},'%')
+		</if>
+	</select>
 </mapper>