Browse Source

暂时去除kafka依赖

master
wangpengfei 2 years ago
parent
commit
121fd8ce07
  1. 8
      yxt_supervise/supervise-customer/supervise-customer-biz/pom.xml
  2. 18
      yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/gdinstoragegd/GdInstorageGdRest.java
  3. 5
      yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/gdinstoragegd/GdInstorageGdService.java
  4. 12
      yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/gdinventoryok/GdInventoryOkRest.java
  5. 12
      yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/biz/gdsales/GdSalesRest.java
  6. 8
      yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/kafka/messageconsumer/MessageConsumerService.java
  7. 16
      yxt_supervise/supervise-customer/supervise-customer-biz/src/main/java/com/yxt/supervise/customer/kafka/messageproducer/MessageProducerService.java
  8. 8
      yxt_supervise/supervise-report/supervise-report-biz/pom.xml
  9. 6
      yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/reportsalesdaylog/ReportSalesDayLogService.java
  10. 12
      yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/kafka/messageconsumer/MessageConsumerService.java
  11. 16
      yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/kafka/messageproducer/MessageProducerService.java

8
yxt_supervise/supervise-customer/supervise-customer-biz/pom.xml

@ -135,10 +135,10 @@
<!-- <version>0.0.1</version>--> <!-- <version>0.0.1</version>-->
<!-- <scope>compile</scope>--> <!-- <scope>compile</scope>-->
<!-- </dependency>--> <!-- </dependency>-->
<dependency> <!-- <dependency>-->
<groupId>org.springframework.cloud</groupId> <!-- <groupId>org.springframework.cloud</groupId>-->
<artifactId>spring-cloud-stream-binder-kafka</artifactId> <!-- <artifactId>spring-cloud-stream-binder-kafka</artifactId>-->
</dependency> <!-- </dependency>-->
</dependencies> </dependencies>

18
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.gdinstoragelog.GdInstorageLogService;
import com.yxt.supervise.customer.biz.gdinventorylog.GdInventoryLogService; import com.yxt.supervise.customer.biz.gdinventorylog.GdInventoryLogService;
import com.yxt.supervise.customer.biz.gdsaleslog.GdSalesLogService; import com.yxt.supervise.customer.biz.gdsaleslog.GdSalesLogService;
import com.yxt.supervise.customer.kafka.messageconsumer.MessageConsumerRest; //import com.yxt.supervise.customer.kafka.messageconsumer.MessageConsumerRest;
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.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.cloud.stream.annotation.StreamListener; //import org.springframework.cloud.stream.annotation.StreamListener;
import org.springframework.cloud.stream.messaging.Sink; //import org.springframework.cloud.stream.messaging.Sink;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartFile;
@ -42,8 +42,8 @@ public class GdInstorageGdRest implements GdInstorageGdFeign {
GdInventoryLogService inventoryLogService; GdInventoryLogService inventoryLogService;
@Autowired @Autowired
GdSalesLogService gdSalesLogService; GdSalesLogService gdSalesLogService;
@Autowired // @Autowired
MessageProducerRest messageProducerRest; // MessageProducerRest messageProducerRest;
@ApiOperation("根据条件分页查询数据的列表") @ApiOperation("根据条件分页查询数据的列表")
@PostMapping("/listPage") @PostMapping("/listPage")
@ -73,9 +73,9 @@ public class GdInstorageGdRest implements GdInstorageGdFeign {
ResultBean rb = ResultBean.fireFail(); ResultBean rb = ResultBean.fireFail();
GdInstorageLog gdInstorageLog=gdInstorageGdService.uploadAndInsert(file); GdInstorageLog gdInstorageLog=gdInstorageGdService.uploadAndInsert(file);
//判断都就给report服务发消息 //判断都就给report服务发消息
if(ee(gdInstorageLog.getOrderDate())==true){ // if(ee(gdInstorageLog.getOrderDate())==true){
messageProducerRest.send(gdInstorageLog.getOrderDate()); // messageProducerRest.send(gdInstorageLog.getOrderDate());
} // }
rb.success().setData(gdInstorageLog); rb.success().setData(gdInstorageLog);
return rb; return rb;
} }

5
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 lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired; 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.stereotype.Service;
import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartFile;

