Merge branch 'feature/1003434' into 'master'

feat: [1003434] 图书全局ID

See merge request rays/pcloud-book!901

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

@@ -683,6 +683,19 @@ public class BookDto extends BaseDto {
      */
     private BookGroupDTO relatedBookGroup;
 
+    /**
+     * 全局唯一id
+     */
+    private String bookUniqueNumber;
+
+    public String getBookUniqueNumber() {
+        return bookUniqueNumber;
+    }
+
+    public void setBookUniqueNumber(String bookUniqueNumber) {
+        this.bookUniqueNumber = bookUniqueNumber;
+    }
+
     public BookGroupDTO getRelatedBookGroup() {
         return relatedBookGroup;
     }

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

+package com.pcloud.book.book.dto;
+
+import lombok.Data;
+
+/**
+ * 书刊全局唯一id关联
+ */
+@Data
+public class BookUniqueNumberDTO {
+
+   private Long bookId;
+
+   private String uniqueNumber;
+}

pcloud-facade-book/src/main/java/com/pcloud/book/book/entity/Book.java

@@ -241,6 +241,19 @@ public class Book extends BaseEntity {
      */
     private Long volLabelId;
 
+    /**
+     * 全局唯一id
+     */
+    private String uniqueNumber;
+
+    public String getUniqueNumber() {
+        return uniqueNumber;
+    }
+
+    public void setUniqueNumber(String uniqueNumber) {
+        this.uniqueNumber = uniqueNumber;
+    }
+
     public Long getVolLabelId() {
         return volLabelId;
     }

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

@@ -20,6 +20,7 @@ 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.book.vo.request.BookSearchParamVO;
+import com.pcloud.book.book.dto.BookUniqueNumberDTO;
 import com.pcloud.book.book.vo.request.UpdateBookRobotProcessDto;
 import com.pcloud.common.exceptions.BizException;
 import com.pcloud.common.page.PageBean;
@@ -665,4 +666,6 @@ public interface BookBiz {
 	PageBeanNew<BookDto> getAdviserBooks4Applet(BookSearchParamVO bookSearchParamVO);
 
     Map<Integer,List<BookLabel>> getBookLabels4Erp();
+
+	void relateUniqueNumber4Erp(List<BookUniqueNumberDTO> bookUniqueNumberVos);
 }

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

@@ -55,6 +55,7 @@ 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.book.vo.request.BookSearchParamVO;
+import com.pcloud.book.book.dto.BookUniqueNumberDTO;
 import com.pcloud.book.book.vo.request.UpdateBookRobotProcessDto;
 import com.pcloud.book.consumer.analysisengine.SceneRecordConsr;
 import com.pcloud.book.consumer.app.AssistTempletConsr;
@@ -2422,4 +2423,13 @@ public class BookBizImpl implements BookBiz {
         }
         return map;
     }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void relateUniqueNumber4Erp(List<BookUniqueNumberDTO> bookUniqueNumberVos) {
+        if(ListUtils.isEmpty(bookUniqueNumberVos)){
+            return;
+        }
+        bookDao.relateUniqueNumber4Erp(bookUniqueNumberVos);
+    }
 }

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

@@ -10,6 +10,7 @@ import com.pcloud.book.book.dto.BookInfoAnalysicsDTO;
 import com.pcloud.book.book.entity.Book;
 import com.pcloud.book.book.vo.BookSaleVO;
 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;
 
@@ -353,4 +354,6 @@ public interface BookDao extends BaseDao<Book> {
 	BookDto getBookByName(String bookName);
 
 	List<AdviserBookInfoDTO> getBookAdviserInfos(List<Long> bookIds);
+
+    void relateUniqueNumber4Erp(List<BookUniqueNumberDTO> bookUniqueNumberVos);
 }

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

@@ -12,6 +12,7 @@ import com.pcloud.book.book.dto.BookInfoAnalysicsDTO;
 import com.pcloud.book.book.entity.Book;
 import com.pcloud.book.book.vo.BookSaleVO;
 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 org.springframework.stereotype.Repository;
@@ -391,4 +392,11 @@ public class BookDaoImpl extends BaseDaoImpl<Book> implements BookDao {
         paramMap.put("bookIds", bookIds);
         return super.getSqlSession().selectList(getStatement("getBookAdviserInfos"),paramMap);
     }
+
+    @Override
+    public void relateUniqueNumber4Erp(List<BookUniqueNumberDTO> bookUniqueNumberVos) {
+        Map<String, Object> paramMap = Maps.newHashMap();
+        paramMap.put("bookUniqueNumberVos", bookUniqueNumberVos);
+        super.getSqlSession().update(getStatement("relateUniqueNumber4Erp"),paramMap);
+    }
 }

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

@@ -11,6 +11,7 @@ import com.pcloud.book.book.vo.ListNoAuthBookParam;
 import com.pcloud.book.book.vo.ListNoAuthGroupBookParam;
 import com.pcloud.book.book.vo.request.BookQualifyInfoVO;
 import com.pcloud.book.book.vo.request.BookSearchParamVO;
