From b6b75f791dbc63a82918e537762d3f9b6b55ccd4 Mon Sep 17 00:00:00 2001
From: whycxzp <perryhsu@163.com>
Date: 星期四, 12 一月 2023 17:11:13 +0800
Subject: [PATCH] 告警语音更新
---
src/main/java/com/whyc/controller/VoiceController.java | 30 +++---------------------------
1 files changed, 3 insertions(+), 27 deletions(-)
diff --git a/src/main/java/com/whyc/controller/VoiceController.java b/src/main/java/com/whyc/controller/VoiceController.java
index 84a1141..80d52f8 100644
--- a/src/main/java/com/whyc/controller/VoiceController.java
+++ b/src/main/java/com/whyc/controller/VoiceController.java
@@ -113,7 +113,8 @@
alarmVoiceSetService.delete(nextTimeIntervalSet.getId());
}else{ //榛樿5鍒嗛挓
- addedTimeMillis = 5*60*1000;
+ //addedTimeMillis = 5*60*1000;
+ addedTimeMillis = 1*60*1000;
}
String readableVoiceTimeWithWavNew = currentTimeMillis+addedTimeMillis+".wav";
//鏂囦欢涓嬫鎾斁鏃堕棿纭畾鏂扮殑鏂囦欢鍚�
@@ -133,32 +134,7 @@
@ApiOperation("鏌ヨ鐢ㄦ埛鐩墠鍙鐨剋av璇煶鏂囦欢鍒楄〃")
@GetMapping("wavRead")
public Response getWavRead(){
- UserInf user = ActionUtil.getUser();
- //鑾峰彇缁濆鏂囦欢澶硅矾寰�
- String readSuffixPath = "wav" + File.separator + "alarm" + File.separator + user.getUId() + File.separator;
- String readDirPath = CommonUtil.getRootFile() + readSuffixPath;
- File readDir = new File(readDirPath);
- //鐩戞帶鐢ㄦ埛鐨勫憡璀�,鍖呭惈鐢熸垚,鍐呭瓨淇℃伅鏇存柊
- alarmDataService.monitorAlarm(readDirPath);
- if(!readDir.exists()){
- return new Response().set(1,false,"鏃犳湭璇诲憡璀﹁闊�");
- }else{
- String[] arr = readDir.list();
- if(arr.length==0){
- return new Response().set(1,false,"鏃犳湭璇诲憡璀﹁闊�");
- }
- List<String> fileNameList = new LinkedList<>();
- for (String fileName : arr) {
- long currentTimeMillis = System.currentTimeMillis();
- long readableVoiceTime = Long.parseLong(fileName.substring(fileName.lastIndexOf("_") + 1, fileName.lastIndexOf(".")));
- //鍙挱鏀炬椂闂�<褰撳墠鏃堕棿,杈撳嚭鎾斁
- if(readableVoiceTime<currentTimeMillis) {
- fileName = "fg_file" + File.separator + readSuffixPath + File.separator + fileName;
- fileNameList.add(fileName);
- }
- }
- return new Response().setII(1,true,fileNameList,null);
- }
+ return alarmDataService.getWavRead();
}
}
--
Gitblit v1.9.1