武汉8号线合并test 代码调整

src/main/java/club/joylink/rtss/services/voice/huawei/HuaweiVoiceServiceImpl.java

@@ -1,3 +1,4 @@
+/*
 package club.joylink.rtss.services.voice.huawei;
 
 import club.joylink.rtss.exception.BusinessExceptionAssertEnum;
@@ -32,9 +33,11 @@ public class HuaweiVoiceServiceImpl implements IVoiceService {
         return this.synthesis(message, "0");
     }
 
-    /**
+    */
+/**
      * 华为语音识别配置
-     */
+     *//*
+
     private final String ak = "YDUXTXRYGAHGPHAIXZCU";
     private final String sk = "Kcbm3sTDCYEou8kGeAhKxfBkgWybIn6IjJyGBX3p";
     private final String region = "cn-north-4";
@@ -72,3 +75,4 @@ public class HuaweiVoiceServiceImpl implements IVoiceService {
         return voiceRecognition(bytes, filePath);
     }
 }
+*/

src/main/java/club/joylink/rtss/simulation/cbtc/ATS/operation/Operation.java

@@ -1432,9 +1432,7 @@ public class Operation {
          * 发送会话消息（语音输入）Base64格式
          */
         Conversation_Chat_Audio_Base64(new Label[]{Label.CLIENT}),
-        ;
 
-        REGULAR_TRAIN_LINE_STATION_UPDATE_LOAD(new Label[]{Label.CLIENT}),
         /**
          * 紧急应急语音命令
          */

src/main/java/club/joylink/rtss/simulation/cbtc/command/service/VoiceCommandService.java

@@ -8,7 +8,7 @@ import club.joylink.rtss.simulation.cbtc.conversation.SimulationVoiceHandler;
 import club.joylink.rtss.simulation.cbtc.data.SimulationDataRepository;
 import club.joylink.rtss.simulation.cbtc.data.map.MapElement;
 import club.joylink.rtss.simulation.cbtc.data.map.Switch;
-import club.joylink.rtss.vo.client.VoiceRecognitionResult;
+import club.joylink.rtss.vo.client.voice.VoiceRecognitionResult;
 import net.sourceforge.pinyin4j.PinyinHelper;
 import net.sourceforge.pinyin4j.format.HanyuPinyinCaseType;
 import net.sourceforge.pinyin4j.format.HanyuPinyinOutputFormat;

src/main/java/club/joylink/rtss/simulation/cbtc/work/MetroSimulationWorkServiceImpl.java

@@ -180,7 +180,7 @@ public class MetroSimulationWorkServiceImpl implements SimulationWorkService {
         powerSupplyService.addJobs(simulation);
         iVirtualRealityPslService.addJobs(simulation);
         iscsMessageCollectAndDispatcher.addJob(simulation);
-        iscsLogicLoop.addJob(simulation);
+        iscsLogicLoop.addJobs(simulation);
         pisLogicLoop.addJobs(simulation);
         atpLogicLoop.addJobs(simulation);
         atsLogicLoop.addJobs(simulation);

src/main/resources/application.yml

@@ -50,7 +50,7 @@ spring:
           connection-timeout: 30000 # 等待连接的超时时间，单位ms
 mybatis:
   mapper-locations: classpath:mybatis/mapper/**/*.xml
-  type-aliases-package: club.joylink.rtss.entity
+#  type-aliases-package: club.joylink.rtss.entity
   configuration:
     map-underscore-to-camel-case: true
 pagehelper:
@@ -88,11 +88,11 @@ tencent-cloud:
 # 环境连接配置 start
 ---
 spring:
-    profiles: dev
+  profiles: dev
-    datasource:
+  datasource:
-        url: jdbc:mysql://localhost:3306/joylink?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true
+    url: jdbc:mysql://192.168.3.233:3306/joylink?useSSL=false&characterEncoding=utf-8&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true
-        username: root
+    username: root
-        password: root
+    password: joylink0503
 
 tencent-cloud:
   allow-send: false
@@ -209,7 +209,7 @@ minio:
   replaceHttps: false
 
 common:
-  env: test
+  env: prd
 
 ---
 spring:
@@ -227,7 +227,8 @@ logging:
     path: /usr/local/joylink/logs/rtss
   level:
     club.joylink.rtss: INFO
-
+tencent-cloud:
+  allow-send: false
 minio:
   endpoint: https://joylink.club
   accessKey: jladmin