Merge remote-tracking branch 'origin/dev' into dev

zd-api/zd-algorithm-api/src/main/java/com/zd/algorithm/api/speaker/entity/PlayBatchVo.java

@@ -1,9 +1,6 @@
 package com.zd.algorithm.api.speaker.entity;
 
 import io.swagger.annotations.ApiModelProperty;
-import org.apache.commons.lang3.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 /**
  * @author 董高升
@@ -11,27 +8,27 @@ import org.slf4j.LoggerFactory;
  */
 public class PlayBatchVo {
     @ApiModelProperty(required = true, notes = "设备编号")
-    private String[] sns;
+    private String[] sn;
     @ApiModelProperty(required = true, notes = "方便对接时传递任务类型")
-    private String[] type;
+    private String type;
     @ApiModelProperty(required = true, notes = "任务名称")
     private String name;
     @ApiModelProperty(required = true, notes = "播放参数")
     private ParamVo params;
 
-    public String[] getSns() {
-        return sns;
+    public String[] getSn() {
+        return sn;
     }
 
-    public void setSns(String[] sns) {
-        this.sns = sns;
+    public void setSn(String[] sn) {
+        this.sn = sn;
     }
 
-    public String[] getType() {
+    public String getType() {
         return type;
     }
 
-    public void setType(String[] type) {
+    public void setType(String type) {
         this.type = type;
     }
 

zd-modules/zd-algorithm/src/main/java/com/zd/alg/face/controller/FaceApi.java

@@ -68,7 +68,7 @@ public class FaceApi {
         }
         List<FaceInfo> faceInfos = faceService.faceDetect(imageInfo);
         if(null==faceInfos || faceInfos.size()==0){
-            return ResultData.fail("人脸特征值获取失败！");
+            return ResultData.fail("识别中");
         }
         FaceFeature faceFeature = faceService.faceFeature(imageInfo, faceInfos);
         return ResultData.success(faceFeature.getFeatureData());

zd-modules/zd-algorithm/src/main/java/com/zd/alg/speaker/service/impl/SpeakerServiceImpl.java

@@ -257,12 +257,10 @@ public class SpeakerServiceImpl implements ISpeakerService {
         return false;
     }
 
-    private List<UrlVo> getUrlList(String texts,Integer playNum) {
+    private List<UrlVo> getUrlList(String texts) {
         List<UrlVo> urlVoList = new ArrayList<>();
-        for(int i=0;i<playNum;i++){
-            UrlVo urlVo = new UrlVo(texts.substring(0, 1), texts);
-            urlVoList.add(urlVo);
-        }
+        UrlVo urlVo = new UrlVo(texts.substring(0, 1), texts);
+        urlVoList.add(urlVo);
         return urlVoList;
     }
 
@@ -306,7 +304,7 @@ public class SpeakerServiceImpl implements ISpeakerService {
     private void commonTextUrlVoice(String texts,List<PlayVo> playVoList,Integer playNum,Integer level) {
         for (PlayVo play : playVoList) {
             String deviceIp=play.getDeviceIp();
-            List<UrlVo> urlVoList = getUrlList(texts,playNum);
+            List<UrlVo> urlVoList = getUrlList(texts);
             if (null != play.getParams()) {
                 play.getParams().setTid(UUID.randomUUID().toString());
                 play.getParams().setUrls(urlVoList);
@@ -329,20 +327,20 @@ public class SpeakerServiceImpl implements ISpeakerService {
     private PlayBatchVo commonPatchTextUrlVoice(String texts,List<PlayVo> playVoList,Integer playNum,Integer level) {
         PlayBatchVo playBatchVo = new PlayBatchVo();
         BeanUtils.copyProperties(playVoList.get(0), playBatchVo);
-        List<UrlVo> urlVoList = getUrlList(texts,playNum);
+        List<UrlVo> urlVoList = getUrlList(texts);
         if (null != playBatchVo.getParams()) {
             playBatchVo.getParams().setTid(UUID.randomUUID().toString());
             playBatchVo.getParams().setUrls(urlVoList);
             playBatchVo.getParams().setUid(UUID.randomUUID().toString());
+            playBatchVo.getParams().setCount(playNum);
+            playBatchVo.getParams().setLevel(level);
         }
         List<String> snsList = new ArrayList<>();
-        List<String> reqList = new ArrayList<>();
         for (PlayVo playVo : playVoList) {
             snsList.add(playVo.getSn());
-            reqList.add("req");
         }
-        playBatchVo.setSns(snsList.toArray(new String[snsList.size()]));
-        playBatchVo.setType(reqList.toArray(new String[reqList.size()]));
+        playBatchVo.setSn(snsList.toArray(new String[snsList.size()]));
+        playBatchVo.setType("req");
         return playBatchVo;
     }
 

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/controller/LabXxpInspectionController.java

@@ -301,7 +301,11 @@ public class LabXxpInspectionController extends BaseController
     @PostMapping("/updateInspection")
     public ResultData updateInspection(@RequestParam("labId") Long labId,@RequestParam("userId") Long userId) {
         logger.info("labId:"+labId+"userId:"+userId);
-        return ResultData.result(xxpInspectionService.updateXxpInspectionSignOut(labId,userId));
+        Integer num=xxpInspectionService.updateXxpInspectionSignOut(labId,userId);
+        if(num>0){
+            return ResultData.success();
+        }
+        return ResultData.fail("未查到签到记录！");
     }
 
 
@@ -321,7 +325,7 @@ public class LabXxpInspectionController extends BaseController
             type=2;
         }
         if(type==0){
-            return ResultData.fail("未查到签到签到记录");
+            return ResultData.fail("未查到签到记录！");
         }
         return ResultData.success(type);
     }

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/onemachine/service/OneMachineService.java

@@ -4,6 +4,7 @@ import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.StrUtil;
 import com.zd.algorithm.api.face.feign.FaceCompare;
 import com.zd.algorithm.api.face.feign.RemoteFaceService;
+import com.zd.common.core.exception.NoRollException;
 import com.zd.common.core.exception.ServiceException;
 import com.zd.common.core.redis.RedisService;
 import com.zd.common.core.security.TokenService;
@@ -140,7 +141,7 @@ public class OneMachineService implements ValidationSignInPerInfo {
             }
             int num=xxpInspectionService.selectNoSignOut(signInfoVO.getSubId(),signInfoVO.getSingInUser().getUserId());
             if(num>0){
-                messages.add("当前用户已经签到成功，不能重复签到！");
+                throw new NoRollException(500,"当前用户已经签到成功，不能重复签到！");
             }
             //1、判断是否有安全准入资格，如没有准入资格进行提示(语音+浮层):验证失败，您需要通过小程序申请实验室准入资格后才能签到。
             if(UserConstants.USER_TYPE_STUDENT.equals(signInPerInfoVO.getSingInUser().getType())){