From ba5cf8d4621d7085c627dbc7a23c9d236ff8122a Mon Sep 17 00:00:00 2001 From: yuyang <2265829957@qq.com> Date: Fri, 10 Sep 2021 15:58:02 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B6=88=E6=81=AF=E5=85=AC?= =?UTF-8?q?=E5=85=B1=E6=8E=A5=E5=8F=A3=EF=BC=8C=E5=A2=9E=E5=8A=A0=E6=97=A5?= =?UTF-8?q?=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/factory/WebSocketFallbackFactory.java | 2 ++ .../order/api/XhpcPileOrderController.java | 12 ++---------- .../OrderNotificationWebSocketController.java | 18 ++++++++++++++---- 3 files changed, 18 insertions(+), 14 deletions(-) diff --git a/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/api/factory/WebSocketFallbackFactory.java b/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/api/factory/WebSocketFallbackFactory.java index 637b3efb..f28c8c8e 100644 --- a/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/api/factory/WebSocketFallbackFactory.java +++ b/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/api/factory/WebSocketFallbackFactory.java @@ -5,12 +5,14 @@ import com.xhpc.common.core.domain.R; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.cloud.openfeign.FallbackFactory; +import org.springframework.stereotype.Component; /** * @author yuyang * @date 2021/9/10 15:14 * @Version 1.0 */ +@Component public class WebSocketFallbackFactory implements FallbackFactory { private static final Logger logger = LoggerFactory.getLogger(WebSocketFallbackFactory.class); diff --git a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/api/XhpcPileOrderController.java b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/api/XhpcPileOrderController.java index efd524e8..09bd78c4 100644 --- a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/api/XhpcPileOrderController.java +++ b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/api/XhpcPileOrderController.java @@ -5,7 +5,6 @@ import cn.hutool.core.date.DateUtil; import com.alibaba.fastjson.JSONObject; import com.rabbitmq.client.Channel; import com.rabbitmq.client.Connection; -import com.xhpc.common.api.SmsService; import com.xhpc.common.core.domain.R; import com.xhpc.common.core.web.controller.BaseController; import com.xhpc.common.data.redis.CacheOrderData; @@ -13,9 +12,9 @@ import com.xhpc.common.data.redis.CacheRealtimeData; import com.xhpc.common.domain.XhpcRate; import com.xhpc.common.redis.service.RedisService; import com.xhpc.common.util.ConnectionRabbitMQUtil; -import com.xhpc.order.domain.*; +import com.xhpc.order.domain.XhpcChargeOrder; +import com.xhpc.order.domain.XhpcHistoryOrder; import com.xhpc.order.service.IXhpcChargeOrderService; -import com.xhpc.order.service.IXhpcHistoryOrderService; import com.xhpc.order.service.IXhpcRealTimeOrderService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -41,16 +40,9 @@ public class XhpcPileOrderController extends BaseController { @Autowired private IXhpcChargeOrderService xhpcChargeOrderService; - @Autowired - private IXhpcHistoryOrderService xhpcHistoryOrderService; - @Autowired private IXhpcRealTimeOrderService xhpcRealTimeOrderService; - @Autowired - private SmsService smsService; - - private static final Logger logger = LoggerFactory.getLogger(XhpcPileOrderController.class); /** * 测试 diff --git a/xhpc-modules/xhpc-wxma/src/main/java/com/xhpc/wxma/controller/OrderNotificationWebSocketController.java b/xhpc-modules/xhpc-wxma/src/main/java/com/xhpc/wxma/controller/OrderNotificationWebSocketController.java index bf09cc5c..ba7930a4 100644 --- a/xhpc-modules/xhpc-wxma/src/main/java/com/xhpc/wxma/controller/OrderNotificationWebSocketController.java +++ b/xhpc-modules/xhpc-wxma/src/main/java/com/xhpc/wxma/controller/OrderNotificationWebSocketController.java @@ -1,27 +1,37 @@ package com.xhpc.wxma.controller; +import cn.hutool.core.date.DateUtil; +import com.xhpc.common.core.domain.R; +import com.xhpc.common.core.web.controller.BaseController; import com.xhpc.wxma.socket.OrderNotificationWebSocket; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; +import java.util.Calendar; + /** * @author yuyang * @date 2021/8/11 17:47 */ @RestController -@RequestMapping("/orderWebSocket") -public class OrderNotificationWebSocketController { +public class OrderNotificationWebSocketController extends BaseController { + private static final Logger logger = LoggerFactory.getLogger(OrderNotificationWebSocketController.class); @GetMapping("/test") public void test(@RequestParam String userId){ OrderNotificationWebSocket.sendMessage(userId,"有新订单啦"); } - @GetMapping("/getMessage") - public void getMessage(@RequestParam String userId,@RequestParam String message){ + @GetMapping("/orderWebSocket/getMessage") + public R getMessage(@RequestParam String userId, @RequestParam String message){ + logger.info("<<<<1111<<<<<<接收时间<<<<<<<<<<<<<<"+ DateUtil.format(Calendar.getInstance().getTime(), "yyyy-MM-dd HH:mm:ss")+">>>>>>>>>>>>>>>>>"); OrderNotificationWebSocket.sendMessage(userId,message); + logger.info("<<<<1111<<<<发送时间<<<<<<<<<<<<<<"+ DateUtil.format(Calendar.getInstance().getTime(), "yyyy-MM-dd HH:mm:ss")+">>>>>>>>>>>>>>>>>"); + return R.ok(); }