拍照时间表顺序修改

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

@@ -5,16 +5,12 @@ import cn.hutool.core.date.DateField;
 import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.StrUtil;
-import com.alibaba.fastjson.JSONObject;
 import com.shxy.xymanager_common.dto.PhotoTimeResultDto;
 import com.shxy.xymanager_common.dto.ScheduleDetailsDto;
 import com.shxy.xymanager_common.entity.ScheduleDetails;
 import com.shxy.xymanager_common.model.TerminalScheduleRuleModel;
-import com.shxy.xymanager_common.model.TerminalScheduleRuleTimeListModel;
 import com.shxy.xymanager_common.vo.ScheduleRuleVo;
-import net.sf.jsqlparser.expression.DateTimeLiteralExpression;
 
-import java.math.BigDecimal;
 import java.sql.Time;
 import java.util.ArrayList;
 import java.util.List;
@@ -86,9 +82,13 @@ public class ScheduleListUtils {
             short endMin = 0;
             short spanHour = 0;
             short spanMin = 0;
-
             if (XyNumberUtils.remainder(i, 3) == 0) {
-                index = i + 2;
+                index = i + 1;
+                spanHour = dtoList.get(i).getHour().shortValue();
+                spanMin = dtoList.get(i).getMinute().shortValue();
+                spanstring = " --hour" + index + "=" + spanHour + " --min" + index + "=" + spanMin + " --preset" + index + "=" + perset;
+            } else if (XyNumberUtils.remainder(i, 3) == 1) {
+                index = i + 1;
                 Number add = XyNumberUtils.add((Number) dtoList.get(i).getMinute(), offset);
                 if (add.intValue() >= 60) {
                     Number add1 = XyNumberUtils.add((Number) dtoList.get(i).getHour(), 1);
@@ -104,8 +104,8 @@ public class ScheduleListUtils {
                     startMin = add.shortValue();
                 }
                 startstring = " --hour" + index + "=" + startHour + " --min" + index + "=" + startMin + " --preset" + index + "=" + perset;
-            } else if (XyNumberUtils.remainder(i, 3) == 1) {
+            } else if (XyNumberUtils.remainder(i, 3) == 2) {
-                index = i + 2;
+                index = i + 1;
                 Number add = XyNumberUtils.add((Number) dtoList.get(i).getMinute(), offset);
                 if (add.intValue() >= 60) {
                     Number add1 = XyNumberUtils.add((Number) dtoList.get(i).getHour(), 1);
@@ -121,15 +121,9 @@ public class ScheduleListUtils {
                     endMin = add.shortValue();
                 }
                 endstring = " --hour" + index + "=" + endHour + " --min" + index + "=" + endMin + " --preset" + index + "=" + perset;
-            } else if (XyNumberUtils.remainder(i, 3) == 2) {
-                index = i - 1;
-                spanHour = dtoList.get(i).getHour().shortValue();
-                spanMin = dtoList.get(i).getMinute().shortValue();
-                spanstring = " --hour" + index + "=" + spanHour + " --min" + index + "=" + spanMin + " --preset" + index + "=" + perset;
                 if (StrUtil.isNotEmpty(spanstring) && StrUtil.isNotEmpty(startstring) && StrUtil.isNotEmpty(endstring)) {
                     timestr.append(spanstring).append(startstring).append(endstring);
                 }
-
             }
         }
         return timestr.toString();
@@ -180,24 +174,24 @@ public class ScheduleListUtils {
         for (int i = 0; i < details.size(); i++) {
             ScheduleDetailsDto dto = details.get(i);
             if (XyNumberUtils.remainder(i, 3) == 0) {
-                scheduleDetailsBean = new TerminalScheduleRuleModel.ScheduleRuleBean();
                 Integer hour = dto.getHour();
                 Integer minute = dto.getMinute();
-                Time time = MyDateUtils.HHMMToTime(hour, minute);
+                Number mul = XyNumberUtils.mul((Number) hour, 60);
+                Number add = XyNumberUtils.add(mul, minute);
                 scheduleDetailsBean.setId(dto.getId());
                 scheduleDetailsBean.setScheduleId(dto.getScheduleId());
-                scheduleDetailsBean.setStartTime(time);
+                scheduleDetailsBean.setSpan(add.intValue());
             } else if (XyNumberUtils.remainder(i, 3) == 1) {
+                scheduleDetailsBean = new TerminalScheduleRuleModel.ScheduleRuleBean();
                 Integer hour = dto.getHour();
                 Integer minute = dto.getMinute();
                 Time time = MyDateUtils.HHMMToTime(hour, minute);
-                scheduleDetailsBean.setEndTime(time);
+                scheduleDetailsBean.setStartTime(time);
             } else if (XyNumberUtils.remainder(i, 3) == 2) {
                 Integer hour = dto.getHour();
                 Integer minute = dto.getMinute();
-                Number mul = XyNumberUtils.mul((Number) hour, 60);
+                Time time = MyDateUtils.HHMMToTime(hour, minute);
-                Number add = XyNumberUtils.add(mul, minute);
+                scheduleDetailsBean.setEndTime(time);
-                scheduleDetailsBean.setSpan(add.intValue());
                 detailsBeans.add(scheduleDetailsBean);
             }
         }

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

@@ -259,7 +259,6 @@ public class TerminalScheduleRuleServiceImpl implements TerminalScheduleRuleServ
                     offset = termlist.get(i).getOffset();
                 }
             }
-//            int offset = RandomUtil.randomInt(10);
             String timestr = ScheduleListUtils.relateTime(dtoList, offset);
 
             String cmd = Constants.CMD + "schedule --group=" + dtoList.size() + " --flag=1 --clientid=10 --cmdid="