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

Merge remote-tracking branch 'origin/master'

Browse Source 
# Conflicts:
#	xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalPhotoServiceImpl.java
jni
18616268358 2 years ago
parent b830b60d34 b4aff2d8fb
commit bb1c1bc271
4 changed files with 36 additions and 28 deletions
Show Stats Download Patch File Download Diff File

2
xymanager_common/src/main/java/com/shxy/xymanager_common/entity/TerminalPhoto.java
Unescape Escape View File

@ -32,6 +32,8 @@ public class TerminalPhoto implements Serializable {
private String path;
private String thumb;
private Date createTime;
private static final long serialVersionUID = 1L;

3
xymanager_common/src/main/java/com/shxy/xymanager_common/model/TerminalPhotoListModel.java
Unescape Escape View File

@ -57,6 +57,9 @@ public class TerminalPhotoListModel implements Serializable {
@ApiModelProperty(value = "照片路径", example = "123456")
private String path;
@ApiModelProperty(value = "视频缩略图", example = "123456")
private String thumb;
@ApiModelProperty(value = "拍照方式", example = "123456")
private Integer manualRequest;

3
xymanager_dao/src/main/resources/mappers/TerminalPhotoDao.xml
Unescape Escape View File

@ -14,6 +14,7 @@
<result column="photo_time" jdbcType="BIGINT" property="photoTime"/>
<result column="recv_time" jdbcType="BIGINT" property="recvTime"/>
<result column="path" jdbcType="VARCHAR" property="path"/>
<result column="thumb" jdbcType="VARCHAR" property="thumb"/>
<result column="create_time" jdbcType="TIMESTAMP" property="createTime"/>
</resultMap>
@ -34,7 +35,7 @@
</resultMap>
<sql id="Base_Column_List">
id, term_id, channel_id,orginal_id, media_type,preset_id, width, height, file_size, photo_time, recv_time,
path, create_time
path, thumb,create_time
</sql>
<select id="selectPhotoList" resultMap="BaseResultMap">
select

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

@ -117,6 +117,7 @@ public class TerminalPhotoServiceImpl implements TerminalPhotoService {
photoBean.setPath(photoaddress + item.getPath());
} else {
photoBean.setPath(videoaddress + item.getPath());
photoBean.setThumb(videoaddress + item.getThumb());
}
photoBean.setId(item.getId());
photoBean.setTermId(item.getTermId());
@ -363,8 +364,8 @@ public class TerminalPhotoServiceImpl implements TerminalPhotoService {
public ServiceBody<String> getPhotoTime(TerminalPhotoTimeVo vo) {
List<TerminalPhotoScheduleDto> dtoList = terminalPhotoDao.selectPhotoSchedule(vo);
for(int j = 0; j<dtoList.size();j++){
TerminalPhotosTimeModel.PhotosTimeBean bean = new TerminalPhotosTimeModel.PhotosTimeBean();
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]);
@ -375,20 +376,21 @@ public class TerminalPhotoServiceImpl implements TerminalPhotoService {
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;
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);
};
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("修改成功");
}
@ -409,7 +411,7 @@ public class TerminalPhotoServiceImpl implements TerminalPhotoService {
Integer result = terminalPhotoDao.updateOrInsertParams(vo);
if (result>0) {
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"
+ "--luminance=" + vo.getLuminance() + "\t" + "-contrast=" + vo.getContrast() + "\t" + "--saturation=" + vo.getSaturation()+ "\t" + "--reqid=" + Constants.REQUEST_ID+ "\t" + "--channel=" + vo.getChannelId();
+ "--luminance=" + vo.getLuminance() + "\t" + "-contrast=" + vo.getContrast() + "\t" + "--saturation=" + vo.getSaturation() + "\t" + "--reqid=" + Constants.REQUEST_ID + "\t" + "--channel=" + vo.getChannelId();
ProcessExecUtils.exec(cmd);
return Asserts.success(Constants.REQUEST_ID.addAndGet(1));
}
@ -421,12 +423,12 @@ public class TerminalPhotoServiceImpl implements TerminalPhotoService {
public ServiceBody<TerminalPhotosParamsModel> getLastedPhotoQueryParam(ReturnedPhotoParamsVo vo) {
String result = terminalPhotoDao.getRequestResult(vo.getRequestId());
TerminalPhotosParamsModel model = new TerminalPhotosParamsModel();
if(StringUtils.isNotBlank(result)) {
if (StringUtils.isNotBlank(result)) {
JSONObject resultObj = JSONObject.parseObject(result);
model = JSONObject.parseObject(resultObj.get("groupData").toString(), TerminalPhotosParamsModel.class);
}else{
PhotoParamsDto dto= terminalPhotoDao.selectPhotoParams(vo);
if(dto!=null) {
} else {
PhotoParamsDto dto = terminalPhotoDao.selectPhotoParams(vo);
if (dto != null) {
BeanUtils.copyProperties(dto, model);
}
}
@ -437,15 +439,15 @@ public class TerminalPhotoServiceImpl implements TerminalPhotoService {
public ServiceBody<TerminalScheduleRuleTimeListModel> selectPhotoTime(TerminalReqPhotoTimeVo vo) {
String result = terminalPhotoDao.getRequestResult(vo.getRequestId());
TerminalScheduleRuleTimeListModel model = new TerminalScheduleRuleTimeListModel();
if(StringUtils.isNotBlank(result)){
JSONObject resultObj =JSONObject.parseObject(result);
if (StringUtils.isNotBlank(result)) {
JSONObject resultObj = JSONObject.parseObject(result);
List<PhotoTimeResultDto> resultDtoList = JSONArray.parseArray(resultObj.get("groupData").toString(), PhotoTimeResultDto.class);
List<String> resultList = Lists.newArrayList();
String startTimeStr = resultDtoList.get(0).getHour()+":"+resultDtoList.get(0).getMinute()+":00";
String endTimeStr = resultDtoList.get(1).getHour()+":"+resultDtoList.get(1).getMinute()+":00";
String startTimeStr = resultDtoList.get(0).getHour() + ":" + resultDtoList.get(0).getMinute() + ":00";
String endTimeStr = resultDtoList.get(1).getHour() + ":" + resultDtoList.get(1).getMinute() + ":00";
Date startTime = DateUtil.parseTime(startTimeStr);
Date endTime = DateUtil.parseTime(endTimeStr);
Integer span = resultDtoList.get(2).getHour()*60+resultDtoList.get(2).getMinute();
Integer span = resultDtoList.get(2).getHour() * 60 + resultDtoList.get(2).getMinute();
List<DateTime> dateTimes = MyDateUtils.rangeToList(startTime, endTime, DateField.MINUTE, span);
for (DateTime data : dateTimes) {
String dateTime = DateUtil.formatTime(data);
@ -453,9 +455,9 @@ public class TerminalPhotoServiceImpl implements TerminalPhotoService {
}
model.setList(resultList);
model.setIsNew(true);
}else {
} else {
TerminalAndChannelIdVo idVo = new TerminalAndChannelIdVo();
BeanUtils.copyProperties(vo,idVo);
BeanUtils.copyProperties(vo, idVo);
ServiceBody<TerminalScheduleRuleTimeListModel> listModel = terminalScheduleRuleService.getChannelSchelduleRule(idVo);
model = listModel.getData();
}
@ -464,7 +466,7 @@ public class TerminalPhotoServiceImpl implements TerminalPhotoService {
@Override
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=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()));
}

Write Preview
Loading…
Cancel
Save