|
|
@ -434,7 +434,7 @@ public class TerminalPhotoServiceImpl implements TerminalPhotoService {
|
|
|
|
|
|
|
|
|
|
|
|
@Override
|
|
|
|
@Override
|
|
|
|
public ServiceBody<TerminalScheduleRuleTimeListModel> selectPhotoTime(TerminalReqPhotoTimeVo vo) {
|
|
|
|
public ServiceBody<TerminalScheduleRuleTimeListModel> selectPhotoTime(TerminalReqPhotoTimeVo vo) {
|
|
|
|
String result = terminalPhotoDao.getRequestResult(5);//待修改
|
|
|
|
String result = terminalPhotoDao.getRequestResult(vo.getRequestId());//待修改
|
|
|
|
TerminalScheduleRuleTimeListModel model = new TerminalScheduleRuleTimeListModel();
|
|
|
|
TerminalScheduleRuleTimeListModel model = new TerminalScheduleRuleTimeListModel();
|
|
|
|
if (StringUtils.isNotBlank(result)) {
|
|
|
|
if (StringUtils.isNotBlank(result)) {
|
|
|
|
JSONObject resultObj = JSONObject.parseObject(result);
|
|
|
|
JSONObject resultObj = JSONObject.parseObject(result);
|
|
|
@ -463,7 +463,7 @@ public class TerminalPhotoServiceImpl implements TerminalPhotoService {
|
|
|
|
|
|
|
|
|
|
|
|
@Override
|
|
|
|
@Override
|
|
|
|
public ServiceBody<Integer> selectPhotoTimeGet(TerminalReqPhotoTimeVo vo) {
|
|
|
|
public ServiceBody<Integer> selectPhotoTimeGet(TerminalReqPhotoTimeVo 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 = "/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";
|
|
|
|
ProcessExecUtils.exec(cmd);
|
|
|
|
ProcessExecUtils.exec(cmd);
|
|
|
|
return Asserts.success(Integer.parseInt(Constants.REQUEST_ID.toString()));
|
|
|
|
return Asserts.success(Integer.parseInt(Constants.REQUEST_ID.toString()));
|
|
|
|
}
|
|
|
|
}
|
|
|
|