From dfd88ada65f3c350911486f5925dee38770d20a2 Mon Sep 17 00:00:00 2001 From: 18616268358 <1440265357@qq.com> Date: Wed, 10 May 2023 17:21:29 +0800 Subject: [PATCH] =?UTF-8?q?#20230510=20=E6=AC=A3=E5=BD=B1=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E5=B9=B3=E5=8F=B0=E8=A3=85=E7=BD=AE=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/shxy/xymanager_common/vo/TerminalIdAndGpsVo.java | 3 +++ .../shxy/xymanager_service/impl/TerminalGpsServiceImpl.java | 5 +++-- .../com/shxy/xymanager_service/impl/TerminalServiceImpl.java | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/TerminalIdAndGpsVo.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/TerminalIdAndGpsVo.java index 96fc4ae..6642add 100644 --- a/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/TerminalIdAndGpsVo.java +++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/TerminalIdAndGpsVo.java @@ -13,4 +13,7 @@ public class TerminalIdAndGpsVo { @ApiModelProperty(value = "开启关闭", example = "0--关闭 1--开启") private Integer gpsstatus; + + @ApiModelProperty(value = "图像监测装置 ID", example = "123455") + private Integer cmdId; } diff --git a/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalGpsServiceImpl.java b/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalGpsServiceImpl.java index 66c7f9c..5cd123f 100644 --- a/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalGpsServiceImpl.java +++ b/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalGpsServiceImpl.java @@ -14,6 +14,7 @@ import com.shxy.xymanager_common.model.TerminalGpsModel; import com.shxy.xymanager_common.model.TerminalListModel; import com.shxy.xymanager_common.page.PageUtils; import com.shxy.xymanager_common.util.MyDateUtils; +import com.shxy.xymanager_common.util.ProcessExecUtils; import com.shxy.xymanager_common.vo.*; import com.shxy.xymanager_dao.dao.TerminalPositionsDao; import com.shxy.xymanager_dao.dao.TerminalStatusDao; @@ -62,12 +63,12 @@ public class TerminalGpsServiceImpl implements TerminalGpsService { Integer status; Integer gpsstatus = vo.getGpsstatus(); if (gpsstatus == 0) { -// set = cma.turnOnGps(vo.getTermid().toString()); status = CommonStatus.EFFECTIVE.value(); } else { -// set = cma.turnOffGps(vo.getTermid().toString()); status = CommonStatus.DELETE.value(); } + String cmd = "/usr/local/bin/xympadmn --server=127.0.0.1 --port=6891 --act=gpsctrl --cmdid="+vo.getCmdId() +"\t" +"--ctrl="+ status; + ProcessExecUtils.exec(cmd); if (set) { TerminalStatus record = new TerminalStatus(); record.setTermId(vo.getTermid()); diff --git a/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalServiceImpl.java b/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalServiceImpl.java index bda4ea4..0e1be99 100644 --- a/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalServiceImpl.java +++ b/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalServiceImpl.java @@ -178,7 +178,7 @@ public class TerminalServiceImpl implements TerminalService { @Override public ServiceBody resetTerminal(String cmId) { // Cma cma = new Cma("47.96.238.157", 6891); - String cmd = "/usr/local/bin/xympadmn --server=47.96.238.157 --port=6891 --act=reset --cmdid=" +cmId +"\t"+"--mode=0"; + String cmd = "/usr/local/bin/xympadmn --server=127.0.0.1 --port=6891 --act=reset --cmdid=" +cmId +"\t"+"--mode=0"; Integer retCode = ProcessExecUtils.exec(cmd); // boolean reset = cma.reset(vo.getTermid().toString(), (short) 0x01); if (retCode ==0) {