From 5978e3209414422c881a88b25ecda8414bad09de Mon Sep 17 00:00:00 2001
From: wulin <wulin@linzikg.com>
Date: Sun, 29 Oct 2023 11:17:52 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=8B=BC=E9=9F=B3=E5=8C=B9?=
 =?UTF-8?q?=E9=85=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 iot-common/iot-third/pom.xml                  |  7 +++++
 .../qiuguo/iot/third/service/NlpService.java  | 28 +++++++++++++++++++
 iot-modules/iot-box-websocket-api/pom.xml     |  2 ++
 3 files changed, 37 insertions(+)

diff --git a/iot-common/iot-third/pom.xml b/iot-common/iot-third/pom.xml
index aae5f93..4b05594 100644
--- a/iot-common/iot-third/pom.xml
+++ b/iot-common/iot-third/pom.xml
@@ -80,6 +80,13 @@
             <artifactId>spring-cloud-context</artifactId>
         </dependency>
 
+        <!-- https://mvnrepository.com/artifact/com.belerweb/pinyin4j -->
+        <dependency>
+            <groupId>com.belerweb</groupId>
+            <artifactId>pinyin4j</artifactId>
+            <version>2.5.1</version>
+        </dependency>
+
     </dependencies>
 
     <build>
diff --git a/iot-common/iot-third/src/main/java/com/qiuguo/iot/third/service/NlpService.java b/iot-common/iot-third/src/main/java/com/qiuguo/iot/third/service/NlpService.java
index 43321be..269b6c0 100644
--- a/iot-common/iot-third/src/main/java/com/qiuguo/iot/third/service/NlpService.java
+++ b/iot-common/iot-third/src/main/java/com/qiuguo/iot/third/service/NlpService.java
@@ -14,6 +14,9 @@ import com.qiuguo.iot.third.nlp.action.Action;
 import com.qiuguo.iot.third.nlp.action.Actions;
 import com.qiuguo.iot.third.nlp.entity.SystemTalkKeyAndDeviceName;
 import lombok.extern.slf4j.Slf4j;
+import net.sourceforge.pinyin4j.PinyinHelper;
+import net.sourceforge.pinyin4j.format.HanyuPinyinOutputFormat;
+import net.sourceforge.pinyin4j.format.HanyuPinyinToneType;
 import org.springframework.stereotype.Service;
 import reactor.core.publisher.Mono;
 
@@ -51,6 +54,8 @@ public class NlpService {
             List<SystemTalkAnswerConfigEntity> systemIncluds = new ArrayList<>();
             List<SystemTalkKeyAndDeviceName> systemTalkKeyAndDeviceNameList = new ArrayList<>();
 
+
+
             int i = 0;
             for(SystemTalkAnswerConfigEntity entity : systemTalkAnswerConfigService.getCommandList()){
                 SystemTalkKeyAndDeviceName systemTalkKeyAndDeviceName = new SystemTalkKeyAndDeviceName();
@@ -82,6 +87,7 @@ public class NlpService {
             String pText = text;
             i = 0;
             int j = 0;
+            Boolean isFinding = false;
             for(SystemTalkKeyAndDeviceName sysTalkKeyAndDeviceName :systemTalkKeyAndDeviceNameList){
                 if(pText.indexOf(sysTalkKeyAndDeviceName.getKey()) >= 0){
                     //找到对应的名称
@@ -89,10 +95,12 @@ public class NlpService {
                         //用户绑定设备名称
                         pText = pText.replace(sysTalkKeyAndDeviceName.getKey(), ">" + (i++) + ">");
                         includs.add(deviceUserBindEntityPagerResult.getData().get(sysTalkKeyAndDeviceName.getIndex()));
+                        isFinding = true;
                     }else{// if(sysTalkKeyAndDeviceName.getType().equals(KeyTypeEnum.SYSTEM_COMMAND.getCode())){
                         //是系统自定义动词后的名称
                         pText = pText.replace(sysTalkKeyAndDeviceName.getKey(), "#" + (j++) + "#");
                         systemIncluds.add(systemTalkAnswerConfigService.getCommandList().get(sysTalkKeyAndDeviceName.getIndex()));
+                        isFinding = true;
                     }/*else{
                         //秋果专有名称
                         pText = pText.replace(sysTalkKeyAndDeviceName.getKey(), "<" + (j++) + "<");
@@ -100,6 +108,25 @@ public class NlpService {
                     }*/
                 }
             }
+            if(!isFinding){
+                HanyuPinyinOutputFormat hanyuPinyinOutputFormat = new HanyuPinyinOutputFormat();
+                hanyuPinyinOutputFormat.setToneType(HanyuPinyinToneType.WITHOUT_TONE);
+                try {
+                    String pinyinArray = PinyinHelper.toHanYuPinyinString(text, hanyuPinyinOutputFormat, null, false).replaceAll("null", "");
+                    log.info("拼音结果：{}", pinyinArray);
+                    for(SystemTalkKeyAndDeviceName sysTalkKeyAndDeviceName :systemTalkKeyAndDeviceNameList){
+                        if(pinyinArray.indexOf(sysTalkKeyAndDeviceName.getKey()) >= 0){
+                            if(sysTalkKeyAndDeviceName.getType().equals(KeyTypeEnum.QIUGUO_NAME.getCode())){
+                                pinyinArray = pinyinArray.replace(sysTalkKeyAndDeviceName.getKey(), "#" + (j++) + "#");
+                                systemIncluds.add(systemTalkAnswerConfigService.getCommandList().get(sysTalkKeyAndDeviceName.getIndex()));
+                                return getActions(pinyinArray, text, includs, systemIncluds, type);
+                            }
+                        }
+                    }
+                }catch (Exception e) {
+                    log.info("获取拼音异常");
+                }
+            }
             return getActions(pText, text, includs, systemIncluds, type);
         });
 
@@ -110,6 +137,7 @@ public class NlpService {
                                     List<DeviceUserBindEntity> includs,
                                     List<SystemTalkAnswerConfigEntity> commands,
                                     String type) {
+
         return liguoNlpService.geSingletNlp(text, type).map(nlp -> {
             Actions actions = new Actions();
             actions.setActions(new ArrayList<>());
diff --git a/iot-modules/iot-box-websocket-api/pom.xml b/iot-modules/iot-box-websocket-api/pom.xml
index d9ba428..2e06c5e 100644
--- a/iot-modules/iot-box-websocket-api/pom.xml
+++ b/iot-modules/iot-box-websocket-api/pom.xml
@@ -94,6 +94,8 @@
             <version>4.6.4</version>
         </dependency>
 
+
+
     </dependencies>
 
     <build>