From b81a6894465f57f48f3e325c334908fcaeaf60d6 Mon Sep 17 00:00:00 2001 From: "guijing.liu" Date: Thu, 31 Aug 2023 15:33:09 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=97=B6=E9=97=B4=E4=B8=8B?= =?UTF-8?q?=E5=8F=91=E6=8F=92=E8=A1=A8=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/LineServiceImpl.java | 10 ++++++++-- .../impl/TerminalScheduleRuleServiceImpl.java | 19 +++++++++---------- 2 files changed, 17 insertions(+), 12 deletions(-) diff --git a/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/LineServiceImpl.java b/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/LineServiceImpl.java index 83a5afe..651d023 100644 --- a/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/LineServiceImpl.java +++ b/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/LineServiceImpl.java @@ -72,7 +72,7 @@ public class LineServiceImpl implements LineService { int pageindex = vo.getPageindex(); int pagesize = vo.getPagesize(); PageUtils.SetPage(pageindex, pagesize); - List list = linesDao.selectAll(CommonStatus.EFFECTIVE.value(),search); + List list = linesDao.selectAll(CommonStatus.EFFECTIVE.value(), search); boolean empty = CollectionUtil.isEmpty(list); if (empty) { model.setList(new ArrayList<>()); @@ -189,7 +189,13 @@ public class LineServiceImpl implements LineService { for (Terminals item : list) { LineAndGtAndChannelListModel.Bean bean = new LineAndGtAndChannelListModel.Bean(); bean.setId(item.getId()); - bean.setName(item.getDisplayName()); + String displayName = item.getDisplayName(); + if (StrUtil.isEmpty(displayName)) { + bean.setName(item.getCmdid()); + } else { + bean.setName(item.getDisplayName()); + } + beans.add(bean); } } 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 e8ce951..c23632f 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 @@ -249,8 +249,8 @@ public class TerminalScheduleRuleServiceImpl implements TerminalScheduleRuleServ Map terminalMap = cacheService.getTerminalMap(); ArrayList requestIdList = new ArrayList<>(); - ArrayList templist = new ArrayList<>(); for (int i = 0; i < termlist.size(); i++) { + ArrayList templist = new ArrayList<>(); String cmdid = null; RelateTerminalListRuleIdVo.Items items = termlist.get(i); Integer termid = items.getTermid(); @@ -270,10 +270,6 @@ public class TerminalScheduleRuleServiceImpl implements TerminalScheduleRuleServ String timestr = ScheduleListUtils.relateTime(timelist); int requestId = Constants.REQUEST_ID.addAndGet(1); - String cmd = CmaUtil.relateSchelduleRule(timelist, cmdid, requestId, channelid, timestr); - ProcessExecUtils.exec(cmd); - log.info("cma下发时间表命令", cmd); - GetScheduleRequestIdListModel.RequestBean requestBean = new GetScheduleRequestIdListModel.RequestBean(); requestBean.setTermid(termid); requestBean.setChannelid(channelid); @@ -295,11 +291,14 @@ public class TerminalScheduleRuleServiceImpl implements TerminalScheduleRuleServ temp.setOffset(offset); templist.add(temp); } - } - if (CollectionUtil.isNotEmpty(templist)) { - terminalSchedulesTempDao.deleteByTermidAndChannelid(templist); - Date date = new Date(); - terminalSchedulesTempDao.insertList(templist, CommonStatus.DELETE.value(), date, date); + if (CollectionUtil.isNotEmpty(templist)) { + terminalSchedulesTempDao.deleteByTermidAndChannelid(templist); + Date date = new Date(); + terminalSchedulesTempDao.insertList(templist, CommonStatus.DELETE.value(), date, date); + String cmd = CmaUtil.relateSchelduleRule(timelist, cmdid, requestId, channelid, timestr); + ProcessExecUtils.exec(cmd); + log.info("cma下发时间表命令", cmd); + } } model.setList(requestIdList); return Asserts.success(model);