diff --git a/bwie-common/src/main/java/com/bwie/common/domain/request/AskBuyRequest.java b/bwie-common/src/main/java/com/bwie/common/domain/request/AskBuyRequest.java index 4c255a6..b570723 100644 --- a/bwie-common/src/main/java/com/bwie/common/domain/request/AskBuyRequest.java +++ b/bwie-common/src/main/java/com/bwie/common/domain/request/AskBuyRequest.java @@ -22,4 +22,7 @@ public class AskBuyRequest { @TableField("addr_id") private Long addrId; //三级联动 + private Integer pageNum=1; + private Integer pageSize=3; + } diff --git a/bwie-common/src/main/java/com/bwie/common/domain/request/AskRentRequest.java b/bwie-common/src/main/java/com/bwie/common/domain/request/AskRentRequest.java index a32bb8d..117c169 100644 --- a/bwie-common/src/main/java/com/bwie/common/domain/request/AskRentRequest.java +++ b/bwie-common/src/main/java/com/bwie/common/domain/request/AskRentRequest.java @@ -20,5 +20,8 @@ public class AskRentRequest { private Long dictionaryTypeId; //求租类型 @TableField("addr_id") - private Long addrId; //三级联动 + private Long addrId; //三级联动 + + private Integer pageNum=1; + private Integer pageSize=3; } diff --git a/bwie-common/src/main/java/com/bwie/common/domain/request/GroupRequest.java b/bwie-common/src/main/java/com/bwie/common/domain/request/GroupRequest.java index f5f6cd7..d814c4e 100644 --- a/bwie-common/src/main/java/com/bwie/common/domain/request/GroupRequest.java +++ b/bwie-common/src/main/java/com/bwie/common/domain/request/GroupRequest.java @@ -46,4 +46,7 @@ public class GroupRequest { @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date updateTime; //修改时间 private Long isDelete; + + private Integer pageNum=1; + private Integer pageSize=5; } diff --git a/bwie-gateway/src/main/java/com/bwie/gateway/config/IgnoreWhiteConfig.java b/bwie-gateway/src/main/java/com/bwie/gateway/config/IgnoreWhiteConfig.java index f3de69d..00a4b79 100644 --- a/bwie-gateway/src/main/java/com/bwie/gateway/config/IgnoreWhiteConfig.java +++ b/bwie-gateway/src/main/java/com/bwie/gateway/config/IgnoreWhiteConfig.java @@ -3,6 +3,7 @@ package com.bwie.gateway.config; import com.alibaba.fastjson.JSONObject; import lombok.Data; +import lombok.extern.log4j.Log4j2; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.cloud.context.config.annotation.RefreshScope; import org.springframework.context.annotation.Configuration; diff --git a/bwie-gateway/src/main/java/com/bwie/gateway/utils/GatewayUtils.java b/bwie-gateway/src/main/java/com/bwie/gateway/utils/GatewayUtils.java index 923ab4d..70a30b4 100644 --- a/bwie-gateway/src/main/java/com/bwie/gateway/utils/GatewayUtils.java +++ b/bwie-gateway/src/main/java/com/bwie/gateway/utils/GatewayUtils.java @@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONObject; import com.bwie.common.result.Result; import com.bwie.common.utils.StringUtils; +import lombok.extern.log4j.Log4j2; import org.springframework.core.io.buffer.DataBuffer; import org.springframework.http.HttpHeaders; import org.springframework.http.HttpStatus; diff --git a/bwie-modules/bwie-background/src/main/java/com/bwie/background/mapper/BackGroundMapper.java b/bwie-modules/bwie-background/src/main/java/com/bwie/background/mapper/BackGroundMapper.java index 501e4dc..5b29a28 100644 --- a/bwie-modules/bwie-background/src/main/java/com/bwie/background/mapper/BackGroundMapper.java +++ b/bwie-modules/bwie-background/src/main/java/com/bwie/background/mapper/BackGroundMapper.java @@ -10,4 +10,6 @@ import org.apache.ibatis.annotations.Mapper; public interface BackGroundMapper{ + + } diff --git a/bwie-modules/bwie-background/src/main/java/com/bwie/background/seriver/impl/BackGroundServiceImpl.java b/bwie-modules/bwie-background/src/main/java/com/bwie/background/seriver/impl/BackGroundServiceImpl.java index 0875cde..ee84b62 100644 --- a/bwie-modules/bwie-background/src/main/java/com/bwie/background/seriver/impl/BackGroundServiceImpl.java +++ b/bwie-modules/bwie-background/src/main/java/com/bwie/background/seriver/impl/BackGroundServiceImpl.java @@ -10,4 +10,7 @@ import org.springframework.stereotype.Service; */ @Service public class BackGroundServiceImpl implements BackGroundService { + + + } diff --git a/bwie-modules/bwie-background/src/main/resources/mapper/AskBuyRentFeign.xml b/bwie-modules/bwie-background/src/main/resources/mapper/AskBuyRentFeign.xml deleted file mode 100644 index f5ce631..0000000 --- a/bwie-modules/bwie-background/src/main/resources/mapper/AskBuyRentFeign.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/bwie-modules/bwie-background/src/main/resources/mapper/AskRentMapper.xml b/bwie-modules/bwie-background/src/main/resources/mapper/AskRentMapper.xml deleted file mode 100644 index b26ae5d..0000000 --- a/bwie-modules/bwie-background/src/main/resources/mapper/AskRentMapper.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/bwie-modules/bwie-esask/src/main/java/com/bwie/esask/seriver/impl/EsAskBuyServiceImpl.java b/bwie-modules/bwie-esask/src/main/java/com/bwie/esask/seriver/impl/EsAskBuyServiceImpl.java index 58dc0ba..6048cd8 100644 --- a/bwie-modules/bwie-esask/src/main/java/com/bwie/esask/seriver/impl/EsAskBuyServiceImpl.java +++ b/bwie-modules/bwie-esask/src/main/java/com/bwie/esask/seriver/impl/EsAskBuyServiceImpl.java @@ -68,6 +68,8 @@ public class EsAskBuyServiceImpl extends ServiceImpl imp SearchRequest searchRequest = new SearchRequest("askbuy"); SearchSourceBuilder sourceBuilder = new SearchSourceBuilder(); BoolQueryBuilder boolQueryBuilder = QueryBuilders.boolQuery(); + sourceBuilder.from((askBuyRequest.getPageNum()-1)*askBuyRequest.getPageSize()); + sourceBuilder.size(arrayList.size()); sourceBuilder.query(boolQueryBuilder); searchRequest.source(sourceBuilder); try { @@ -86,5 +88,4 @@ public class EsAskBuyServiceImpl extends ServiceImpl imp } return Result.success(arrayList); } - } diff --git a/bwie-modules/bwie-esask/src/main/java/com/bwie/esask/seriver/impl/EsAskRentServiceImpl.java b/bwie-modules/bwie-esask/src/main/java/com/bwie/esask/seriver/impl/EsAskRentServiceImpl.java index cc520cc..7b41d8f 100644 --- a/bwie-modules/bwie-esask/src/main/java/com/bwie/esask/seriver/impl/EsAskRentServiceImpl.java +++ b/bwie-modules/bwie-esask/src/main/java/com/bwie/esask/seriver/impl/EsAskRentServiceImpl.java @@ -31,19 +31,12 @@ import java.util.List; */ @Service public class EsAskRentServiceImpl extends ServiceImpl implements EsAskRentService { - - private final RedisCache redisCache; - - private final RestHighLevelClient client; - public EsAskRentServiceImpl(RedisCache redisCache, RestHighLevelClient client) { this.redisCache = redisCache; this.client = client; } - - @Override public void shouListt(List list) { try { @@ -60,7 +53,6 @@ public class EsAskRentServiceImpl extends ServiceImpl throw new RuntimeException(e); } } - //求购的链表 @Override public Result shouRentList(AskRentRequest askRentRequest){ @@ -68,6 +60,8 @@ public class EsAskRentServiceImpl extends ServiceImpl SearchRequest searchRequest = new SearchRequest("askrent"); SearchSourceBuilder sourceBuilder = new SearchSourceBuilder(); BoolQueryBuilder boolQueryBuilder = QueryBuilders.boolQuery(); + sourceBuilder.from((askRentRequest.getPageNum()-1)*askRentRequest.getPageSize()); + sourceBuilder.size(askRentRequest.getPageSize()); sourceBuilder.query(boolQueryBuilder); searchRequest.source(sourceBuilder); try { @@ -85,6 +79,4 @@ public class EsAskRentServiceImpl extends ServiceImpl } return Result.success(arrayList); } - - } diff --git a/bwie-modules/bwie-group/src/main/resources/mapper/AskBuyRentFeign.xml b/bwie-modules/bwie-group/src/main/resources/mapper/AskBuyRentFeign.xml deleted file mode 100644 index 87c4fde..0000000 --- a/bwie-modules/bwie-group/src/main/resources/mapper/AskBuyRentFeign.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - -