Skip to content

M
midjourney-proxy
Commit 57536923 by daixing
Options

Merge branch 'master' of ssh://begitlab.chubanyun.me:12122/rays/pcloud-book into dx

parents 60c5c49b 9140f530
Showing with 66 additions and 83 deletions
pcloud-service-book/src/main/java/com/pcloud/book/book/biz/BookBiz.java
......@@ -492,7 +492,7 @@ public interface BookBiz {
* @return
* @throws BizException
*/
PageBean getBookBaseInfoListByChannelId4Adviser(Long partyId,Long channelId,PageParam pageParam) throws BizException;
PageBean getBookBaseInfoListByChannelId4Adviser(Long partyId,Long channelId,PageParam pageParam, String name) throws BizException;
/**
* 修改时间
......
pcloud-service-book/src/main/java/com/pcloud/book/book/biz/impl/BookBizImpl.java
......@@ -1507,10 +1507,11 @@ public class BookBizImpl implements BookBiz {
*/
@ParamLog(description = "根据渠道ID分页获取图书列表")
@Override
public PageBean getBookBaseInfoListByChannelId4Adviser(Long partyId, Long channelId, PageParam pageParam) throws BizException {
public PageBean getBookBaseInfoListByChannelId4Adviser(Long partyId, Long channelId, PageParam pageParam, String name) throws BizException {
Map<String, Object> paramMap = Maps.newHashMap();
paramMap.put("adviserId", partyId);
paramMap.put("channelId", channelId);
paramMap.put("name", name);
/*paramMap.put("typeCode",BookTypeEnum.BOOK.value);*/
PageBean pageBean = bookDao.listPage(pageParam, paramMap, "getListPage4Adviser");
if (null == pageBean || ListUtils.isEmpty(pageBean.getRecordList())) {
......
pcloud-service-book/src/main/java/com/pcloud/book/book/facade/BookFacade.java
......@@ -12,16 +12,24 @@ import com.pcloud.common.exceptions.BizException;
import com.pcloud.common.page.PageBean;
import com.pcloud.common.page.PageBeanNew;
import com.pcloud.common.permission.PermissionException;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import org.codehaus.jackson.JsonParseException;
import org.springframework.cloud.netflix.feign.FeignClient;
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.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 java.util.List;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
/**
* @描述：书籍接口
* @作者：songx
......@@ -537,12 +545,14 @@ public interface BookFacade {
@ApiImplicitParams({@ApiImplicitParam(name = "token", value = "token", dataType = "String", paramType = "header"),
@ApiImplicitParam(name = "channelId", value = "渠道标识", dataType = "Long", paramType = "query"),
@ApiImplicitParam(name = "currentPage", value = "当前页数", dataType = "int", paramType = "query"),
@ApiImplicitParam(name = "numPerPage", value = "每页条数", dataType = "int", paramType = "query")})
@ApiImplicitParam(name = "numPerPage", value = "每页条数", dataType = "int", paramType = "query"),
@ApiImplicitParam(name = "name", value = "图书名称、isbn", dataType = "string", paramType = "query")
})
@GetMapping("getBookListByChannelId4Adviser")
ResponseDto<PageBean> getBookListByChannelId4Adviser(@RequestHeader("token") String token, @RequestParam(value =
"currentPage") Integer currentPage, @RequestParam(value = "numPerPage")
Integer numPerPage, @RequestParam(value = "channelId") Long channelId) throws
PermissionException, JsonParseException, BizException;
ResponseDto<PageBean> getBookListByChannelId4Adviser(
@RequestHeader("token") String token, @RequestParam(value = "currentPage") Integer currentPage,
@RequestParam(value = "numPerPage") Integer numPerPage, @RequestParam(value = "channelId") Long channelId,
@RequestParam(value = "name", required = false) String name) throws PermissionException, JsonParseException, BizException;
@RequestMapping(value = "listNoAuthBook", method = RequestMethod.POST)
@ApiOperation(value = "获取未设置正版授权的图书", httpMethod = "POST")
......
pcloud-service-book/src/main/java/com/pcloud/book/book/facade/impl/BookFacadeImpl.java
......@@ -715,10 +715,11 @@ public class BookFacadeImpl implements BookFacade {
public ResponseDto<PageBean> getBookListByChannelId4Adviser(@RequestHeader("token") String token,
@RequestParam(value = "currentPage") Integer currentPage,
@RequestParam(value = "numPerPage") Integer numPerPage,
@RequestParam(value = "channelId") Long channelId) throws PermissionException, BizException {
@RequestParam(value = "channelId") Long channelId,
@RequestParam(value = "name", required = false) String name) throws PermissionException, BizException {
Long partyId = (Long) SessionUtil.getVlaue(token, SessionUtil.PARTY_ID);
PageParam pageParam = new PageParam(currentPage, numPerPage);
return new ResponseDto<>(bookBiz.getBookBaseInfoListByChannelId4Adviser(partyId, channelId, pageParam));
return new ResponseDto<>(bookBiz.getBookBaseInfoListByChannelId4Adviser(partyId, channelId, pageParam, name));
}
@RequestMapping(value = "listPage4PC", method = RequestMethod.GET)
......
pcloud-service-book/src/main/resources/mapper/book/Book.Mapper.xml
......@@ -784,58 +784,43 @@
<!-- 获取书籍列表(平台) -->
<select id="listBook4Platform" resultMap="bookMap" parameterType="map">
SELECT
a.BOOK_ID,
a.CHANNEL_ID,
a.ADVISER_ID,
a.IS_MAIN_EDITOR,
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,
a.TEMPLET_ID,
a.CREATED_DATE,
a.LAST_MODIFIED_DATE,
a.BOOK_ADVISER_ID,
IF (t.id IS NOT NULL, 1, 0) isSelect
FROM
BOOK_ADVISER a
INNER JOIN BOOK b ON a.BOOK_ID = b.BOOK_ID
AND a.IS_DELETE = 0
AND b.IS_DELETE = 0
<if test="bookGroupOnly != null and bookGroupOnly == 1">
INNER 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
</if>
LEFT JOIN (
SELECT
db.id,
db.ad_id,
db.book_id,
db.adviser_id,
db.channel_id
FROM
advertising_distribution_book db
INNER JOIN advertising_space s ON db.ad_id = s.id
AND s.is_open = 1
) t ON t.adviser_id = a.ADVISER_ID
AND t.channel_id = a.CHANNEL_ID
AND t.book_id = a.BOOK_ID
SELECT
a.BOOK_ID,
a.CHANNEL_ID,
a.ADVISER_ID,
a.IS_MAIN_EDITOR,
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,
a.TEMPLET_ID,
a.CREATED_DATE,
a.LAST_MODIFIED_DATE,
a.BOOK_ADVISER_ID
FROM
BOOK_ADVISER a
INNER JOIN BOOK b ON a.BOOK_ID = b.BOOK_ID
AND a.IS_DELETE = 0
AND b.IS_DELETE = 0
<if test="bookGroupOnly != null and bookGroupOnly == 1">
INNER 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
</if>
LEFT JOIN advertising_adviser_permission adp ON a.BOOK_ID = adp.book_id
AND a.ADVISER_ID = adp.adviser_id
AND a.CHANNEL_ID = adp.channel_id
WHERE
a.IS_MAIN_EDITOR = 1
WHERE
a.IS_MAIN_EDITOR = 1
AND (
adp.is_open IS NULL
OR adp.is_open = 1
......
pcloud-service-book/src/main/resources/mapper/group/BookGroupClassify.Mapper.xml
......@@ -420,7 +420,6 @@
c.classify,
c.book_group_id bookGroupId,
g.group_name groupQrcodeName,
IF (t.id IS NOT NULL, 1, 0) isSelect,
bg.dep_label_id depLabelId,
bg.pro_label_id proLabelId,
bg.pur_label_id purLabelId
......@@ -431,24 +430,6 @@
AND g.is_delete = 0
LEFT JOIN book b ON c.book_id = b.book_id
LEFT JOIN book_group bg ON c.book_group_id = bg.id
LEFT JOIN (
SELECT
db.id,
db.ad_id,
db.book_id,
db.adviser_id,
db.channel_id,
db.classify_id,
db.qrcode_id
FROM
advertising_distribution_book db
INNER JOIN advertising_space s ON db.ad_id = s.id
AND s.is_open = 1
) t ON t.adviser_id = c.create_user
AND t.book_id = c.book_id
AND t.channel_id = c.channel_id
AND t.classify_id = c.id
AND t.qrcode_id = g.id
WHERE
1 = 1
<if test="name != null">
......
pcloud-service-book/src/main/resources/mapper/group/BookGroupMapper.xml
......@@ -79,7 +79,8 @@
select
<include refid="Base_Column_List"/>
from book_group
where book_id = #{bookId,jdbcType=BIGINT}
where is_delete = 0
and book_id = #{bookId,jdbcType=BIGINT}
and channel_id = #{channelId,jdbcType=BIGINT}
and create_user = #{adviserId,jdbcType=BIGINT}
</select>
......
pcloud-service-book/src/main/resources/mapper/group/GroupQrcode.Mapper.xml
......@@ -465,8 +465,12 @@
book_group_qrcode t
INNER JOIN book_group_classify t1 ON t.classify_id = t1.id
INNER JOIN book t2 ON t1.book_id = t2.BOOK_ID
INNER JOIN book_group bg ON t1.book_id = bg.book_id
WHERE
t1.create_user = #{adviserId}
AND t.is_delete = 0
AND t1.is_delete = 0
AND bg.is_delete = 0
<if test="name != null">
AND (
t2.BOOK_NAME LIKE CONCAT('%', #{name}, '%')
......
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