diff --git a/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalPhotoServiceImpl.java b/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalPhotoServiceImpl.java index 8c2dcd2..b32cc6d 100644 --- a/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalPhotoServiceImpl.java +++ b/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalPhotoServiceImpl.java @@ -294,39 +294,37 @@ public class TerminalPhotoServiceImpl implements TerminalPhotoService { List dtoList = terminalPhotoDao.selectPhotoSchedule(vo); Map> map =dtoList.stream().collect(Collectors.groupingBy(TerminalPhotoScheduleDto :: getCmid)) ; map.forEach((key,value) ->{ - List timeList = Lists.newArrayList(); - int i = 0 ; + for(int j = 0; j 0) { - timeList.add((short)(span/60)); - timeList.add((short)(span % 60)); + span1 =(short)(span/60); + span2 =(short)(span % 60); }else if(span<60 ){ - timeList.add((short)0); - timeList.add(span); - + span1 = (short)0; + span2 = span; } - timeList.add((short)255); + String cmd = "/usr/local/bin/xympadmn --server=127.0.0.1 --port=6891 --act=schedule --cmdid="+key +"\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=updateSchedule[0xCA] --cmdid="+key +"\t" +"--channel="+ vo.getChannel() +"\t"+ "--scheduleData="+ JSON.toJSONString(timeList); - ProcessExecUtils.exec(cmd); + }); return Asserts.success(true);