调整监控控制
This commit is contained in:
@@ -20,6 +20,7 @@ import javax.annotation.Resource;
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
import javax.servlet.http.HttpServletResponse;
|
||||
import java.io.IOException;
|
||||
import java.math.BigDecimal;
|
||||
import java.nio.charset.StandardCharsets;
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
@@ -296,7 +297,7 @@ public class NasManager {
|
||||
@RequestMapping("/nas/door/cctv.do")
|
||||
public void getDoorCCTV(HttpServletResponse response){
|
||||
try {
|
||||
response.sendRedirect(UpdateIp.nas_ip+":9999/live/index.m3u8");
|
||||
response.sendRedirect("http://"+UpdateIp.nas_ip+":9999/live/index.m3u8");
|
||||
} catch (IOException e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
@@ -307,9 +308,37 @@ public class NasManager {
|
||||
if(!name.endsWith(".ts")){
|
||||
return;
|
||||
}
|
||||
response.sendRedirect(UpdateIp.nas_ip+":9999/live/"+request.getRequestURI().replace("/nas/door/",""));
|
||||
response.sendRedirect("http://"+UpdateIp.nas_ip+":9999/live/"+request.getRequestURI().replace("/nas/door/",""));
|
||||
} catch (Exception e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
}
|
||||
@ResponseBody
|
||||
@RequestMapping("/door/set.do")
|
||||
public JSONObject setDoorConfig(String status){
|
||||
JSONObject json=new JSONObject();
|
||||
JSONObject data=JSONObject.parseObject(HttpTools.get("http://"+UpdateIp.nas_ip+":8000/door/data.do"));
|
||||
BigDecimal zoom=new BigDecimal(Float.toString(data.getFloat("zoom")));
|
||||
float _zoom=0;
|
||||
switch (status){
|
||||
case "reboot":
|
||||
json.put("msg",HttpTools.https_get("http://"+UpdateIp.nas_ip+":8000/door/reboot.do",null));
|
||||
break;
|
||||
case "up":
|
||||
_zoom=zoom.add(new BigDecimal("0.1")).floatValue();
|
||||
json.put("msg","已设置焦距:"+_zoom);
|
||||
HttpTools.get("http://"+UpdateIp.nas_ip+":8000/door/zoom.do?zoom="+_zoom);
|
||||
break;
|
||||
case "down":
|
||||
_zoom=zoom.subtract(new BigDecimal("0.1")).floatValue();
|
||||
json.put("msg","已设置焦距:"+_zoom);
|
||||
HttpTools.get("http://"+UpdateIp.nas_ip+":8000/door/zoom.do?zoom="+_zoom);
|
||||
break;
|
||||
case "warning":
|
||||
json.put("msg","已播放警告音频");
|
||||
HttpTools.get("http://"+UpdateIp.nas_ip+":8000/door/audio_url.do?url=http%3A%2F%2F192.168.31.88%3A803%2Fwarning.mp3");
|
||||
break;
|
||||
}
|
||||
return json;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
package com.yutou.tools.nas;
|
||||
|
||||
import com.alibaba.fastjson.JSONObject;
|
||||
import com.yutou.tools.utils.ConfigTools;
|
||||
import com.yutou.tools.utils.RedisTools;
|
||||
import com.yutou.tools.utils.Tools;
|
||||
import org.springframework.stereotype.Controller;
|
||||
@@ -21,6 +22,11 @@ import java.util.regex.Pattern;
|
||||
public class UpdateIp {
|
||||
private static List<String> keys = new ArrayList<>();
|
||||
public static String nas_ip=null;
|
||||
static {
|
||||
if ("dev".equals(ConfigTools.load(ConfigTools.CONFIG, "model"))) {
|
||||
nas_ip="192.168.31.88";
|
||||
}
|
||||
}
|
||||
/* static {
|
||||
keys.add("nas.yutou233.cn;");
|
||||
keys.add("bt.yutou233.cn;");
|
||||
|
||||
Reference in New Issue
Block a user