From 66911541b419e6c2dd747f08deb2d5430c8d7b3b Mon Sep 17 00:00:00 2001 From: liuguijing <123456> Date: Tue, 30 May 2023 21:19:39 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9cma=E6=8C=87=E4=BB=A4?= =?UTF-8?q?=E4=B8=8B=E5=8F=91=E6=97=B6=20group=E5=8F=82=E6=95=B0=E6=95=B0?= =?UTF-8?q?=E5=AD=97=E9=94=99=E8=AF=AF=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/shxy/xymanager_common/util/ScheduleListUtils.java | 5 ----- .../impl/TerminalScheduleRuleServiceImpl.java | 2 +- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/util/ScheduleListUtils.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/util/ScheduleListUtils.java index 383713f..4194986 100644 --- a/xymanager_common/src/main/java/com/shxy/xymanager_common/util/ScheduleListUtils.java +++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/util/ScheduleListUtils.java @@ -1,17 +1,12 @@ package com.shxy.xymanager_common.util; -import cn.hutool.core.date.DateTime; import com.shxy.xymanager_common.dto.ScheduleDetailsDto; import com.shxy.xymanager_common.entity.ScheduleDetailss; -import com.shxy.xymanager_common.entity.Schedules; import com.shxy.xymanager_common.model.TerminalScheduleRuleModel; -import com.shxy.xymanager_common.vo.ScheduleListVo; import com.shxy.xymanager_common.vo.ScheduleRuleVo; -import javax.validation.constraints.NotEmpty; import java.sql.Time; import java.util.ArrayList; -import java.util.Date; import java.util.List; /** diff --git a/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalScheduleRuleServiceImpl.java b/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalScheduleRuleServiceImpl.java index dade377..2e2c0b6 100644 --- a/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalScheduleRuleServiceImpl.java +++ b/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalScheduleRuleServiceImpl.java @@ -276,7 +276,7 @@ public class TerminalScheduleRuleServiceImpl implements TerminalScheduleRuleServ int offset = RandomUtil.randomInt(10); String timestr = ScheduleListUtils.relateTime(dtoList, offset); - String cmd = Constants.CMD + "schedule --group=" + dtoList.size() * 3 + " --flag=1 --clientid=10 --cmdid=" + String cmd = Constants.CMD + "schedule --group=" + dtoList.size() + " --flag=1 --clientid=10 --cmdid=" + channelAndTermDto.getCmdid() + " --reqid=" + requestId + " --channel=" + channelAndTermDto.getChannelid() + " " + timestr; ProcessExecUtils.exec(cmd);