#20230506 欣影管理平台杆塔管理功能代码

xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalPhotoServiceImpl.java

@@ -156,8 +156,8 @@ public class TerminalPhotoServiceImpl implements TerminalPhotoService {
     @Override
     public ServiceBody<Boolean> 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)) {
+            if(StringUtils.isNotBlank(result)){
-                hasNew = true;
+                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());*/