From b96514a86f76a43588239cb7413eea42629d68b1 Mon Sep 17 00:00:00 2001 From: limqhz Date: Sun, 13 Feb 2022 22:30:23 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E8=87=AA=E5=8A=A8=E5=A4=8D?= =?UTF-8?q?=E5=88=B6=EF=BC=8C=E5=BE=80=E4=B8=8B=E4=B8=8B=E5=91=A8=E5=BC=80?= =?UTF-8?q?=E5=A7=8B=E5=A4=8D=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/sv/dto/api/VenueDTO.java | 39 +++++++++++++++ entity/src/main/java/com/sv/entity/Venue.java | 40 +++++++++++++++ .../java/com/ydd/oms/task/CopyLessonTask.java | 12 +++-- .../mybatis/mapper/sv/VenueMapper.xml | 50 ++++++++++++++++--- 4 files changed, 130 insertions(+), 11 deletions(-) diff --git a/entity/src/main/java/com/sv/dto/api/VenueDTO.java b/entity/src/main/java/com/sv/dto/api/VenueDTO.java index bb094b2..8e093ce 100644 --- a/entity/src/main/java/com/sv/dto/api/VenueDTO.java +++ b/entity/src/main/java/com/sv/dto/api/VenueDTO.java @@ -136,6 +136,16 @@ public class VenueDTO implements Serializable { */ private Integer limitWeek; + /** + * 每天预约限制 + */ + private Integer limitNoDay; + + /** + * 每周预约限制 + */ + private Integer limitNoWeek; + /** * 复制周几 */ @@ -148,6 +158,11 @@ public class VenueDTO implements Serializable { @JsonSerialize(using = LocalTimeSerializer.class) private LocalTime copyTime; + /** + * 向后复制多少 + */ + private Integer copyTarget; + /** * 场馆图片列表 */ @@ -585,4 +600,28 @@ public class VenueDTO implements Serializable { public void setCopyTime(LocalTime copyTime) { this.copyTime = copyTime; } + + public Integer getCopyTarget() { + return copyTarget; + } + + public void setCopyTarget(Integer copyTarget) { + this.copyTarget = copyTarget; + } + + public Integer getLimitNoDay() { + return limitNoDay; + } + + public void setLimitNoDay(Integer limitNoDay) { + this.limitNoDay = limitNoDay; + } + + public Integer getLimitNoWeek() { + return limitNoWeek; + } + + public void setLimitNoWeek(Integer limitNoWeek) { + this.limitNoWeek = limitNoWeek; + } } diff --git a/entity/src/main/java/com/sv/entity/Venue.java b/entity/src/main/java/com/sv/entity/Venue.java index 692fbd6..a4da7fc 100644 --- a/entity/src/main/java/com/sv/entity/Venue.java +++ b/entity/src/main/java/com/sv/entity/Venue.java @@ -42,6 +42,11 @@ public class Venue implements Serializable { @JsonSerialize(using = LocalTimeSerializer.class) private LocalTime copyTime; + /** + * 向后复制多少 + */ + private Integer copyTarget; + /** * 地址 */ @@ -174,6 +179,17 @@ public class Venue implements Serializable { private Integer limitWeek; + /** + * 每天预约限制 + */ + private Integer limitNoDay; + + /** + * 每周预约限制 + */ + private Integer limitNoWeek; + + /** * 设置 * @@ -628,4 +644,28 @@ public class Venue implements Serializable { public void setCopyTime(LocalTime copyTime) { this.copyTime = copyTime; } + + public Integer getCopyTarget() { + return copyTarget; + } + + public void setCopyTarget(Integer copyTarget) { + this.copyTarget = copyTarget; + } + + public Integer getLimitNoDay() { + return limitNoDay; + } + + public void setLimitNoDay(Integer limitNoDay) { + this.limitNoDay = limitNoDay; + } + + public Integer getLimitNoWeek() { + return limitNoWeek; + } + + public void setLimitNoWeek(Integer limitNoWeek) { + this.limitNoWeek = limitNoWeek; + } } diff --git a/oms/src/main/java/com/ydd/oms/task/CopyLessonTask.java b/oms/src/main/java/com/ydd/oms/task/CopyLessonTask.java index c22b463..7d946b5 100644 --- a/oms/src/main/java/com/ydd/oms/task/CopyLessonTask.java +++ b/oms/src/main/java/com/ydd/oms/task/CopyLessonTask.java @@ -40,7 +40,7 @@ public class CopyLessonTask { /** * 每周一九点 */ - @Scheduled(cron = "0 */1 * * * ?") +// @Scheduled(cron = "0 */1 * * * ?") public void execute(){ logger.info("开始执行拷贝课程批处理"); LocalTime time = LocalTime.now(); @@ -62,10 +62,14 @@ public class CopyLessonTask { List allForCopy = venueLessonService.findAllForCopy(startTime, endTime); if (allForCopy!= null && allForCopy.size()>0){ logger.info("需要操作的课程数为：" + allForCopy.size()); + Integer copyTarget = venue.getCopyTarget(); + if (copyTarget == null){ + copyTarget = 1; + } int count = 0; for (VenueLesson venueLesson : allForCopy) { count ++; - Date copyDate = DateUtilCard.addDays(venueLesson.getDate(), 7); + Date copyDate = DateUtilCard.addDays(venueLesson.getDate(), 7 * copyTarget + 7); venueLessonService.copy(venueLesson.getId(),copyDate,copyDate); } logger.info("拷贝的课程数量为：" + count); @@ -78,12 +82,12 @@ public class CopyLessonTask { private boolean checkTime(LocalTime time, LocalTime copyTime) { int cHour = time.getHour(); int cMinute = time.getMinute(); - if (copyTime == null){ + if (copyTime == null) { copyTime = LocalTime.parse("00:00"); } int sHour = copyTime.getHour(); int sMinute = copyTime.getMinute(); - if (cHour == sHour && cMinute == sMinute){ + if (cHour == sHour && cMinute == sMinute) { return true; } return false; diff --git a/service/src/main/resources/mybatis/mapper/sv/VenueMapper.xml b/service/src/main/resources/mybatis/mapper/sv/VenueMapper.xml index b6be2d7..e366f03 100644 --- a/service/src/main/resources/mybatis/mapper/sv/VenueMapper.xml +++ b/service/src/main/resources/mybatis/mapper/sv/VenueMapper.xml @@ -30,8 +30,11 @@ + + + @@ -56,8 +59,11 @@ + + + @@ -116,8 +122,11 @@ deleted, limit_day, limit_week, + limit_no_day, + limit_no_week, copy_week, - copy_time + copy_time, + copy_target @@ -140,11 +149,14 @@ #{modifiedId, jdbcType=INTEGER}, #{createdTime, jdbcType=TIMESTAMP}, #{modifiedTime, jdbcType=TIMESTAMP}, - #{deleted, jdbcType=TINYINT} - #{limit_day, jdbcType=TINYINT} - #{limit_week, jdbcType=TINYINT} - #{copy_week, jdbcType=TINYINT} - #{copy_time, jdbcType=TIMESTAMP} + #{deleted, jdbcType=TINYINT}, + #{limit_day, jdbcType=TINYINT}, + #{limit_week, jdbcType=TINYINT}, + #{limit_no_day, jdbcType=TINYINT}, + #{limit_no_week, jdbcType=TINYINT}, + #{copy_week, jdbcType=TINYINT}, + #{copy_time, jdbcType=TIMESTAMP}, + #{copy_target, jdbcType=TINYINT} @@ -273,12 +285,21 @@ limit_week, + + limit_no_day, + + + limit_no_week, + copy_week, copy_time, + + copy_target, + @@ -365,6 +386,9 @@ #{copyTime}, + + #{copyTarget}, + @@ -476,12 +500,21 @@ limit_week = #{limitWeek}, + + limit_no_day = #{limitNoDay}, + + + limit_no_week = #{limitNoWeek}, + copy_week = #{copyWeek}, copy_time = #{copyTime}, + + copy_target = #{copyTarget}, + WHERE id = #{id} @@ -520,8 +553,11 @@ card_content, limit_day, limit_week, + limit_no_day, + limit_no_week, copy_week, - copy_time + copy_time, + copy_target FROM sv_venue WHERE