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

zc-business/src/main/java/com/zc/business/service/impl/DcEmergencyPlansServiceImpl.java

@@ -995,7 +995,7 @@ public class DcEmergencyPlansServiceImpl implements DcEmergencyPlansService {
                     // 路段广播
                     JSONObject params = new JSONObject();
                     params.put("name", "task-event");
-                    params.put("outVVol", UniversalEnum.EIGHT.getValue());
+                    params.put("outVVol",otherConfig.getString("outVol"));
                     params.put("priority", UniversalEnum.ONE.getValue());
                     JSONArray contentList = JSON.parseArray(otherConfig.get("contentList").toString());
                     JSONObject foundContent = contentList.stream()
@@ -1025,7 +1025,7 @@ public class DcEmergencyPlansServiceImpl implements DcEmergencyPlansService {
                             params.put("text", foundContent.getString("content"));
                         }
 
-                        params.put("repeatTimes", UniversalEnum.THREE.getValue());
+                        params.put("repeatTimes", otherConfig.getString("repeatTimes"));
                         params.put("functionType", UniversalEnum.START_PA_TTS.getValue());
                         JSONArray termList = new JSONArray();
                         termList.add(JSON.parseObject(device.getOtherConfig()));