From 8c293998f71402238cda0704cc9d3db2cd25d3e7 Mon Sep 17 00:00:00 2001 From: liuguijing <123456> Date: Wed, 31 May 2023 15:06:14 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=97=B6=E9=97=B4=E8=A1=A8=E5=88=A0?= =?UTF-8?q?=E9=99=A4=E4=B8=8D=E7=94=A8=E7=9A=84=E8=A1=A8=E7=BB=93=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/ScheduleDetails.java | 6 +- .../entity/ScheduleDetailss.java | 28 ---- .../entity/TerminalScheduleDetails.java | 4 +- .../entity/TerminalScheduleDetailss.java | 28 ---- .../util/ScheduleListUtils.java | 45 +++-- .../vo/RelateTerminalListRuleIdVo.java | 3 + .../xymanager_dao/dao/ScheduleDetailsDao.java | 1 - .../dao/ScheduleDetailssDao.java | 31 ---- .../dao/TerminalScheduleDetailsDao.java | 1 - .../dao/TerminalScheduleDetailssDao.java | 27 --- .../resources/mappers/ScheduleDetailsDao.xml | 13 +- .../resources/mappers/ScheduleDetailssDao.xml | 156 ------------------ .../main/resources/mappers/SchedulesDao.xml | 6 +- .../mappers/TerminalScheduleDetailsDao.xml | 6 +- .../mappers/TerminalScheduleDetailssDao.xml | 135 --------------- .../impl/TerminalScheduleRuleServiceImpl.java | 55 +++--- 16 files changed, 87 insertions(+), 458 deletions(-) delete mode 100644 xymanager_common/src/main/java/com/shxy/xymanager_common/entity/ScheduleDetailss.java delete mode 100644 xymanager_common/src/main/java/com/shxy/xymanager_common/entity/TerminalScheduleDetailss.java delete mode 100644 xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/ScheduleDetailssDao.java delete mode 100644 xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/TerminalScheduleDetailssDao.java delete mode 100644 xymanager_dao/src/main/resources/mappers/ScheduleDetailssDao.xml delete mode 100644 xymanager_dao/src/main/resources/mappers/TerminalScheduleDetailssDao.xml diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/ScheduleDetails.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/ScheduleDetails.java index 10020c6..e49994d 100644 --- a/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/ScheduleDetails.java +++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/ScheduleDetails.java @@ -13,11 +13,11 @@ public class ScheduleDetails implements Serializable { private Integer scheduleId; - private Time startTime; + private Integer hour; - private Time endTime; + private Integer minute; - private Integer span; + private Integer preset; private Date createTime; diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/ScheduleDetailss.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/ScheduleDetailss.java deleted file mode 100644 index 8b4eb4b..0000000 --- a/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/ScheduleDetailss.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.shxy.xymanager_common.entity; - -import lombok.Data; - -import java.io.Serializable; -import java.sql.Time; -import java.util.Date; - -@Data -public class ScheduleDetailss implements Serializable { - - private Integer id; - - private Integer scheduleId; - - private Integer hour; - - private Integer minute; - - private Integer preset; - - private Date createTime; - - private Date updateTime; - - private static final long serialVersionUID = 1L; - -} \ No newline at end of file diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/TerminalScheduleDetails.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/TerminalScheduleDetails.java index 63bc497..29de08b 100644 --- a/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/TerminalScheduleDetails.java +++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/TerminalScheduleDetails.java @@ -13,9 +13,9 @@ public class TerminalScheduleDetails implements Serializable { private Integer channelId; - private Date startTime; + private Integer hour; - private Date endTime; + private Integer minute; private Integer span; diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/TerminalScheduleDetailss.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/TerminalScheduleDetailss.java deleted file mode 100644 index d73dcd7..0000000 --- a/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/TerminalScheduleDetailss.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.shxy.xymanager_common.entity; - -import lombok.Data; - -import java.io.Serializable; -import java.util.Date; - -@Data -public class TerminalScheduleDetailss implements Serializable { - private Integer id; - - private Integer termId; - - private Integer channelId; - - private Integer hour; - - private Integer minute; - - private Integer span; - - private Date createTime; - - private Date updateTime; - - private static final long serialVersionUID = 1L; - -} \ No newline at end of file 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 0fec008..4cf938b 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,7 +1,7 @@ package com.shxy.xymanager_common.util; import com.shxy.xymanager_common.dto.ScheduleDetailsDto; -import com.shxy.xymanager_common.entity.ScheduleDetailss; +import com.shxy.xymanager_common.entity.ScheduleDetails; import com.shxy.xymanager_common.model.TerminalScheduleRuleModel; import com.shxy.xymanager_common.vo.ScheduleRuleVo; @@ -21,11 +21,11 @@ public class ScheduleListUtils { * @param scheduleid 规则编号 * @return */ - public static ArrayList getScheduleDetailsses(List beans, Integer scheduleid) { - ArrayList list = new ArrayList<>(); + public static ArrayList getScheduleDetailsses(List beans, Integer scheduleid) { + ArrayList list = new ArrayList<>(); for (ScheduleRuleVo item : beans) { - ScheduleDetailss startrule = new ScheduleDetailss(); + ScheduleDetails startrule = new ScheduleDetails(); startrule.setScheduleId(scheduleid); Time startTime = item.getStartTime(); startrule.setHour(MyDateUtils.hour(startTime, true)); @@ -33,7 +33,7 @@ public class ScheduleListUtils { startrule.setPreset(255); list.add(startrule); - ScheduleDetailss endrule = new ScheduleDetailss(); + ScheduleDetails endrule = new ScheduleDetails(); endrule.setScheduleId(scheduleid); Time endTime = item.getEndTime(); endrule.setHour(MyDateUtils.hour(endTime, true)); @@ -42,7 +42,7 @@ public class ScheduleListUtils { list.add(endrule); Integer span = item.getSpan(); - ScheduleDetailss spanrule = new ScheduleDetailss(); + ScheduleDetails spanrule = new ScheduleDetails(); spanrule.setScheduleId(scheduleid); spanrule.setHour(XyNumberUtils.delivery(span, 60)); spanrule.setMinute(XyNumberUtils.remainder(span, 60)); @@ -75,15 +75,38 @@ public class ScheduleListUtils { String string = ""; if (XyNumberUtils.remainder(i, 3) == 0) { index = index + 3; - startHour = dtoList.get(i).getHour().shortValue(); - startMin = dtoList.get(i).getMinute().shortValue(); + Number add = XyNumberUtils.add((Number) dtoList.get(i).getMinute(), 60); + if (add.intValue() >= 60) { + Number add1 = XyNumberUtils.add((Number) dtoList.get(i).getHour(), 1); + if (add1.intValue() >= 24) { + startHour = Integer.valueOf(24).shortValue(); + startMin = Integer.valueOf(0).shortValue(); + } else { + startHour = XyNumberUtils.add((Number) dtoList.get(i).getHour(), 1).shortValue(); + startMin = XyNumberUtils.sub(add, 60).shortValue(); + } + } else { + startHour = dtoList.get(i).getHour().shortValue(); + startMin = add.shortValue(); + } string = " --hour" + index + "=" + startHour + " --min" + index + "=" + startMin + " --preset" + index + "=" + perset; } else if (XyNumberUtils.remainder(i, 3) == 1) { index = index - 1; - endHour = dtoList.get(i).getHour().shortValue(); - endMin = dtoList.get(i).getMinute().shortValue(); + Number add = XyNumberUtils.add((Number) dtoList.get(i).getMinute(), 60); + if (add.intValue() >= 60) { + Number add1 = XyNumberUtils.add((Number) dtoList.get(i).getHour(), 1); + if (add1.intValue() >= 24) { + endHour = Integer.valueOf(24).shortValue(); + endMin = Integer.valueOf(0).shortValue(); + } else { + endHour = add1.shortValue(); + endMin = XyNumberUtils.sub(add, 60).shortValue(); + } + } else { + endHour = dtoList.get(i).getHour().shortValue(); + endMin = add.shortValue(); + } string = " --hour" + index + "=" + endHour + " --min" + index + "=" + endMin + " --preset" + index + "=" + perset; - } else if (XyNumberUtils.remainder(i, 3) == 2) { index = index - 1; spanHour = dtoList.get(i).getHour().shortValue(); diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/RelateTerminalListRuleIdVo.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/RelateTerminalListRuleIdVo.java index de9287f..38d4882 100644 --- a/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/RelateTerminalListRuleIdVo.java +++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/RelateTerminalListRuleIdVo.java @@ -32,6 +32,9 @@ public class RelateTerminalListRuleIdVo { @NotNull(message = "通道编号列表不能缺少") @ApiModelProperty(value = "通道编号列表", example = "123455") private List channelidlist; + + @ApiModelProperty(value = "偏移量", example = "123455") + private Integer offset; } } diff --git a/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/ScheduleDetailsDao.java b/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/ScheduleDetailsDao.java index c5d4c64..eae4328 100644 --- a/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/ScheduleDetailsDao.java +++ b/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/ScheduleDetailsDao.java @@ -4,7 +4,6 @@ import com.shxy.xymanager_common.entity.ScheduleDetails; import com.shxy.xymanager_common.entity.TerminalSchedule; import org.apache.ibatis.annotations.Param; -import java.util.ArrayList; import java.util.Date; import java.util.List; diff --git a/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/ScheduleDetailssDao.java b/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/ScheduleDetailssDao.java deleted file mode 100644 index 542f45d..0000000 --- a/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/ScheduleDetailssDao.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.shxy.xymanager_dao.dao; - -import com.shxy.xymanager_common.entity.ScheduleDetails; -import com.shxy.xymanager_common.entity.ScheduleDetailss; -import com.shxy.xymanager_common.entity.TerminalSchedule; -import org.apache.ibatis.annotations.Param; - -import java.util.Date; -import java.util.List; - -public interface ScheduleDetailssDao { - - int insertSelective(ScheduleDetailss record); - - int insertList(@Param("list") List record, @Param("createat") Date create, @Param("updateat") Date update); - - ScheduleDetails selectByPrimaryKey(Integer id); - - List selectAll(@Param("status") Integer status); - - List selectAllByList(@Param("list") List list); - - int deleteById(@Param("scheduleid") Integer id); - - - int updateByPrimaryKeySelective(@Param("data") ScheduleDetailss record, @Param("updateat") Date update); - - int updateByPrimaryKey(ScheduleDetailss record); - - List selectAllBySceduleidList(@Param("list") List distinct); -} \ No newline at end of file diff --git a/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/TerminalScheduleDetailsDao.java b/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/TerminalScheduleDetailsDao.java index 1cb005d..2e94a6d 100644 --- a/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/TerminalScheduleDetailsDao.java +++ b/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/TerminalScheduleDetailsDao.java @@ -4,7 +4,6 @@ import com.shxy.xymanager_common.entity.TerminalSchedule; import com.shxy.xymanager_common.entity.TerminalScheduleDetails; import org.apache.ibatis.annotations.Param; -import javax.xml.crypto.Data; import java.util.Date; import java.util.List; diff --git a/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/TerminalScheduleDetailssDao.java b/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/TerminalScheduleDetailssDao.java deleted file mode 100644 index 26d2dcf..0000000 --- a/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/TerminalScheduleDetailssDao.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.shxy.xymanager_dao.dao; - -import com.shxy.xymanager_common.entity.TerminalSchedule; -import com.shxy.xymanager_common.entity.TerminalScheduleDetailss; -import org.apache.ibatis.annotations.Param; - -import java.util.Date; -import java.util.List; - -public interface TerminalScheduleDetailssDao { - - int deleteByTermiAndChannel(Integer id); - - int deleteByTermidAndChannelIdList(@Param("list") List lsit); - - int insert(TerminalScheduleDetailss record); - - int insertList(@Param("list") List record, @Param("createat") Date createat, @Param("updateat") Date updateat); - - int insertSelective(TerminalScheduleDetailss record); - - TerminalScheduleDetailss selectByPrimaryKey(Integer id); - - int updateByPrimaryKeySelective(TerminalScheduleDetailss record); - - int updateByPrimaryKey(TerminalScheduleDetailss record); -} \ No newline at end of file diff --git a/xymanager_dao/src/main/resources/mappers/ScheduleDetailsDao.xml b/xymanager_dao/src/main/resources/mappers/ScheduleDetailsDao.xml index cc42e28..0f9a7fe 100644 --- a/xymanager_dao/src/main/resources/mappers/ScheduleDetailsDao.xml +++ b/xymanager_dao/src/main/resources/mappers/ScheduleDetailsDao.xml @@ -4,14 +4,14 @@ - - - + + + - id, schedule_id, start_time, end_time, span, create_time, update_time + id, schedule_id, start_time, end_time, create_time, update_time - - select - - from schedule_detailss - where id = #{id,jdbcType=INTEGER} - - - - - - - - - - insert into schedule_detailss (id, name, start_time, - end_time, span, remark, - create_time, update_time) - values (#{id,jdbcType=INTEGER}, #{name,jdbcType=VARCHAR}, #{startTime,jdbcType=TIME}, - #{endTime,jdbcType=TIME}, #{span,jdbcType=INTEGER}, #{remark,jdbcType=VARCHAR}, - #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}) - - - - insert into schedule_detailss - (schedule_id,`hour`,`minute`,preset,create_time,update_time) - VALUES - - (#{item.scheduleId},#{item.hour},#{item.minute},#{item.preset},#{createat},#{updateat}) - - - - - - insert into schedule_detailss - - - id, - - - name, - - - start_time, - - - end_time, - - - span, - - - remark, - - - create_time, - - - update_time, - - - - - #{id,jdbcType=INTEGER}, - - - #{name,jdbcType=VARCHAR}, - - - #{startTime,jdbcType=TIME}, - - - #{endTime,jdbcType=TIME}, - - - #{span,jdbcType=INTEGER}, - - - #{remark,jdbcType=VARCHAR}, - - - #{createTime,jdbcType=TIMESTAMP}, - - - #{updateTime,jdbcType=TIMESTAMP}, - - - - - - - delete from schedule_detailss - where schedule_id = #{scheduleid} - - - - update schedules - - - name = #{data.name,jdbcType=VARCHAR}, - - - remark = #{data.remark,jdbcType=VARCHAR}, - - - update_time = #{updateat,jdbcType=TIMESTAMP}, - - - where id = #{data.id,jdbcType=INTEGER} - - - update schedule_detailss - set name = #{name,jdbcType=VARCHAR}, - start_time = #{startTime,jdbcType=TIME}, - end_time = #{endTime,jdbcType=TIME}, - span = #{span,jdbcType=INTEGER}, - remark = #{remark,jdbcType=VARCHAR}, - create_time = #{createTime,jdbcType=TIMESTAMP}, - update_time = #{updateTime,jdbcType=TIMESTAMP} - where id = #{id,jdbcType=INTEGER} - - \ No newline at end of file diff --git a/xymanager_dao/src/main/resources/mappers/SchedulesDao.xml b/xymanager_dao/src/main/resources/mappers/SchedulesDao.xml index 4fbba74..3d0c083 100644 --- a/xymanager_dao/src/main/resources/mappers/SchedulesDao.xml +++ b/xymanager_dao/src/main/resources/mappers/SchedulesDao.xml @@ -53,7 +53,7 @@ y.minute as minute, y.preset as preset from schedules x, - schedule_detailss y + schedule_details y where y.schedule_id = x.id and x.status = #{status} and y.schedule_id in @@ -61,7 +61,7 @@ #{item.id} - order by x.create_time desc + order by y.id asc diff --git a/xymanager_dao/src/main/resources/mappers/TerminalScheduleDetailsDao.xml b/xymanager_dao/src/main/resources/mappers/TerminalScheduleDetailsDao.xml index bfbbbb4..3585e16 100644 --- a/xymanager_dao/src/main/resources/mappers/TerminalScheduleDetailsDao.xml +++ b/xymanager_dao/src/main/resources/mappers/TerminalScheduleDetailsDao.xml @@ -5,8 +5,8 @@ - - + + @@ -25,7 +25,7 @@ where id = #{id,jdbcType=INTEGER} - insert into terminal_schedule_details (id, schedule_id, start_time, + insert into terminal_schedule_details (id, schedule_id, start_time, end_time, span, create_time, update_time) values (#{id,jdbcType=INTEGER}, #{scheduleId,jdbcType=INTEGER}, #{startTime,jdbcType=TIME}, diff --git a/xymanager_dao/src/main/resources/mappers/TerminalScheduleDetailssDao.xml b/xymanager_dao/src/main/resources/mappers/TerminalScheduleDetailssDao.xml deleted file mode 100644 index 8bdc097..0000000 --- a/xymanager_dao/src/main/resources/mappers/TerminalScheduleDetailssDao.xml +++ /dev/null @@ -1,135 +0,0 @@ - - - - - - - - - - - - - - - id,term_id, channel_id, start_time, end_time, span, create_time, update_time - - - - delete from terminal_schedule_detailss - where id = #{id,jdbcType=INTEGER} - - - insert into terminal_schedule_detailss (id, schedule_id, start_time, - end_time, span, create_time, - update_time) - values (#{id,jdbcType=INTEGER}, #{scheduleId,jdbcType=INTEGER}, #{startTime,jdbcType=TIME}, - #{endTime,jdbcType=TIME}, #{span,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, - #{updateTime,jdbcType=TIMESTAMP}) - - - - - insert into terminal_schedule_detailss - (term_id, channel_id,start_time, end_time, span, create_time, update_time) - values - - (#{item.termId},#{item.channelId},#{item.startTime},#{item.endTime},#{item.span},#{createat},#{updateat}) - - - - insert into terminal_schedule_detailss - - - id, - - - schedule_id, - - - start_time, - - - end_time, - - - span, - - - create_time, - - - update_time, - - - - - #{id,jdbcType=INTEGER}, - - - #{scheduleId,jdbcType=INTEGER}, - - - #{startTime,jdbcType=TIME}, - - - #{endTime,jdbcType=TIME}, - - - #{span,jdbcType=INTEGER}, - - - #{createTime,jdbcType=TIMESTAMP}, - - - #{updateTime,jdbcType=TIMESTAMP}, - - - - - update terminal_schedule_detailss - - - schedule_id = #{scheduleId,jdbcType=INTEGER}, - - - start_time = #{startTime,jdbcType=TIME}, - - - end_time = #{endTime,jdbcType=TIME}, - - - span = #{span,jdbcType=INTEGER}, - - - create_time = #{createTime,jdbcType=TIMESTAMP}, - - - update_time = #{updateTime,jdbcType=TIMESTAMP}, - - - where id = #{id,jdbcType=INTEGER} - - - update terminal_schedule_detailss - set schedule_id = #{scheduleId,jdbcType=INTEGER}, - start_time = #{startTime,jdbcType=TIME}, - end_time = #{endTime,jdbcType=TIME}, - span = #{span,jdbcType=INTEGER}, - create_time = #{createTime,jdbcType=TIMESTAMP}, - update_time = #{updateTime,jdbcType=TIMESTAMP} - where id = #{id,jdbcType=INTEGER} - - - delete from terminal_schedule_detailss - where - - term_id = #{item.termId} and channel_id = #{item.channelId} - - - \ No newline at end of file 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 a900761..899d51b 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 @@ -5,7 +5,6 @@ import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.date.DateField; import cn.hutool.core.date.DateTime; import cn.hutool.core.date.DateUtil; -import cn.hutool.core.util.RandomUtil; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.github.pagehelper.PageInfo; @@ -47,7 +46,7 @@ public class TerminalScheduleRuleServiceImpl implements TerminalScheduleRuleServ SchedulesDao schedulesDao; @Autowired - ScheduleDetailssDao scheduleDetailssDao; + ScheduleDetailsDao scheduleDetailsDao; @Autowired TerminalScheduleDao terminalScheduleDao; @@ -157,8 +156,8 @@ public class TerminalScheduleRuleServiceImpl implements TerminalScheduleRuleServ schedules.setUpdateTime(date); int i1 = schedulesDao.insertSelective(schedules); if (i1 != 0) { - ArrayList list = ScheduleListUtils.getScheduleDetailsses(vo.getList(), schedules.getId()); - int i = scheduleDetailssDao.insertList(list, date, date); + ArrayList list = ScheduleListUtils.getScheduleDetailsses(vo.getList(), schedules.getId()); + int i = scheduleDetailsDao.insertList(list, date, date); if (i != 0) { return Asserts.success("录入成功"); } else { @@ -189,9 +188,9 @@ public class TerminalScheduleRuleServiceImpl implements TerminalScheduleRuleServ schedule.setRemark(vo.getRemark()); schedule.setUpdateTime(date); schedulesDao.updateByPrimaryKeySelective(schedule); - scheduleDetailssDao.deleteById(scheduleid); - ArrayList list = ScheduleListUtils.getScheduleDetailsses(vo.getList(), scheduleid); - int i = scheduleDetailssDao.insertList(list, date, date); + scheduleDetailsDao.deleteById(scheduleid); + ArrayList list = ScheduleListUtils.getScheduleDetailsses(vo.getList(), scheduleid); + int i = scheduleDetailsDao.insertList(list, date, date); if (i != 0) { return Asserts.success("修改成功"); } else { @@ -253,8 +252,13 @@ public class TerminalScheduleRuleServiceImpl implements TerminalScheduleRuleServ for (int x = 0; x < terminalsList.size(); x++) { ChannelAndTermDto channelAndTermDto = terminalsList.get(x); int requestId = Constants.REQUEST_ID.addAndGet(1); - - int offset = RandomUtil.randomInt(10); + int offset = 0; + for (int i = 0; i < termlist.size(); i++) { + if (channelAndTermDto.getTermid().intValue() == termlist.get(i).getTermid().intValue()) { + offset = termlist.get(i).getOffset(); + } + } +// int offset = RandomUtil.randomInt(10); String timestr = ScheduleListUtils.relateTime(dtoList, offset); String cmd = Constants.CMD + "schedule --group=" + dtoList.size() + " --flag=1 --clientid=10 --cmdid=" @@ -358,21 +362,28 @@ public class TerminalScheduleRuleServiceImpl implements TerminalScheduleRuleServ } else { Integer scheduleId = mapper.getScheduleId(); ScheduleAndRuleDto bean = schedulesDao.selectSingleScheduleAndDetailsList(scheduleId, CommonStatus.EFFECTIVE.value()); - - List list = bean.getList(); - ArrayList detailsBeans = ScheduleListUtils.getScheduleDetailsBeans(list); - ArrayList timestrlist = new ArrayList<>(); - for (TerminalScheduleRuleModel.ScheduleRuleBean item : detailsBeans) { - Time startTime = item.getStartTime(); - Time endTime = item.getEndTime(); - Integer span = item.getSpan(); - List dateTimes = MyDateUtils.rangeToList(startTime, endTime, DateField.MINUTE, span); - for (DateTime data : dateTimes) { - String dateTime = DateUtil.formatTime(data); - timestrlist.add(dateTime); + if (BeanUtil.isEmpty(bean)) { + model.setList(new ArrayList<>()); + }else { + List list = bean.getList(); + if (CollectionUtil.isEmpty(list)) { + model.setList(new ArrayList<>()); + }else { + ArrayList detailsBeans = ScheduleListUtils.getScheduleDetailsBeans(list); + ArrayList timestrlist = new ArrayList<>(); + for (TerminalScheduleRuleModel.ScheduleRuleBean item : detailsBeans) { + Time startTime = item.getStartTime(); + Time endTime = item.getEndTime(); + Integer span = item.getSpan(); + List dateTimes = MyDateUtils.rangeToList(startTime, endTime, DateField.MINUTE, span); + for (DateTime data : dateTimes) { + String dateTime = DateUtil.formatTime(data); + timestrlist.add(dateTime); + } + } + model.setList(timestrlist); } } - model.setList(timestrlist); } return Asserts.success(model); } From 616abf302ac45ebee72a76a150981a15cdbdd431 Mon Sep 17 00:00:00 2001 From: liuguijing <123456> Date: Wed, 31 May 2023 21:02:01 +0800 Subject: [PATCH 2/3] =?UTF-8?q?war=E5=8C=85=E4=BF=AE=E6=94=B9=20=20=20?= =?UTF-8?q?=E6=97=B6=E9=97=B4=E8=A1=A8=E6=9F=A5=E8=AF=A2=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=20=20=20=E6=97=B6=E9=97=B4=E8=A1=A8=E4=B8=8B=E5=8F=91=E6=97=B6?= =?UTF-8?q?=E9=97=B4=E5=81=8F=E7=A7=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 31 +++++++++----- xymanager_admin/pom.xml | 23 ++++++----- .../SpringBootStartApplication.java | 24 +++++------ .../XymanagerAdminApplication.java | 7 +++- .../main/resources/META-INF/spring.factories | 2 +- .../entity/TerminalSchedule.java | 2 + .../resources/mappers/TerminalScheduleDao.xml | 3 +- xymanager_framework/pom.xml | 41 ++++++++++++------- .../interaction/JwtInterceptor.java | 8 ---- .../impl/TerminalScheduleRuleServiceImpl.java | 19 +++++++-- 10 files changed, 96 insertions(+), 64 deletions(-) diff --git a/pom.xml b/pom.xml index ed9c4e3..c316737 100644 --- a/pom.xml +++ b/pom.xml @@ -75,11 +75,11 @@ ${swagger.version} - - - - - + + + + + @@ -124,12 +124,12 @@ 5.7.20 - - - - - - + + + + + + @@ -139,6 +139,15 @@ 5.9.0 + + + + + + + + + org.springframework.boot spring-boot-starter-test diff --git a/xymanager_admin/pom.xml b/xymanager_admin/pom.xml index c43a7ec..f059729 100644 --- a/xymanager_admin/pom.xml +++ b/xymanager_admin/pom.xml @@ -13,7 +13,7 @@ xymanager_admin Demo project for Spring Boot - + war 1.8 @@ -39,6 +39,7 @@ test 2.5.6 + com.shxy xymanager_framework @@ -84,17 +85,17 @@ - - - - - - - + + + src/main/resources + + + **/*.properties + **/*.yml - - - + + + xymanager-admin diff --git a/xymanager_admin/src/main/java/com/shxy/xymanager_admin/SpringBootStartApplication.java b/xymanager_admin/src/main/java/com/shxy/xymanager_admin/SpringBootStartApplication.java index 902266b..64e64e2 100644 --- a/xymanager_admin/src/main/java/com/shxy/xymanager_admin/SpringBootStartApplication.java +++ b/xymanager_admin/src/main/java/com/shxy/xymanager_admin/SpringBootStartApplication.java @@ -1,12 +1,12 @@ -package com.shxy.xymanager_admin; - -import org.springframework.boot.builder.SpringApplicationBuilder; -import org.springframework.boot.web.servlet.support.SpringBootServletInitializer; - -public class SpringBootStartApplication extends SpringBootServletInitializer { - @Override - protected SpringApplicationBuilder configure(SpringApplicationBuilder builder) { - // 注意这里要指向原先用main方法执行的Application启动类 - return builder.sources(XymanagerAdminApplication.class); - } -} +//package com.shxy.xymanager_admin; +// +//import org.springframework.boot.builder.SpringApplicationBuilder; +//import org.springframework.boot.web.servlet.support.SpringBootServletInitializer; +// +//public class SpringBootStartApplication extends SpringBootServletInitializer { +// @Override +// protected SpringApplicationBuilder configure(SpringApplicationBuilder builder) { +// // 注意这里要指向原先用main方法执行的Application启动类 +// return builder.sources(XymanagerAdminApplication.class); +// } +//} diff --git a/xymanager_admin/src/main/java/com/shxy/xymanager_admin/XymanagerAdminApplication.java b/xymanager_admin/src/main/java/com/shxy/xymanager_admin/XymanagerAdminApplication.java index 4f6145c..fd01e85 100644 --- a/xymanager_admin/src/main/java/com/shxy/xymanager_admin/XymanagerAdminApplication.java +++ b/xymanager_admin/src/main/java/com/shxy/xymanager_admin/XymanagerAdminApplication.java @@ -19,7 +19,7 @@ import org.springframework.core.env.Environment; @Slf4j @EnableConfigurationProperties @ComponentScan(basePackages = {"com.shxy"}) -public class XymanagerAdminApplication { +public class XymanagerAdminApplication extends SpringBootServletInitializer{ public static void main(String[] args) { try { @@ -34,5 +34,8 @@ public class XymanagerAdminApplication { log.error("error>>>>>>>>>>>>>>>>>>>>>>>>>>>", e); } } - + @Override + protected SpringApplicationBuilder configure(SpringApplicationBuilder application){ + return application.sources(XymanagerAdminApplication.class); + } } diff --git a/xymanager_admin/src/main/resources/META-INF/spring.factories b/xymanager_admin/src/main/resources/META-INF/spring.factories index 8e7c358..5e2059b 100644 --- a/xymanager_admin/src/main/resources/META-INF/spring.factories +++ b/xymanager_admin/src/main/resources/META-INF/spring.factories @@ -1 +1 @@ -#org.springframework.boot.env.EnvironmentPostProcessor=com.shxy.xymanager_framework.config.MyEnvironmentPostProcessor +org.springframework.boot.env.EnvironmentPostProcessor=com.shxy.xymanager_framework.config.MyEnvironmentPostProcessor diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/TerminalSchedule.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/TerminalSchedule.java index 845dc84..d3342a8 100644 --- a/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/TerminalSchedule.java +++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/TerminalSchedule.java @@ -15,6 +15,8 @@ public class TerminalSchedule implements Serializable { private Integer scheduleId; + private Integer offset; + private Date createTime; private Date updateTime; diff --git a/xymanager_dao/src/main/resources/mappers/TerminalScheduleDao.xml b/xymanager_dao/src/main/resources/mappers/TerminalScheduleDao.xml index f57ebae..7506257 100644 --- a/xymanager_dao/src/main/resources/mappers/TerminalScheduleDao.xml +++ b/xymanager_dao/src/main/resources/mappers/TerminalScheduleDao.xml @@ -6,11 +6,12 @@ + - id, term_id, channel_id, schedule_id, create_time, update_time + id, term_id, channel_id, schedule_id, `offset`,create_time, update_time + @@ -397,7 +417,8 @@ order by create_time desc limit 1 - + insert into terminal_photo_marks (term_id, channel_id, color, width, height,boder_width ,create_time ) @@ -451,7 +472,6 @@ - + +