From 503563ad0549c0355a485687c0872d080ada4174 Mon Sep 17 00:00:00 2001
From: tiger_zhou <123456>
Date: Wed, 12 Apr 2023 13:32:39 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=AE=9E=E8=AE=AD=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E7=AE=A1=E7=90=86/=E7=94=A8=E6=88=B7=E8=80=83?=
 =?UTF-8?q?=E8=AF=95=E7=AE=A1=E7=90=86=E9=9C=80=E8=A6=81=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E6=89=8B=E6=9C=BA=E5=8F=B7=E6=88=96=E8=80=85?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7ID=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/club/joylink/rtss/dao/TrainingDAO.java           | 1 +
 src/main/java/club/joylink/rtss/dao/UserExamMapper.java        | 1 +
 .../services/voice/discriminate/VoiceParseServiceImpl.java     | 2 ++
 src/main/java/club/joylink/rtss/vo/client/UserExamQueryVO.java | 3 +++
 .../rtss/vo/client/trainingUsage/UserTrainingQueryVO.java      | 2 ++
 5 files changed, 9 insertions(+)

diff --git a/src/main/java/club/joylink/rtss/dao/TrainingDAO.java b/src/main/java/club/joylink/rtss/dao/TrainingDAO.java
index 67c75f77b..4cab17e88 100644
--- a/src/main/java/club/joylink/rtss/dao/TrainingDAO.java
+++ b/src/main/java/club/joylink/rtss/dao/TrainingDAO.java
@@ -65,6 +65,7 @@ public interface TrainingDAO extends MyBatisBaseDao<Training, Long, TrainingExam
             "<when test=\"null != trainingName and '' != trainingName \"> and training.name like CONCAT('%',#{trainingName},'%') </when>" +
             "<when test=\"null != userName and '' != userName \"> and user.name like CONCAT('%',#{userName},'%') </when>" +
             "<when test=\"null != userMobile and '' != userMobile \"> and user.mobile like CONCAT('%',#{userMobile},'%') </when>" +
+            "<when test=\"null != userId and '' != userId \"> and user.id = #{userId} </when>" +
             " order by id DESC " +
             "</script>")
     Page<UserTrainingListVO> queryPagedUserTraining(UserTrainingQueryVO queryVO);
diff --git a/src/main/java/club/joylink/rtss/dao/UserExamMapper.java b/src/main/java/club/joylink/rtss/dao/UserExamMapper.java
index ca1f70c82..42fb271d0 100644
--- a/src/main/java/club/joylink/rtss/dao/UserExamMapper.java
+++ b/src/main/java/club/joylink/rtss/dao/UserExamMapper.java
@@ -54,6 +54,7 @@ public interface UserExamMapper {
             "<when test=\"null != examName and '' != examName \"> and ue.exam_name like CONCAT('%',#{examName},'%') </when>" +
             "<when test=\"null != userName and '' != userName \"> and user.name like CONCAT('%',#{userName},'%') </when>" +
             "<when test=\"null != userMobile and '' != userMobile \"> and user.mobile like CONCAT('%',#{userMobile},'%') </when>" +
+            "<when test=\"null != userId and '' != userId \"> and user.id = #{userId} </when>" +
             "<when test=\"null != result and '' != result \"> and ue.result = #{result} </when>" +
             " order by end_time DESC " +
             "</script>")
diff --git a/src/main/java/club/joylink/rtss/services/voice/discriminate/VoiceParseServiceImpl.java b/src/main/java/club/joylink/rtss/services/voice/discriminate/VoiceParseServiceImpl.java
index 2dfadd9be..41fbdd2bd 100644
--- a/src/main/java/club/joylink/rtss/services/voice/discriminate/VoiceParseServiceImpl.java
+++ b/src/main/java/club/joylink/rtss/services/voice/discriminate/VoiceParseServiceImpl.java
@@ -20,6 +20,7 @@ import org.springframework.util.StringUtils;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -138,6 +139,7 @@ public class VoiceParseServiceImpl implements VoiceParseService {
             log.error("参数解析配置数据错误,原文:[{}],匹配规则:[{}]",result.getOriginContent(),result.getRule().getKeyWordRules());
             throw new BusinessException(BusinessExceptionAssertEnum.VOICE_COMMAND_CONFIG_NULL);
         }
+        paramsRules.stream().flatMap(d-> Arrays.stream(d.getIndexArr())).anyMatch(d->groupSize < d);
 
         for (ParamExtractRule rule : paramsRules) {
             String[] originGroupArr = new String[rule.getIndexArr().length];
diff --git a/src/main/java/club/joylink/rtss/vo/client/UserExamQueryVO.java b/src/main/java/club/joylink/rtss/vo/client/UserExamQueryVO.java
index 8355e7a86..30028bb80 100644
--- a/src/main/java/club/joylink/rtss/vo/client/UserExamQueryVO.java
+++ b/src/main/java/club/joylink/rtss/vo/client/UserExamQueryVO.java
@@ -26,4 +26,7 @@ public class UserExamQueryVO extends PageQueryVO {
      */
     private String result;
 
+    private Long userId;
+
+
 }
diff --git a/src/main/java/club/joylink/rtss/vo/client/trainingUsage/UserTrainingQueryVO.java b/src/main/java/club/joylink/rtss/vo/client/trainingUsage/UserTrainingQueryVO.java
index 11841cacc..70ad736dc 100644
--- a/src/main/java/club/joylink/rtss/vo/client/trainingUsage/UserTrainingQueryVO.java
+++ b/src/main/java/club/joylink/rtss/vo/client/trainingUsage/UserTrainingQueryVO.java
@@ -31,4 +31,6 @@ public class UserTrainingQueryVO extends PageQueryVO {
      */
     private String trainingName;
 
+    private Long userId;
+
 }