From 121fd8ce076c11fa175a3f3136c81762f4cef6e6 Mon Sep 17 00:00:00 2001 From: wangpengfei <1928057482@qq.com> Date: Fri, 12 May 2023 11:48:13 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9A=82=E6=97=B6=E5=8E=BB=E9=99=A4kafka?= =?UTF-8?q?=E4=BE=9D=E8=B5=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../supervise-customer-biz/pom.xml | 8 ++++---- .../biz/gdinstoragegd/GdInstorageGdRest.java | 18 +++++++++--------- .../gdinstoragegd/GdInstorageGdService.java | 5 ----- .../biz/gdinventoryok/GdInventoryOkRest.java | 12 ++++++------ .../customer/biz/gdsales/GdSalesRest.java | 12 ++++++------ .../MessageConsumerService.java | 8 ++++---- .../MessageProducerService.java | 16 ++++++++-------- .../supervise-report-biz/pom.xml | 8 ++++---- .../ReportSalesDayLogService.java | 6 ------ .../MessageConsumerService.java | 12 ++++++------ .../MessageProducerService.java | 16 ++++++++-------- 11 files changed, 55 insertions(+), 66 deletions(-) diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/pom.xml b/yxt_supervise/supervise-customer/supervise-customer-biz/pom.xml index a1310265..de18f2bc 100644 --- a/yxt_supervise/supervise-customer/supervise-customer-biz/pom.xml +++ b/yxt_supervise/supervise-customer/supervise-customer-biz/pom.xml @@ -135,10 +135,10 @@ - - org.springframework.cloud - spring-cloud-stream-binder-kafka - + + + + diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/gdinstoragegd/GdInstorageGdRest.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/gdinstoragegd/GdInstorageGdRest.java index df314d27..3bb904c2 100644 --- a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/gdinstoragegd/GdInstorageGdRest.java +++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/gdinstoragegd/GdInstorageGdRest.java @@ -11,13 +11,13 @@ import com.yxt.supervise.customer.api.gdsales.GdSalesQuery; import com.yxt.supervise.customer.biz.gdinstoragelog.GdInstorageLogService; import com.yxt.supervise.customer.biz.gdinventorylog.GdInventoryLogService; import com.yxt.supervise.customer.biz.gdsaleslog.GdSalesLogService; -import com.yxt.supervise.customer.kafka.messageconsumer.MessageConsumerRest; -import com.yxt.supervise.customer.kafka.messageproducer.MessageProducerRest; +//import com.yxt.supervise.customer.kafka.messageconsumer.MessageConsumerRest; +//import com.yxt.supervise.customer.kafka.messageproducer.MessageProducerRest; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.cloud.stream.annotation.StreamListener; -import org.springframework.cloud.stream.messaging.Sink; +//import org.springframework.cloud.stream.annotation.StreamListener; +//import org.springframework.cloud.stream.messaging.Sink; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; @@ -42,8 +42,8 @@ public class GdInstorageGdRest implements GdInstorageGdFeign { GdInventoryLogService inventoryLogService; @Autowired GdSalesLogService gdSalesLogService; - @Autowired - MessageProducerRest messageProducerRest; +// @Autowired +// MessageProducerRest messageProducerRest; @ApiOperation("根据条件分页查询数据的列表") @PostMapping("/listPage") @@ -73,9 +73,9 @@ public class GdInstorageGdRest implements GdInstorageGdFeign { ResultBean rb = ResultBean.fireFail(); GdInstorageLog gdInstorageLog=gdInstorageGdService.uploadAndInsert(file); //判断都就给report服务发消息 - if(ee(gdInstorageLog.getOrderDate())==true){ - messageProducerRest.send(gdInstorageLog.getOrderDate()); - } +// if(ee(gdInstorageLog.getOrderDate())==true){ +// messageProducerRest.send(gdInstorageLog.getOrderDate()); +// } rb.success().setData(gdInstorageLog); return rb; } diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/gdinstoragegd/GdInstorageGdService.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/gdinstoragegd/GdInstorageGdService.java index b08e4e8a..4e769af9 100644 --- a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/gdinstoragegd/GdInstorageGdService.java +++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/gdinstoragegd/GdInstorageGdService.java @@ -38,11 +38,6 @@ import lombok.experimental.Accessors; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.cloud.stream.annotation.EnableBinding; -import org.springframework.cloud.stream.annotation.StreamListener; -import org.springframework.cloud.stream.messaging.Sink; -import org.springframework.cloud.stream.messaging.Source; -import org.springframework.messaging.support.MessageBuilder; import org.springframework.stereotype.Service; import org.springframework.web.multipart.MultipartFile; diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/gdinventoryok/GdInventoryOkRest.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/gdinventoryok/GdInventoryOkRest.java index 0341b74c..74ff39a9 100644 --- a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/gdinventoryok/GdInventoryOkRest.java +++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/gdinventoryok/GdInventoryOkRest.java @@ -14,7 +14,7 @@ import com.yxt.supervise.customer.biz.gdinstoragelog.GdInstorageLogService; import com.yxt.supervise.customer.biz.gdinventorylog.GdInventoryLogService; import com.yxt.supervise.customer.biz.gdinventoryyc.GdInventoryYcService; import com.yxt.supervise.customer.biz.gdsaleslog.GdSalesLogService; -import com.yxt.supervise.customer.kafka.messageproducer.MessageProducerRest; +//import com.yxt.supervise.customer.kafka.messageproducer.MessageProducerRest; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; @@ -46,8 +46,8 @@ public class GdInventoryOkRest implements GdInventoryOkFeign { GdInventoryLogService inventoryLogService; @Autowired GdSalesLogService gdSalesLogService; - @Autowired - MessageProducerRest messageProducerRest; +// @Autowired +// MessageProducerRest messageProducerRest; //@Override @ApiOperation("根据条件分页查询数据的列表") @@ -78,9 +78,9 @@ public class GdInventoryOkRest implements GdInventoryOkFeign { public ResultBean uploadGdData(@RequestParam("file") MultipartFile file) { ResultBean rb = ResultBean.fireFail(); GdInventoryLog log=gdInventoryOkService.uploadAndResetData(file); - if(ee(log.getOrderDate())==true){ - messageProducerRest.send(log.getOrderDate()); - } +// if(ee(log.getOrderDate())==true){ +// messageProducerRest.send(log.getOrderDate()); +// } return rb.success().setData(log); } public Boolean ee(String orderDate){ diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/gdsales/GdSalesRest.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/gdsales/GdSalesRest.java index cfbe24dc..be777905 100644 --- a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/gdsales/GdSalesRest.java +++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/gdsales/GdSalesRest.java @@ -18,7 +18,7 @@ import com.yxt.supervise.customer.biz.gdinstoragegd.GdInstorageGdService; import com.yxt.supervise.customer.biz.gdinstoragelog.GdInstorageLogService; import com.yxt.supervise.customer.biz.gdinventorylog.GdInventoryLogService; import com.yxt.supervise.customer.biz.gdsaleslog.GdSalesLogService; -import com.yxt.supervise.customer.kafka.messageproducer.MessageProducerRest; +//import com.yxt.supervise.customer.kafka.messageproducer.MessageProducerRest; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.apache.poi.ss.usermodel.FillPatternType; @@ -56,8 +56,8 @@ public class GdSalesRest implements GdSalesFeign { GdInventoryLogService inventoryLogService; @Autowired GdSalesLogService gdSalesLogService; - @Autowired - MessageProducerRest messageProducerRest; +// @Autowired +// MessageProducerRest messageProducerRest; @Override @@ -89,9 +89,9 @@ public class GdSalesRest implements GdSalesFeign { public ResultBean uploadGdData(@RequestParam("file") MultipartFile file) { ResultBean rb = ResultBean.fireFail(); GdSalesLog log=gdSalesService.uploadAndInsert(file); - if(ee(log.getOrderDate())==true){ - messageProducerRest.send(log.getOrderDate()); - } +// if(ee(log.getOrderDate())==true){ +// messageProducerRest.send(log.getOrderDate()); +// } return rb.success().setData(log); } public Boolean ee(String orderDate){ diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/kafka/messageconsumer/MessageConsumerService.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/kafka/messageconsumer/MessageConsumerService.java index 3ec38161..c7b11c33 100644 --- a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/kafka/messageconsumer/MessageConsumerService.java +++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/kafka/messageconsumer/MessageConsumerService.java @@ -1,10 +1,10 @@ package com.yxt.supervise.customer.kafka.messageconsumer; import lombok.extern.slf4j.Slf4j; -import org.springframework.cloud.stream.annotation.EnableBinding; -import org.springframework.cloud.stream.annotation.StreamListener; -import org.springframework.cloud.stream.messaging.Sink; -import org.springframework.cloud.stream.messaging.Source; +//import org.springframework.cloud.stream.annotation.EnableBinding; +//import org.springframework.cloud.stream.annotation.StreamListener; +//import org.springframework.cloud.stream.messaging.Sink; +//import org.springframework.cloud.stream.messaging.Source; import org.springframework.stereotype.Service; /** diff --git a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/kafka/messageproducer/MessageProducerService.java b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/kafka/messageproducer/MessageProducerService.java index f05058e7..c22406ba 100644 --- a/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/kafka/messageproducer/MessageProducerService.java +++ b/yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/kafka/messageproducer/MessageProducerService.java @@ -1,10 +1,10 @@ package com.yxt.supervise.customer.kafka.messageproducer; import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.cloud.stream.annotation.EnableBinding; -import org.springframework.cloud.stream.messaging.Source; -import org.springframework.messaging.support.MessageBuilder; +//import org.springframework.beans.factory.annotation.Autowired; +//import org.springframework.cloud.stream.annotation.EnableBinding; +//import org.springframework.cloud.stream.messaging.Source; +//import org.springframework.messaging.support.MessageBuilder; import org.springframework.stereotype.Service; /** @@ -13,13 +13,13 @@ import org.springframework.stereotype.Service; */ @Slf4j @Service -@EnableBinding(Source.class) +//@EnableBinding(Source.class) public class MessageProducerService { - @Autowired - private Source source; + //@Autowired + //private Source source; public void sendMsg(String msg) { log.info("customer开始执行"); log.info(msg); - source.output().send(MessageBuilder.withPayload(msg).build()); + //source.output().send(MessageBuilder.withPayload(msg).build()); } } diff --git a/yxt_supervise/supervise-report/supervise-report-biz/pom.xml b/yxt_supervise/supervise-report/supervise-report-biz/pom.xml index bb2df1ae..442f7c32 100644 --- a/yxt_supervise/supervise-report/supervise-report-biz/pom.xml +++ b/yxt_supervise/supervise-report/supervise-report-biz/pom.xml @@ -86,10 +86,10 @@ fastcsv 2.2.1 - - org.springframework.cloud - spring-cloud-stream-binder-kafka - + + + + diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/reportsalesdaylog/ReportSalesDayLogService.java b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/reportsalesdaylog/ReportSalesDayLogService.java index 439d1b3a..5ee5de9d 100644 --- a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/reportsalesdaylog/ReportSalesDayLogService.java +++ b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/reportsalesdaylog/ReportSalesDayLogService.java @@ -13,12 +13,6 @@ import com.yxt.supervise.report.api.reportsalesdaylog.ReportSalesDayLogQuery; import com.yxt.supervise.report.api.reportsalesdaylog.ReportSalesDayLogVo; import com.yxt.supervise.report.kafka.messageconsumer.MessageConsumerService; import org.apache.commons.lang3.StringUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.cloud.stream.annotation.EnableBinding; -import org.springframework.cloud.stream.annotation.StreamListener; -import org.springframework.cloud.stream.messaging.Sink; -import org.springframework.cloud.stream.messaging.Source; -import org.springframework.messaging.handler.annotation.SendTo; import org.springframework.stereotype.Service; import java.util.Date; diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/kafka/messageconsumer/MessageConsumerService.java b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/kafka/messageconsumer/MessageConsumerService.java index 7c1cf33a..4515b15f 100644 --- a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/kafka/messageconsumer/MessageConsumerService.java +++ b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/kafka/messageconsumer/MessageConsumerService.java @@ -4,9 +4,9 @@ import com.yxt.supervise.report.biz.reportsalesdaygather.ReportSalesDayGatherSer import com.yxt.supervise.report.biz.thread.ReportThread; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.cloud.stream.annotation.EnableBinding; -import org.springframework.cloud.stream.annotation.StreamListener; -import org.springframework.cloud.stream.messaging.Sink; +//import org.springframework.cloud.stream.annotation.EnableBinding; +//import org.springframework.cloud.stream.annotation.StreamListener; +//import org.springframework.cloud.stream.messaging.Sink; import org.springframework.stereotype.Service; /** @@ -15,15 +15,15 @@ import org.springframework.stereotype.Service; */ @Slf4j @Service -@EnableBinding(Sink.class) +//@EnableBinding(Sink.class) public class MessageConsumerService { @Autowired ReportThread reportThread; - @StreamListener(Sink.INPUT) + //@StreamListener(Sink.INPUT) public void recieve(String payload) { log.info("report接收"+payload); - reportThread.ReportThread(payload); + //reportThread.ReportThread(payload); System.out.println(payload); } } diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/kafka/messageproducer/MessageProducerService.java b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/kafka/messageproducer/MessageProducerService.java index c16ac26e..4132c915 100644 --- a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/kafka/messageproducer/MessageProducerService.java +++ b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/kafka/messageproducer/MessageProducerService.java @@ -2,11 +2,11 @@ package com.yxt.supervise.report.kafka.messageproducer; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.cloud.stream.annotation.EnableBinding; -import org.springframework.cloud.stream.annotation.StreamListener; -import org.springframework.cloud.stream.messaging.Sink; -import org.springframework.cloud.stream.messaging.Source; -import org.springframework.messaging.support.MessageBuilder; +//import org.springframework.cloud.stream.annotation.EnableBinding; +//import org.springframework.cloud.stream.annotation.StreamListener; +//import org.springframework.cloud.stream.messaging.Sink; +//import org.springframework.cloud.stream.messaging.Source; +//import org.springframework.messaging.support.MessageBuilder; import org.springframework.stereotype.Service; /** @@ -15,8 +15,8 @@ import org.springframework.stereotype.Service; */ @Slf4j @Service -@EnableBinding(Source.class) +//@EnableBinding(Source.class) public class MessageProducerService { - @Autowired - private Source source; + //@Autowired + //private Source source; }