充电宝归还

Author: Romantic-Lei

share-parent/share-modules/share-device/src/main/java/com/share/device/api/DeviceApiControlller.java

@@ -42,7 +42,7 @@ public AjaxResult getStation(@PathVariable Long id, @PathVariable String latitud
 
     @Operation(summary = "扫码充电")
     @RequiresLogin
-    @GetMapping("scanCharge/{cabinetNo}")
+    @GetMapping("/scanCharge/{cabinetNo}")
     public AjaxResult scanCharge(@PathVariable String cabinetNo) {
         return success(deviceService.scanCharge(cabinetNo));
     }

share-parent/share-modules/share-device/src/main/java/com/share/device/emqx/callback/OnMessageCallback.java

@@ -1,15 +1,21 @@
 package com.share.device.emqx.callback;
 
+import com.alibaba.fastjson2.JSONObject;
+import com.share.device.emqx.factory.MessageHandlerFactory;
 import lombok.extern.slf4j.Slf4j;
+import com.share.device.emqx.handler.MessageHandler;
 import org.eclipse.paho.client.mqttv3.IMqttDeliveryToken;
 import org.eclipse.paho.client.mqttv3.MqttCallback;
 import org.eclipse.paho.client.mqttv3.MqttMessage;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 @Slf4j
 @Component
 public class OnMessageCallback implements MqttCallback {
 
+    @Autowired
+    private MessageHandlerFactory messageHandlerFactory;
 
     @Override
     public void connectionLost(Throwable cause) {
@@ -23,6 +29,17 @@ public void messageArrived(String topic, MqttMessage message) {
         System.out.println("接收消息主题:" + topic);
         System.out.println("接收消息Qos:" + message.getQos());
         System.out.println("接收消息内容:" + new String(message.getPayload()));
+        try {
+            // 根据主题选择不同的处理逻辑
+            MessageHandler massageHandler = messageHandlerFactory.getMassageHandler(topic);
+            if(null != massageHandler) {
+                String content = new String(message.getPayload());
+                massageHandler.handleMessage(JSONObject.parseObject(content));
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+            log.error("mqtt消息异常：{}", new String(message.getPayload()));
+        }
 
     }
 

share-parent/share-modules/share-device/src/main/java/com/share/device/emqx/contant/EmqxConstants.java renamed to share-parent/share-modules/share-device/src/main/java/com/share/device/emqx/constant/EmqxConstants.java

@@ -10,12 +10,12 @@
 import com.share.device.domain.PowerBank;
 import com.share.device.domain.Station;
 import com.share.device.emqx.annotation.JiaEmqx;
+import com.share.device.emqx.constant.EmqxConstants;
 import com.share.device.emqx.handler.MessageHandler;
 import com.share.device.service.ICabinetService;
 import com.share.device.service.ICabinetSlotService;
 import com.share.device.service.IPowerBankService;
 import com.share.device.service.IStationService;
-import com.share.order.api.RemoteOrderInfoService;
 import com.share.order.domain.EndOrderVo;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
@@ -25,13 +25,11 @@
 
 import java.math.BigDecimal;
 import java.util.Date;
-import java.util.List;
 import java.util.concurrent.TimeUnit;
-import java.util.stream.Collectors;
 
 @Slf4j
 @Component
-@JiaEmqx(topic = com.share.device.emqx.constant.EmqxConstants.TOPIC_POWERBANK_CONNECTED)
+@JiaEmqx(topic = EmqxConstants.TOPIC_POWERBANK_CONNECTED)
 public class PowerBankConnectedHandler implements MessageHandler {
 
     @Autowired

share-parent/share-modules/share-device/src/main/java/com/share/device/emqx/handler/impl/PowerBankConnectedHandler.java

@@ -9,6 +9,7 @@
 import com.share.device.domain.PowerBank;
 import com.share.device.domain.Station;
 import com.share.device.emqx.annotation.JiaEmqx;
+import com.share.device.emqx.constant.EmqxConstants;
 import com.share.device.emqx.handler.MessageHandler;
 import com.share.device.service.ICabinetService;
 import com.share.device.service.ICabinetSlotService;
@@ -27,7 +28,7 @@
 
 @Slf4j
 @Component
-@JiaEmqx(topic = com.share.device.emqx.constant.EmqxConstants.TOPIC_POWERBANK_UNLOCK)
+@JiaEmqx(topic = EmqxConstants.TOPIC_POWERBANK_UNLOCK)
 public class PowerBankUnlockHandler implements MessageHandler {
 
     @Autowired

share-parent/share-modules/share-device/src/main/java/com/share/device/emqx/handler/impl/PowerBankUnlockHandler.java

@@ -3,13 +3,14 @@
 
 import com.alibaba.fastjson2.JSONObject;
 import com.share.device.emqx.annotation.JiaEmqx;
+import com.share.device.emqx.constant.EmqxConstants;
 import com.share.device.emqx.handler.MessageHandler;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
 
 @Slf4j
 @Component
-@JiaEmqx(topic = com.share.device.emqx.constant.EmqxConstants.TOPIC_PROPERTY_POST)
+@JiaEmqx(topic = EmqxConstants.TOPIC_PROPERTY_POST)
 public class PropertyPostHandler implements MessageHandler {
 
     @Override

share-parent/share-modules/share-device/src/main/java/com/share/device/emqx/handler/impl/PropertyPostHandler.java

@@ -294,36 +294,4 @@ public OrderInfo selectOrderInfoById(Long id) {
         return orderInfo;
     }
 
-    public static void main(String[] args) {
-        // 假设这是从JSON解析得到的List<Map<String, Object>>
-        List<Map<String, Object>> dataList = new ArrayList<>();
-        Map<String, Object> map1 = new HashMap<>();
-        map1.put("MONTH", "2024-10");
-        map1.put("order_count", 1);
-        dataList.add(map1);
-
-        Map<String, Object> map2 = new HashMap<>();
-        map2.put("MONTH", "2024-11");
-        map2.put("order_count", 4);
-        dataList.add(map2);
-
-        Map<String, Object> map3 = new HashMap<>();
-        map3.put("MONTH", "2024-12");
-        map3.put("order_count", 1);
-        dataList.add(map3);
-
-        Map dataMap = new HashMap<>();
-
-        List<Object> monthList = new ArrayList<>();
-        List<Object> orderCountList = new ArrayList<>();
-
-        for (Map<String, Object> map : dataList) {
-            monthList.add(map.get("MONTH"));
-            orderCountList.add(map.get("order_count"));
-        }
-
-        dataMap.put("dateList", monthList);
-        dataMap.put("countList", orderCountList);
-
-    }
 }