修复时间下发插表的bug

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<LineAndDyNameDto> list = linesDao.selectAll(CommonStatus.EFFECTIVE.value(),search);
+        List<LineAndDyNameDto> 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);
                 }
             }

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

@@ -249,8 +249,8 @@ public class TerminalScheduleRuleServiceImpl implements TerminalScheduleRuleServ
 
         Map<Integer, Terminals> terminalMap = cacheService.getTerminalMap();
         ArrayList<GetScheduleRequestIdListModel.RequestBean> requestIdList = new ArrayList<>();
-        ArrayList<TerminalSchedulesTemp> templist = new ArrayList<>();
         for (int i = 0; i < termlist.size(); i++) {
+            ArrayList<TerminalSchedulesTemp> 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);