用户实训数据管理/用户考试管理需要添加根据手机号或者用户ID查询

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);

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>")

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];

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;
+
+
 }

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;
+
 }