From ad29fd7485cbc680bba936c6d5f538fa69e9a4aa Mon Sep 17 00:00:00 2001
From: 18616268358 <1440265357@qq.com>
Date: Tue, 9 May 2023 11:20:26 +0800
Subject: [PATCH] =?UTF-8?q?#20230506=20=E6=AC=A3=E5=BD=B1=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E5=B9=B3=E5=8F=B0=E6=8B=8D=E7=85=A7=E5=8A=9F=E8=83=BD?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/TerminalPhotoServiceImpl.java        | 32 +++++++++----------
 1 file changed, 15 insertions(+), 17 deletions(-)

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<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));
-                    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);