Commit 94f8c31b by 曾迫

1002692 扫码展示质检信息

parent 5c95810d
...@@ -13,9 +13,12 @@ import com.pcloud.book.book.dto.BookInfoAnalysicsDTO; ...@@ -13,9 +13,12 @@ import com.pcloud.book.book.dto.BookInfoAnalysicsDTO;
import com.pcloud.book.book.dto.BookInfoAndAuthStatusDTO; import com.pcloud.book.book.dto.BookInfoAndAuthStatusDTO;
import com.pcloud.book.book.entity.Book; import com.pcloud.book.book.entity.Book;
import com.pcloud.book.book.entity.BookLabel; import com.pcloud.book.book.entity.BookLabel;
import com.pcloud.book.book.vo.BookQualifyVO;
import com.pcloud.book.book.vo.BookSaleVO; import com.pcloud.book.book.vo.BookSaleVO;
import com.pcloud.book.book.vo.ListNoAuthBookParam; import com.pcloud.book.book.vo.ListNoAuthBookParam;
import com.pcloud.book.book.vo.ListNoAuthGroupBookParam; import com.pcloud.book.book.vo.ListNoAuthGroupBookParam;
import com.pcloud.book.book.vo.SearchBookVO;
import com.pcloud.book.book.vo.request.BookQualifyInfoVO;
import com.pcloud.common.exceptions.BizException; import com.pcloud.common.exceptions.BizException;
import com.pcloud.common.page.PageBean; import com.pcloud.common.page.PageBean;
import com.pcloud.common.page.PageBeanNew; import com.pcloud.common.page.PageBeanNew;
...@@ -634,4 +637,13 @@ public interface BookBiz { ...@@ -634,4 +637,13 @@ public interface BookBiz {
List<Long> getBookIdsByIsbn(String isbn); List<Long> getBookIdsByIsbn(String isbn);
BookDto getAdviserBook(Long bookId, Long adviserId, Long channelId); BookDto getAdviserBook(Long bookId, Long adviserId, Long channelId);
/**
* 批量更新质检书籍
*/
void updateBookQualifyInfo(BookQualifyInfoVO bookQualifyInfo, Long adviserId);
PageBeanNew<BookQualifyVO> getAddBookQualifyList(Integer currentPage, Integer numPerPage, String name,Integer isShowQualifyInfo);
SearchBookVO getBookInfoByBookGroupId(Long bookGroupId);
} }
...@@ -24,9 +24,12 @@ import com.pcloud.book.book.entity.BookAdviser; ...@@ -24,9 +24,12 @@ import com.pcloud.book.book.entity.BookAdviser;
import com.pcloud.book.book.entity.BookLabel; import com.pcloud.book.book.entity.BookLabel;
import com.pcloud.book.book.set.BookSet; import com.pcloud.book.book.set.BookSet;
import com.pcloud.book.book.tools.BookTools; import com.pcloud.book.book.tools.BookTools;
import com.pcloud.book.book.vo.BookQualifyVO;
import com.pcloud.book.book.vo.BookSaleVO; import com.pcloud.book.book.vo.BookSaleVO;
import com.pcloud.book.book.vo.ListNoAuthBookParam; import com.pcloud.book.book.vo.ListNoAuthBookParam;
import com.pcloud.book.book.vo.ListNoAuthGroupBookParam; import com.pcloud.book.book.vo.ListNoAuthGroupBookParam;
import com.pcloud.book.book.vo.SearchBookVO;
import com.pcloud.book.book.vo.request.BookQualifyInfoVO;
import com.pcloud.book.consumer.analysisengine.SceneRecordConsr; import com.pcloud.book.consumer.analysisengine.SceneRecordConsr;
import com.pcloud.book.consumer.app.AssistTempletConsr; import com.pcloud.book.consumer.app.AssistTempletConsr;
import com.pcloud.book.consumer.channel.QrcodeSceneConsr; import com.pcloud.book.consumer.channel.QrcodeSceneConsr;
...@@ -2071,4 +2074,45 @@ public class BookBizImpl implements BookBiz { ...@@ -2071,4 +2074,45 @@ public class BookBizImpl implements BookBiz {
public List<Long> getBookIdsByIsbn(String isbn) { public List<Long> getBookIdsByIsbn(String isbn) {
return bookDao.getBookIdsByIsbn(isbn); return bookDao.getBookIdsByIsbn(isbn);
} }
@Override
public void updateBookQualifyInfo(BookQualifyInfoVO bookQualifyInfo, Long adviserId) {
Map<String,Object> map=new HashMap<>();
map.put("bookIds",bookQualifyInfo.getBookIds());
map.put("adviserId",adviserId);
map.put("isShowQualifyInfo",bookQualifyInfo.getIsShowQualifyInfo());
bookDao.updateBookQualifyInfo(map);
}
@Override
public PageBeanNew<BookQualifyVO> getAddBookQualifyList(Integer currentPage, Integer numPerPage, String name, Integer isShowQualifyInfo) {
Map<String, Object> paramMap = new HashMap<>();
paramMap.put("isShowQualifyInfo", isShowQualifyInfo);
paramMap.put("name", name);
PageBeanNew<BookQualifyVO> pageBeanNew = bookDao.listPageNew(new PageParam(currentPage, numPerPage), paramMap, "getAddBookQualifyList");
if (null==pageBeanNew || ListUtils.isEmpty(pageBeanNew.getRecordList())){
return new PageBeanNew<>(currentPage,numPerPage,0,new ArrayList<>());
}
return pageBeanNew;
}
@Override
public SearchBookVO getBookInfoByBookGroupId(Long bookGroupId) {
Map<String, Object> paramMap = new HashMap<>();
paramMap.put("bookGroupId", bookGroupId);
SearchBookVO bookVO=bookDao.getBookInfoByBookGroupId(paramMap);
//通过agentId查找出版社名称
List<Long> agentIds=new ArrayList<>();
agentIds.add(bookVO.getAgentId());
Map<Long, String> names = agentConsr.getNames(agentIds);
String name = names.get(bookVO.getAgentId());
bookVO.setAgentName(name);
//通过编辑id查找编辑名称
List<Long> adviserIds=new ArrayList<>();
adviserIds.add(bookVO.getAdviserId());
Map<Long, String> map = adviserConsr.getNames(adviserIds);
String adviserName = map.get(bookVO.getAdviserId());
bookVO.setAdviserName(adviserName);
return bookVO;
}
} }
...@@ -8,6 +8,7 @@ import com.pcloud.book.book.dto.BookInfo4AnlysicsDTO; ...@@ -8,6 +8,7 @@ import com.pcloud.book.book.dto.BookInfo4AnlysicsDTO;
import com.pcloud.book.book.dto.BookInfoAnalysicsDTO; import com.pcloud.book.book.dto.BookInfoAnalysicsDTO;
import com.pcloud.book.book.entity.Book; import com.pcloud.book.book.entity.Book;
import com.pcloud.book.book.vo.BookSaleVO; import com.pcloud.book.book.vo.BookSaleVO;
import com.pcloud.book.book.vo.SearchBookVO;
import com.pcloud.common.core.dao.BaseDao; import com.pcloud.common.core.dao.BaseDao;
import java.util.List; import java.util.List;
...@@ -332,4 +333,8 @@ public interface BookDao extends BaseDao<Book> { ...@@ -332,4 +333,8 @@ public interface BookDao extends BaseDao<Book> {
BookDto getAdviserBookByName(String bookName); BookDto getAdviserBookByName(String bookName);
List<Long> getBookIdsByIsbn(String isbn); List<Long> getBookIdsByIsbn(String isbn);
void updateBookQualifyInfo(Map<String, Object> map);
SearchBookVO getBookInfoByBookGroupId(Map<String, Object> paramMap);
} }
...@@ -10,6 +10,7 @@ import com.pcloud.book.book.dto.BookInfo4AnlysicsDTO; ...@@ -10,6 +10,7 @@ import com.pcloud.book.book.dto.BookInfo4AnlysicsDTO;
import com.pcloud.book.book.dto.BookInfoAnalysicsDTO; import com.pcloud.book.book.dto.BookInfoAnalysicsDTO;
import com.pcloud.book.book.entity.Book; import com.pcloud.book.book.entity.Book;
import com.pcloud.book.book.vo.BookSaleVO; import com.pcloud.book.book.vo.BookSaleVO;
import com.pcloud.book.book.vo.SearchBookVO;
import com.pcloud.common.core.dao.BaseDaoImpl; import com.pcloud.common.core.dao.BaseDaoImpl;
import org.springframework.stereotype.Repository; import org.springframework.stereotype.Repository;
...@@ -333,4 +334,14 @@ public class BookDaoImpl extends BaseDaoImpl<Book> implements BookDao { ...@@ -333,4 +334,14 @@ public class BookDaoImpl extends BaseDaoImpl<Book> implements BookDao {
paramMap.put("isbn", isbn); paramMap.put("isbn", isbn);
return super.getSqlSession().selectOne(getStatement("getBookIdsByIsbn"),paramMap); return super.getSqlSession().selectOne(getStatement("getBookIdsByIsbn"),paramMap);
} }
@Override
public void updateBookQualifyInfo(Map<String, Object> map) {
super.getSqlSession().update(super.getStatement("updateBookQualifyInfo"), map);
}
@Override
public SearchBookVO getBookInfoByBookGroupId(Map<String, Object> paramMap) {
return super.getSqlSession().selectOne(super.getStatement("getBookInfoByBookGroupId"), paramMap);
}
} }
...@@ -9,6 +9,7 @@ import com.pcloud.book.book.dto.BookDto; ...@@ -9,6 +9,7 @@ import com.pcloud.book.book.dto.BookDto;
import com.pcloud.book.book.entity.Book; import com.pcloud.book.book.entity.Book;
import com.pcloud.book.book.vo.ListNoAuthBookParam; import com.pcloud.book.book.vo.ListNoAuthBookParam;
import com.pcloud.book.book.vo.ListNoAuthGroupBookParam; import com.pcloud.book.book.vo.ListNoAuthGroupBookParam;
import com.pcloud.book.book.vo.request.BookQualifyInfoVO;
import com.pcloud.common.dto.ResponseDto; import com.pcloud.common.dto.ResponseDto;
import com.pcloud.common.exceptions.BizException; import com.pcloud.common.exceptions.BizException;
import com.pcloud.common.page.PageBean; import com.pcloud.common.page.PageBean;
...@@ -720,4 +721,24 @@ public interface BookFacade { ...@@ -720,4 +721,24 @@ public interface BookFacade {
@RequestParam(value = "adviserId") Long adviserId, @RequestParam(value = "adviserId") Long adviserId,
@RequestParam(value = "channelId") Long channelId @RequestParam(value = "channelId") Long channelId
) throws BizException, PermissionException; ) throws BizException, PermissionException;
@ApiOperation(value = "批量更新质检书刊", httpMethod = "POST")
@RequestMapping(value = "updateBookQualifyInfo", method = RequestMethod.POST)
public ResponseDto<?> updateBookQualifyInfo(@RequestHeader("token") String token, @RequestBody BookQualifyInfoVO bookQualifyInfo ) throws PermissionException;
@ApiOperation(value = "查询添加书刊列表", httpMethod = "GET")
@GetMapping("getAddBookQualifyList")
ResponseDto<?> getAddBookQualifyList(
@RequestHeader("token") String token,
@RequestParam(value = "currentPage") @ApiParam("当前页数") Integer currentPage,
@RequestParam(value = "numPerPage") @ApiParam("每页条数") Integer numPerPage,
@RequestParam(value = "name", required = false) @ApiParam("图书名称、isbn") String name,
@RequestParam(value = "isShowQualifyInfo", required = false) Integer isShowQualifyInfo
) throws PermissionException, JsonParseException, BizException;
@ApiOperation(value = "码后根据bookGroupId查询本书信息", httpMethod = "GET")
@GetMapping("getBookInfoByBookGroupId")
public ResponseDto<?> getBookInfoByBookGroupId(
@RequestParam(value = "bookGroupId") Long bookGroupId
) throws PermissionException, JsonParseException, BizException;
} }
...@@ -11,8 +11,11 @@ import com.pcloud.book.book.dto.BookAssocCount; ...@@ -11,8 +11,11 @@ import com.pcloud.book.book.dto.BookAssocCount;
import com.pcloud.book.book.dto.BookDto; import com.pcloud.book.book.dto.BookDto;
import com.pcloud.book.book.entity.Book; import com.pcloud.book.book.entity.Book;
import com.pcloud.book.book.facade.BookFacade; import com.pcloud.book.book.facade.BookFacade;
import com.pcloud.book.book.vo.BookQualifyVO;
import com.pcloud.book.book.vo.ListNoAuthBookParam; import com.pcloud.book.book.vo.ListNoAuthBookParam;
import com.pcloud.book.book.vo.ListNoAuthGroupBookParam; import com.pcloud.book.book.vo.ListNoAuthGroupBookParam;
import com.pcloud.book.book.vo.SearchBookVO;
import com.pcloud.book.book.vo.request.BookQualifyInfoVO;
import com.pcloud.common.core.constant.SystemCode; import com.pcloud.common.core.constant.SystemCode;
import com.pcloud.common.dto.ResponseDto; import com.pcloud.common.dto.ResponseDto;
import com.pcloud.common.exceptions.BizException; import com.pcloud.common.exceptions.BizException;
...@@ -989,4 +992,45 @@ public class BookFacadeImpl implements BookFacade { ...@@ -989,4 +992,45 @@ public class BookFacadeImpl implements BookFacade {
) throws BizException, PermissionException { ) throws BizException, PermissionException {
return new ResponseDto<>(bookBiz.getAdviserBook(bookId,adviserId,channelId)); return new ResponseDto<>(bookBiz.getAdviserBook(bookId,adviserId,channelId));
} }
@ApiOperation("添加移除质检书刊")
@Override
@RequestMapping(value = "updateBookQualifyInfo", method = RequestMethod.POST)
public ResponseDto<?> updateBookQualifyInfo(@RequestHeader("token") String token, @RequestBody BookQualifyInfoVO bookQualifyInfo ) throws PermissionException {
Long adviserId = (Long) SessionUtil.getVlaue(token, SessionUtil.PARTY_ID);
bookBiz.updateBookQualifyInfo(bookQualifyInfo,adviserId);
return new ResponseDto<>();
}
//添加书刊时书籍查询 入参bookName isbn 查询更新后质检书刊 isShowQualifyInfo
@Override
@GetMapping("getAddBookQualifyList")
public ResponseDto<?> getAddBookQualifyList(
@RequestHeader("token") String token,
@RequestParam(value = "currentPage") Integer currentPage,
@RequestParam(value = "numPerPage") Integer numPerPage,
@RequestParam(value = "name", required = false) String name,
@RequestParam(value = "isShowQualifyInfo", required = false) Integer isShowQualifyInfo
) throws PermissionException, JsonParseException, BizException{
Long channelId = (Long) SessionUtil.getVlaue(token,SessionUtil.PARTY_ID);
PageBeanNew<BookQualifyVO> pageBean = bookBiz.getAddBookQualifyList(currentPage,numPerPage,name,isShowQualifyInfo);
return new ResponseDto<>(pageBean);
}
@Override
@GetMapping("getBookInfoByBookGroupId")
public ResponseDto<?> getBookInfoByBookGroupId(
@RequestParam(value = "bookGroupId", required = true) Long bookGroupId
) throws PermissionException, JsonParseException, BizException{
SearchBookVO bookVO= bookBiz.getBookInfoByBookGroupId(bookGroupId);
return new ResponseDto<>(bookVO);
}
} }
\ No newline at end of file
package com.pcloud.book.book.vo;
import com.pcloud.settlementcenter.record.dto.AgentBookIncomeDTO;
import io.swagger.annotations.ApiModel;
import lombok.Data;
@ApiModel("出版社书籍收益")
@Data
public class BookQualifyVO {
private Long bookId;
private Long bookGroupId;
private String bookName;
private String coverImg;
private String isbn;
private Integer resourceCount;
}
...@@ -17,6 +17,12 @@ public class SearchBookVO { ...@@ -17,6 +17,12 @@ public class SearchBookVO {
@ApiModelProperty("作者") @ApiModelProperty("作者")
private String author; private String author;
@ApiModelProperty("isbn")
private String isbn;
@ApiModelProperty("publish")
private String publish;
@ApiModelProperty("书id") @ApiModelProperty("书id")
private Long bookId; private Long bookId;
...@@ -37,6 +43,7 @@ public class SearchBookVO { ...@@ -37,6 +43,7 @@ public class SearchBookVO {
private Integer searchCount; private Integer searchCount;
private Long adviserId; private Long adviserId;
private String adviserName;
@ApiModelProperty("书id") @ApiModelProperty("书id")
private Long secondTempletId; private Long secondTempletId;
...@@ -45,6 +52,9 @@ public class SearchBookVO { ...@@ -45,6 +52,9 @@ public class SearchBookVO {
private String coverImg; private String coverImg;
@ApiModelProperty("是否展示质检信息0 否 1是")
private Integer isShowQualifyInfo;
} }
package com.pcloud.book.book.vo.request;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import com.pcloud.book.base.exception.BookBizException;
import com.pcloud.book.book.constant.BookConstant;
import com.pcloud.book.book.entity.KeywordWarehouse;
import com.pcloud.book.book.entity.KeywordWarehouseDetail;
import com.pcloud.book.book.vo.BookKeywordDetailVO;
import com.pcloud.book.book.vo.KeywordWearhouseLabelVO;
import com.pcloud.common.entity.BaseRequestVO;
import com.pcloud.common.utils.BeanUtils;
import com.pcloud.common.utils.string.StringUtil;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.ToString;
import org.springframework.util.CollectionUtils;
import java.util.Date;
import java.util.List;
import java.util.Map;
@EqualsAndHashCode(callSuper = true)
@Data
@ToString(callSuper = true)
@ApiModel
public class BookQualifyInfoVO extends BaseRequestVO {
private static final long serialVersionUID = -5581508584274149498L;
@ApiModelProperty("是否展示质检信息0 否 1是")
private Integer isShowQualifyInfo;
@ApiModelProperty("bookId列表")
private List<Long> bookIds;
}
...@@ -61,6 +61,7 @@ ...@@ -61,6 +61,7 @@
<result column="SUB_LABEL_ID" property="subLabelId" jdbcType="BIGINT" /> <result column="SUB_LABEL_ID" property="subLabelId" jdbcType="BIGINT" />
<result column="VER_LABEL_ID" property="verLabelId" jdbcType="BIGINT" /> <result column="VER_LABEL_ID" property="verLabelId" jdbcType="BIGINT" />
<result column="AREA_LABEL_ID" property="areaLabelId" jdbcType="BIGINT" /> <result column="AREA_LABEL_ID" property="areaLabelId" jdbcType="BIGINT" />
<result column="is_show_qualify_info" property="isShowQualifyInfo" jdbcType="INTEGER" />
<result column="pro_label_id" property="proLabelId" jdbcType="BIGINT"/> <result column="pro_label_id" property="proLabelId" jdbcType="BIGINT"/>
<result column="dep_label_id" property="depLabelId" jdbcType="BIGINT"/> <result column="dep_label_id" property="depLabelId" jdbcType="BIGINT"/>
<result column="pur_label_id" property="purLabelId" jdbcType="BIGINT"/> <result column="pur_label_id" property="purLabelId" jdbcType="BIGINT"/>
...@@ -1509,6 +1510,22 @@ ...@@ -1509,6 +1510,22 @@
UPDATE BOOK SET LAST_MODIFIED_DATE = NOW() WHERE BOOK_ID = #{bookId, jdbcType=BIGINT} UPDATE BOOK SET LAST_MODIFIED_DATE = NOW() WHERE BOOK_ID = #{bookId, jdbcType=BIGINT}
</update> </update>
<update id="updateBookQualifyInfo" parameterType="map">
UPDATE BOOK SET LAST_MODIFIED_DATE = NOW() ,
<if test="adviserId != null">
LAST_MODIFIED_USER = #{adviserId, jdbcType=BIGINT},
</if>
<if test="isShowQualifyInfo != null">
is_show_qualify_info = #{isShowQualifyInfo}
</if>
<if test="bookIds != null">
where BOOK_ID in
<foreach collection="bookIds" item="item" open="(" separator="," close=")">
#{item}
</foreach>
</if>
</update>
<update id="updateTimeByIds" parameterType="map"> <update id="updateTimeByIds" parameterType="map">
UPDATE BOOK_ADVISER SET LAST_MODIFIED_DATE = NOW() WHERE UPDATE BOOK_ADVISER SET LAST_MODIFIED_DATE = NOW() WHERE
ADVISER_ID = #{adviserId} ADVISER_ID = #{adviserId}
...@@ -2186,4 +2203,35 @@ ...@@ -2186,4 +2203,35 @@
from BOOK from BOOK
where isbn like concat('%', #{isbn},'%') where isbn like concat('%', #{isbn},'%')
</select> </select>
<select id="getAddBookQualifyList" resultType="com.pcloud.book.book.vo.BookQualifyVO" parameterType="map">
select a.BOOK_ID bookId,a.COVER_IMG coverImg,a.BOOK_NAME bookName,a.ISBN isbn,b.id bookGroupId ,d.resourceCount from book a
LEFT JOIN book_group b on a.book_id=b.book_id
LEFT JOIN (select book_group_id as bookGroupId,COUNT(1) as resourceCount from book_group_serve GROUP BY book_group_id ) d on b.id=d.bookGroupId
where a.IS_DELETE=0
and b.is_delete=0
AND b.join_group_type =4
<if test="name != null">
AND (a.BOOK_NAME LIKE CONCAT('%',#{name},'%') OR a.ISBN LIKE CONCAT(#{name},'%'))
</if>
<if test="isShowQualifyInfo!=null">
AND A.is_show_qualify_info =#{isShowQualifyInfo}
</if>
ORDER BY
A.LAST_MODIFIED_DATE DESC
</select>
<select id="getBookInfoByBookGroupId" parameterType="map" resultType="com.pcloud.book.book.vo.SearchBookVO">
select a.id bookGroupId,b.book_id bookId ,b.book_name bookName,b.publish ,
b.author,b.COVER_IMG coverImg,b.isbn,b.is_show_qualify_info isShowQualifyInfo,c.ADVISER_ID adviserId,a.agent_id agentId
from book_group a
LEFT JOIN book b on a.book_id=b.book_id
left join book_adviser c on a.book_id=c.book_id
where
b.is_delete=0
and c.is_delete=0
and a.id=#{bookGroupId}
AND a.join_group_type in =4
limit 1
</select>
</mapper> </mapper>
\ No newline at end of file
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