text():测试

cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/remote/factory/RemoteDataFallbackFactory.java

@@ -1,6 +1,8 @@
 package com.muyu.common.system.remote.factory;
 
+import com.muyu.common.core.domain.Result;
 import com.muyu.common.system.remote.RemoteDataService;
+import lombok.NonNull;
 import org.springframework.cloud.openfeign.FallbackFactory;
 import org.springframework.stereotype.Component;
 
@@ -19,6 +21,10 @@ public class RemoteDataFallbackFactory implements FallbackFactory<RemoteDataServ
     @Override
     public RemoteDataService create(Throwable cause) {
         return new RemoteDataService() {
+            @Override
+            public Result<String> carRealTimeStatus(@NonNull String vin, @NonNull Boolean status) {
+                return Result.error("远程调用错误");
+            }
         };
     }
 }

cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/controller/SysCarMessageController.java

@@ -1,6 +1,7 @@
 package com.muyu.openbusiness.controller;
 
 import com.muyu.common.system.domain.SysUser;
+import com.muyu.common.system.remote.RemoteDataService;
 import com.muyu.openbusiness.domain.SysCarMessage;
 
 import com.muyu.openbusiness.service.ISysCarMessageService;
@@ -33,58 +34,8 @@ public class SysCarMessageController extends BaseController
 {
     @Resource
     private ISysCarMessageService sysCarMessageService;
-//    @Autowired
+    @Resource
-//    private SystemFeign feign;
+    private RemoteDataService remoteDataService;
-    @Autowired
-    private HttpSession session;
-
-    static String TEST = "7E 56 45 48 49 43 4C 45 5F 4D 53 47 3A 56 49 4E 31 32 B6 A1 C0 F2 B3 E5 D9 A8 C1 B2 E3 F4 A6 D7 C9 F1 E0 A3 B5 C8 D4 E2 A1 F5 B6 C7 E8 D9 A0 E3 B2 C4 F5 D6 A8 C0 E1 F2 B7 D8 A4 E3 C2 B1 A5 D9 F6 C8 E7 A0 B2 C3 D1 F4 E5 A9 3F 2A 7B D9 1E C8 4D A3 6F 5B 9A 0C 3E 7D F2 8B 46 1A 5E 9F 2D 73 8C 4A B1 6C 5D E2 7E C4 39 0B AD 7C 1F 0E 3C 68 92 B4 5A 7F 6E 81 0D 4B A5 E3 F9 2E 8A 37 6D 14 5C 73 8E D2 04 9B 3A 6C F1 70 BF 29 5F 8C 43 61 24 5D 7A 9C 0A D5 1B 3D 6E F4 78 3E 5B";
-
-    @GetMapping("/test")
-    public Result test() throws InterruptedException, ExecutionException {
-        List<SysCarMessage> list = (List<SysCarMessage>) session.getAttribute("list");
-
-        // 检查 list 是否为空
-        if (list == null || list.isEmpty()) {
-            return Result.success(new String[0]); // 或者返回一个适当的错误消息
-        }
-
-        String[] test = TEST.split(" ");
-        String[] results = new String[list.size()];
-
-        List<CompletableFuture<String>> futures = new ArrayList<>();
-
-        for (SysCarMessage carMessage : list) {
-            futures.add(CompletableFuture.supplyAsync(() -> {
-                int startIndex = Integer.parseInt(carMessage.getMessageStartIndex()) - 1;
-                int endIndex = Integer.parseInt(carMessage.getMessageEndIndex());
-                StringBuilder hexBuilder = new StringBuilder();
-
-                for (int j = startIndex; j < endIndex; j++) {
-                    hexBuilder.append(test[j]);
-                }
-
-                String hex = hexBuilder.toString();
-                char[] result = new char[hex.length() / 2];
-
-                for (int x = 0; x < hex.length(); x += 2) {
-                    int high = Character.digit(hex.charAt(x), 16);
-                    int low = Character.digit(hex.charAt(x + 1), 16);
-                    result[x / 2] = (char) ((high << 4) + low);
-                }
-
-                return new String(result);
-            }));
-        }
-
-        for (int i = 0; i < futures.size(); i++) {
-            results[i] = futures.get(i).get();
-        }
-
-        return Result.success(results);
-    }
-
-
     /**
      * 查询车辆报文记录列表
      */
@@ -92,10 +43,7 @@ public class SysCarMessageController extends BaseController
     @GetMapping("/list")
     public Result<List<SysCarMessage>> list(SysCarMessage sysCarMessage)
     {
-//        Result info = feign.getInfo();
-//        SysUser sysUser = (SysUser) info.getData();
         List<SysCarMessage> list = sysCarMessageService.selectSysCarMessageList(sysCarMessage);
-        session.setAttribute("list", list);
         return Result.success(list);
     }
 

cloud-modules/cloud-modules-parsing/pom.xml

@@ -107,6 +107,10 @@
             <version>3.6.3</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>io.netty</groupId>
+            <artifactId>netty-codec-mqtt</artifactId>
+        </dependency>
     </dependencies>
 
     <build>

cloud-modules/cloud-modules-parsing/src/main/java/com/muyu/parsing/consumer/RabbitListenerComponent.java

@@ -1,6 +1,6 @@
 package com.muyu.parsing.consumer;
 
-import com.muyu.cargateway.domain.properties.MqttProperties;
+import com.muyu.car.gateway.domain.properties.MqttProperties;
 import com.muyu.common.rabbit.constants.RabbitConstants;
 import com.muyu.parsing.mqtt.service.MqttClientService;
 import com.rabbitmq.client.Channel;

cloud-modules/cloud-modules-parsing/src/main/java/com/muyu/parsing/mqtt/service/MqttClientService.java

@@ -1,6 +1,6 @@
 package com.muyu.parsing.mqtt.service;
 
-import com.muyu.cargateway.domain.properties.MqttProperties;
+import com.muyu.car.gateway.domain.properties.MqttProperties;
 import com.muyu.parsing.manager.MessageProcessor;
 import lombok.extern.slf4j.Slf4j;
 import org.eclipse.paho.client.mqttv3.*;

cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysFirmController.java

@@ -84,18 +84,20 @@ public class SysFirmController extends BaseController
     /**
      * 获取企业基础信息详细信息
      */
-
     public Result<SysFirm> getInfo(@PathVariable("firmCode") String firmCode)
     {
         return success(sysFirmService.selectSysFirmById(firmCode));
     }
 
+
+
+
     /**
      * 新增企业基础信息
      */
     @RequiresPermissions("firm:firmInfo:add")
     @PostMapping
-    public Result<Integer> add(@Validated @RequestBody SysFirmReq sysFirm) {
+    public Result<Integer> add(@Validated @RequestBody SysFirm sysFirm) {
         String firmName = sysFirm.getFirmName();
         String firmCode = sysFirm.getFirmCode();
         String firmCreditCode = sysFirm.getFirmCreditCode();