Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/MaintenanceCompanyServiceImpl.java

@@ -664,23 +664,26 @@ public class MaintenanceCompanyServiceImpl
 	 * @return
 	 */
 	public MaintenanceCompany getMaintenanceCompany(String amosUserId) {
-		MaintenanceCompany maintenanceCompany;
-		DynamicFormInstance dyFormInstance = dynamicFormInstanceService.getOne(
-				new LambdaQueryWrapper<DynamicFormInstance>().eq(DynamicFormInstance::getFieldCode, "amosAccount")
-						.eq(DynamicFormInstance::getFieldValue, amosUserId));
-		if (ValidationUtil.isEmpty(dyFormInstance)) {
-			throw new BadRequest("维保账号不存在或未关联系统账号.");
-		}
-		MaintenanceCompany person = this.getOne(new LambdaQueryWrapper<MaintenanceCompany>()
-				.eq(MaintenanceCompany::getInstanceId, dyFormInstance.getInstanceId()));
-		if (ValidationUtil.isEmpty(person)) {
-			throw new BadRequest("维保账号不存在或未关联系统账号.");
-		}
-		maintenanceCompany = this.getOne(new LambdaQueryWrapper<MaintenanceCompany>()
-				.eq(MaintenanceCompany::getSequenceNbr, person.getParentId()));
+		LambdaQueryWrapper<MaintenanceCompany> wrapper = new LambdaQueryWrapper<MaintenanceCompany>();
+		wrapper.eq(MaintenanceCompany::getIsDelete, false);
+		wrapper.eq(MaintenanceCompany::getAmosId, amosUserId);
+		MaintenanceCompany maintenanceCompany =	this.baseMapper.selectOne(wrapper);
+//		DynamicFormInstance dyFormInstance = dynamicFormInstanceService.getOne(
+//				new LambdaQueryWrapper<DynamicFormInstance>().eq(DynamicFormInstance::getFieldCode, "amosAccount")
+//						.eq(DynamicFormInstance::getFieldValue, amosUserId));
 		if (ValidationUtil.isEmpty(maintenanceCompany)) {
 			throw new BadRequest("维保账号不存在或未关联系统账号.");
 		}
+//		MaintenanceCompany person = this.getOne(new LambdaQueryWrapper<MaintenanceCompany>()
+//				.eq(MaintenanceCompany::getInstanceId, dyFormInstance.getInstanceId()));
+//		if (ValidationUtil.isEmpty(person)) {
+//			throw new BadRequest("维保账号不存在或未关联系统账号.");
+//		}
+//		maintenanceCompany = this.getOne(new LambdaQueryWrapper<MaintenanceCompany>()
+//				.eq(MaintenanceCompany::getSequenceNbr, person.getParentId()));
+//		if (ValidationUtil.isEmpty(maintenanceCompany)) {
+//			throw new BadRequest("维保账号不存在或未关联系统账号.");
+//		}
 		return maintenanceCompany;
 	}
 

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/audioToText/streamToText/RealTimeStream2Text.java

@@ -19,9 +19,7 @@ import org.springframework.web.client.RestTemplate;
 import org.typroject.tyboot.component.emq.EmqKeeper;
 
 import java.net.DatagramSocket;
-import java.net.InetAddress;
 import java.net.SocketException;
-import java.net.UnknownHostException;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -44,6 +42,9 @@ public class RealTimeStream2Text {
     @Value("${ifc.url}")
     String audioSystemAddress;
 
+    @Value("${rule.definition.localIp}")
+    String localIpAddress;
+
     /**
      * 开始语音转文字
      *
@@ -63,14 +64,16 @@ public class RealTimeStream2Text {
         Thread thread1 =
                 new Thread(() -> {
                     new AppSpeechTranscriber(
-                            new RealTimeSpeechTranscriberListener(myNumber, myNumber, emqKeeper, audioRecords, audioKeyWord), serverSocket1)
+                            new RealTimeSpeechTranscriberListener(myNumber, myNumber, emqKeeper, audioRecords, audioKeyWord)
+                            , serverSocket1, localIpAddress)
                             .process();
                 }, "我的语音流");
         //呼入的语音流
         Thread thread2 =
                 new Thread(() -> {
                     new AppSpeechTranscriber(
-                            new RealTimeSpeechTranscriberListener(myNumber, callerNumber, emqKeeper, audioRecords, audioKeyWord), serverSocket2)
+                            new RealTimeSpeechTranscriberListener(myNumber, callerNumber, emqKeeper, audioRecords, audioKeyWord),
+                            serverSocket2, localIpAddress)
                             .process();
                 }, "呼入的语音流");
         thread1.setUncaughtExceptionHandler(new SubUncaughtExceptionHandler(serverSocket1));
@@ -99,7 +102,8 @@ public class RealTimeStream2Text {
             map.add("number", number);
             map.add("codec", "PCM");
             map.add("uuid", UUID.randomUUID().toString());
-            map.add("dstip", InetAddress.getLocalHost().getHostAddress());
+            //map.add("dstip", InetAddress.getLocalHost().getHostAddress());
+            map.add("dstip", localIpAddress);
             map.add("dstport", String.valueOf(port));
             map.add("marker", "amos");
             httpHeaders.setContentType(MediaType.MULTIPART_FORM_DATA);
@@ -117,7 +121,7 @@ public class RealTimeStream2Text {
                 logger.error("调用语音融合系统接口获取音频流返回异常：响应码：" + responseEntityBody.getState());
                 logger.error("调用语音融合系统接口获取音频流返回异常：失败原因：" + responseEntityBody.getDescribe());
             }
-        } catch (UnknownHostException e) {
+        } catch (Exception e) {
             e.printStackTrace();
             logger.error(e.getMessage());
         }
@@ -188,5 +192,14 @@ public class RealTimeStream2Text {
         public void setData(Object data) {
             this.data = data;
         }
+
+        @Override
+        public String toString() {
+            return "AudioResponseEntity{" +
+                    "state=" + state +
+                    ", describe='" + describe + '\'' +
+                    ", data=" + data +
+                    '}';
+        }
     }
 }

amos-boot-utils/amos-boot-utils-speech/src/main/java/com/yeejoin/amos/speech/AppSpeechTranscriber.java

@@ -28,8 +28,10 @@ public class AppSpeechTranscriber {
     private final DatagramSocket serverSocket;
     private final Timer serverSocketTimeoutTimer;
     private final TimerTask timerTask;
+    private final String localIpAddress;
 
-    public AppSpeechTranscriber(SpeechTranscriberListener listener, DatagramSocket serverSocket) {
+    public AppSpeechTranscriber(SpeechTranscriberListener listener, DatagramSocket serverSocket, String localIpAddress) {
+        this.localIpAddress = localIpAddress;
         this.listener = listener;
         this.serverSocket = serverSocket;
         serverSocketTimeoutTimer = new Timer();
@@ -53,7 +55,7 @@ public class AppSpeechTranscriber {
             //创建实例、建立连接。
             byte[] b = new byte[332];
             DatagramPacket datagramPacket = new DatagramPacket(b, b.length);
-            logger.warn("serverSocket已启动，地址：" + InetAddress.getLocalHost().getHostAddress()
+            logger.warn("serverSocket已启动，地址：" + localIpAddress
                     + "监听端口：" + serverSocket.getLocalPort() + "  等待语音融合系统推送数据...");
             while (true) {
                 serverSocket.receive(datagramPacket);