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 8e093ce..33b2f3c 100644 --- a/entity/src/main/java/com/sv/dto/api/VenueDTO.java +++ b/entity/src/main/java/com/sv/dto/api/VenueDTO.java @@ -163,6 +163,11 @@ public class VenueDTO implements Serializable { */ private Integer copyTarget; + /** + * 复制开关 1-关闭，不复制 0-开启，复制 + */ + private Integer copyControl; + /** * 场馆图片列表 */ @@ -624,4 +629,12 @@ public class VenueDTO implements Serializable { public void setLimitNoWeek(Integer limitNoWeek) { this.limitNoWeek = limitNoWeek; } + + public Integer getCopyControl() { + return copyControl; + } + + public void setCopyControl(Integer copyControl) { + this.copyControl = copyControl; + } } diff --git a/entity/src/main/java/com/sv/entity/Venue.java b/entity/src/main/java/com/sv/entity/Venue.java index a4da7fc..4b999a4 100644 --- a/entity/src/main/java/com/sv/entity/Venue.java +++ b/entity/src/main/java/com/sv/entity/Venue.java @@ -47,6 +47,11 @@ public class Venue implements Serializable { */ private Integer copyTarget; + /** + * 复制开关 1-关闭，不复制 0-开启，复制 + */ + private Integer copyControl; + /** * 地址 */ @@ -668,4 +673,12 @@ public class Venue implements Serializable { public void setLimitNoWeek(Integer limitNoWeek) { this.limitNoWeek = limitNoWeek; } + + public Integer getCopyControl() { + return copyControl; + } + + public void setCopyControl(Integer copyControl) { + this.copyControl = copyControl; + } } 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 d298575..17bb27d 100644 --- a/oms/src/main/java/com/ydd/oms/task/CopyLessonTask.java +++ b/oms/src/main/java/com/ydd/oms/task/CopyLessonTask.java @@ -40,18 +40,18 @@ public class CopyLessonTask { /** * 每周一九点 */ -// @Scheduled(cron = "0 */1 * * * ?") + @Scheduled(cron = "0 */1 * * * ?") public void execute(){ logger.info("开始执行拷贝课程批处理"); - LocalTime time = LocalTime.parse("09:00"); - LocalDate date = LocalDate.parse("2022-02-21"); + LocalTime time = LocalTime.now(); + LocalDate date = LocalDate.now(); logger.info(time.toString()); logger.info(date.toString()); int cWeek = date.getDayOfWeek().getValue(); List venueList = venueService.findAlls(); for (Venue venue : venueList) { if (VenueTypeEnum.BASKETBALL.value != venue.getType() - && venue.getCopyWeek() != null && cWeek == venue.getCopyWeek()){ + && venue.getCopyWeek() != null && cWeek == venue.getCopyWeek() && !"1".equals(venue.getCopyControl())){ // 非篮球馆有课程 LocalTime copyTime = venue.getCopyTime(); if (checkTime(time,copyTime)){ diff --git a/oms/src/main/resources/config/application-development.yml b/oms/src/main/resources/config/application-development.yml index bf9bfa1..9605ab3 100644 --- a/oms/src/main/resources/config/application-development.yml +++ b/oms/src/main/resources/config/application-development.yml @@ -3,9 +3,9 @@ spring: # url: jdbc:mysql://yingdiandian.mysql.rds.aliyuncs.com:3306/smart_venue?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&zeroDateTimeBehavior=convertToNull&serverTimezone=GMT%2b8 # username: yingdd # password: Yingdd2015 - url: jdbc:mysql://120.27.209.4:3306/smart_venue?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&zeroDateTimeBehavior=convertToNull&serverTimezone=GMT%2b8&useAffectedRows=true + url: jdbc:mysql://127.0.0.1:3306/smart_venue?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&zeroDateTimeBehavior=convertToNull&serverTimezone=GMT%2b8&useAffectedRows=true username: root - password: hyty1234 + password: 123456 redis: host: 127.0.0.1 password: diff --git a/oms/src/main/resources/config/application-test.yml b/oms/src/main/resources/config/application-test.yml index 961633f..9189dd1 100644 --- a/oms/src/main/resources/config/application-test.yml +++ b/oms/src/main/resources/config/application-test.yml @@ -3,7 +3,7 @@ spring: # url: jdbc:mysql://yingdiandian.mysql.rds.aliyuncs.com:3306/smart_venue?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&zeroDateTimeBehavior=convertToNull&serverTimezone=GMT%2b8 # username: yingdd # password: Yingdd2015 - url: jdbc:mysql://120.27.209.4:3306/smart_venue?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&zeroDateTimeBehavior=convertToNull&serverTimezone=GMT%2b8&useAffectedRows=true + url: jdbc:mysql://127.0.0.1:3306/smart_venue?useUnicode=true&characterEncoding=utf-8&autoReconnect=true&zeroDateTimeBehavior=convertToNull&serverTimezone=GMT%2b8&useAffectedRows=true username: root password: 123456 redis: diff --git a/service/src/main/java/com/sv/mapper/VenueMapper.java b/service/src/main/java/com/sv/mapper/VenueMapper.java index c93d7a2..9dedfcf 100644 --- a/service/src/main/java/com/sv/mapper/VenueMapper.java +++ b/service/src/main/java/com/sv/mapper/VenueMapper.java @@ -6,7 +6,6 @@ import com.sv.dto.api.MemberCardVenuesDTO; import com.sv.dto.api.VenueDTO; import com.sv.dto.oms.VenueOmsDTO; import com.sv.entity.Venue; -import com.sv.entity.VenueCard; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/service/src/main/java/com/sv/service/oms/VenueLessonService.java b/service/src/main/java/com/sv/service/oms/VenueLessonService.java index 38090d8..7519bb8 100644 --- a/service/src/main/java/com/sv/service/oms/VenueLessonService.java +++ b/service/src/main/java/com/sv/service/oms/VenueLessonService.java @@ -1,11 +1,9 @@ package com.sv.service.oms; -import com.enums.VenueTypeEnum; import com.github.pagehelper.PageHelper; import com.sv.dto.oms.VenueLessonOmsDTO; import com.sv.entity.Platform; import com.sv.entity.VenueLesson; -import com.sv.entity.VenueLessonTag; import com.sv.entity.VenueLessonTicket; import com.sv.exception.oms.OmsException; import com.sv.mapper.VenueLessonMapper; @@ -28,13 +26,11 @@ import org.springframework.dao.DuplicateKeyException; import org.springframework.data.redis.core.RedisTemplate; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import redis.clients.jedis.Jedis; import javax.annotation.Resource; import java.io.InputStream; import java.time.format.DateTimeFormatter; import java.util.*; -import java.util.function.Consumer; import static com.sv.entity.Constants.LESSON_TICKET_LOCK_KEY; @@ -346,7 +342,7 @@ public class VenueLessonService extends BaseServiceImpl { VenueLesson x = venueLessonMapper.findById(lessonId); Integer oldId = x.getId(); x.setId(null); - x.setModifiedId(999); + x.setModifiedId(888); x.setSaleNum(0); x.setModifiedTime(new Date()); x.setDate(targetDate); diff --git a/service/src/main/resources/mybatis/mapper/sv/VenueMapper.xml b/service/src/main/resources/mybatis/mapper/sv/VenueMapper.xml index e366f03..3fc3cd7 100644 --- a/service/src/main/resources/mybatis/mapper/sv/VenueMapper.xml +++ b/service/src/main/resources/mybatis/mapper/sv/VenueMapper.xml @@ -35,6 +35,7 @@ + @@ -64,6 +65,7 @@ + @@ -126,7 +128,8 @@ limit_no_week, copy_week, copy_time, - copy_target + copy_target, + copy_control @@ -156,7 +159,8 @@ #{limit_no_week, jdbcType=TINYINT}, #{copy_week, jdbcType=TINYINT}, #{copy_time, jdbcType=TIMESTAMP}, - #{copy_target, jdbcType=TINYINT} + #{copy_target, jdbcType=TINYINT}, + #{copy_control, jdbcType=TINYINT} @@ -300,6 +304,9 @@ copy_target, + + copy_control, + @@ -515,6 +522,9 @@ copy_target = #{copyTarget}, + + copy_control = #{copyControl}, + WHERE id = #{id} @@ -557,7 +567,8 @@ limit_no_week, copy_week, copy_time, - copy_target + copy_target, + copy_control FROM sv_venue WHERE