+import com.pcloud.book.book.dto.BookUniqueNumberDTO;
 import com.pcloud.book.book.vo.request.UpdateBookRobotProcessDto;
 import com.pcloud.common.dto.ResponseDto;
 import com.pcloud.common.exceptions.BizException;
@@ -770,4 +771,10 @@ public interface BookFacade {
     public ResponseDto<Map<Long, String>> getLabelMapByIds(
             @RequestBody List<Long> labelIds
     ) throws BizException;
+
+    @ApiOperation("erp关联书刊全局唯一id")
+    @RequestMapping(value = "/relateUniqueNumber4Erp", method = RequestMethod.POST)
+    public ResponseDto<?> relateUniqueNumber4Erp(
+            @RequestBody List<BookUniqueNumberDTO> bookUniqueNumberVos
+    ) throws BizException;
 }

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

@@ -19,6 +19,7 @@ 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.book.vo.request.BookSearchParamVO;
+import com.pcloud.book.book.dto.BookUniqueNumberDTO;
 import com.pcloud.book.book.vo.request.UpdateBookRobotProcessDto;
 import com.pcloud.common.core.constant.SystemCode;
 import com.pcloud.common.dto.ResponseDto;
@@ -1107,4 +1108,11 @@ public class BookFacadeImpl implements BookFacade {
         }
         return new ResponseDto<>(bookLabelBiz.getLabelMapByIds(labelIds));
     }
+
+    @Override
+    @RequestMapping(value = "/relateUniqueNumber4Erp", method = RequestMethod.POST)
+    public ResponseDto<?> relateUniqueNumber4Erp(@RequestBody List<BookUniqueNumberDTO> bookUniqueNumberVos) throws BizException {
+        bookBiz.relateUniqueNumber4Erp(bookUniqueNumberVos);
+        return new ResponseDto<>();
+    }
 }
\ No newline at end of file

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

@@ -67,6 +67,7 @@
 		<result column="pur_label_id" property="purLabelId" jdbcType="BIGINT"/>
 		<result column="is_open_robot_process" property="isOpenRobotProcess" jdbcType="INTEGER" />
 		<result column="vol_label_id" property="volLabelId" jdbcType="BIGINT" />
+		<result column="unique_number" property="bookUniqueNumber" jdbcType="VARCHAR" />
 	</resultMap>
 	
 	<resultMap id="bookListPageMap" type="bookDto" extends ="bookMap">
@@ -298,7 +299,7 @@
 	   		IF(ISNULL(BF.BOOK_FUND_ID),0,1) IS_FUND_SUPPORT,START_TIME,END_TIME,BA.TEMPLET_ID,BA.SECOND_TEMPLET_ID,
 			BA.GRA_LABEL_ID,BA.SUB_LABEL_ID,BA.VER_LABEL_ID,BA.AREA_LABEL_ID, BA.IS_PRINT isPrint,
 			BA.pro_label_id, BA.dep_label_id,BA.pur_label_id,BA.vol_label_id,if(G.ID IS NULL, 0, 1) isBookGroup, G.id BOOK_GROUP_ID,G.join_group_type,
-			BA.is_open_robot_process,BA.vol_label_id
+			BA.is_open_robot_process,BA.vol_label_id,b.unique_number
 		FROM
 			BOOK_ADVISER BA	
 		INNER JOIN 
@@ -315,7 +316,7 @@
 	<!-- 批量获取书籍信息 -->
 	<select id="getMapByIds" resultMap="bookMap" parameterType="list">
 		SELECT 
-			BOOK_ID, ISBN, ISSN, BOOK_NAME, REMARK, AUTHOR, PUBLISH, PUBLISH_DATE, COVER_IMG,AD_IMG,ORIGIN_NAME,BOOK_PRICE,TYPE_CODE,SERIAL_NUMBER,CREATED_DATE
+			BOOK_ID, ISBN, ISSN, BOOK_NAME, REMARK, AUTHOR, PUBLISH, PUBLISH_DATE, COVER_IMG,AD_IMG,ORIGIN_NAME,BOOK_PRICE,TYPE_CODE,SERIAL_NUMBER,CREATED_DATE,unique_number
 		FROM 
 			BOOK
 		WHERE
@@ -328,7 +329,7 @@
 	<!-- 批量获取书籍信息（书名 与书刊序号 封面图） -->
 	<select id="listBaseMapByIds" resultMap="bookMap" parameterType="list">
 		SELECT 
-			BOOK_ID, ISBN,BOOK_NAME, COVER_IMG,SERIAL_NUMBER
+			BOOK_ID, ISBN,BOOK_NAME, COVER_IMG,SERIAL_NUMBER,unique_number
 		FROM 
 			BOOK
 		WHERE
@@ -2455,4 +2456,14 @@
 	ORDER BY
 	A.LAST_MODIFIED_DATE DESC
 	</select>
+
+	<update id="relateUniqueNumber4Erp" parameterType="map">
+		<foreach collection="bookUniqueNumberVos" item="item" separator=";">
+			update book
+			set
+            unique_number = #{item.uniqueNumber},
+			LAST_MODIFIED_DATE =  NOW()
+			where book_id = #{item.bookId}
+		</foreach>
+	</update>
 </mapper>
\ No newline at end of file