From 8162c438b678557366473b27c47b4f803fb3b6e0 Mon Sep 17 00:00:00 2001
From: 18616268358 <1440265357@qq.com>
Date: Thu, 25 May 2023 13:13:16 +0800
Subject: [PATCH] =?UTF-8?q?#20230510=20=E6=AC=A3=E5=BD=B1=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E5=B9=B3=E5=8F=B0=E8=A3=85=E7=BD=AE=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 xymanager_dao/src/main/resources/mappers/RequestResultsDao.xml  | 2 +-
 .../xymanager_service/impl/TerminalScheduleRuleServiceImpl.java | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/xymanager_dao/src/main/resources/mappers/RequestResultsDao.xml b/xymanager_dao/src/main/resources/mappers/RequestResultsDao.xml
index 626af2e..9ccf888 100644
--- a/xymanager_dao/src/main/resources/mappers/RequestResultsDao.xml
+++ b/xymanager_dao/src/main/resources/mappers/RequestResultsDao.xml
@@ -39,7 +39,7 @@
         where request_type = #{requesttype}
         and client_id = #{clientid}
         and result = #{result}
-        and request_schedule_status = #{schedulestatus}
+        and request_schedule_status is null
     </select>
 
     <select id="selectByRequestIdList" resultMap="BaseResultMap">
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 d677d0a..2d843f9 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
@@ -282,7 +282,7 @@ public class TerminalScheduleRuleServiceImpl implements TerminalScheduleRuleServ
         ArrayList<GetScheduleRequestIdListModel.RequestBean> requestIdList = new ArrayList<>();
         for (int x = 0; x < terminalsList.size(); 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()*3 + " --flag=1 --cmdid=" + channelAndTermDto.getCmdid() + "\t" + "--channel=" + channelAndTermDto.getChannelid() + "\t" +
                     timestr.toString();
             ProcessExecUtils.exec(cmd);
             int requestId = Integer.parseInt(Constants.REQUEST_ID.toString());