From 594df81b1b8fea4fd364a2de960a195ef5ade53c Mon Sep 17 00:00:00 2001 From: Guo YuKun <1458871005@qq.com> Date: Sun, 24 Mar 2024 16:41:46 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/encodings.xml | 1 + bwie-common/pom.xml | 6 ++ .../common/handler/GlobalExceptionHandle.java | 1 + .../gateway/config/IgnoreWhiteConfig.java | 2 +- .../com/bwie/gateway/utils/GatewayUtils.java | 2 +- bwie-modules/bwie-ask/pom.xml | 11 ++- .../src/main/java/com/bwie/ask/AskApp.java | 3 + .../bwie/ask/controller/AskBuyController.java | 8 -- .../ask/controller/EsAskBuyController.java | 19 ---- .../ask/controller/EsAskRentController.java | 19 ---- .../com/bwie/ask/seriver/EsAskBuyService.java | 8 -- .../bwie/ask/seriver/EsAskRentService.java | 10 --- .../ask/seriver/impl/AskBuyServiceImpl.java | 16 ++++ .../ask/seriver/impl/AskRentServiceImpl.java | 16 ++++ .../ask/seriver/impl/EsAskBuyServiceImpl.java | 22 ----- .../seriver/impl/EsAskRentServiceImpl.java | 24 ----- .../main/resources/mapper/AskBuyMapper.xml | 2 +- .../main/resources/mapper/AskRentMapper.xml | 5 +- .../{AskBuyMapper.xml => AskBuyRentFeign.xml} | 0 bwie-modules/bwie-esask/pom.xml | 78 ++++++++++++++++ .../main/java/com/bwie/esask/EsAskApp.java | 22 +++++ .../java/com/bwie/esask/config/InitEsRes.java | 25 ++++++ .../esask/controller/EsAskBuyController.java | 36 ++++++++ .../esask/controller/EsAskRentController.java | 37 ++++++++ .../com/bwie/esask/feign/AskBuyRentFeign.java | 26 ++++++ .../bwie/esask}/mapper/EsAskBuyMapper.java | 5 +- .../bwie/esask}/mapper/EsAskRentMapper.java | 4 +- .../bwie/esask/seriver/EsAskBuyService.java | 16 ++++ .../bwie/esask/seriver/EsAskRentService.java | 16 ++++ .../seriver/impl/EsAskBuyServiceImpl.java | 90 +++++++++++++++++++ .../seriver/impl/EsAskRentServiceImpl.java | 90 +++++++++++++++++++ .../java/com/bwie/esask/sync/AskBuySync.java | 51 +++++++++++ .../src/main/resources/bootstrap.yml | 34 +++++++ .../main/resources/mapper/EsAskBuyMapper.xml | 2 +- .../main/resources/mapper/EsAskRentMapper.xml | 2 +- .../{GroupMapper.xml => AskBuyRentFeign.xml} | 0 pom.xml | 1 + 37 files changed, 586 insertions(+), 124 deletions(-) delete mode 100644 bwie-modules/bwie-ask/src/main/java/com/bwie/ask/controller/EsAskBuyController.java delete mode 100644 bwie-modules/bwie-ask/src/main/java/com/bwie/ask/controller/EsAskRentController.java delete mode 100644 bwie-modules/bwie-ask/src/main/java/com/bwie/ask/seriver/EsAskBuyService.java delete mode 100644 bwie-modules/bwie-ask/src/main/java/com/bwie/ask/seriver/EsAskRentService.java delete mode 100644 bwie-modules/bwie-ask/src/main/java/com/bwie/ask/seriver/impl/EsAskBuyServiceImpl.java delete mode 100644 bwie-modules/bwie-ask/src/main/java/com/bwie/ask/seriver/impl/EsAskRentServiceImpl.java rename bwie-modules/bwie-background/src/main/resources/mapper/{AskBuyMapper.xml => AskBuyRentFeign.xml} (100%) create mode 100644 bwie-modules/bwie-esask/pom.xml create mode 100644 bwie-modules/bwie-esask/src/main/java/com/bwie/esask/EsAskApp.java create mode 100644 bwie-modules/bwie-esask/src/main/java/com/bwie/esask/config/InitEsRes.java create mode 100644 bwie-modules/bwie-esask/src/main/java/com/bwie/esask/controller/EsAskBuyController.java create mode 100644 bwie-modules/bwie-esask/src/main/java/com/bwie/esask/controller/EsAskRentController.java create mode 100644 bwie-modules/bwie-esask/src/main/java/com/bwie/esask/feign/AskBuyRentFeign.java rename bwie-modules/{bwie-ask/src/main/java/com/bwie/ask => bwie-esask/src/main/java/com/bwie/esask}/mapper/EsAskBuyMapper.java (88%) rename bwie-modules/{bwie-ask/src/main/java/com/bwie/ask => bwie-esask/src/main/java/com/bwie/esask}/mapper/EsAskRentMapper.java (90%) create mode 100644 bwie-modules/bwie-esask/src/main/java/com/bwie/esask/seriver/EsAskBuyService.java create mode 100644 bwie-modules/bwie-esask/src/main/java/com/bwie/esask/seriver/EsAskRentService.java create mode 100644 bwie-modules/bwie-esask/src/main/java/com/bwie/esask/seriver/impl/EsAskBuyServiceImpl.java create mode 100644 bwie-modules/bwie-esask/src/main/java/com/bwie/esask/seriver/impl/EsAskRentServiceImpl.java create mode 100644 bwie-modules/bwie-esask/src/main/java/com/bwie/esask/sync/AskBuySync.java create mode 100644 bwie-modules/bwie-esask/src/main/resources/bootstrap.yml rename bwie-modules/{bwie-ask => bwie-esask}/src/main/resources/mapper/EsAskBuyMapper.xml (73%) rename bwie-modules/{bwie-ask => bwie-esask}/src/main/resources/mapper/EsAskRentMapper.xml (72%) rename bwie-modules/bwie-group/src/main/resources/mapper/{GroupMapper.xml => AskBuyRentFeign.xml} (100%) diff --git a/.idea/encodings.xml b/.idea/encodings.xml index e70111a..7129404 100644 --- a/.idea/encodings.xml +++ b/.idea/encodings.xml @@ -10,6 +10,7 @@ + diff --git a/bwie-common/pom.xml b/bwie-common/pom.xml index 74b6a63..6f86910 100644 --- a/bwie-common/pom.xml +++ b/bwie-common/pom.xml @@ -15,6 +15,7 @@ 8 8 UTF-8 + 7.17.0 @@ -53,6 +54,11 @@ jjwt 0.9.1 + + + org.elasticsearch.client + elasticsearch-rest-high-level-client + com.alibaba diff --git a/bwie-common/src/main/java/com/bwie/common/handler/GlobalExceptionHandle.java b/bwie-common/src/main/java/com/bwie/common/handler/GlobalExceptionHandle.java index 533cab2..ac544b4 100644 --- a/bwie-common/src/main/java/com/bwie/common/handler/GlobalExceptionHandle.java +++ b/bwie-common/src/main/java/com/bwie/common/handler/GlobalExceptionHandle.java @@ -2,6 +2,7 @@ package com.bwie.common.handler; import com.alibaba.fastjson.JSONObject; import com.bwie.common.result.Result; + import lombok.extern.log4j.Log4j2; import org.springframework.context.annotation.Configuration; import org.springframework.validation.ObjectError; 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 5705d6f..f3de69d 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 @@ -2,7 +2,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 cc033bf..923ab4d 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 @@ -3,7 +3,7 @@ package com.bwie.gateway.utils; 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-ask/pom.xml b/bwie-modules/bwie-ask/pom.xml index a893d18..4e6328b 100644 --- a/bwie-modules/bwie-ask/pom.xml +++ b/bwie-modules/bwie-ask/pom.xml @@ -16,6 +16,7 @@ 8 8 UTF-8 + 7.17.0 @@ -23,12 +24,20 @@ com.bwie bwie-common + + xin.altitude.cms.common + ucode-cms-common + 1.3.4 + org.springframework.boot spring-boot-starter-web - + + org.elasticsearch.client + elasticsearch-rest-high-level-client + com.alibaba diff --git a/bwie-modules/bwie-ask/src/main/java/com/bwie/ask/AskApp.java b/bwie-modules/bwie-ask/src/main/java/com/bwie/ask/AskApp.java index acaf2f3..518283b 100644 --- a/bwie-modules/bwie-ask/src/main/java/com/bwie/ask/AskApp.java +++ b/bwie-modules/bwie-ask/src/main/java/com/bwie/ask/AskApp.java @@ -4,8 +4,11 @@ import org.mybatis.spring.annotation.MapperScan; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.cloud.client.discovery.EnableDiscoveryClient; +import org.springframework.scheduling.annotation.EnableScheduling; + @SpringBootApplication @EnableDiscoveryClient +@EnableScheduling @MapperScan("com.bwie.ask.mapper") public class AskApp { public static void main(String[] args) { diff --git a/bwie-modules/bwie-ask/src/main/java/com/bwie/ask/controller/AskBuyController.java b/bwie-modules/bwie-ask/src/main/java/com/bwie/ask/controller/AskBuyController.java index 42d67eb..906b5bb 100644 --- a/bwie-modules/bwie-ask/src/main/java/com/bwie/ask/controller/AskBuyController.java +++ b/bwie-modules/bwie-ask/src/main/java/com/bwie/ask/controller/AskBuyController.java @@ -1,5 +1,4 @@ package com.bwie.ask.controller; - import com.bwie.ask.seriver.AskBuyService; import com.bwie.common.domain.AskBuy; import com.bwie.common.result.Result; @@ -7,30 +6,23 @@ import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; - import java.util.List; - /** * 求购controller层 */ @RestController @RequestMapping("/buy") public class AskBuyController { - private final AskBuyService askBuyService; - public AskBuyController(AskBuyService askBuyService) { this.askBuyService = askBuyService; } - @PostMapping("/shouAll") public Result> shouAll(){ return askBuyService.shouAll(); } - @PostMapping("/addAskBuy") public Result addAskBuy(@RequestBody AskBuy askBuy){ return askBuyService.addAskBuy(askBuy); } - } diff --git a/bwie-modules/bwie-ask/src/main/java/com/bwie/ask/controller/EsAskBuyController.java b/bwie-modules/bwie-ask/src/main/java/com/bwie/ask/controller/EsAskBuyController.java deleted file mode 100644 index 99f5065..0000000 --- a/bwie-modules/bwie-ask/src/main/java/com/bwie/ask/controller/EsAskBuyController.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.bwie.ask.controller; - -import com.bwie.ask.seriver.EsAskBuyService; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -/** - * Es求购表 - */ -@RestController -@RequestMapping("/esBuy") -public class EsAskBuyController { - - private final EsAskBuyService esAskBuyService; - - public EsAskBuyController(EsAskBuyService esAskBuyService) { - this.esAskBuyService = esAskBuyService; - } -} diff --git a/bwie-modules/bwie-ask/src/main/java/com/bwie/ask/controller/EsAskRentController.java b/bwie-modules/bwie-ask/src/main/java/com/bwie/ask/controller/EsAskRentController.java deleted file mode 100644 index b5429ab..0000000 --- a/bwie-modules/bwie-ask/src/main/java/com/bwie/ask/controller/EsAskRentController.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.bwie.ask.controller; - -import com.bwie.ask.seriver.EsAskRentService; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -/** - * Es求租表 - */ -@RestController -@RequestMapping("/esRent") -public class EsAskRentController { - - private final EsAskRentService esAskRentService; - - public EsAskRentController(EsAskRentService esAskRentService) { - this.esAskRentService = esAskRentService; - } -} diff --git a/bwie-modules/bwie-ask/src/main/java/com/bwie/ask/seriver/EsAskBuyService.java b/bwie-modules/bwie-ask/src/main/java/com/bwie/ask/seriver/EsAskBuyService.java deleted file mode 100644 index 57c21b0..0000000 --- a/bwie-modules/bwie-ask/src/main/java/com/bwie/ask/seriver/EsAskBuyService.java +++ /dev/null @@ -1,8 +0,0 @@ -package com.bwie.ask.seriver; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.bwie.common.domain.AskBuy; -import com.bwie.common.domain.AskRent; - -public interface EsAskBuyService extends IService { -} diff --git a/bwie-modules/bwie-ask/src/main/java/com/bwie/ask/seriver/EsAskRentService.java b/bwie-modules/bwie-ask/src/main/java/com/bwie/ask/seriver/EsAskRentService.java deleted file mode 100644 index d9835fd..0000000 --- a/bwie-modules/bwie-ask/src/main/java/com/bwie/ask/seriver/EsAskRentService.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.bwie.ask.seriver; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.bwie.common.domain.AskBuy; -import com.bwie.common.domain.AskRent; - -public interface EsAskRentService extends IService { - - -} diff --git a/bwie-modules/bwie-ask/src/main/java/com/bwie/ask/seriver/impl/AskBuyServiceImpl.java b/bwie-modules/bwie-ask/src/main/java/com/bwie/ask/seriver/impl/AskBuyServiceImpl.java index 252b3a5..fc6b450 100644 --- a/bwie-modules/bwie-ask/src/main/java/com/bwie/ask/seriver/impl/AskBuyServiceImpl.java +++ b/bwie-modules/bwie-ask/src/main/java/com/bwie/ask/seriver/impl/AskBuyServiceImpl.java @@ -5,6 +5,7 @@ import com.bwie.ask.mapper.AskBuyMapper; import com.bwie.ask.seriver.AskBuyService; import com.bwie.common.domain.AskBuy; import com.bwie.common.result.Result; +import org.hibernate.validator.internal.util.stereotypes.Lazy; import org.springframework.stereotype.Service; import java.util.List; @@ -34,6 +35,21 @@ public class AskBuyServiceImpl extends ServiceImpl impleme } @Override public Result addAskBuy(AskBuy askBuy){ + if(askBuy.getAskBuyAddress()==null || askBuy.getAskBuyAddress().equals("")){ + return Result.error("具体位置不能为空!!!!"); + } + if(askBuy.getAskBuyTitle()==null || askBuy.getAskBuyTitle().equals("")){ + return Result.error("标签不能为空!!!!"); + } + if(askBuy.getAskBuyPrice()==null || askBuy.getAskBuyPrice().equals("")){ + return Result.error("期望价格 不允许为空!!!!"); + } + if(askBuy.getDictionaryTypeId()==null){ + return Result.error("求购类型不允许为空!!!!"); + } + if(askBuy.getAddrId()==null){ + return Result.error("具体的省市县不允许为空!!!!"); + } Integer i = askBuyMapper.addAskBuy(askBuy); return Result.success(i>0?200:500,i>0?"发表成功!!!!":"发表失败!!!!"); } diff --git a/bwie-modules/bwie-ask/src/main/java/com/bwie/ask/seriver/impl/AskRentServiceImpl.java b/bwie-modules/bwie-ask/src/main/java/com/bwie/ask/seriver/impl/AskRentServiceImpl.java index 1f48b94..3384d14 100644 --- a/bwie-modules/bwie-ask/src/main/java/com/bwie/ask/seriver/impl/AskRentServiceImpl.java +++ b/bwie-modules/bwie-ask/src/main/java/com/bwie/ask/seriver/impl/AskRentServiceImpl.java @@ -31,8 +31,24 @@ public class AskRentServiceImpl extends ServiceImpl impl return Result.success(askRentList); } + @Override public Result addAskRent(AskRent askRent){ + if(askRent.getAskRentAddress()==null || askRent.getAskRentAddress().equals("")){ + return Result.error("具体位置不能为空!!!!"); + } + if(askRent.getAskRentTitle()==null || askRent.getAskRentTitle().equals("")){ + return Result.error("标签不能为空!!!!"); + } + if(askRent.getAskRentPrice()==null || askRent.getAskRentPrice().equals("")){ + return Result.error("期望价格 不允许为空!!!!"); + } + if(askRent.getDictionaryTypeId()==null){ + return Result.error("求购类型不允许为空!!!!"); + } + if(askRent.getAddrId()==null){ + return Result.error("具体的省市县不允许为空!!!!"); + } Integer i = askRentMapper.addAskRent(askRent); return Result.success(i>0?200:500,i>0?"发表成功!!!!":"发表失败!!!!"); } diff --git a/bwie-modules/bwie-ask/src/main/java/com/bwie/ask/seriver/impl/EsAskBuyServiceImpl.java b/bwie-modules/bwie-ask/src/main/java/com/bwie/ask/seriver/impl/EsAskBuyServiceImpl.java deleted file mode 100644 index e7d8de4..0000000 --- a/bwie-modules/bwie-ask/src/main/java/com/bwie/ask/seriver/impl/EsAskBuyServiceImpl.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.bwie.ask.seriver.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.bwie.ask.mapper.EsAskBuyMapper; -import com.bwie.ask.seriver.EsAskBuyService; -import com.bwie.common.domain.AskBuy; -import com.bwie.common.redis.RedisCache; -import org.springframework.stereotype.Service; -/** - * Es求购表 - */ -@Service -public class EsAskBuyServiceImpl extends ServiceImpl implements EsAskBuyService { - - private final RedisCache redisCache; - private final EsAskBuyMapper esAskBuyMapper; - - public EsAskBuyServiceImpl(RedisCache redisCache, EsAskBuyMapper esAskBuyMapper) { - this.redisCache = redisCache; - this.esAskBuyMapper = esAskBuyMapper; - } -} diff --git a/bwie-modules/bwie-ask/src/main/java/com/bwie/ask/seriver/impl/EsAskRentServiceImpl.java b/bwie-modules/bwie-ask/src/main/java/com/bwie/ask/seriver/impl/EsAskRentServiceImpl.java deleted file mode 100644 index f467f6a..0000000 --- a/bwie-modules/bwie-ask/src/main/java/com/bwie/ask/seriver/impl/EsAskRentServiceImpl.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.bwie.ask.seriver.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.bwie.ask.mapper.EsAskRentMapper; -import com.bwie.ask.seriver.EsAskRentService; -import com.bwie.common.domain.AskRent; -import com.bwie.common.redis.RedisCache; -import org.springframework.stereotype.Service; -/** - * Es求租表 - */ -@Service -public class EsAskRentServiceImpl extends ServiceImpl implements EsAskRentService { - - - private final RedisCache redisCache; - - private final EsAskRentService esAskRentService; - - public EsAskRentServiceImpl(RedisCache redisCache, EsAskRentService esAskRentService) { - this.redisCache = redisCache; - this.esAskRentService = esAskRentService; - } -} diff --git a/bwie-modules/bwie-ask/src/main/resources/mapper/AskBuyMapper.xml b/bwie-modules/bwie-ask/src/main/resources/mapper/AskBuyMapper.xml index c90155f..68ac41d 100644 --- a/bwie-modules/bwie-ask/src/main/resources/mapper/AskBuyMapper.xml +++ b/bwie-modules/bwie-ask/src/main/resources/mapper/AskBuyMapper.xml @@ -5,7 +5,7 @@ INSERT INTO `xm_house`.`askbuy` (`askbuy_address`, `askbuy_title`, `dictionary_type_id`, `addr_id`, `user_id`, `askbuy_price`, `is_delete`, `create_time`, `update_time`) - VALUES (#{askBuyAddress},#{askbuy},#{dictionaryTypeId},#{addrId},#{userId},#{askBuyPrice},#{isDelete},#{createTime},#{updateTime}); + VALUES (#{askBuyAddress},#{askBuyTitle},#{dictionaryTypeId},#{addrId},#{userId},#{askBuyPrice},#{isDelete},#{createTime},#{updateTime}); diff --git a/bwie-modules/bwie-background/src/main/resources/mapper/AskBuyMapper.xml b/bwie-modules/bwie-background/src/main/resources/mapper/AskBuyRentFeign.xml similarity index 100% rename from bwie-modules/bwie-background/src/main/resources/mapper/AskBuyMapper.xml rename to bwie-modules/bwie-background/src/main/resources/mapper/AskBuyRentFeign.xml diff --git a/bwie-modules/bwie-esask/pom.xml b/bwie-modules/bwie-esask/pom.xml new file mode 100644 index 0000000..bb7ffff --- /dev/null +++ b/bwie-modules/bwie-esask/pom.xml @@ -0,0 +1,78 @@ + + + 4.0.0 + + com.bwie + house_project + 1.0.0 + ../../pom.xml + + + bwie-esask + + + 8 + 8 + UTF-8 + 7.17.0 + + + + + com.bwie + bwie-common + + + xin.altitude.cms.common + ucode-cms-common + 1.3.4 + + + + org.springframework.boot + spring-boot-starter-web + + + org.elasticsearch.client + elasticsearch-rest-high-level-client + + + + com.alibaba + druid-spring-boot-starter + 1.2.8 + + + + mysql + mysql-connector-java + + + + org.mybatis.spring.boot + mybatis-spring-boot-starter + 2.2.2 + + + + + com.github.pagehelper + pagehelper-spring-boot-starter + 1.4.1 + + + + org.springframework.boot + spring-boot-starter-test + test + + + org.elasticsearch + elasticsearch-x-content + 7.17.12 + compile + + + diff --git a/bwie-modules/bwie-esask/src/main/java/com/bwie/esask/EsAskApp.java b/bwie-modules/bwie-esask/src/main/java/com/bwie/esask/EsAskApp.java new file mode 100644 index 0000000..c636892 --- /dev/null +++ b/bwie-modules/bwie-esask/src/main/java/com/bwie/esask/EsAskApp.java @@ -0,0 +1,22 @@ +package com.bwie.esask; + +import com.bwie.common.redis.RedisCache; +import org.mybatis.spring.annotation.MapperScan; +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.cloud.client.discovery.EnableDiscoveryClient; +import org.springframework.cloud.openfeign.EnableFeignClients; +import org.springframework.context.annotation.Import; +import org.springframework.scheduling.annotation.EnableScheduling; + +@SpringBootApplication +@EnableDiscoveryClient +@EnableFeignClients +@EnableScheduling +@MapperScan("com.bwie.esask.mapper") +@Import(value = {RedisCache.class}) +public class EsAskApp { + public static void main(String[] args) { + SpringApplication.run(EsAskApp.class); + } +} diff --git a/bwie-modules/bwie-esask/src/main/java/com/bwie/esask/config/InitEsRes.java b/bwie-modules/bwie-esask/src/main/java/com/bwie/esask/config/InitEsRes.java new file mode 100644 index 0000000..efa96e4 --- /dev/null +++ b/bwie-modules/bwie-esask/src/main/java/com/bwie/esask/config/InitEsRes.java @@ -0,0 +1,25 @@ +package com.bwie.esask.config; + +import lombok.Data; +import org.apache.http.HttpHost; +import org.elasticsearch.client.RestClient; +import org.elasticsearch.client.RestHighLevelClient; +import org.springframework.boot.context.properties.ConfigurationProperties; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +@Configuration +@ConfigurationProperties(prefix = "es") +@Data +public class InitEsRes { + private String host; + private int port; + private String scheme; + + @Bean + public RestHighLevelClient restHighLevelClient(){ + return new RestHighLevelClient( + RestClient.builder(new HttpHost(host,port,scheme)) + ); + } +} diff --git a/bwie-modules/bwie-esask/src/main/java/com/bwie/esask/controller/EsAskBuyController.java b/bwie-modules/bwie-esask/src/main/java/com/bwie/esask/controller/EsAskBuyController.java new file mode 100644 index 0000000..c59ef41 --- /dev/null +++ b/bwie-modules/bwie-esask/src/main/java/com/bwie/esask/controller/EsAskBuyController.java @@ -0,0 +1,36 @@ +package com.bwie.esask.controller; + +import com.bwie.esask.seriver.EsAskBuyService; +import com.bwie.common.domain.AskBuy; +import com.bwie.common.domain.request.AskBuyRequest; +import com.bwie.common.result.Result; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +/** + * Es求购表 + */ +@RestController +@RequestMapping("/esBuy") +public class EsAskBuyController { + + private final EsAskBuyService esAskBuyService; + + public EsAskBuyController(EsAskBuyService esAskBuyService) { + this.esAskBuyService = esAskBuyService; + } + + @PostMapping("/shouList") + public void shouList(@RequestBody List list){ + esAskBuyService.shouList(list); + } + @PostMapping("/shouBuyList") + public Result shouBuyList(@RequestBody AskBuyRequest askBuyRequest){ + return esAskBuyService.shouBuyList(askBuyRequest); + } + +} diff --git a/bwie-modules/bwie-esask/src/main/java/com/bwie/esask/controller/EsAskRentController.java b/bwie-modules/bwie-esask/src/main/java/com/bwie/esask/controller/EsAskRentController.java new file mode 100644 index 0000000..cc83a1f --- /dev/null +++ b/bwie-modules/bwie-esask/src/main/java/com/bwie/esask/controller/EsAskRentController.java @@ -0,0 +1,37 @@ +package com.bwie.esask.controller; + +import com.bwie.esask.seriver.EsAskRentService; +import com.bwie.common.domain.AskRent; +import com.bwie.common.domain.request.AskRentRequest; +import com.bwie.common.result.Result; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +/** + * Es求租表 + */ +@RestController +@RequestMapping("/esRent") +public class EsAskRentController { + + private final EsAskRentService esAskRentService; + + public EsAskRentController(EsAskRentService esAskRentService) { + this.esAskRentService = esAskRentService; + } + @PostMapping("/shouListt") + public void shouListt(@RequestBody List list){ + esAskRentService.shouListt(list); + } + + + @PostMapping("/shouRentList") + public Result shouRentList(@RequestBody AskRentRequest askRentRequest){ + return esAskRentService.shouRentList(askRentRequest); + } + +} diff --git a/bwie-modules/bwie-esask/src/main/java/com/bwie/esask/feign/AskBuyRentFeign.java b/bwie-modules/bwie-esask/src/main/java/com/bwie/esask/feign/AskBuyRentFeign.java new file mode 100644 index 0000000..65c500b --- /dev/null +++ b/bwie-modules/bwie-esask/src/main/java/com/bwie/esask/feign/AskBuyRentFeign.java @@ -0,0 +1,26 @@ +package com.bwie.esask.feign; + +import com.bwie.common.domain.AskBuy; +import com.bwie.common.domain.AskRent; +import com.bwie.common.result.Result; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.PostMapping; + +import java.util.List; + +@FeignClient("bwie-ask") +public interface AskBuyRentFeign { + + @PostMapping("/buy/shouAll") + public Result> shouAll(); + + @PostMapping("/rent/shouList") + public Result> shouList(); + + + + + + + +} diff --git a/bwie-modules/bwie-ask/src/main/java/com/bwie/ask/mapper/EsAskBuyMapper.java b/bwie-modules/bwie-esask/src/main/java/com/bwie/esask/mapper/EsAskBuyMapper.java similarity index 88% rename from bwie-modules/bwie-ask/src/main/java/com/bwie/ask/mapper/EsAskBuyMapper.java rename to bwie-modules/bwie-esask/src/main/java/com/bwie/esask/mapper/EsAskBuyMapper.java index 8ef9ff3..eecd672 100644 --- a/bwie-modules/bwie-ask/src/main/java/com/bwie/ask/mapper/EsAskBuyMapper.java +++ b/bwie-modules/bwie-esask/src/main/java/com/bwie/esask/mapper/EsAskBuyMapper.java @@ -1,12 +1,13 @@ -package com.bwie.ask.mapper; +package com.bwie.esask.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.bwie.common.domain.AskBuy; import org.apache.ibatis.annotations.Mapper; - /** * Es求购同步表 */ @Mapper public interface EsAskBuyMapper extends BaseMapper { + + } diff --git a/bwie-modules/bwie-ask/src/main/java/com/bwie/ask/mapper/EsAskRentMapper.java b/bwie-modules/bwie-esask/src/main/java/com/bwie/esask/mapper/EsAskRentMapper.java similarity index 90% rename from bwie-modules/bwie-ask/src/main/java/com/bwie/ask/mapper/EsAskRentMapper.java rename to bwie-modules/bwie-esask/src/main/java/com/bwie/esask/mapper/EsAskRentMapper.java index ef5daa2..60bf3e7 100644 --- a/bwie-modules/bwie-ask/src/main/java/com/bwie/ask/mapper/EsAskRentMapper.java +++ b/bwie-modules/bwie-esask/src/main/java/com/bwie/esask/mapper/EsAskRentMapper.java @@ -1,4 +1,4 @@ -package com.bwie.ask.mapper; +package com.bwie.esask.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.bwie.common.domain.AskBuy; @@ -15,6 +15,4 @@ import java.util.List; public interface EsAskRentMapper extends BaseMapper { - - } diff --git a/bwie-modules/bwie-esask/src/main/java/com/bwie/esask/seriver/EsAskBuyService.java b/bwie-modules/bwie-esask/src/main/java/com/bwie/esask/seriver/EsAskBuyService.java new file mode 100644 index 0000000..5582f93 --- /dev/null +++ b/bwie-modules/bwie-esask/src/main/java/com/bwie/esask/seriver/EsAskBuyService.java @@ -0,0 +1,16 @@ +package com.bwie.esask.seriver; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.bwie.common.domain.AskBuy; +import com.bwie.common.domain.AskRent; +import com.bwie.common.domain.request.AskBuyRequest; +import com.bwie.common.result.Result; + +import java.util.List; + +public interface EsAskBuyService extends IService { + + public void shouList(List list); + + public Result shouBuyList(AskBuyRequest askBuyRequest); +} diff --git a/bwie-modules/bwie-esask/src/main/java/com/bwie/esask/seriver/EsAskRentService.java b/bwie-modules/bwie-esask/src/main/java/com/bwie/esask/seriver/EsAskRentService.java new file mode 100644 index 0000000..07d0676 --- /dev/null +++ b/bwie-modules/bwie-esask/src/main/java/com/bwie/esask/seriver/EsAskRentService.java @@ -0,0 +1,16 @@ +package com.bwie.esask.seriver; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.bwie.common.domain.AskBuy; +import com.bwie.common.domain.AskRent; +import com.bwie.common.domain.request.AskRentRequest; +import com.bwie.common.result.Result; + +import java.util.List; + +public interface EsAskRentService extends IService { + + public void shouListt(List list); + + public Result shouRentList(AskRentRequest askRentRequest); +} 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 new file mode 100644 index 0000000..58dc0ba --- /dev/null +++ b/bwie-modules/bwie-esask/src/main/java/com/bwie/esask/seriver/impl/EsAskBuyServiceImpl.java @@ -0,0 +1,90 @@ +package com.bwie.esask.seriver.impl; + +import com.alibaba.fastjson.JSON; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.bwie.esask.feign.AskBuyRentFeign; +import com.bwie.esask.mapper.EsAskBuyMapper; +import com.bwie.esask.seriver.EsAskBuyService; +import com.bwie.common.domain.AskBuy; +import com.bwie.common.domain.request.AskBuyRequest; +import com.bwie.common.redis.RedisCache; +import com.bwie.common.result.Result; +import org.elasticsearch.action.bulk.BulkRequest; +import org.elasticsearch.action.index.IndexRequest; +import org.elasticsearch.action.search.SearchRequest; +import org.elasticsearch.action.search.SearchResponse; +import org.elasticsearch.client.RequestOptions; +import org.elasticsearch.client.RestHighLevelClient; +import org.elasticsearch.index.query.BoolQueryBuilder; +import org.elasticsearch.index.query.QueryBuilders; +import org.elasticsearch.search.SearchHit; +import org.elasticsearch.search.SearchHits; +import org.elasticsearch.search.builder.SearchSourceBuilder; +import org.elasticsearch.xcontent.XContentType; +import org.springframework.stereotype.Service; + +import java.io.IOException; +import java.util.ArrayList; +import java.util.List; + +/** + * Es求购表 + */ +@Service +public class EsAskBuyServiceImpl extends ServiceImpl implements EsAskBuyService { + + private final RedisCache redisCache; + + + private final RestHighLevelClient client; + + private final AskBuyRentFeign askBuyRentFeign; + + public EsAskBuyServiceImpl(RedisCache redisCache,RestHighLevelClient client, AskBuyRentFeign askBuyRentFeign) { + this.redisCache = redisCache; + this.client = client; + this.askBuyRentFeign = askBuyRentFeign; + } + + @Override + public void shouList(List list){ + try { + BulkRequest bulkRequest = new BulkRequest(); + list.forEach(askBuy -> { + bulkRequest.add( + new IndexRequest("askbuy") + .id(JSON.toJSONString(askBuy.getAskBuyId())) + .source(JSON.toJSONString(askBuy),XContentType.JSON) + ); + }); + client.bulk(bulkRequest, RequestOptions.DEFAULT); + } catch (IOException e) { + throw new RuntimeException(e); + } + } + @Override + public Result shouBuyList(AskBuyRequest askBuyRequest){ + ArrayList arrayList = new ArrayList<>(); + SearchRequest searchRequest = new SearchRequest("askbuy"); + SearchSourceBuilder sourceBuilder = new SearchSourceBuilder(); + BoolQueryBuilder boolQueryBuilder = QueryBuilders.boolQuery(); + sourceBuilder.query(boolQueryBuilder); + searchRequest.source(sourceBuilder); + try { + SearchResponse search = client.search(searchRequest, RequestOptions.DEFAULT); + SearchHits hits = search.getHits(); + if(hits!=null){ + for (SearchHit hit : hits.getHits()) { + String sourceAsString = hit.getSourceAsString(); + AskBuy askBuy = JSON.parseObject(sourceAsString, AskBuy.class); + arrayList.add(askBuy); + } + + } + } catch (IOException e) { + throw new RuntimeException(e); + } + 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 new file mode 100644 index 0000000..cc520cc --- /dev/null +++ b/bwie-modules/bwie-esask/src/main/java/com/bwie/esask/seriver/impl/EsAskRentServiceImpl.java @@ -0,0 +1,90 @@ +package com.bwie.esask.seriver.impl; + +import com.alibaba.fastjson.JSON; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.bwie.esask.mapper.EsAskRentMapper; +import com.bwie.esask.seriver.EsAskRentService; +import com.bwie.common.domain.AskRent; +import com.bwie.common.domain.request.AskRentRequest; +import com.bwie.common.redis.RedisCache; +import com.bwie.common.result.Result; +import org.elasticsearch.action.bulk.BulkRequest; +import org.elasticsearch.action.index.IndexRequest; +import org.elasticsearch.action.search.SearchRequest; +import org.elasticsearch.action.search.SearchResponse; +import org.elasticsearch.client.RequestOptions; +import org.elasticsearch.client.RestHighLevelClient; +import org.elasticsearch.index.query.BoolQueryBuilder; +import org.elasticsearch.index.query.QueryBuilders; +import org.elasticsearch.search.SearchHit; +import org.elasticsearch.search.SearchHits; +import org.elasticsearch.search.builder.SearchSourceBuilder; +import org.elasticsearch.xcontent.XContentType; +import org.springframework.stereotype.Service; + +import java.io.IOException; +import java.util.ArrayList; +import java.util.List; + +/** + * Es求租表 + */ +@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 { + BulkRequest bulkRequest = new BulkRequest(); + list.forEach(askRent -> { + bulkRequest.add( + new IndexRequest("askrent") + .id(JSON.toJSONString(askRent.getAskRentId())) + .source(JSON.toJSONString(askRent),XContentType.JSON) + ); + }); + client.bulk(bulkRequest,RequestOptions.DEFAULT); + } catch (Exception e) { + throw new RuntimeException(e); + } + } + + //求购的链表 + @Override + public Result shouRentList(AskRentRequest askRentRequest){ + ArrayList arrayList = new ArrayList<>(); + SearchRequest searchRequest = new SearchRequest("askrent"); + SearchSourceBuilder sourceBuilder = new SearchSourceBuilder(); + BoolQueryBuilder boolQueryBuilder = QueryBuilders.boolQuery(); + sourceBuilder.query(boolQueryBuilder); + searchRequest.source(sourceBuilder); + try { + SearchResponse search = client.search(searchRequest, RequestOptions.DEFAULT); + SearchHits hits = search.getHits(); + if(hits!=null){ + for (SearchHit hit : hits.getHits()) { + String sourceAsString = hit.getSourceAsString(); + AskRent askRent = JSON.parseObject(sourceAsString, AskRent.class); + arrayList.add(askRent); + } + } + } catch (IOException e) { + throw new RuntimeException(e); + } + return Result.success(arrayList); + } + + +} diff --git a/bwie-modules/bwie-esask/src/main/java/com/bwie/esask/sync/AskBuySync.java b/bwie-modules/bwie-esask/src/main/java/com/bwie/esask/sync/AskBuySync.java new file mode 100644 index 0000000..a118668 --- /dev/null +++ b/bwie-modules/bwie-esask/src/main/java/com/bwie/esask/sync/AskBuySync.java @@ -0,0 +1,51 @@ +package com.bwie.esask.sync; + +import com.bwie.common.domain.AskRent; +import com.bwie.esask.feign.AskBuyRentFeign; +import com.bwie.esask.seriver.EsAskBuyService; +import com.bwie.common.domain.AskBuy; +import com.bwie.common.result.Result; +import com.bwie.esask.seriver.EsAskRentService; +import org.springframework.scheduling.annotation.Scheduled; +import org.springframework.stereotype.Component; + +import java.util.List; +/** + * 同步求购表 + */ +@Component +public class AskBuySync { + + /** + * 求购表 + */ + private final AskBuyRentFeign askBuyRentFeign; + + /** + * 求租表 + */ + private final EsAskRentService esAskRentService; + private final EsAskBuyService esAskBuyService; + public AskBuySync(AskBuyRentFeign askBuyRentFeign, EsAskRentService askRentService, EsAskBuyService esAskBuyService) { + this.askBuyRentFeign = askBuyRentFeign; + this.esAskRentService = askRentService; + this.esAskBuyService = esAskBuyService; + } + + @Scheduled(cron = "0/5 * * * * ?") + public void buySync(){ + Result> listResult = askBuyRentFeign.shouAll(); + List data = listResult.getData(); + if(data!=null){ + esAskBuyService.shouList(data); + } + System.out.println("定时器求购正常启动!!!!!!"); + + Result> listResulta = askBuyRentFeign.shouList(); + List dataa = listResulta.getData(); + if(dataa!=null) { + esAskRentService.shouListt(dataa); + } + System.out.println("定时器求租正常启动!!!!!!"); + } +} diff --git a/bwie-modules/bwie-esask/src/main/resources/bootstrap.yml b/bwie-modules/bwie-esask/src/main/resources/bootstrap.yml new file mode 100644 index 0000000..815f8f1 --- /dev/null +++ b/bwie-modules/bwie-esask/src/main/resources/bootstrap.yml @@ -0,0 +1,34 @@ +es: + host: 124.221.177.197 + port: 9200 + scheme: http +# Tomcat +server: + port: 9004 +# Spring +spring: + main: + allow-circular-references: true + allow-bean-definition-overriding: true + jackson: + date-format: yyyy-MM-dd HH:mm:ss + time-zone: GMT+8 + application: + # 应用名称 + name: bwie-es + profiles: + # 环境配置 + active: dev + cloud: + nacos: + discovery: + # 服务注册地址 + server-addr: 124.221.177.197:8848 + config: + # 配置中心地址 + server-addr: 124.221.177.197:8848 + # 配置文件格式 + file-extension: yml + # 共享配置 + shared-configs: + - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} diff --git a/bwie-modules/bwie-ask/src/main/resources/mapper/EsAskBuyMapper.xml b/bwie-modules/bwie-esask/src/main/resources/mapper/EsAskBuyMapper.xml similarity index 73% rename from bwie-modules/bwie-ask/src/main/resources/mapper/EsAskBuyMapper.xml rename to bwie-modules/bwie-esask/src/main/resources/mapper/EsAskBuyMapper.xml index cffbf9b..79fb72e 100644 --- a/bwie-modules/bwie-ask/src/main/resources/mapper/EsAskBuyMapper.xml +++ b/bwie-modules/bwie-esask/src/main/resources/mapper/EsAskBuyMapper.xml @@ -1,5 +1,5 @@ - + diff --git a/bwie-modules/bwie-ask/src/main/resources/mapper/EsAskRentMapper.xml b/bwie-modules/bwie-esask/src/main/resources/mapper/EsAskRentMapper.xml similarity index 72% rename from bwie-modules/bwie-ask/src/main/resources/mapper/EsAskRentMapper.xml rename to bwie-modules/bwie-esask/src/main/resources/mapper/EsAskRentMapper.xml index f356875..2d2bae1 100644 --- a/bwie-modules/bwie-ask/src/main/resources/mapper/EsAskRentMapper.xml +++ b/bwie-modules/bwie-esask/src/main/resources/mapper/EsAskRentMapper.xml @@ -1,5 +1,5 @@ - + diff --git a/bwie-modules/bwie-group/src/main/resources/mapper/GroupMapper.xml b/bwie-modules/bwie-group/src/main/resources/mapper/AskBuyRentFeign.xml similarity index 100% rename from bwie-modules/bwie-group/src/main/resources/mapper/GroupMapper.xml rename to bwie-modules/bwie-group/src/main/resources/mapper/AskBuyRentFeign.xml diff --git a/pom.xml b/pom.xml index 21104bc..dd5fe37 100644 --- a/pom.xml +++ b/pom.xml @@ -16,6 +16,7 @@ bwie-modules/bwie-background bwie-modules/bwie-ask bwie-modules/bwie-home + bwie-modules/bwie-esask