Merge branch 'dev' of http://192.168.1.43:3000/v2/zd-parents into dev

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/labAppTest/","http://192.168.1.43/labSystem/");
-        iSpeakerService.textParseVoiceAppIps(text,playVo,1,10000);
+        iSpeakerService.textParseVoiceAppIps(text,playVo,1,1000);
         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

@@ -106,4 +106,19 @@ public interface ISpeakerService {
      * @param ip 设备ip
      */
     boolean stopPlayMusic(String sn,String ip);
+
+
+
+    /**
+     * 情况音乐队列
+     * @param sns 设备sn
+     */
+    boolean clearPlayMusic(String[] sns);
+
+
+    /**
+     * 情况音乐队列
+     * @param sns 设备sn
+     */
+    boolean stopPriorityMusic(String[] sns);
 }

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

@@ -187,6 +187,9 @@ public class SpeakerServiceImpl implements ISpeakerService {
 //        }
         String deviceIp =playVoList.get(0).getDeviceIp();
         PlayBatchVo playBatchVo=commonPatchTextUrlVoice(texts,playVoList,playNum,level);
+        //清空原来队列
+        stopPriorityMusic(playBatchVo.getSns());
+        clearPlayMusic(playBatchVo.getSns());
         boolean isTrue = invokePost(JSONObject.toJSON(playBatchVo).toString(), deviceIp,1, playVoList.get(0).getPort());
         if (isTrue) {
             textParseVoiceAppIps(texts,playVoList,playNum,level);
@@ -212,6 +215,34 @@ public class SpeakerServiceImpl implements ISpeakerService {
         return tokenRefresh(responseStr);
     }
 
+    @Override
+    public boolean clearPlayMusic(String[] sns) {
+        logger.info("********************" + sns + "********************");
+        String remoteUrlIp = remoteAddress.getProtocol() + "://" + remoteAddress.getTtsIp() + ":" + remoteAddress.getRemotePort() + "/api/sendtodevice";
+        String token = getToken();
+        JSONObject jsonObject = new JSONObject();
+        jsonObject.put("sns", sns);
+        jsonObject.put("type", "req");
+        jsonObject.put("name", "songs_queue_clear");
+        String responseStr = okHttpRequest.doPostJson(remoteUrlIp, token, jsonObject.toString());
+        logger.info("responseStr:+++++++++++++++++++++++++++" + responseStr + "+++++++++++++++++++++++++");
+        return tokenRefresh(responseStr);
+    }
+
+    @Override
+    public boolean stopPriorityMusic(String[] sns) {
+        logger.info("********************" + sns + "********************");
+        String remoteUrlIp = remoteAddress.getProtocol() + "://" + remoteAddress.getTtsIp() + ":" + remoteAddress.getRemotePort() + "/api/sendtodevice";
+        String token = getToken();
+        JSONObject jsonObject = new JSONObject();
+        jsonObject.put("sns", sns);
+        jsonObject.put("type", "req");
+        jsonObject.put("name", "priority_task_stop");
+        String responseStr = okHttpRequest.doPostJson(remoteUrlIp, token, jsonObject.toString());
+        logger.info("responseStr:+++++++++++++++++++++++++++" + responseStr + "+++++++++++++++++++++++++");
+        return tokenRefresh(responseStr);
+    }
+
     /**
      * 认证失败刷新token
      * @param requestStr