|
|
@ -273,7 +273,7 @@ public class TerminalScheduleRuleServiceImpl implements TerminalScheduleRuleServ
|
|
|
|
int indexOri = index;
|
|
|
|
int indexOri = index;
|
|
|
|
int indexAdd = indexOri + 1;
|
|
|
|
int indexAdd = indexOri + 1;
|
|
|
|
int indexAddT = indexAdd + 1;
|
|
|
|
int indexAddT = indexAdd + 1;
|
|
|
|
String string = "--hour" + indexOri + "=" + startHour + "\t" + "--min" + indexOri + "=" + startMin + "\t" + "--preset" + indexOri + "=255 --hour=" + (indexAdd) + "=" + endTimeHour + "\t" + "--min" + (indexAdd) + "=" + endTimeMin + "\t"
|
|
|
|
String string = "--hour" + indexOri + "=" + startHour + "\t" + "--min" + indexOri + "=" + startMin + "\t" + "--preset" + indexOri + "=255 --hour" + (indexAdd) + "=" + endTimeHour + "\t" + "--min" + (indexAdd) + "=" + endTimeMin + "\t"
|
|
|
|
+ "--preset" + (indexAdd) + "=255 --hour" + indexAddT + "=" + span1 + "\t" + "--min" + indexAddT + "=" + span2 + "\t" + "--preset" + indexAddT + "=255";
|
|
|
|
+ "--preset" + (indexAdd) + "=255 --hour" + indexAddT + "=" + span1 + "\t" + "--min" + indexAddT + "=" + span2 + "\t" + "--preset" + indexAddT + "=255";
|
|
|
|
timestr.append(string);
|
|
|
|
timestr.append(string);
|
|
|
|
index = indexAddT+1;
|
|
|
|
index = indexAddT+1;
|
|
|
@ -282,7 +282,7 @@ public class TerminalScheduleRuleServiceImpl implements TerminalScheduleRuleServ
|
|
|
|
ArrayList<GetScheduleRequestIdListModel.RequestBean> requestIdList = new ArrayList<>();
|
|
|
|
ArrayList<GetScheduleRequestIdListModel.RequestBean> requestIdList = new ArrayList<>();
|
|
|
|
for (int x = 0; x < terminalsList.size(); x++) {
|
|
|
|
for (int x = 0; x < terminalsList.size(); x++) {
|
|
|
|
ChannelAndTermDto channelAndTermDto = terminalsList.get(x);
|
|
|
|
ChannelAndTermDto channelAndTermDto = terminalsList.get(x);
|
|
|
|
String cmd = Constants.CMD + "schedule --group=" + dtoList.size() + "--flag=1 --cmdid=" + channelAndTermDto.getCmdid() + "\t" + "--channel=" + channelAndTermDto.getChannelid() + "\t" +
|
|
|
|
String cmd = Constants.CMD + "schedule --group=" + dtoList.size() + " --flag=1 --cmdid=" + channelAndTermDto.getCmdid() + "\t" + "--channel=" + channelAndTermDto.getChannelid() + "\t" +
|
|
|
|
timestr.toString();
|
|
|
|
timestr.toString();
|
|
|
|
ProcessExecUtils.exec(cmd);
|
|
|
|
ProcessExecUtils.exec(cmd);
|
|
|
|
int requestId = Integer.parseInt(Constants.REQUEST_ID.toString());
|
|
|
|
int requestId = Integer.parseInt(Constants.REQUEST_ID.toString());
|
|
|
|