喇叭进行有优先级播放 2023-02-10

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

@@ -16,6 +16,8 @@ public class ParamVo {
     private Integer vol;
     @ApiModelProperty(required = true, notes = "播放路径")
     private List<UrlVo> urls;
+    @ApiModelProperty(required = true, notes = "任务优先级")
+    private Integer level;
 
     public String getTid() {
         return tid;
@@ -40,4 +42,12 @@ public class ParamVo {
     public void setUrls(List<UrlVo> urls) {
         this.urls = urls;
     }
+
+    public Integer getLevel() {
+        return level;
+    }
+
+    public void setLevel(Integer level) {
+        this.level = Optional.ofNullable(vol).orElse(0);
+    }
 }

zd-modules/zd-algorithm/src/main/java/com/zd/alg/speaker/controller/SpeakerController.java

@@ -214,7 +214,7 @@ public class SpeakerController {
         }
         text=text.replace("https","http");
         text=text.replace("http://lab.sxitdlc.com/sudalabSystem/","http://10.20.10.7/labSystem/");
-        iSpeakerService.textParseVoiceAppIps(text,playVo,1);
+        iSpeakerService.textParseVoiceAppIps(text,playVo,1,1000);
         Map<String,Object> map=new HashMap<>();
         map.put("text",text);
         String date=DateUtils.parseDateToStr("HH:MM",new Date());
@@ -238,7 +238,7 @@ public class SpeakerController {
         }
         text=text.replace("https","http");
         text=text.replace("http://lab.sxitdlc.com/sudalabSystem/","http://10.20.10.7/labSystem/");
-        iSpeakerService.textParseVoiceAppIps(text,playVo,playNum);
+        iSpeakerService.textParseVoiceAppIps(text,playVo,playNum,0);
         Map<String,Object> map=new HashMap<>();
         map.put("text",text);
         String date=DateUtils.parseDateToStr("HH:MM",new Date());

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

@@ -90,7 +90,7 @@ public interface ISpeakerService {
      * @param playVo
      * @return
      */
-    void textParseVoiceAppIps(String texts, List<PlayVo> playVo,Integer playNum);
+    void textParseVoiceAppIps(String texts, List<PlayVo> playVo,Integer playNum,Integer level);
 
     /**
      * 文字转硬盘播放

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

@@ -174,15 +174,15 @@ public class SpeakerServiceImpl implements ISpeakerService {
     }
 
     @Override
-    public void textParseVoiceAppIps(String texts,List<PlayVo> playVoList,Integer playNum) {
+    public void textParseVoiceAppIps(String texts,List<PlayVo> playVoList,Integer playNum,Integer level) {
         if (playVoList.size() == 1) {
-            commonTextUrlVoice(texts, playVoList,playNum);
+            commonTextUrlVoice(texts, playVoList,playNum,level);
         } else {
             String deviceIp =playVoList.get(0).getDeviceIp();
             PlayBatchVo playBatchVo=commonPatchTextUrlVoice(texts,playVoList,playNum);
             boolean isTrue = invokePost(JSONObject.toJSON(playBatchVo).toString(), deviceIp,1, playVoList.get(0).getPort());
             if (isTrue) {
-                textParseVoiceAppIps(texts,playVoList,playNum);
+                textParseVoiceAppIps(texts,playVoList,playNum,level);
             }
         }
     }
@@ -266,13 +266,14 @@ public class SpeakerServiceImpl implements ISpeakerService {
      * @param texts
      * @param playVoList
      */
-    private void commonTextUrlVoice(String texts,List<PlayVo> playVoList,Integer playNum) {
+    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);
             if (null != play.getParams()) {
                 play.getParams().setTid(UUID.randomUUID().toString());
                 play.getParams().setUrls(urlVoList);
+                play.getParams().setLevel(level);
             }
             boolean isTrue = invokePost(JSONObject.toJSON(play).toString(),deviceIp, 0, play.getPort());
             if (isTrue) {