|
|
|
|
@ -12,6 +12,7 @@ import com.github.pagehelper.Constant;
|
|
|
|
|
import com.github.pagehelper.PageInfo;
|
|
|
|
|
import com.google.common.collect.Lists;
|
|
|
|
|
import com.shxy.xymanager_common.bean.ServiceBody;
|
|
|
|
|
import com.shxy.xymanager_common.constant.Constants;
|
|
|
|
|
import com.shxy.xymanager_common.dto.PhotoAndLineAndChannelDto;
|
|
|
|
|
import com.shxy.xymanager_common.dto.PhotoParamsDto;
|
|
|
|
|
import com.shxy.xymanager_common.dto.PhotoTimeResultDto;
|
|
|
|
|
@ -358,87 +359,78 @@ public class TerminalPhotoServiceImpl implements TerminalPhotoService {
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
@Override
|
|
|
|
|
public ServiceBody<Boolean> getPhotoTime(TerminalPhotoTimeVo vo) {
|
|
|
|
|
TerminalPhotosTimeModel model = new TerminalPhotosTimeModel();
|
|
|
|
|
public ServiceBody<String> getPhotoTime(TerminalPhotoTimeVo vo) {
|
|
|
|
|
List<TerminalPhotoScheduleDto> dtoList = terminalPhotoDao.selectPhotoSchedule(vo);
|
|
|
|
|
|
|
|
|
|
List<TerminalPhotosTimeModel.PhotosTimeBean> beanList = Lists.newArrayList();
|
|
|
|
|
|
|
|
|
|
for(int j = 0; j<dtoList.size();j++){
|
|
|
|
|
TerminalPhotosTimeModel.PhotosTimeBean bean = new TerminalPhotosTimeModel.PhotosTimeBean();
|
|
|
|
|
Short span = dtoList.get(j).getSpan();
|
|
|
|
|
Date startTime = dtoList.get(j).getStartTime();
|
|
|
|
|
Short startHour = Short.parseShort(MyDateUtils.parseHourAndMinute(startTime).split("/")[0]);
|
|
|
|
|
Short startMin = Short.parseShort(MyDateUtils.parseHourAndMinute(startTime).split("/")[1]);
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Date endTime = dtoList.get(j).getEndTime();
|
|
|
|
|
Short endTimeHour = Short.parseShort(MyDateUtils.parseHourAndMinute(endTime).split("/")[0]);
|
|
|
|
|
Short endTimeMin = Short.parseShort(MyDateUtils.parseHourAndMinute(endTime).split("/")[1]);
|
|
|
|
|
|
|
|
|
|
Short span1 =-1;
|
|
|
|
|
Short span2 =-1;
|
|
|
|
|
if(span/60 > 0) {
|
|
|
|
|
span1 =(short)(span/60);
|
|
|
|
|
span2 =(short)(span % 60);
|
|
|
|
|
}else if(span<60 ){
|
|
|
|
|
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"
|
|
|
|
|
+ "--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);
|
|
|
|
|
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
return Asserts.success(true);
|
|
|
|
|
for(int j = 0; j<dtoList.size();j++){
|
|
|
|
|
TerminalPhotosTimeModel.PhotosTimeBean bean = new TerminalPhotosTimeModel.PhotosTimeBean();
|
|
|
|
|
Short span = dtoList.get(j).getSpan();
|
|
|
|
|
Date startTime = dtoList.get(j).getStartTime();
|
|
|
|
|
Short startHour = Short.parseShort(MyDateUtils.parseHourAndMinute(startTime).split("/")[0]);
|
|
|
|
|
Short startMin = Short.parseShort(MyDateUtils.parseHourAndMinute(startTime).split("/")[1]);
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Date endTime = dtoList.get(j).getEndTime();
|
|
|
|
|
Short endTimeHour = Short.parseShort(MyDateUtils.parseHourAndMinute(endTime).split("/")[0]);
|
|
|
|
|
Short endTimeMin = Short.parseShort(MyDateUtils.parseHourAndMinute(endTime).split("/")[1]);
|
|
|
|
|
|
|
|
|
|
Short span1 =-1;
|
|
|
|
|
Short span2 =-1;
|
|
|
|
|
if(span/60 > 0) {
|
|
|
|
|
span1 =(short)(span/60);
|
|
|
|
|
span2 =(short)(span % 60);
|
|
|
|
|
}else if(span<60 ){
|
|
|
|
|
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"
|
|
|
|
|
+ "--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);
|
|
|
|
|
};
|
|
|
|
|
return Asserts.success("修改成功");
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
@Override
|
|
|
|
|
public ServiceBody<TerminalPhotosParamsModel> getPhotoQueryParam(Integer termId) {
|
|
|
|
|
public ServiceBody<String> getPhotoQueryParam(Integer termId) {
|
|
|
|
|
String cmdId = terminalPhotoDao.selectCmdIdById(termId);
|
|
|
|
|
String cmd = "/usr/local/bin/xympadmn --server=127.0.0.1 --port=6891 --act=imgparams --cmdid="+cmdId +"\t" +"--flag=1 --rf=7";
|
|
|
|
|
String cmd = "/usr/local/bin/xympadmn --server=127.0.0.1 --port=6891 --act=imgparams --cmdid="+cmdId +"\t" +"--clientid=10 --reqid="+Constants.REQUEST_ID+"--flag=1 --rf=7";
|
|
|
|
|
ProcessExecUtils.exec(cmd);
|
|
|
|
|
TerminalPhotosParamsModel model = new TerminalPhotosParamsModel();
|
|
|
|
|
/* TerminalPhotosParamsModel model = new TerminalPhotosParamsModel();
|
|
|
|
|
PhotoParamsDto dto= terminalPhotoDao.selectPhotoParams(termId);
|
|
|
|
|
if(dto!=null) {
|
|
|
|
|
BeanUtils.copyProperties(dto, model);
|
|
|
|
|
DateTime now = DateTime.now();
|
|
|
|
|
model.setQueryTime(now);
|
|
|
|
|
}
|
|
|
|
|
return Asserts.success(model);
|
|
|
|
|
}*/
|
|
|
|
|
return Asserts.success("查询成功");
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
@Override
|
|
|
|
|
public ServiceBody<String> addOrUpdatePhotoParams(PhotoParamsVo vo) {
|
|
|
|
|
|
|
|
|
|
Integer result = terminalPhotoDao.updateOrInsertParams(vo);
|
|
|
|
|
String cmd = "/usr/local/bin/xympadmn --server=127.0.0.1 --port=6891 --act=imgparams --cmdid="+vo.getCmdId() +"\t" +"--color=" +vo.getColor() +"\t" + "--resolution="+ vo.getResolution() +"\t"
|
|
|
|
|
+ "--luminance=" + vo.getLuminance() +"\t"+ "-contrast=" + vo.getContrast() +"\t"+ "--saturation=" + vo.getSaturation();
|
|
|
|
|
ProcessExecUtils.exec(cmd);
|
|
|
|
|
if(result>0){
|
|
|
|
|
return Asserts.success("操作成功");
|
|
|
|
|
if (result>0) {
|
|
|
|
|
String cmd = "/usr/local/bin/xympadmn --server=127.0.0.1 --port=6891 --act=imgparams --cmdid=" + vo.getCmdId() + "\t" + "--color=" + vo.getColor() + "\t" + "--resolution=" + vo.getResolution() + "\t"
|
|
|
|
|
+ "--luminance=" + vo.getLuminance() + "\t" + "-contrast=" + vo.getContrast() + "\t" + "--saturation=" + vo.getSaturation();
|
|
|
|
|
ProcessExecUtils.exec(cmd);
|
|
|
|
|
return Asserts.success("更新成功");
|
|
|
|
|
}
|
|
|
|
|
return Asserts.error("操作失败");
|
|
|
|
|
|
|
|
|
|
return Asserts.error("更新失败");
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
@Override
|
|
|
|
|
public ServiceBody<TerminalPhotosParamsModel> getLastedPhotoQueryParam(ReturnedPhotoParamsVo vo) {
|
|
|
|
|
Boolean hasNew;
|
|
|
|
|
BigInteger photoTime = terminalPhotoDao.getLatestPhotoParam(vo.getTermId());
|
|
|
|
|
BigInteger localPhotoTime = MyDateUtils.TimeMillSecond2Second(vo.getPhotoTime());
|
|
|
|
|
hasNew = photoTime.compareTo(localPhotoTime)<0?false:true;
|
|
|
|
|
if(hasNew){
|
|
|
|
|
String result = terminalPhotoDao.getRequestResult(vo.getRequestId());
|
|
|
|
|
TerminalPhotosParamsModel model = new TerminalPhotosParamsModel();
|
|
|
|
|
if(StringUtils.isNotBlank(result)) {
|
|
|
|
|
JSONObject resultObj = JSONObject.parseObject(result);
|
|
|
|
|
model = JSONObject.parseObject(resultObj.get("groupData").toString(), TerminalPhotosParamsModel.class);
|
|
|
|
|
}else{
|
|
|
|
|
PhotoParamsDto dto= terminalPhotoDao.selectPhotoParams(vo.getTermId());
|
|
|
|
|
if(null!=dto){
|
|
|
|
|
TerminalPhotosParamsModel model = new TerminalPhotosParamsModel();
|
|
|
|
|
BeanUtils.copyProperties(dto,model);
|
|
|
|
|
return Asserts.success(model);
|
|
|
|
|
if(dto!=null) {
|
|
|
|
|
BeanUtils.copyProperties(dto, model);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
return Asserts.success(null);
|
|
|
|
|
return Asserts.success(model);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
@Override
|
|
|
|
|
@ -469,5 +461,12 @@ public class TerminalPhotoServiceImpl implements TerminalPhotoService {
|
|
|
|
|
return Asserts.success(model);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
@Override
|
|
|
|
|
public ServiceBody<String> selectPhotoTimeGet(TerminalReqPhotoTimeVo vo) {
|
|
|
|
|
String cmd = "/usr/local/bin/xympadmn --server=127.0.0.1 --port=6891 --act=imgparams --cmdid="+vo.getCmdId()+ "\t" + "--reqid="+vo.getRequestId()+ "\t"+ "--clientid=10--flag=1 --rf=7";
|
|
|
|
|
ProcessExecUtils.exec(cmd);
|
|
|
|
|
return Asserts.success("操作成功");
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
liuguijing
2 years ago