From b4833ab41d84c6cf75251074487a12c90f9adaf6 Mon Sep 17 00:00:00 2001 From: 18616268358 <1440265357@qq.com> Date: Mon, 8 May 2023 10:49:28 +0800 Subject: [PATCH] =?UTF-8?q?#20230506=20=E6=AC=A3=E5=BD=B1=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E5=B9=B3=E5=8F=B0=E6=9D=86=E5=A1=94=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/TerminalPhotoServiceImpl.java | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalPhotoServiceImpl.java b/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalPhotoServiceImpl.java index d7d5e69..9af2eed 100644 --- a/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalPhotoServiceImpl.java +++ b/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalPhotoServiceImpl.java @@ -156,8 +156,8 @@ public class TerminalPhotoServiceImpl implements TerminalPhotoService { @Override public ServiceBody getLatestPhoto(TerminalPhotoVo vo) { /* Cma cma = new Cma(server, port);*/ - String[] cmd = {"sh", "/usr/local/bin/xympadmn", server, String.valueOf(port)}; - ProcessBuilder builder = new ProcessBuilder("/bin/chmod", "755", "/usr/local/bin/xympadmn"); + + ProcessBuilder builder = new ProcessBuilder("/bin/chmod", "755","/usr/local/bin/xympadmn"); String line = ""; StringBuffer sb = new StringBuffer(); String result = ""; @@ -165,21 +165,22 @@ public class TerminalPhotoServiceImpl implements TerminalPhotoService { try { Process process = builder.start(); process.waitFor(); - Process ps = Runtime.getRuntime().exec(cmd); + Process ps = Runtime.getRuntime().exec("/usr/local/bin/xympadmn --server=127.0.0.1 --port=6891 --act=capture --cmdid="+vo.getCmdid() +"--channel="+ vo.getChannel() + "--preset=255 --type=0"); + log.info("传入cmid:{}",vo.getCmdid()); ps.waitFor(); BufferedReader reader = new BufferedReader(new InputStreamReader(ps.getInputStream())); while ((line = reader.readLine()) != null) { sb.append(line).append("\n"); } result = sb.toString(); - if (StringUtils.isNotBlank(result)) { - hasNew = true; + if(StringUtils.isNotBlank(result)){ + hasNew =true; } } catch (IOException e) { - log.error("IOException", e); + log.error("IOException",e); } catch (InterruptedException e) { - log.error("InterruptedException", e); + log.error("InterruptedException",e); } /* Boolean hasNew = cma.requestCapture(vo.getCmdid(), vo.getChannel(), vo.getPreset(), vo.getCaptureType());*/