From a06012cbc3b8790ca6e6c0eb476691d824d8acca Mon Sep 17 00:00:00 2001
From: wulin <wulin@linzikg.com>
Date: Mon, 20 Nov 2023 22:55:25 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=BE=A4=E8=8B=B1=E6=96=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/qiuguo/iot/third/enums/ActionPartSpeechEnum.java    | 6 +++---
 .../main/java/com/qiuguo/iot/third/service/NlpService.java  | 6 ++++++
 .../iot/user/api/controller/device/DeviceController.java    | 1 +
 .../iot-box-user-api/src/main/resources/bootstrap.yml       | 2 +-
 4 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/iot-common/iot-third/src/main/java/com/qiuguo/iot/third/enums/ActionPartSpeechEnum.java b/iot-common/iot-third/src/main/java/com/qiuguo/iot/third/enums/ActionPartSpeechEnum.java
index 690dc43..42a9602 100644
--- a/iot-common/iot-third/src/main/java/com/qiuguo/iot/third/enums/ActionPartSpeechEnum.java
+++ b/iot-common/iot-third/src/main/java/com/qiuguo/iot/third/enums/ActionPartSpeechEnum.java
@@ -53,7 +53,7 @@ public enum ActionPartSpeechEnum implements IChinesePartSpeech{
                                 List<SystemTalkAnswerConfigEntity> commands){
             return action;
         }
-    },
+    },*/
     vn(0, "名动词"){
         @Override
         public Action getAction(ConcurrentHashMap<String,  SystemTalkAnswerConfig> keyGroup, 
@@ -63,13 +63,13 @@ public enum ActionPartSpeechEnum implements IChinesePartSpeech{
                                 List<SystemTalkAnswerConfigEntity> systemTalkAnswerConfigEntities,
                                 List<DeviceUserBindEntity> includs,
                                 List<SystemTalkAnswerConfigEntity> commands){
-            return action;
+            return v.getAction(keyGroup, key, actions, action, systemTalkAnswerConfigEntities, includs, commands);
         }
     },
 
 
 
-    ng(1, "名语素"){
+    /*ng(1, "名语素"){
         @Override
         public Action getAction(ConcurrentHashMap<String,  SystemTalkAnswerConfig> keyGroup, 
                                 String key, 
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 0d34e0f..79eaed3 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
@@ -256,6 +256,12 @@ public class NlpService {
             if(actions.getA() + actions.getB() > 0){
                 actions.getActions().add(action);
             }
+            if(actions.getActions().size() > 1){
+                actions.getActions().sort((a, b) -> {
+                    return Integer.parseInt(String.valueOf(a.getSystemTalkAnswerConfigEntity().getKeyOrder() - b.getSystemTalkAnswerConfigEntity().getKeyOrder()));
+                });
+            }
+
             return actions;
         });
     }
diff --git a/iot-modules/iot-box-user-api/src/main/java/com/qiuguo/iot/user/api/controller/device/DeviceController.java b/iot-modules/iot-box-user-api/src/main/java/com/qiuguo/iot/user/api/controller/device/DeviceController.java
index 9c1378c..dc1aaed 100644
--- a/iot-modules/iot-box-user-api/src/main/java/com/qiuguo/iot/user/api/controller/device/DeviceController.java
+++ b/iot-modules/iot-box-user-api/src/main/java/com/qiuguo/iot/user/api/controller/device/DeviceController.java
@@ -89,6 +89,7 @@ public class DeviceController {
                     session.setNickName(userTalkRequst.getNickName());
                     session.setRoleId(DeviceCodeEnum.BOX.getName());
                     session.setRequestId(userTalkRequst.getTimeTemp());
+                    session.setLanguage(actions.getLanguage());
                     //当不不使用城市时，默认使用杭州查询
                     session.setCustomerIP("115.205.2.137");
                     BaseMessageResp baseMessageResp = new BaseMessageResp();
diff --git a/iot-modules/iot-box-user-api/src/main/resources/bootstrap.yml b/iot-modules/iot-box-user-api/src/main/resources/bootstrap.yml
index 303ef87..051aa77 100644
--- a/iot-modules/iot-box-user-api/src/main/resources/bootstrap.yml
+++ b/iot-modules/iot-box-user-api/src/main/resources/bootstrap.yml
@@ -1,5 +1,5 @@
 server:
-  port: 8080
+  port: 8082
 spring:
   application:
     name: qiuguo-iot-box-user-api
\ No newline at end of file