12
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.gdinventorylog.GdInventoryLogService;
import com.yxt.supervise.customer.biz.gdinventoryyc.GdInventoryYcService; import com.yxt.supervise.customer.biz.gdinventoryyc.GdInventoryYcService;
import com.yxt.supervise.customer.biz.gdsaleslog.GdSalesLogService; 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.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
@ -46,8 +46,8 @@ public class GdInventoryOkRest implements GdInventoryOkFeign {
GdInventoryLogService inventoryLogService; GdInventoryLogService inventoryLogService;
@Autowired @Autowired
GdSalesLogService gdSalesLogService; GdSalesLogService gdSalesLogService;
@Autowired // @Autowired
MessageProducerRest messageProducerRest; // MessageProducerRest messageProducerRest;
//@Override //@Override
@ApiOperation("根据条件分页查询数据的列表") @ApiOperation("根据条件分页查询数据的列表")
@ -78,9 +78,9 @@ public class GdInventoryOkRest implements GdInventoryOkFeign {
public ResultBean<GdInventoryLog> uploadGdData(@RequestParam("file") MultipartFile file) { public ResultBean<GdInventoryLog> uploadGdData(@RequestParam("file") MultipartFile file) {
ResultBean rb = ResultBean.fireFail(); ResultBean rb = ResultBean.fireFail();
GdInventoryLog log=gdInventoryOkService.uploadAndResetData(file); GdInventoryLog log=gdInventoryOkService.uploadAndResetData(file);
if(ee(log.getOrderDate())==true){ // if(ee(log.getOrderDate())==true){
messageProducerRest.send(log.getOrderDate()); // messageProducerRest.send(log.getOrderDate());
} // }
return rb.success().setData(log); return rb.success().setData(log);
} }
public Boolean ee(String orderDate){ public Boolean ee(String orderDate){

12
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.gdinstoragelog.GdInstorageLogService;
import com.yxt.supervise.customer.biz.gdinventorylog.GdInventoryLogService; import com.yxt.supervise.customer.biz.gdinventorylog.GdInventoryLogService;
import com.yxt.supervise.customer.biz.gdsaleslog.GdSalesLogService; 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.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import org.apache.poi.ss.usermodel.FillPatternType; import org.apache.poi.ss.usermodel.FillPatternType;
@ -56,8 +56,8 @@ public class GdSalesRest implements GdSalesFeign {
GdInventoryLogService inventoryLogService; GdInventoryLogService inventoryLogService;
@Autowired @Autowired
GdSalesLogService gdSalesLogService; GdSalesLogService gdSalesLogService;
@Autowired // @Autowired
MessageProducerRest messageProducerRest; // MessageProducerRest messageProducerRest;
@Override @Override
@ -89,9 +89,9 @@ public class GdSalesRest implements GdSalesFeign {
public ResultBean<GdSalesLog> uploadGdData(@RequestParam("file") MultipartFile file) { public ResultBean<GdSalesLog> uploadGdData(@RequestParam("file") MultipartFile file) {
ResultBean rb = ResultBean.fireFail(); ResultBean rb = ResultBean.fireFail();
GdSalesLog log=gdSalesService.uploadAndInsert(file); GdSalesLog log=gdSalesService.uploadAndInsert(file);
if(ee(log.getOrderDate())==true){ // if(ee(log.getOrderDate())==true){
messageProducerRest.send(log.getOrderDate()); // messageProducerRest.send(log.getOrderDate());
} // }
return rb.success().setData(log); return rb.success().setData(log);
} }
public Boolean ee(String orderDate){ public Boolean ee(String orderDate){

8
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; package com.yxt.supervise.customer.kafka.messageconsumer;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.cloud.stream.annotation.EnableBinding; //import org.springframework.cloud.stream.annotation.EnableBinding;
import org.springframework.cloud.stream.annotation.StreamListener; //import org.springframework.cloud.stream.annotation.StreamListener;
import org.springframework.cloud.stream.messaging.Sink; //import org.springframework.cloud.stream.messaging.Sink;
import org.springframework.cloud.stream.messaging.Source; //import org.springframework.cloud.stream.messaging.Source;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
/** /**

16
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; package com.yxt.supervise.customer.kafka.messageproducer;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired; //import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.cloud.stream.annotation.EnableBinding; //import org.springframework.cloud.stream.annotation.EnableBinding;
import org.springframework.cloud.stream.messaging.Source; //import org.springframework.cloud.stream.messaging.Source;
import org.springframework.messaging.support.MessageBuilder; //import org.springframework.messaging.support.MessageBuilder;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
/** /**
@ -13,13 +13,13 @@ import org.springframework.stereotype.Service;
*/ */
@Slf4j @Slf4j
@Service @Service
@EnableBinding(Source.class) //@EnableBinding(Source.class)
public class MessageProducerService { public class MessageProducerService {
@Autowired //@Autowired
private Source source; //private Source source;
public void sendMsg(String msg) { public void sendMsg(String msg) {
log.info("customer开始执行"); log.info("customer开始执行");
log.info(msg); log.info(msg);
source.output().send(MessageBuilder.withPayload(msg).build()); //source.output().send(MessageBuilder.withPayload(msg).build());
} }
} }

8
yxt_supervise/supervise-report/supervise-report-biz/pom.xml

@ -86,10 +86,10 @@
<artifactId>fastcsv</artifactId> <artifactId>fastcsv</artifactId>
<version>2.2.1</version> <version>2.2.1</version>
</dependency> </dependency>
<dependency> <!-- <dependency>-->
<groupId>org.springframework.cloud</groupId> <!-- <groupId>org.springframework.cloud</groupId>-->
<artifactId>spring-cloud-stream-binder-kafka</artifactId> <!-- <artifactId>spring-cloud-stream-binder-kafka</artifactId>-->
</dependency> <!-- </dependency>-->
</dependencies> </dependencies>

6
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.api.reportsalesdaylog.ReportSalesDayLogVo;
import com.yxt.supervise.report.kafka.messageconsumer.MessageConsumerService; import com.yxt.supervise.report.kafka.messageconsumer.MessageConsumerService;
import org.apache.commons.lang3.StringUtils; 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 org.springframework.stereotype.Service;
import java.util.Date; import java.util.Date;

12
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 com.yxt.supervise.report.biz.thread.ReportThread;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.cloud.stream.annotation.EnableBinding; //import org.springframework.cloud.stream.annotation.EnableBinding;
import org.springframework.cloud.stream.annotation.StreamListener; //import org.springframework.cloud.stream.annotation.StreamListener;
import org.springframework.cloud.stream.messaging.Sink; //import org.springframework.cloud.stream.messaging.Sink;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
/** /**
@ -15,15 +15,15 @@ import org.springframework.stereotype.Service;
*/ */
@Slf4j @Slf4j
@Service @Service
@EnableBinding(Sink.class) //@EnableBinding(Sink.class)
public class MessageConsumerService { public class MessageConsumerService {
@Autowired @Autowired
ReportThread reportThread; ReportThread reportThread;
@StreamListener(Sink.INPUT) //@StreamListener(Sink.INPUT)
public void recieve(String payload) { public void recieve(String payload) {
log.info("report接收"+payload); log.info("report接收"+payload);
reportThread.ReportThread(payload); //reportThread.ReportThread(payload);
System.out.println(payload); System.out.println(payload);
} }
} }

16
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 lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.cloud.stream.annotation.EnableBinding; //import org.springframework.cloud.stream.annotation.EnableBinding;
import org.springframework.cloud.stream.annotation.StreamListener; //import org.springframework.cloud.stream.annotation.StreamListener;
import org.springframework.cloud.stream.messaging.Sink; //import org.springframework.cloud.stream.messaging.Sink;
import org.springframework.cloud.stream.messaging.Source; //import org.springframework.cloud.stream.messaging.Source;
import org.springframework.messaging.support.MessageBuilder; //import org.springframework.messaging.support.MessageBuilder;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
/** /**
@ -15,8 +15,8 @@ import org.springframework.stereotype.Service;
*/ */
@Slf4j @Slf4j
@Service @Service
@EnableBinding(Source.class) //@EnableBinding(Source.class)
public class MessageProducerService { public class MessageProducerService {
@Autowired //@Autowired
private Source source; //private Source source;
} }

Loading…
Cancel
Save