Merge branch 'master' of https://gitee.com/xinyingpower/xymanagerbackend

 Conflicts:

	xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalPhotoServiceImpl.java

xymanager_common/src/main/java/com/shxy/xymanager_common/util/ProcessExecUtils.java

@@ -10,7 +10,7 @@ import java.util.UUID;
 
 /**
  *
- * 上传文件
+ * 执行指令
  * @author cy
  */
 @Slf4j
@@ -18,7 +18,7 @@ public class ProcessExecUtils
 {
 
     /**
-     * 上传文件
+     * 执行指令
      *
      */
     public static Integer exec(String cmd) {
@@ -38,7 +38,6 @@ public class ProcessExecUtils
             if(StringUtils.isNotBlank(result)){
                 log.info("查询最新结果:{}",result);
             }
-            result = sb.toString();
         } catch (IOException e) {
             log.error("IOException",e);
         } catch (InterruptedException e) {

xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalPhotoServiceImpl.java

@@ -311,40 +311,37 @@ public class TerminalPhotoServiceImpl implements TerminalPhotoService {
         List<TerminalPhotoScheduleDto> dtoList = terminalPhotoDao.selectPhotoSchedule(vo);
         Map<String,List<TerminalPhotoScheduleDto>> map =dtoList.stream().collect(Collectors.groupingBy(TerminalPhotoScheduleDto :: getCmid)) ;
         map.forEach((key,value) ->{
-            List<Short> timeList = Lists.newArrayList();
+
-            int i = 0;
            for(int j = 0; j<value.size();j++){
                 Short span = value.get(j).getSpan();
                 Date startTime = value.get(j).getStartTime();
                 Short startHour = Short.parseShort(MyDateUtils.parseHourAndMinute(startTime).split("/")[0]);
                 Short startMin = Short.parseShort(MyDateUtils.parseHourAndMinute(startTime).split("/")[1]);
-                timeList.add(startHour);
-                timeList.add(startMin);
-                timeList.add((short) 255);
 
-                Date endTime = value.get(j).getStartTime();
+
+                Date endTime = value.get(j).getEndTime();
                 Short endTimeHour = Short.parseShort(MyDateUtils.parseHourAndMinute(endTime).split("/")[0]);
                 Short endTimeMin = Short.parseShort(MyDateUtils.parseHourAndMinute(endTime).split("/")[1]);
-                timeList.add(endTimeHour);
+
-                timeList.add(endTimeMin);
-                timeList.add((short) 255);
 
 
                 String spanStr;
+               Short span1 =-1;
+               Short span2 =-1;
                 if(span/60 > 0) {
-                    timeList.add((short) (span / 60));
+                    span1 =(short)(span/60);
-                    timeList.add((short) (span % 60));
+                    span2 =(short)(span % 60);
                 }else if(span<60 ){
-                    timeList.add((short) 0);
+                    span1 = (short)0;
-                    timeList.add(span);
+                    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";
-            ;
-            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);