feat:[none] 平台书刊查询删除切换开关

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

@@ -3,31 +3,11 @@
  */
 package com.pcloud.book.book.biz;
 
-import com.pcloud.book.book.dto.AdviserBookInfoDTO;
-import com.pcloud.book.book.dto.BookAdviserUpdateTimeDTO;
-import com.pcloud.book.book.dto.BookAssocCount;
-import com.pcloud.book.book.dto.BookDetialDTO;
-import com.pcloud.book.book.dto.BookDto;
-import com.pcloud.book.book.dto.BookInfo4AnlysicsDTO;
-import com.pcloud.book.book.dto.BookInfoAnalysicsDTO;
-import com.pcloud.book.book.dto.BookInfoAndAuthStatusDTO;
-import com.pcloud.book.book.dto.BookUniqueNumberDTO;
-import com.pcloud.book.book.dto.CreateBookResultVO;
-import com.pcloud.book.book.dto.CreateBookVO;
-import com.pcloud.book.book.dto.MapResourceTotalCountDTO;
-import com.pcloud.book.book.dto.EditionAnalysisResultVO;
-import com.pcloud.book.book.dto.QrcodeServeDto;
-import com.pcloud.book.book.dto.RelateAdviserVO;
+import com.pcloud.book.book.dto.*;
 import com.pcloud.book.book.entity.Book;
 import com.pcloud.book.book.entity.BookLabel;
 import com.pcloud.book.book.entity.SeriesBookRecord;
-import com.pcloud.book.book.vo.BookInfo4ScanCount;
-import com.pcloud.book.book.vo.BookLabelVO;
-import com.pcloud.book.book.vo.BookQualifyVO;
-import com.pcloud.book.book.vo.BookSaleVO;
-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.*;
 import com.pcloud.book.book.vo.request.BookInfo4ScanCountRequestVO;
 import com.pcloud.book.book.vo.request.BookQualifyInfoVO;
 import com.pcloud.book.book.vo.request.BookSearchParamVO;
