|
|
|
@ -289,7 +289,7 @@ public class TerminalPhotoServiceImpl implements TerminalPhotoService {
|
|
|
|
public ServiceBody<Date> getLatestPhoto(TerminalPhotoVo vo) {
|
|
|
|
public ServiceBody<Date> getLatestPhoto(TerminalPhotoVo vo) {
|
|
|
|
/* Cma cma = new Cma(server, port);*/
|
|
|
|
/* Cma cma = new Cma(server, port);*/
|
|
|
|
DateTime now = DateTime.now();
|
|
|
|
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);
|
|
|
|
ProcessExecUtils.exec(cmd);
|
|
|
|
/* Boolean hasNew = cma.requestCapture(vo.getCmdid(), vo.getChannel(), vo.getPreset(), vo.getCaptureType());*/
|
|
|
|
/* Boolean hasNew = cma.requestCapture(vo.getCmdid(), vo.getChannel(), vo.getPreset(), vo.getCaptureType());*/
|
|
|
|
return Asserts.success(now);
|
|
|
|
return Asserts.success(now);
|
|
|
|
@ -404,7 +404,7 @@ public class TerminalPhotoServiceImpl implements TerminalPhotoService {
|
|
|
|
span1 = (short) 0;
|
|
|
|
span1 = (short) 0;
|
|
|
|
span2 = span;
|
|
|
|
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 --flag=1 --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"
|
|
|
|
+ "--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";
|
|
|
|
+ "--preset2=255 --hour3=" + span1 + "\t" + "--min3=" + span2 + "\t" + "--preset3=255";
|
|
|
|
ProcessExecUtils.exec(cmd);
|
|
|
|
ProcessExecUtils.exec(cmd);
|
|
|
|
@ -414,9 +414,9 @@ public class TerminalPhotoServiceImpl implements TerminalPhotoService {
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
@Override
|
|
|
|
@Override
|
|
|
|
public ServiceBody<TerminalStatusGetModel> getPhotoQueryParam(ReturnedPhotoParamsGetVo vo) {
|
|
|
|
public ServiceBody<GetModel> getPhotoQueryParam(ReturnedPhotoParamsGetVo vo) {
|
|
|
|
TerminalStatusGetModel model = new TerminalStatusGetModel();
|
|
|
|
GetModel model = new GetModel();
|
|
|
|
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();
|
|
|
|
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);
|
|
|
|
ProcessExecUtils.exec(cmd);
|
|
|
|
model.setRequestId(Integer.parseInt(Constants.REQUEST_ID.toString()));
|
|
|
|
model.setRequestId(Integer.parseInt(Constants.REQUEST_ID.toString()));
|
|
|
|
Constants.REQUEST_ID.addAndGet(1);
|
|
|
|
Constants.REQUEST_ID.addAndGet(1);
|
|
|
|
@ -430,7 +430,7 @@ public class TerminalPhotoServiceImpl implements TerminalPhotoService {
|
|
|
|
|
|
|
|
|
|
|
|
@Override
|
|
|
|
@Override
|
|
|
|
public ServiceBody<String> addOrUpdatePhotoParams(PhotoParamsVo vo) {
|
|
|
|
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 --flag=1 --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();
|
|
|
|
+ "--luminance=" + vo.getLuminance() + "\t" + "-contrast=" + vo.getContrast() + "\t" + "--saturation=" + vo.getSaturation() + "\t" + "--channel=" + vo.getChannelId();
|
|
|
|
ProcessExecUtils.exec(cmd);
|
|
|
|
ProcessExecUtils.exec(cmd);
|
|
|
|
return Asserts.success("设置成功");
|
|
|
|
return Asserts.success("设置成功");
|
|
|
|
@ -458,20 +458,22 @@ public class TerminalPhotoServiceImpl implements TerminalPhotoService {
|
|
|
|
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);
|
|
|
|
List<PhotoTimeResultDto> resultDtoList = JSONArray.parseArray(resultObj.get("groupData").toString(), PhotoTimeResultDto.class);
|
|
|
|
if(null!=resultObj.get("groupData")) {
|
|
|
|
List<String> resultList = Lists.newArrayList();
|
|
|
|
List<PhotoTimeResultDto> resultDtoList = JSONArray.parseArray(resultObj.get("groupData").toString(), PhotoTimeResultDto.class);
|
|
|
|
String startTimeStr = resultDtoList.get(0).getHour() + ":" + resultDtoList.get(0).getMinute() + ":00";
|
|
|
|
List<String> resultList = Lists.newArrayList();
|
|
|
|
String endTimeStr = resultDtoList.get(1).getHour() + ":" + resultDtoList.get(1).getMinute() + ":00";
|
|
|
|
String startTimeStr = resultDtoList.get(0).getHour() + ":" + resultDtoList.get(0).getMinute() + ":00";
|
|
|
|
Date startTime = DateUtil.parseTime(startTimeStr);
|
|
|
|
String endTimeStr = resultDtoList.get(1).getHour() + ":" + resultDtoList.get(1).getMinute() + ":00";
|
|
|
|
Date endTime = DateUtil.parseTime(endTimeStr);
|
|
|
|
Date startTime = DateUtil.parseTime(startTimeStr);
|
|
|
|
Integer span = resultDtoList.get(2).getHour() * 60 + resultDtoList.get(2).getMinute();
|
|
|
|
Date endTime = DateUtil.parseTime(endTimeStr);
|
|
|
|
List<DateTime> dateTimes = MyDateUtils.rangeToList(startTime, endTime, DateField.MINUTE, span);
|
|
|
|
Integer span = resultDtoList.get(2).getHour() * 60 + resultDtoList.get(2).getMinute();
|
|
|
|
for (DateTime data : dateTimes) {
|
|
|
|
List<DateTime> dateTimes = MyDateUtils.rangeToList(startTime, endTime, DateField.MINUTE, span);
|
|
|
|
String dateTime = DateUtil.formatTime(data);
|
|
|
|
for (DateTime data : dateTimes) {
|
|
|
|
resultList.add(dateTime);
|
|
|
|
String dateTime = DateUtil.formatTime(data);
|
|
|
|
|
|
|
|
resultList.add(dateTime);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
model.setList(resultList);
|
|
|
|
|
|
|
|
model.setIsNew(true);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
model.setList(resultList);
|
|
|
|
|
|
|
|
model.setIsNew(true);
|
|
|
|
|
|
|
|
} else {
|
|
|
|
} else {
|
|
|
|
TerminalAndChannelIdVo idVo = new TerminalAndChannelIdVo();
|
|
|
|
TerminalAndChannelIdVo idVo = new TerminalAndChannelIdVo();
|
|
|
|
BeanUtils.copyProperties(vo, idVo);
|
|
|
|
BeanUtils.copyProperties(vo, idVo);
|
|
|
|
@ -482,9 +484,9 @@ public class TerminalPhotoServiceImpl implements TerminalPhotoService {
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
@Override
|
|
|
|
@Override
|
|
|
|
public ServiceBody<CmaBackModel> selectPhotoTimeGet(TerminalPhotoTimeGetVo vo) {
|
|
|
|
public ServiceBody<GetModel> selectPhotoTimeGet(TerminalPhotoTimeGetVo vo) {
|
|
|
|
CmaBackModel model = new CmaBackModel();
|
|
|
|
GetModel model = new GetModel();
|
|
|
|
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();
|
|
|
|
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);
|
|
|
|
ProcessExecUtils.exec(cmd);
|
|
|
|
Integer requestId = Integer.parseInt(Constants.REQUEST_ID.toString());
|
|
|
|
Integer requestId = Integer.parseInt(Constants.REQUEST_ID.toString());
|
|
|
|
model.setRequestId(requestId);
|
|
|
|
model.setRequestId(requestId);
|
|
|
|
|
liuguijing
2 years ago