rename to fix ibatis TypeException

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

@@ -7,8 +7,8 @@ import com.pcloud.book.book.dto.BookFundDto;
 import com.pcloud.book.book.dto.BookTypeDto;
 import com.pcloud.book.consumer.book.elasticsearch.BookElasticSearchConsr;
 import com.pcloud.book.consumer.user.PartyConsr;
-import com.pcloud.book.elasticsearch7.entity.EsBook;
-import com.pcloud.book.elasticsearch7.entity.EsBookFreeze;
+import com.pcloud.book.elasticsearch7.entity.Es7Book;
+import com.pcloud.book.elasticsearch7.entity.Es7BookFreeze;
 import com.pcloud.book.elasticsearch7.search.domain.dto.param.PlatformSearchDto;
 import com.pcloud.book.util.common.Converter;
 import com.pcloud.common.core.constant.SystemCode;
@@ -37,7 +37,7 @@ public class BookElasticSearchBizImpl {
 
     public PageBeanNew<BookDto> getListPage(PlatformSearchDto dto) throws BizException {
 
-        Pagination<EsBook> esResult = bookElasticSearchConsr.search(dto);
+        Pagination<Es7Book> esResult = bookElasticSearchConsr.search(dto);
 
         List<BookDto> bookList = new ArrayList<>();
 
@@ -57,13 +57,13 @@ public class BookElasticSearchBizImpl {
         return result;
     }
 
-    private BookDto doBookProcess(EsBook esBook, Map<Long, String> pcloudUserMap, Map<String, BookTypeDto> typeCodeMap) {
+    private BookDto doBookProcess(Es7Book esBook, Map<Long, String> pcloudUserMap, Map<String, BookTypeDto> typeCodeMap) {
         BookDto bookDto = Converter.convert(esBook);
 
         Integer freezeStatus = BookFreezeEnum.WAIT_FREEZE.value;
         boolean isFundSupport = false;
 
-        EsBookFreeze bf = findOneByOrderFreezetime(esBook.getBookFreezeList());
+        Es7BookFreeze bf = findOneByOrderFreezetime(esBook.getBookFreezeList());
         String transferor = bf == null ? null : bf.getTransferor();
 
         if (CollectionUtils.isNotEmpty(bookDto.getBookFunds())) {
@@ -105,17 +105,17 @@ public class BookElasticSearchBizImpl {
         return bookDto;
     }
 
-    private EsBookFreeze findOneByOrderFreezetime(List<EsBookFreeze> fs) {
+    private Es7BookFreeze findOneByOrderFreezetime(List<Es7BookFreeze> fs) {
         if (CollectionUtils.isEmpty(fs)) {
             return null;
         }
 
-        fs.sort(Comparator.comparing(EsBookFreeze::getFreezetime).reversed());
+        fs.sort(Comparator.comparing(Es7BookFreeze::getFreezetime).reversed());
 
         return fs.get(0);
     }
 
-    private EsBookFreeze findFreezedRecord(List<EsBookFreeze> fs) {
+    private Es7BookFreeze findFreezedRecord(List<Es7BookFreeze> fs) {
         if (CollectionUtils.isEmpty(fs)) {
             return null;
         }

pcloud-service-book/src/main/java/com/pcloud/book/consumer/book/elasticsearch/BookElasticSearchConsr.java

 package com.pcloud.book.consumer.book.elasticsearch;
 
-import com.pcloud.book.consumer.reader.ReaderConsr;
-import com.pcloud.book.elasticsearch7.entity.EsBook;
+import com.pcloud.book.elasticsearch7.entity.Es7Book;
 import com.pcloud.book.elasticsearch7.search.domain.dto.param.PlatformSearchDto;
 import com.pcloud.book.elasticsearch7.search.facade.PlatformBookSearchFacade;
 import com.pcloud.common.dto.ResponseDto;
@@ -25,9 +24,9 @@ public class BookElasticSearchConsr {
     @Autowired
     private PlatformBookSearchFacade platformBookSearchFacade;
 
-    public Pagination<EsBook> search(PlatformSearchDto dto) {
+    public Pagination<Es7Book> search(PlatformSearchDto dto) {
         try {
-            ResponseDto<Pagination<EsBook>> r = platformBookSearchFacade.search(dto);
+            ResponseDto<Pagination<Es7Book>> r = platformBookSearchFacade.search(dto);
             return r.getData();
         } catch (Exception e) {
             logger.error("platform book es search exception.", e);

pcloud-service-book/src/main/java/com/pcloud/book/util/common/Converter.java

@@ -2,8 +2,8 @@ package com.pcloud.book.util.common;
 
 import com.pcloud.book.book.dto.BookDto;
 import com.pcloud.book.book.dto.BookFundDto;
-import com.pcloud.book.elasticsearch7.entity.EsBook;
-import com.pcloud.book.elasticsearch7.entity.EsBookFund;
+import com.pcloud.book.elasticsearch7.entity.Es7Book;
+import com.pcloud.book.elasticsearch7.entity.Es7BookFund;
 import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.cglib.beans.BeanCopier;
 
@@ -15,10 +15,10 @@ public class Converter {
 
     private Converter() {}
 
-    private static final BeanCopier BOOK_COPIER = BeanCopier.create(EsBook.class, BookDto.class, false);
-    private static final BeanCopier FUND_COPIER = BeanCopier.create(EsBookFund.class, BookFundDto.class, false);
+    private static final BeanCopier BOOK_COPIER = BeanCopier.create(Es7Book.class, BookDto.class, false);
+    private static final BeanCopier FUND_COPIER = BeanCopier.create(Es7BookFund.class, BookFundDto.class, false);
 
-    public static BookDto convert(EsBook book) {
+    public static BookDto convert(Es7Book book) {
         if (book == null) {
             return null;
         }

pcloud-service-book/src/test/java/com.pcloud.book.test/PlatformBookSearchFacadeTest.java

@@ -2,7 +2,7 @@ package com.pcloud.book.test;
 
 import com.alibaba.fastjson.JSON;
 import com.pcloud.book.BookApplication;
-import com.pcloud.book.elasticsearch7.entity.EsBook;
+import com.pcloud.book.elasticsearch7.entity.Es7Book;
 import com.pcloud.book.elasticsearch7.search.domain.dto.param.PlatformSearchDto;
 import com.pcloud.book.elasticsearch7.search.facade.PlatformBookSearchFacade;
 import com.pcloud.common.dto.ResponseDto;
@@ -27,7 +27,7 @@ public class PlatformBookSearchFacadeTest {
         PlatformSearchDto dto = new PlatformSearchDto();
         dto.setFundName(" 上海基金");
 
-        ResponseDto<Pagination<EsBook>> r = platformBookSearchFacade.search(dto);
+        ResponseDto<Pagination<Es7Book>> r = platformBookSearchFacade.search(dto);
 
         log.info(JSON.toJSONString(r));
     }