驾舱IP

yudao-module-remote/yudao-module-remote-biz/src/main/java/cn/iocoder/yudao/module/remote/config/ip/IpProperties.java

@@ -19,7 +19,7 @@ public class IpProperties {
 
     public Cockpit getCockpitByIp(String ip) {
         for (Cockpit v : cockpit) {
-            if (ip.equals(v.getControllerIp())){
+            if (ip.equals(v.getIpcIp())){
                 return v;
             }
         }

yudao-module-remote/yudao-module-remote-biz/src/main/java/cn/iocoder/yudao/module/remote/controller/admin/robot/dto/Cockpit.java

@@ -5,6 +5,8 @@ import lombok.Data;
 
 @Data
 public class Cockpit {
+    @Schema(description = "工控机IP")
+    private String ipcIp;
     @Schema(description = "驾舱端口")
     private int controllerPort;
     @Schema(description = "驾舱IP")

yudao-module-remote/yudao-module-remote-biz/src/main/resources/application-dev.yaml

@@ -53,11 +53,13 @@ logging:
     name: ${user.home}/logs/${spring.application.name}.log # 日志文件名，全路径
 
 remote:
-  cockpit:
-    - controllerPort: 9001
+  cockpit: # 远遥控制车辆IP和端口
+    - controllerPort: 9002
       controllerIp: 127.0.0.2
+      ipcIp: 127.0.0.1
     - controllerPort: 9001
       controllerIp: 127.0.0.3
+      ipcIp: 127.0.0.1
   msg: AA 55 13 04 01 88 88  # 驾舱socket头信息
   cockpit-time-out: 120  # 驾舱超时报警时间
   industrial-control-time-out: 120  # 工控通信超时报警时间

yudao-module-remote/yudao-module-remote-biz/src/main/resources/application-local.yaml

@@ -53,11 +53,13 @@ logging:
     name: C:\system\install\log/${spring.application.name}.log
 
 remote:
-  cockpit:  # 远遥控制车辆最大速度 m/s
-    - controllerPort: 9001
+  cockpit:  # 远遥控制车辆IP和端口
+    - controllerPort: 9002
       controllerIp: 127.0.0.2
+      ipcIp: 127.0.0.1
     - controllerPort: 9001
       controllerIp: 127.0.0.3
+      ipcIp: 127.0.0.1
   msg: AA 55 13 04 01 88 88  # 驾舱socket头信息
   cockpit-time-out: 120  # 驾舱超时报警时间
   industrial-control-time-out: 120  # 工控通信超时报警时间

yudao-module-remote/yudao-module-remote-biz/src/main/resources/application-test.yaml

@@ -34,11 +34,13 @@ logging:
     name: D:/project/rcs/logs/${spring.application.name}.log
 
 remote:
-  cockpit:
-    - controllerPort: 9001
+  cockpit: # 远遥控制车辆IP和端口
+    - controllerPort: 9002
       controllerIp: 127.0.0.2
+      ipcIp: 127.0.0.1
     - controllerPort: 9001
       controllerIp: 127.0.0.3
+      ipcIp: 127.0.0.1
   msg: AA 55 13 04 01 88 88  # 驾舱socket头信息
   cockpit-time-out: 120  # 驾舱超时报警时间
   industrial-control-time-out: 120  # 工控通信超时报警时间

yudao-module-system/yudao-module-system-biz/src/main/resources/application-local.yaml

@@ -81,7 +81,7 @@ spring:
     host: 127.0.0.1 # 地址
     port: 6379 # 端口
     database: 0 # 数据库索引
-#    password: 123456 # 密码，建议生产环境开启
+    password: yhtkj@2024! # 密码，建议生产环境开启
 
 --- #################### MQ 消息队列相关配置 ####################
 
@@ -216,8 +216,8 @@ justauth:
     timeout: 24h # 超时时长，目前只对 Redis 缓存生效，默认 3 分钟
 map:
   file:
-    upload-path: /Users/aikai/Documents/map/ # 地图文件上传路径
-    warn-path: /Users/aikai/Documents/json/ # 告警码值上传路径
+    upload-path: C:\system\config\map\map\map\2 # 地图文件上传路径
+    warn-path: C:\system\config\map\map\map\2 # 告警码值上传路径
 
 zn:
   task-no: TASK #任务号开头
@@ -249,4 +249,4 @@ zn:
 
 logging:
   file:
-    name: D:/project/rcs/logs/${spring.application.name}.log
+    name: C:\system\install\log/${spring.application.name}.log