@@ -194,31 +174,6 @@ public interface BookBiz {
 	Map<String,BookDto> listDetailByIds(BookDetialDTO bookDetialDTO)throws BizException;
 
 	/**
-	 * 获取书籍列表
-	 * 
-	 * @param isbn
-	 * @param bookName
-	 *            图书名称
-	 * @param publish
-	 *            出版社
-	 * @param fundName
-	 *            基金名称
-	 * @param serialNumber
-	 *            序列号
-	 * @param isCurrentMonth
-	 *            是否当前月
-	 * @param currentPage
-	 *            当前页
-	 * @param numPerPage
-	 *            每页条数
-	 * 
-	 * @return
-	 * @throws BizException
-	 */
-	PageBeanNew<BookDto> getListPage(String isbn, String bookName, String publish, String fundName, String serialNumber,
-			Integer isCurrentMonth, Integer currentPage, Integer numPerPage) throws BizException;
-
-	/**
 	 * 获取书籍列表(编辑)
 	 * 
 	 * @param paramMap

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

@@ -3,10 +3,11 @@
  */
 package com.pcloud.book.book.biz.impl;
 
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.date.DateUtil;
+import com.alibaba.fastjson.JSONObject;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
-
-import com.alibaba.fastjson.JSONObject;
 import com.pcloud.analysisengine.qrcode.dto.BookTimeSourceDto;
 import com.pcloud.appcenter.app.dto.AppDto;
 import com.pcloud.appcenter.assist.dto.AssistTempletDTO;
@@ -18,78 +19,18 @@ import com.pcloud.book.applet.dao.AnswerSubscribeDao;
 import com.pcloud.book.applet.entity.AnswerSubscribe;
 import com.pcloud.book.applet.entity.AppletUserLabelRelation;
 import com.pcloud.book.applet.enums.LabelTypeEnum;
-import com.pcloud.book.base.enums.BookFreezeEnum;
 import com.pcloud.book.base.enums.BookStatusEnum;
 import com.pcloud.book.base.enums.BookTypeEnum;
 import com.pcloud.book.base.exception.BookBizException;
-import com.pcloud.book.book.biz.BookAdviserBiz;
-import com.pcloud.book.book.biz.BookAdviserErpBiz;
-import com.pcloud.book.book.biz.BookAppBiz;
-import com.pcloud.book.book.biz.BookBiz;
-import com.pcloud.book.book.biz.BookFreezeBiz;
-import com.pcloud.book.book.biz.BookFundBiz;
-import com.pcloud.book.book.biz.BookLabelBiz;
-import com.pcloud.book.book.biz.BookProductBiz;
-import com.pcloud.book.book.biz.BookResourceBiz;
-import com.pcloud.book.book.biz.BookSerialNumberBiz;
+import com.pcloud.book.book.biz.*;
 import com.pcloud.book.book.cache.BookCache;
 import com.pcloud.book.book.constant.BookConstant;
-import com.pcloud.book.book.dao.BookAdviserDao;
-import com.pcloud.book.book.dao.BookDao;
-import com.pcloud.book.book.dao.BookEdtionDao;
-import com.pcloud.book.book.dao.BookLabelDao;
-import com.pcloud.book.book.dao.BookRaysClassifyDao;
-import com.pcloud.book.book.dao.BookTypeDao;
-import com.pcloud.book.book.dao.EdtionRecordDao;
-import com.pcloud.book.book.dao.QrcodeSceneErpDao;
-import com.pcloud.book.book.dao.SeriesBookDao;
-import com.pcloud.book.book.dao.SeriesBookRecordDao;
-import com.pcloud.book.book.dto.AdviserBookInfoDTO;
-import com.pcloud.book.book.dto.BookAdviserDto;
-import com.pcloud.book.book.dto.BookAdviserUpdateTimeDTO;
-import com.pcloud.book.book.dto.BookAssocCount;
-import com.pcloud.book.book.dto.BookCoverImgUpdateDTO;
-import com.pcloud.book.book.dto.BookDetialDTO;
-import com.pcloud.book.book.dto.BookDto;
-import com.pcloud.book.book.dto.BookFreezeDto;
-import com.pcloud.book.book.dto.BookFundDto;
-import com.pcloud.book.book.dto.BookInfo4AnlysicsDTO;
-import com.pcloud.book.book.dto.BookInfoAnalysicsDTO;
-import com.pcloud.book.book.dto.BookInfoAndAuthStatusDTO;
-import com.pcloud.book.book.dto.BookMinimumSupportDTO;
-import com.pcloud.book.book.dto.BookNameUpdateDTO;
-import com.pcloud.book.book.dto.BookTypeDto;
-import com.pcloud.book.book.dto.BookUniqueNumberDTO;
-import com.pcloud.book.book.dto.CreateBookResultVO;
-import com.pcloud.book.book.dto.CreateBookVO;
-import com.pcloud.book.book.dto.CreateQrcodeVO;
-import com.pcloud.book.book.dto.ErpBookApprovalDTO;
-import com.pcloud.book.book.dto.MapResourceTotalCountDTO;
-import com.pcloud.book.book.dto.EditionAnalysisListVO;
-import com.pcloud.book.book.dto.EditionAnalysisResultVO;
-import com.pcloud.book.book.dto.EditionAnalysisVO;
-import com.pcloud.book.book.dto.QrcodeServeDto;
-import com.pcloud.book.book.dto.RelateAdviserVO;
-import com.pcloud.book.book.entity.Book;
-import com.pcloud.book.book.entity.BookAdviser;
-import com.pcloud.book.book.entity.BookAdviserErp;
-import com.pcloud.book.book.entity.BookEdition;
-import com.pcloud.book.book.entity.BookLabel;
-import com.pcloud.book.book.entity.BookSerialNumber;
-import com.pcloud.book.book.entity.EditionRecord;
-import com.pcloud.book.book.entity.QrcodeSceneErp;
-import com.pcloud.book.book.entity.SeriesBook;
-import com.pcloud.book.book.entity.SeriesBookRecord;
+import com.pcloud.book.book.dao.*;
+import com.pcloud.book.book.dto.*;
+import com.pcloud.book.book.entity.*;
 import com.pcloud.book.book.set.BookSet;
 import com.pcloud.book.book.tools.BookTools;
-import com.pcloud.book.book.vo.BookInfo4ScanCount;
-import com.pcloud.book.book.vo.BookLabelVO;
-import com.pcloud.book.book.vo.BookQualifyVO;
-import com.pcloud.book.book.vo.BookResourceNumDTO;
-import com.pcloud.book.book.vo.BookSaleVO;
-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.*;
 import com.pcloud.book.book.vo.request.BookInfo4ScanCountRequestVO;
 import com.pcloud.book.book.vo.request.BookQualifyInfoVO;
 import com.pcloud.book.book.vo.request.BookSearchParamVO;
@@ -105,11 +46,7 @@ import com.pcloud.book.consumer.label.LabelConsr;
 import com.pcloud.book.consumer.message.MessageConsr;
 import com.pcloud.book.consumer.raystask.MainLineConsr;
 import com.pcloud.book.consumer.resource.ProductConsr;
-import com.pcloud.book.consumer.user.AdviserConsr;
-import com.pcloud.book.consumer.user.AgentConsr;
-import com.pcloud.book.consumer.user.ChannelConsr;
-import com.pcloud.book.consumer.user.MerchantConsr;
-import com.pcloud.book.consumer.user.PartyConsr;
+import com.pcloud.book.consumer.user.*;
 import com.pcloud.book.consumer.wechat.WechatConsr;
 import com.pcloud.book.copyright.biz.BookAuthInfoBiz;
 import com.pcloud.book.copyright.vo.BookAuthInfoVO;
@@ -128,7 +65,6 @@ import com.pcloud.book.group.enums.JoinGroupTypeEnum;
 import com.pcloud.book.mq.producer.BookMQProducer;
 import com.pcloud.book.rightsSetting.constants.RightsSettingConstant;
 import com.pcloud.book.rightsSetting.dao.RightsNowItemDao;
-import com.pcloud.book.rightsSetting.dao.RightsSettingItemDao;
 import com.pcloud.book.rightsSetting.mapper.RightsSettingBookRelationMapper;
 import com.pcloud.book.util.common.ThreadPoolUtils;
 import com.pcloud.book.util.common.YesOrNoEnums;
@@ -162,7 +98,6 @@ import com.pcloud.resourcecenter.product.dto.ProductDto;
 import com.pcloud.resourcecenter.product.dto.SpecificationDto;
 import com.pcloud.usercenter.party.adviser.dto.AdviserBaseInfoDto;
 import com.pcloud.usercenter.party.agent.dto.SaleAgentDTO;
-
 import org.apache.commons.collections.MapUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
@@ -178,17 +113,7 @@ import org.springframework.util.CollectionUtils;
 
 import java.io.IOException;
 import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Calendar;
-import java.util.Collections;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Optional;
-import java.util.Random;
+import java.util.*;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
@@ -197,9 +122,6 @@ import java.util.function.Function;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
-import cn.hutool.core.collection.CollUtil;
-import cn.hutool.core.date.DateUtil;
-
 /**
  * @描述：书籍业务层接口实现类
  * @作者：songx
@@ -878,86 +800,6 @@ public class BookBizImpl implements BookBiz {
         return bookMap;
     }
 
-    /**
-     * 获取书籍列表
-     */
-    @Override
-    public PageBeanNew<BookDto> getListPage(String isbn, String bookName, String publish, String fundName,
-            String serialNumber, Integer isCurrentMonth, Integer currentPage, Integer numPerPage) throws BizException {
-        Map<String, Object> paramMap = new HashMap<>();
-        paramMap.put("isbn", isbn != null && "".equals(isbn.trim()) ? null : isbn);
-        paramMap.put("bookName", bookName != null && "".equals(bookName.trim()) ? null : bookName);
-        paramMap.put("publish", publish != null && "".equals(publish.trim()) ? null : publish);
-        paramMap.put("fundName", fundName != null && "".equals(fundName.trim()) ? null : fundName);
-        paramMap.put("serialNumber", serialNumber != null && "".equals(serialNumber.trim()) ? null : serialNumber);
-        paramMap.put("isCurrentMonth", isCurrentMonth);
-        paramMap.put("currentPage", currentPage * numPerPage);
-        paramMap.put("numPerPage", numPerPage);
-
-        if(!StringUtil.isEmpty(bookName)){
-            String[] bookNameList = bookName.trim().split("\\s+");
-            paramMap.put("bookNameList",Lists.newArrayList(bookNameList));
-        }
-
-        List<BookDto> bookList = bookDao.getListPage4Platform(paramMap);
-
-        // 获取平台端所有账号用户名
-        Map<Long, String> pcloudUserMap = partyConsr.getAllUserLoginName(0L, SystemCode.pcloud.code);
-        if (!ListUtils.isEmpty(bookList) && !pcloudUserMap.isEmpty()) {
-            for (BookDto bookDto : bookList) {
-                List<BookFundDto> bookFunds = bookDto.getBookFunds();
-                Integer freezeStatus = BookFreezeEnum.WAIT_FREEZE.value;
-                boolean isFundSupport = false;
-                BookFreezeDto bf = bookFreezeBiz.getById(bookDto.getBookId());
-                String transferor = bf == null ? null : bf.getTransferor();
-                if (!ListUtils.isEmpty(bookFunds)) {
-                    for (BookFundDto bookFundDto : bookFunds) {
-                        if (StringUtil.isEmpty(transferor)) {
-                            transferor = bookFundDto.getTransferor();
-                        }
-                        Date startTime = bookFundDto.getStartTime();
-                        Date endTime = bookFundDto.getEndTime();
-                        if (new Date().before(startTime)) {
-                            bookFundDto.setButton(2);
-                            freezeStatus = BookFreezeEnum.NO_FREEZE.value;
-                        } else if (new Date().after(startTime) && new Date().before(endTime)) {
-                            bookFundDto.setButton(1);
-                            freezeStatus = BookFreezeEnum.NO_FREEZE.value;
-                        } else {
-                            bookFundDto.setButton(0);
-                        }
-                        Long opearateUserId = bookFundDto.getLastModifiedUser();
-                        if (pcloudUserMap.containsKey(opearateUserId)) {
-                            bookFundDto.setOperateUserName(pcloudUserMap.get(opearateUserId));
-                        }
-                        if (new Date().before(endTime)) {
-                            isFundSupport = true;
-                        }
-                    }
-                    bookDto.setIsHaveFund(true);
-                }
-                bookDto.setTransferor(transferor);
-                bookDto.setIsFundSupport(isFundSupport);
-                bookDto.setFreezeStatus(freezeStatus);
-            }
-        }
-        int totalCount;
-        if (StringUtil.isEmpty(isbn) && StringUtil.isEmpty(bookName) && StringUtil.isEmpty(publish)
-                && StringUtil.isEmpty(fundName) && StringUtil.isEmpty(serialNumber) && null == isCurrentMonth) {
-            totalCount = this.getAllBookCount();
-        } else {
-            totalCount = bookDao.getBookCount4Platform(paramMap);
-        }
-        if (!ListUtils.isEmpty(bookList)) {
-            bookSet.setPageDetailInfo4Platform(bookList);
-        }
-        PageBeanNew<BookDto> result = new PageBeanNew<>();
-        result.setCurrentPage(currentPage);
-        result.setNumPerPage(numPerPage);
-        result.setRecordList(bookList);
-        result.setTotalCount(totalCount);
-        return result;
-    }
 
     /**
      * 获取书籍总数信息

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

@@ -5,32 +5,19 @@ 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.AdviserBookInfoDTO;
-import com.pcloud.book.book.dto.BookAssocCount;
-import com.pcloud.book.book.dto.BookDetialDTO;
-import com.pcloud.book.book.dto.BookDto;
-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.dto.*;
 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.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.*;
 import com.pcloud.book.book.vo.request.BookInfo4ScanCountRequestVO;
 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.elasticsearch7.constants.SwitchKey;
 import com.pcloud.book.elasticsearch7.search.domain.dto.param.PlatformSearchDto;
 import com.pcloud.common.core.constant.SystemCode;
 import com.pcloud.common.dto.ResponseDto;
@@ -43,33 +30,17 @@ import com.pcloud.common.permission.PermissionCode.ServerPermissionCode;
 import com.pcloud.common.permission.PermissionException;
 import com.pcloud.common.utils.ListUtils;
 import com.pcloud.common.utils.SessionUtil;
-import com.pcloud.common.utils.cache.redis.JedisClusterUtils;
 import com.pcloud.common.utils.cookie.Cookie;
 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.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 org.springframework.web.bind.annotation.*;
+
+import java.util.*;
 
 /**
  * @描述：书籍接口实现类
@@ -267,7 +238,6 @@ public class BookFacadeImpl implements BookFacade {
             throw BookBizException.PAGE_PARAM_DELETION;
         }
 
-        if (JedisClusterUtils.exists(SwitchKey.PLATFORM_SEARCH_ELASTICSEARCH)) {
         PlatformSearchDto param = new PlatformSearchDto();
         param.setPublish(publish);
         param.setFundName(fundName);
@@ -280,10 +250,6 @@ public class BookFacadeImpl implements BookFacade {
         param.setPageSize(numPerPage);
 
         return new ResponseDto<>(bookElasticSearchBiz.getListPage(param));
-        } else {
-            return new ResponseDto<>(bookBiz.getListPage(isbn, bookName, publish, fundName,
-                    serialNumber, isCurrentMonth, currentPage, numPerPage));
-        }
     }
 
     /**