xymp
/
backend
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

#20230510 欣影管理平台装置信息查询代码

Browse Source
jni
18616268358 2 years ago
parent 67b3a73998
commit 387926551a
16 changed files with 72 additions and 115 deletions
Show Stats Download Patch File Download Diff File

10
xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/SystemConfigController.java
Unescape Escape View File

@ -5,7 +5,7 @@ import com.shxy.xymanager_common.base.BaseController;
import com.shxy.xymanager_common.base.ResponseReult;
import com.shxy.xymanager_common.bean.ServiceBody;
import com.shxy.xymanager_common.bean.ServiceStatus;
import com.shxy.xymanager_common.model.CmaBackModel;
import com.shxy.xymanager_common.model.GetModel;
import com.shxy.xymanager_common.model.SystemConfigModel;
import com.shxy.xymanager_common.model.UpperComputerInfoModel;
import com.shxy.xymanager_common.vo.SystemConfigReqVo;
@ -37,8 +37,8 @@ public class SystemConfigController extends BaseController {
@ApiResponses({@ApiResponse(code = 200, message = "请求成功"), @ApiResponse(code = 400, message = "请求参数没填好"), @ApiResponse(code = 404, message = "请求路径没有或页面跳转路径不对")})
@RequestMapping("/getSystemConfigGet")
@Log(title = "获取全局配置触发接口", type = "查询")
public ResponseReult<CmaBackModel> getSystemConfigGet(@RequestParam("id") String id) {
ServiceBody<CmaBackModel> serviceBody = configService.getSystemConfig(id);
public ResponseReult<GetModel> getSystemConfigGet(@RequestParam("id") String id) {
ServiceBody<GetModel> serviceBody = configService.getSystemConfig(id);
if (serviceBody.getCode() == ServiceStatus.SUCCESS) {
return ResponseReult.success(serviceBody.getData());
} else {
@ -76,8 +76,8 @@ public class SystemConfigController extends BaseController {
@ApiResponses({@ApiResponse(code = 200, message = "请求成功"), @ApiResponse(code = 400, message = "请求参数没填好"), @ApiResponse(code = 404, message = "请求路径没有或页面跳转路径不对")})
@RequestMapping("/upperComputerGet")
@Log(title = "获取上位机信息触发", type = "查询")
public ResponseReult<Integer> upperComputerGet(@RequestParam("cmdId") String cmdId) {
ServiceBody<Integer> serviceBody = configService.upperComputerGet(cmdId);
public ResponseReult<GetModel> upperComputerGet(@RequestParam("cmdId") String cmdId) {
ServiceBody<GetModel> serviceBody = configService.upperComputerGet(cmdId);
if (serviceBody.getCode() == ServiceStatus.SUCCESS) {
return ResponseReult.success(serviceBody.getData());
} else {

4
xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/TerminalController.java
Unescape Escape View File

@ -134,8 +134,8 @@ public class TerminalController extends BaseController {
@ApiResponses({@ApiResponse(code = 200, message = "请求成功"), @ApiResponse(code = 400, message = "请求参数没填好"), @ApiResponse(code = 404, message = "请求路径没有或页面跳转路径不对")})
@RequestMapping("/terminalIdGet")
@Log(title = "图像装置ID查询触发", type = "修改")
public ResponseReult<TerminalIdGetModel> terminalIdGet(@RequestBody @Validated TerminalIdUpdateVo vo) {
ServiceBody<TerminalIdGetModel> serviceBody = terminalService.terminalIdGet(vo);
public ResponseReult<GetModel> terminalIdGet(@RequestBody @Validated TerminalIdUpdateVo vo) {
ServiceBody<GetModel> serviceBody = terminalService.terminalIdGet(vo);
if (serviceBody.getCode() == ServiceStatus.SUCCESS) {
return ResponseReult.success(serviceBody.getData());
} else {

8
xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/TerminalPhotoController.java
Unescape Escape View File

@ -76,8 +76,8 @@ public class TerminalPhotoController extends BaseController {
@ApiResponses({@ApiResponse(code = 200, message = "请求成功"), @ApiResponse(code = 400, message = "请求参数没填好"), @ApiResponse(code = 404, message = "请求路径没有或页面跳转路径不对")})
@RequestMapping("/selectPhotoTimeGet")
@Log(title = "拍照时间表查询触发", type = "查询")
public ResponseReult<CmaBackModel> selectPhotoTimeGet(@RequestBody @Validated TerminalPhotoTimeGetVo vo) {
ServiceBody<CmaBackModel> serviceBody = terminalPhotoService.selectPhotoTimeGet(vo);
public ResponseReult<GetModel> selectPhotoTimeGet(@RequestBody @Validated TerminalPhotoTimeGetVo vo) {
ServiceBody<GetModel> serviceBody = terminalPhotoService.selectPhotoTimeGet(vo);
if (serviceBody.getCode() == ServiceStatus.SUCCESS) {
return ResponseReult.success(serviceBody.getData());
} else {
@ -155,8 +155,8 @@ public class TerminalPhotoController extends BaseController {
@ApiResponses({@ApiResponse(code = 200, message = "请求成功"), @ApiResponse(code = 400, message = "请求参数没填好"), @ApiResponse(code = 404, message = "请求路径没有或页面跳转路径不对")})
@RequestMapping("/getPhotoQueryParamList")
@Log(title = "最新图片采集参数触发", type = "查询")
public ResponseReult<TerminalStatusGetModel> getPhotoQueryParamList(@RequestBody @Validated ReturnedPhotoParamsGetVo vo) {
ServiceBody<TerminalStatusGetModel> serviceBody = terminalPhotoService.getPhotoQueryParam(vo);
public ResponseReult<GetModel> getPhotoQueryParamList(@RequestBody @Validated ReturnedPhotoParamsGetVo vo) {
ServiceBody<GetModel> serviceBody = terminalPhotoService.getPhotoQueryParam(vo);
if (serviceBody.getCode() == ServiceStatus.SUCCESS) {
return ResponseReult.success(serviceBody.getData());
} else {

13
xymanager_common/src/main/java/com/shxy/xymanager_common/constant/Constants.java
Unescape Escape View File

@ -1,6 +1,8 @@
package com.shxy.xymanager_common.constant;
import org.springframework.beans.factory.annotation.Value;
import java.util.concurrent.atomic.AtomicInteger;
/**
@ -10,6 +12,14 @@ import java.util.concurrent.atomic.AtomicInteger;
*/
public class Constants
{
@Value("${cma.server}")
private static String server;
@Value("${cma.port}")
private static int port;
/**
* UTF-8 字符集
*/
@ -165,4 +175,7 @@ public class Constants
* 调用JNI自增ID
*/
public static AtomicInteger REQUEST_ID = new AtomicInteger((int) (System.currentTimeMillis()/1000));
public static String CMD = "/usr/local/bin/xympadmn --server="+server+"\t" +"--port="+port+"\t" +"--act=";
}

21
xymanager_common/src/main/java/com/shxy/xymanager_common/model/CmaBackModel.java
Unescape Escape View File

@ -1,21 +0,0 @@
package com.shxy.xymanager_common.model;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.io.Serializable;
import java.util.List;
/**
* 所有杆塔列表
*/
@Data
@ApiModel(value = "Cma返回信息", description = "Cma返回信息")
public class CmaBackModel implements Serializable {
@ApiModelProperty(value = "请求ID", example = "1233")
private Integer requestId;
}

4
xymanager_common/src/main/java/com/shxy/xymanager_common/model/TerminalIdGetModel.java → xymanager_common/src/main/java/com/shxy/xymanager_common/model/GetModel.java
Unescape Escape View File

@ -10,8 +10,8 @@ import java.io.Serializable;
* 设备ID触发查询信息
*/
@Data
@ApiModel(value = "设备ID触发查询信息", description = "获取设备ID触发查询信息")
public class TerminalIdGetModel implements Serializable {
@ApiModel(value = "触发查询信息", description = "触发查询信息")
public class GetModel implements Serializable {
@ApiModelProperty(value = "请求ID", example = "123456")
private Integer requestId;

21
xymanager_common/src/main/java/com/shxy/xymanager_common/model/TerminalStatusGetModel.java
Unescape Escape View File

@ -1,21 +0,0 @@
package com.shxy.xymanager_common.model;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.io.Serializable;
/**
* 设备信息列表
*/
@Data
@ApiModel(value = "触发获取设备状态信息", description = "触发获取设备状态信息")
public class TerminalStatusGetModel implements Serializable {
@ApiModelProperty(value = "请求Id", example = "123456")
private Integer requestId;
}

3
xymanager_common/src/main/java/com/shxy/xymanager_common/vo/TerminalIdVo.java
Unescape Escape View File

@ -17,7 +17,4 @@ public class TerminalIdVo {
@ApiModelProperty(value = "图像监测装置 ID", example = "123455")
private String cmdId;
@ApiModelProperty(value = "请求 ID", example = "123455")
private Integer requestId;
}

21
xymanager_service/src/main/java/com/shxy/xymanager_service/impl/SystemConfigServiceImpl.java
Unescape Escape View File

@ -7,10 +7,7 @@ import com.shxy.xymanager_common.dto.PhotoParamsDto;
import com.shxy.xymanager_common.dto.UpperComputerInfoDto;
import com.shxy.xymanager_common.entity.TerminalParams;
import com.shxy.xymanager_common.exception.Asserts;
import com.shxy.xymanager_common.model.CmaBackModel;
import com.shxy.xymanager_common.model.SystemConfigModel;
import com.shxy.xymanager_common.model.TerminalPhotosParamsModel;
import com.shxy.xymanager_common.model.UpperComputerInfoModel;
import com.shxy.xymanager_common.model.*;
import com.shxy.xymanager_common.util.ProcessExecUtils;
import com.shxy.xymanager_common.util.StringUtils;
import com.shxy.xymanager_common.vo.SystemConfigReqVo;
@ -40,14 +37,14 @@ public class SystemConfigServiceImpl implements SystemConfigService {
@Override
public ServiceBody<CmaBackModel> getSystemConfig(String cmdId) {
public ServiceBody<GetModel> getSystemConfig(String cmdId) {
/* SystemConfigModel model = new SystemConfigModel();
Integer beatHeartTime = systemConfigDao.getTerminalParams(id);
model.setHeartBeatTime(beatHeartTime);
String globalTime = systemConfigDao.getGlobalTime(Constants.GLOBAL_TIME);
model.setGlobalTime(Integer.parseInt(globalTime));*/
CmaBackModel model = new CmaBackModel();
String cmd = "/usr/local/bin/xympadmn --server=127.0.0.1 --port=6891 --clientid=10 --act=sampling --flag=0 --cmdid="+cmdId+ "\t"+"--reqid="+Constants.REQUEST_ID;
GetModel model = new GetModel();
String cmd = Constants.CMD+"sampling --clientid=10 --flag=0 --cmdid="+cmdId+ "\t"+"--reqid="+Constants.REQUEST_ID;
ProcessExecUtils.exec(cmd);
model.setRequestId(Integer.parseInt(Constants.REQUEST_ID.toString()));
Constants.REQUEST_ID.addAndGet(1);
@ -61,7 +58,7 @@ public class SystemConfigServiceImpl implements SystemConfigService {
param.setHeartbeatTime(vo.getHeartBeatTime());
systemConfigDao.updateSystemConfig(param);
String cmd = "/usr/local/bin/xympadmn --server=127.0.0.1 --port=6891 --act=sampling --cmdid="+vo.getCmdId()+ "\t"+ "--heartbeat=" + vo.getHeartBeatTime();
String cmd =Constants.CMD+"sampling --cmdid="+vo.getCmdId()+ "\t"+ "--heartbeat=" + vo.getHeartBeatTime();
ProcessExecUtils.exec(cmd);
return Asserts.success("修改成功");
}
@ -82,11 +79,13 @@ public class SystemConfigServiceImpl implements SystemConfigService {
}
@Override
public ServiceBody<Integer> upperComputerGet(String cmdId) {
String cmd = "/usr/local/bin/xympadmn --server=127.0.0.1 --port=6891 --clientid=10 --act=cma --flag=0 --cmdid="+cmdId+ "\t"+"--reqid="+Constants.REQUEST_ID;
public ServiceBody<GetModel> upperComputerGet(String cmdId) {
GetModel model = new GetModel();
String cmd = Constants.CMD+"cma --clientid=10 --flag=0 --cmdid="+cmdId+ "\t"+"--reqid="+Constants.REQUEST_ID;
ProcessExecUtils.exec(cmd);
model.setRequestId(Integer.parseInt( Constants.REQUEST_ID.toString()));
Constants.REQUEST_ID.addAndGet(1);
return Asserts.success(Integer.parseInt(Constants.REQUEST_ID.toString()));
return Asserts.success(model);
}
@Override

4
xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TermSetServiceImpl.java
Unescape Escape View File

@ -34,14 +34,14 @@ public class TermSetServiceImpl implements TermSetService {
@Override
public ServiceBody<Integer> alarmMark(TerminalIdVo vo) {
String cmd = "/usr/local/bin/xympadmn --server=127.0.0.1 --port=6891 --act=imgparams --cmdid="+vo.getCmdId()+ "\t" + "--reqid="+ Constants.REQUEST_ID+ "\t"+ "--clientid=10--flag=1 --rf=7";
String cmd =Constants.CMD+"imgparams --cmdid="+vo.getCmdId()+ "\t" + "--reqid="+ Constants.REQUEST_ID+ "\t"+ "--clientid=10--flag=0 --rf=7";
ProcessExecUtils.exec(cmd);
return Asserts.success(Integer.parseInt(Constants.REQUEST_ID.toString()));
}
@Override
public ServiceBody<Integer> selectPhotoTimeGet(TerminalIdVo vo) {
String cmd = "/usr/local/bin/xympadmn --server=127.0.0.1 --port=6891 --act=alarmMark --cmdid="+vo.getCmdId()+ "\t" + "--reqid="+Constants.REQUEST_ID+ "\t"+ "--clientid=10--flag=1 --rf=7";
String cmd = Constants.CMD+"alarmMark --cmdid="+vo.getCmdId()+ "\t" + "--reqid="+Constants.REQUEST_ID+ "\t"+ "--clientid=10--flag=1 --rf=7";
ProcessExecUtils.exec(cmd);
return Asserts.success(Integer.parseInt(Constants.REQUEST_ID.toString()));
}

32
xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalGpsServiceImpl.java
Unescape Escape View File

@ -79,7 +79,7 @@ public class TerminalGpsServiceImpl implements TerminalGpsService {
} else {
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;
String cmd = Constants.CMD+"gpsctrl --cmdid="+vo.getCmdId() +"\t" +"--ctrl="+ status;
ProcessExecUtils.exec(cmd);
if (set) {
TerminalStatus record = new TerminalStatus();
@ -107,24 +107,18 @@ public class TerminalGpsServiceImpl implements TerminalGpsService {
TerminalGpsModel model = new TerminalGpsModel();
// Cma cma = new Cma("47.96.238.157", 6891);
// boolean b = cma.requestGpsInfo(vo.getTermid().toString());
String result = terminalPhotoDao.getRequestResult(5);//待修改
DateTime now = DateTime.now();
if(StringUtils.isNotBlank(result)) {
model = JSONObject.parseObject(result, TerminalGpsModel.class);
}else {
TerminalPositions bean = terminalPositionsDao.selectByPrimaryKey(vo.getTermid());
if (!BeanUtil.isEmpty(bean)) {
model.setRadius(bean.getRadius());
model.setLongitude(bean.getLongitude());
model.setLatitude(bean.getLatitude());
model.setTermid(bean.getTermId());
model.setQueryTime(now);
BigInteger updatetime = MyDateUtils.TimeSecond2MillSecond(bean.getUpdateTime().longValue());
model.setUpdatetime(MyDateUtils.date(updatetime.longValue()));
}
DateTime now = DateTime.now();
TerminalPositions bean = terminalPositionsDao.selectByPrimaryKey(vo.getTermid());
if (!BeanUtil.isEmpty(bean)) {
model.setRadius(bean.getRadius());
model.setLongitude(bean.getLongitude());
model.setLatitude(bean.getLatitude());
model.setTermid(bean.getTermId());
model.setQueryTime(now);
BigInteger updatetime = MyDateUtils.TimeSecond2MillSecond(bean.getUpdateTime().longValue());
model.setUpdatetime(MyDateUtils.date(updatetime.longValue()));
}
if (null!=model) {
return Asserts.success(model);
@ -136,7 +130,7 @@ public class TerminalGpsServiceImpl implements TerminalGpsService {
@Override
public ServiceBody<Integer> getReturnedGPS(TerminalGpsVo vo) {
String cmd = "/usr/local/bin/xympadmn --server=127.0.0.1 --port=6891 --clientid=10 --act=gpsinfo --cmdid="+vo.getCmdId()+ "\t" +"--reqid="+ Constants.REQUEST_ID;
String cmd = Constants.CMD+"gpsinfo --cmdid="+vo.getCmdId()+ "\t" +"--clientid=10 --reqid="+ Constants.REQUEST_ID;
ProcessExecUtils.exec(cmd);
return Asserts.success(Constants.REQUEST_ID.addAndGet(1));
}

18
xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalPhotoServiceImpl.java
Unescape Escape View File

@ -289,7 +289,7 @@ public class TerminalPhotoServiceImpl implements TerminalPhotoService {
public ServiceBody<Date> getLatestPhoto(TerminalPhotoVo vo) {
/* Cma cma = new Cma(server, port);*/
DateTime now = DateTime.now();
String cmd = "/usr/local/bin/xympadmn --server=127.0.0.1 --port=6891 --act=capture --cmdid=" + vo.getCmdid() + "\t" + "--channel=" + vo.getChannel() + "\t" + "--preset=255 --type=" + vo.getCaptureType();
String cmd =Constants.CMD+"capture --cmdid=" + vo.getCmdid() + "\t" + "--channel=" + vo.getChannel() + "\t" + "--preset=255 --type=" + vo.getCaptureType();
ProcessExecUtils.exec(cmd);
/* Boolean hasNew = cma.requestCapture(vo.getCmdid(), vo.getChannel(), vo.getPreset(), vo.getCaptureType());*/
return Asserts.success(now);
@ -404,7 +404,7 @@ public class TerminalPhotoServiceImpl implements TerminalPhotoService {
span1 = (short) 0;
span2 = span;
}
String cmd = "/usr/local/bin/xympadmn --server=127.0.0.1 --port=6891 --act=schedule --cmdid=" + dtoList.get(j).getCmid() + "\t" + "--channel=" + vo.getChannel() + "\t"
String cmd = Constants.CMD+"schedule --cmdid=" + dtoList.get(j).getCmid() + "\t" + "--channel=" + vo.getChannel() + "\t"
+ "--group=3 --hour1=" + startHour + "\t" + "--min1=" + startMin + "\t" + "--preset1=255 --hour2=" + endTimeHour + "\t" + "--min2=" + endTimeMin + "\t"
+ "--preset2=255 --hour3=" + span1 + "\t" + "--min3=" + span2 + "\t" + "--preset3=255";
ProcessExecUtils.exec(cmd);
@ -414,9 +414,9 @@ public class TerminalPhotoServiceImpl implements TerminalPhotoService {
}
@Override
public ServiceBody<TerminalStatusGetModel> getPhotoQueryParam(ReturnedPhotoParamsGetVo vo) {
TerminalStatusGetModel model = new TerminalStatusGetModel();
String cmd = "/usr/local/bin/xympadmn --server=127.0.0.1 --port=6891 --act=imgparams --cmdid=" + vo.getCmdId() + "\t" + "--clientid=10 --reqid=" + Constants.REQUEST_ID + "\t" + "--flag=0 --rf=7 --channel=" + vo.getChannelId();
public ServiceBody<GetModel> getPhotoQueryParam(ReturnedPhotoParamsGetVo vo) {
GetModel model = new GetModel();
String cmd = Constants.CMD+"act=imgparams --cmdid=" + vo.getCmdId() + "\t" + "--clientid=10 --reqid=" + Constants.REQUEST_ID + "\t" + "--flag=0 --rf=7 --channel=" + vo.getChannelId();
ProcessExecUtils.exec(cmd);
model.setRequestId(Integer.parseInt(Constants.REQUEST_ID.toString()));
Constants.REQUEST_ID.addAndGet(1);
@ -430,7 +430,7 @@ public class TerminalPhotoServiceImpl implements TerminalPhotoService {
@Override
public ServiceBody<String> addOrUpdatePhotoParams(PhotoParamsVo vo) {
String cmd = "/usr/local/bin/xympadmn --server=127.0.0.1 --port=6891 --act=imgparams --clientid=10 --cmdid=" + vo.getCmdId() + "\t" + "--color=" + vo.getColor() + "\t" + "--resolution=" + vo.getResolution() + "\t"
String cmd = Constants.CMD+"imgparams --clientid=10 --cmdid=" + vo.getCmdId() + "\t" + "--color=" + vo.getColor() + "\t" + "--resolution=" + vo.getResolution() + "\t"
+ "--luminance=" + vo.getLuminance() + "\t" + "-contrast=" + vo.getContrast() + "\t" + "--saturation=" + vo.getSaturation() + "\t" + "--channel=" + vo.getChannelId();
ProcessExecUtils.exec(cmd);
return Asserts.success("设置成功");
@ -484,9 +484,9 @@ public class TerminalPhotoServiceImpl implements TerminalPhotoService {
}
@Override
public ServiceBody<CmaBackModel> selectPhotoTimeGet(TerminalPhotoTimeGetVo vo) {
CmaBackModel model = new CmaBackModel();
String cmd = "/usr/local/bin/xympadmn --server=127.0.0.1 --port=6891 --act=schedule --cmdid=" + vo.getCmdId() + "\t" + "--reqid=" + Constants.REQUEST_ID + "\t" + "--clientid=10 --flag=0 --rf=7 --channel=" + vo.getChannel();
public ServiceBody<GetModel> selectPhotoTimeGet(TerminalPhotoTimeGetVo vo) {
GetModel model = new GetModel();
String cmd = Constants.CMD+"schedule --cmdid=" + vo.getCmdId() + "\t" + "--reqid=" + Constants.REQUEST_ID + "\t" + "--clientid=10 --flag=0 --rf=7 --channel=" + vo.getChannel();
ProcessExecUtils.exec(cmd);
Integer requestId = Integer.parseInt(Constants.REQUEST_ID.toString());
model.setRequestId(requestId);

15
xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalServiceImpl.java
Unescape Escape View File

@ -9,7 +9,6 @@ import com.github.pagehelper.PageInfo;
import com.shxy.xymanager_common.bean.ServiceBody;
import com.shxy.xymanager_common.constant.Constants;
import com.shxy.xymanager_common.dto.DyLineAndTerminalNoHeartDto;
import com.shxy.xymanager_common.dto.PhotoParamsDto;
import com.shxy.xymanager_common.dto.TerminalInfoDto;
import com.shxy.xymanager_common.dto.TerminalsAndLineAndChannelDto;
import com.shxy.xymanager_common.entity.TerminalChannelMapper;
@ -192,7 +191,7 @@ public class TerminalServiceImpl implements TerminalService {
@Override
public ServiceBody<String> resetTerminal(String cmId) {
// Cma cma = new Cma("47.96.238.157", 6891);
String cmd = "/usr/local/bin/xympadmn --server=127.0.0.1 --port=6891 --act=reset --cmdid=" + cmId + "\t" + "--mode=0";
String cmd = Constants.CMD+"reset --cmdid=" + cmId + "\t" + "--mode=0";
Integer retCode = ProcessExecUtils.exec(cmd);
// boolean reset = cma.reset(vo.getTermid().toString(), (short) 0x01);
if (retCode == 0) {
@ -207,7 +206,7 @@ public class TerminalServiceImpl implements TerminalService {
public ServiceBody<TerminalStatusModel> getTerminalStatus(Integer termId) {
TerminalStatusModel model = new TerminalStatusModel();
String cmdId = terminalsDao.getCmdIdByTermId(termId);
String cmd = "/usr/local/bin/xympadmn --server=127.0.0.1 --port=6891 --flag=0 --act=runningstatus --cmdid=" + cmdId;
String cmd = Constants.CMD+"runningstatus --flag=0 --cmdid=" + cmdId;
ProcessExecUtils.exec(cmd);
/* TerminalModel model = new TerminalModel();*/
@ -253,11 +252,9 @@ public class TerminalServiceImpl implements TerminalService {
@Override
public ServiceBody<TerminalUpdateModel> updateTerminalId(TerminalIdUpdateVo vo) {
TerminalUpdateModel model = new TerminalUpdateModel();
String cmd = "/usr/local/bin/xympadmn --server=127.0.0.1 --port=6891 --act=termid --cmdid=" + vo.getCmdId() + "\t" + "--newcmdid=" + vo.getNewCmdId() ;
String cmd = Constants.CMD+"termid --cmdid=" + vo.getCmdId() + "\t" + "--newcmdid=" + vo.getNewCmdId() ;
Integer retCode = ProcessExecUtils.exec(cmd);
model.setRequestId(Integer.parseInt(Constants.REQUEST_ID.toString()));
model.setTermId(vo.getTermId());
Constants.REQUEST_ID.addAndGet(1);
if (retCode == 0) {
int result = terminalsDao.updateCmd(vo);
if (result > 0) {
@ -290,10 +287,10 @@ public class TerminalServiceImpl implements TerminalService {
}
@Override
public ServiceBody<TerminalIdGetModel> terminalIdGet(TerminalIdUpdateVo vo) {
String cmd = "/usr/local/bin/xympadmn --server=127.0.0.1 --port=6891 --clientid=10 --act=termid --cmdid=" + vo.getCmdId() + "\t" + "--reqid=" + Constants.REQUEST_ID;
public ServiceBody<GetModel> terminalIdGet(TerminalIdUpdateVo vo) {
String cmd = Constants.CMD+"termid --clientid=10 flag=0 --cmdid=" + vo.getCmdId() + "\t" + "--reqid=" + Constants.REQUEST_ID;
ProcessExecUtils.exec(cmd);
TerminalIdGetModel model = new TerminalIdGetModel();
GetModel model = new GetModel();
model.setRequestId(Integer.parseInt(Constants.REQUEST_ID.toString()));
Constants.REQUEST_ID.addAndGet(1);
return Asserts.success(model);

7
xymanager_service/src/main/java/com/shxy/xymanager_service/service/SystemConfigService.java
Unescape Escape View File

@ -1,13 +1,12 @@
package com.shxy.xymanager_service.service;
import com.shxy.xymanager_common.bean.ServiceBody;
import com.shxy.xymanager_common.model.CmaBackModel;
import com.shxy.xymanager_common.model.GetModel;
import com.shxy.xymanager_common.model.SystemConfigModel;
import com.shxy.xymanager_common.model.UpperComputerInfoModel;
import com.shxy.xymanager_common.vo.SystemConfigReqVo;
import com.shxy.xymanager_common.vo.SystemConfigVo;
import com.shxy.xymanager_common.vo.TerminalUpperComputerVo;
import org.springframework.web.multipart.MultipartFile;
/**
*
@ -21,7 +20,7 @@ public interface SystemConfigService {
*
* @return
*/
ServiceBody<CmaBackModel> getSystemConfig(String id);
ServiceBody<GetModel> getSystemConfig(String id);
/**
@ -39,7 +38,7 @@ public interface SystemConfigService {
*
* @return
*/
ServiceBody<Integer> upperComputerGet(String cmdId);
ServiceBody<GetModel> upperComputerGet(String cmdId);
ServiceBody<UpperComputerInfoModel> getUpperComputerInfo(TerminalUpperComputerVo vo);

4
xymanager_service/src/main/java/com/shxy/xymanager_service/service/TerminalPhotoService.java
Unescape Escape View File

@ -69,7 +69,7 @@ public interface TerminalPhotoService {
*
* @return
*/
ServiceBody<TerminalStatusGetModel> getPhotoQueryParam(ReturnedPhotoParamsGetVo vo);
ServiceBody<GetModel> getPhotoQueryParam(ReturnedPhotoParamsGetVo vo);
ServiceBody<String> addOrUpdatePhotoParams(PhotoParamsVo vo);
@ -78,7 +78,7 @@ public interface TerminalPhotoService {
ServiceBody<TerminalScheduleRuleTimeListModel> selectPhotoTime(TerminalReqPhotoTimeVo vo);
ServiceBody<CmaBackModel> selectPhotoTimeGet(TerminalPhotoTimeGetVo vo);
ServiceBody<GetModel> selectPhotoTimeGet(TerminalPhotoTimeGetVo vo);

2
xymanager_service/src/main/java/com/shxy/xymanager_service/service/TerminalService.java
Unescape Escape View File

@ -75,7 +75,7 @@ public interface TerminalService {
* @param vo
* @return
*/
ServiceBody<TerminalIdGetModel> terminalIdGet(TerminalIdUpdateVo vo);
ServiceBody<GetModel> terminalIdGet(TerminalIdUpdateVo vo);
/**
* 根据请求ID查询装置ID

Write Preview
Loading…
Cancel
Save