From 22989a31a00d8283caf6029ff7455e6d155c393a Mon Sep 17 00:00:00 2001 From: 18616268358 <1440265357@qq.com> Date: Mon, 29 May 2023 10:21:26 +0800 Subject: [PATCH] =?UTF-8?q?#20230529=20=E6=AC=A3=E5=BD=B1=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E5=B9=B3=E5=8F=B0=E6=8B=8D=E7=85=A7=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E8=A1=A8=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/shxy/xymanager_common/model/TerminalListModel.java | 3 --- .../impl/TerminalScheduleRuleServiceImpl.java | 5 +++-- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/model/TerminalListModel.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/model/TerminalListModel.java index 424402f..f39ec0b 100644 --- a/xymanager_common/src/main/java/com/shxy/xymanager_common/model/TerminalListModel.java +++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/model/TerminalListModel.java @@ -1,10 +1,7 @@ package com.shxy.xymanager_common.model; -import com.shxy.xymanager_common.dto.TerminalChannelsAndScheduleDto; -import com.shxy.xymanager_common.dto.TerminalChannelsDto; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import jdk.nashorn.internal.ir.Terminal; import lombok.Data; import java.io.Serializable; 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 06fc00c..c347002 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 @@ -455,8 +455,9 @@ public class TerminalScheduleRuleServiceImpl implements TerminalScheduleRuleServ terminalSchedules.add(record); } Date date = new Date(); - terminalScheduleDao.insertOrUpdate(terminalSchedules, date, date);//将实际的拍照时间表规则从临时表更新到正式表中 - + if(CollectionUtil.isNotEmpty(terminalSchedules)) { + terminalScheduleDao.insertOrUpdate(terminalSchedules, date, date);//将实际的拍照时间表规则从临时表更新到正式表中 + } ArrayList distinct = CollectionUtil.distinct(scheduleidlist); List scheduleDetails = scheduleDetailsDao.selectAllBySceduleidList(distinct); ArrayList terminalScheduleDetails = new ArrayList<>();