sql更改

src/main/java/com/izouma/nineth/repo/CollectionRepo.java

@@ -148,13 +148,13 @@ public interface CollectionRepo extends JpaRepository<Collection, Long>, JpaSpec
     Integer getVipQuota(Long id);
 
 
-    List<Collection> findAllByStartTimeGreaterThanAndStartTimeGreaterThanEqual(LocalDateTime startTime,LocalDateTime endTime);
+    List<Collection> findAllByStartTimeGreaterThanAndStartTimeEquals(LocalDateTime startTime,LocalDateTime endTime);
 
-    List<Collection> findAllByEndTimeGreaterThanAndEndTimeGreaterThanEqual(LocalDateTime startTime, LocalDateTime endTime);
+    List<Collection> findAllByEndTimeGreaterThanAndEndTimeEquals(LocalDateTime startTime, LocalDateTime endTime);
 
-    List<Collection> findAllByPublishTimeGreaterThanAndPublishTimeGreaterThanEqual(LocalDateTime endTime, LocalDateTime publishTime);
+    List<Collection> findAllByPublishTimeGreaterThanAndPublishTimeEquals(LocalDateTime endTime, LocalDateTime publishTime);
 
-    List<Collection> findAllByPurchaseTimeGreaterThanAndPurchaseTimeGreaterThanEqual(LocalDateTime publishTime, LocalDateTime purchaseTime);
+    List<Collection> findAllByPurchaseTimeGreaterThanAndPurchaseTimeEquals(LocalDateTime publishTime, LocalDateTime purchaseTime);
 
 
     //筛选

src/main/java/com/izouma/nineth/service/scheduledTask/AnnouncingTask.java

@@ -1,39 +1,39 @@
-package com.izouma.nineth.service.scheduledTask;
-
-import cn.hutool.core.util.ObjectUtil;
-import com.izouma.nineth.domain.Collection;
-import com.izouma.nineth.enums.SubscribeStatus;
-import com.izouma.nineth.repo.CollectionRepo;
-import io.jsonwebtoken.lang.Collections;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.scheduling.annotation.EnableScheduling;
-import org.springframework.scheduling.annotation.SchedulingConfigurer;
-import org.springframework.scheduling.config.ScheduledTaskRegistrar;
-
-import java.time.LocalDateTime;
-import java.time.ZoneId;
-import java.util.ArrayList;
-import java.util.Comparator;
-import java.util.Date;
-import java.util.List;
-import java.util.stream.Collectors;
-
-
-
-
-@Configuration
-@EnableScheduling
-public class AnnouncingTask extends ScheduleConfig {
-
-    @Autowired
-    private CollectionRepo collectionRepo;
-
-
-    private List<Collection> collections = new ArrayList();
-    private Date time;
-    @Override
-    public void configureTasks(ScheduledTaskRegistrar taskRegistrar) {
+//package com.izouma.nineth.service.scheduledTask;
+//
+//import cn.hutool.core.util.ObjectUtil;
+//import com.izouma.nineth.domain.Collection;
+//import com.izouma.nineth.enums.SubscribeStatus;
+//import com.izouma.nineth.repo.CollectionRepo;
+//import io.jsonwebtoken.lang.Collections;
+//import org.springframework.beans.factory.annotation.Autowired;
+//import org.springframework.context.annotation.Configuration;
+//import org.springframework.scheduling.annotation.EnableScheduling;
+//import org.springframework.scheduling.annotation.SchedulingConfigurer;
+//import org.springframework.scheduling.config.ScheduledTaskRegistrar;
+//
+//import java.time.LocalDateTime;
+//import java.time.ZoneId;
+//import java.util.ArrayList;
+//import java.util.Comparator;
+//import java.util.Date;
+//import java.util.List;
+//import java.util.stream.Collectors;
+//
+//
+//
+//
+//@Configuration
+//@EnableScheduling
+//public class AnnouncingTask extends ScheduleConfig {
+//
+//    @Autowired
+//    private CollectionRepo collectionRepo;
+//
+//
+//    private List<Collection> collections = new ArrayList();
+//    private Date time;
+//    @Override
+//    public void configureTasks(ScheduledTaskRegistrar taskRegistrar) {
 //        taskRegistrar.addTriggerTask(() -> {
 //            b:
 //            if (Collections.isEmpty(collections)){
@@ -62,5 +62,5 @@ public class AnnouncingTask extends ScheduleConfig {
 //            }
 //            return time;
 //        });
-    }
-}
+//    }
+//}

src/main/java/com/izouma/nineth/service/scheduledTask/OnSaleTask.java

@@ -1,38 +1,38 @@
-package com.izouma.nineth.service.scheduledTask;
-
-import cn.hutool.core.util.ObjectUtil;
-import com.izouma.nineth.domain.Collection;
-import com.izouma.nineth.enums.SubscribeStatus;
-import com.izouma.nineth.repo.CollectionRepo;
-import io.jsonwebtoken.lang.Collections;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.scheduling.annotation.EnableScheduling;
-import org.springframework.scheduling.annotation.SchedulingConfigurer;
-import org.springframework.scheduling.config.ScheduledTaskRegistrar;
-
-import java.time.LocalDateTime;
-import java.time.ZoneId;
-import java.util.ArrayList;
-import java.util.Comparator;
-import java.util.Date;
-import java.util.List;
-import java.util.stream.Collectors;
-
-
-
-@Configuration
-@EnableScheduling
-public class OnSaleTask extends ScheduleConfig {
-
-    @Autowired
-    private CollectionRepo collectionRepo;
-
-
-    private List<Collection> collections = new ArrayList();
-    private Date time;
-    @Override
-    public void configureTasks(ScheduledTaskRegistrar taskRegistrar) {
+//package com.izouma.nineth.service.scheduledTask;
+//
+//import cn.hutool.core.util.ObjectUtil;
+//import com.izouma.nineth.domain.Collection;
+//import com.izouma.nineth.enums.SubscribeStatus;
+//import com.izouma.nineth.repo.CollectionRepo;
+//import io.jsonwebtoken.lang.Collections;
+//import org.springframework.beans.factory.annotation.Autowired;
+//import org.springframework.context.annotation.Configuration;
+//import org.springframework.scheduling.annotation.EnableScheduling;
+//import org.springframework.scheduling.annotation.SchedulingConfigurer;
+//import org.springframework.scheduling.config.ScheduledTaskRegistrar;
+//
+//import java.time.LocalDateTime;
+//import java.time.ZoneId;
+//import java.util.ArrayList;
+//import java.util.Comparator;
+//import java.util.Date;
+//import java.util.List;
+//import java.util.stream.Collectors;
+//
+//
+//
+//@Configuration
+//@EnableScheduling
+//public class OnSaleTask extends ScheduleConfig {
+//
+//    @Autowired
+//    private CollectionRepo collectionRepo;
+//
+//
+//    private List<Collection> collections = new ArrayList();
+//    private Date time;
+//    @Override
+//    public void configureTasks(ScheduledTaskRegistrar taskRegistrar) {
 //        taskRegistrar.addTriggerTask(() -> {
 //            b:
 //            if (Collections.isEmpty(collections)){
@@ -61,5 +61,5 @@ public class OnSaleTask extends ScheduleConfig {
 //            }
 //            return time;
 //        });
-    }
-}
+//    }
+//}

src/main/java/com/izouma/nineth/service/scheduledTask/OngoingTask.java

@@ -1,39 +1,39 @@
-package com.izouma.nineth.service.scheduledTask;
-
-import cn.hutool.core.util.ObjectUtil;
-import com.izouma.nineth.domain.Collection;
-import com.izouma.nineth.enums.SubscribeStatus;
-import com.izouma.nineth.repo.CollectionRepo;
-import io.jsonwebtoken.lang.Collections;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.scheduling.annotation.EnableScheduling;
-import org.springframework.scheduling.annotation.SchedulingConfigurer;
-import org.springframework.scheduling.config.ScheduledTaskRegistrar;
-
-import java.time.LocalDate;
-import java.time.LocalDateTime;
-import java.time.ZoneId;
-import java.util.ArrayList;
-import java.util.Comparator;
-import java.util.Date;
-import java.util.List;
-import java.util.stream.Collectors;
-
-
-@Configuration
-@EnableScheduling
-public class OngoingTask extends ScheduleConfig {
-
-    @Autowired
-    private CollectionRepo collectionRepo;
-
-
-    private List<Collection> collections = new ArrayList();
-    private Date time;
-
-    @Override
-    public void configureTasks(ScheduledTaskRegistrar taskRegistrar) {
+//package com.izouma.nineth.service.scheduledTask;
+//
+//import cn.hutool.core.util.ObjectUtil;
+//import com.izouma.nineth.domain.Collection;
+//import com.izouma.nineth.enums.SubscribeStatus;
+//import com.izouma.nineth.repo.CollectionRepo;
+//import io.jsonwebtoken.lang.Collections;
+//import org.springframework.beans.factory.annotation.Autowired;
+//import org.springframework.context.annotation.Configuration;
+//import org.springframework.scheduling.annotation.EnableScheduling;
+//import org.springframework.scheduling.annotation.SchedulingConfigurer;
+//import org.springframework.scheduling.config.ScheduledTaskRegistrar;
+//
+//import java.time.LocalDate;
+//import java.time.LocalDateTime;
+//import java.time.ZoneId;
+//import java.util.ArrayList;
+//import java.util.Comparator;
+//import java.util.Date;
+//import java.util.List;
+//import java.util.stream.Collectors;
+//
+//
+//@Configuration
+//@EnableScheduling
+//public class OngoingTask extends ScheduleConfig {
+//
+//    @Autowired
+//    private CollectionRepo collectionRepo;
+//
+//
+//    private List<Collection> collections = new ArrayList();
+//    private Date time;
+//
+//    @Override
+//    public void configureTasks(ScheduledTaskRegistrar taskRegistrar) {
 //        taskRegistrar.addTriggerTask(() -> {
 //            b:if (Collections.isEmpty(collections)) {
 //                return;
@@ -71,5 +71,5 @@ public class OngoingTask extends ScheduleConfig {
 //            //取第一个藏品的预约发布时间的前10秒做下次定时任务的时间  换成五秒  两秒
 //            return time;
 //        });
-    }
-}
+//    }
+//}

src/main/java/com/izouma/nineth/service/scheduledTask/ScheduleConfig.java

@@ -1,18 +1,18 @@
-package com.izouma.nineth.service.scheduledTask;
-
-
-import org.springframework.context.annotation.Configuration;
-import org.springframework.scheduling.annotation.EnableScheduling;
-import org.springframework.scheduling.annotation.SchedulingConfigurer;
-import org.springframework.scheduling.config.ScheduledTaskRegistrar;
-
-import java.util.concurrent.Executors;
-
-@Configuration
-@EnableScheduling
-public class ScheduleConfig implements SchedulingConfigurer {
-    @Override
-    public void configureTasks(ScheduledTaskRegistrar taskRegistrar) {
-        taskRegistrar.setScheduler(Executors.newScheduledThreadPool(5));
-    }
-}
+//package com.izouma.nineth.service.scheduledTask;
+//
+//
+//import org.springframework.context.annotation.Configuration;
+//import org.springframework.scheduling.annotation.EnableScheduling;
+//import org.springframework.scheduling.annotation.SchedulingConfigurer;
+//import org.springframework.scheduling.config.ScheduledTaskRegistrar;
+//
+//import java.util.concurrent.Executors;
+//
+//@Configuration
+//@EnableScheduling
+//public class ScheduleConfig implements SchedulingConfigurer {
+//    @Override
+//    public void configureTasks(ScheduledTaskRegistrar taskRegistrar) {
+//        taskRegistrar.setScheduler(Executors.newScheduledThreadPool(5));
+//    }
+//}

src/main/java/com/izouma/nineth/service/scheduledTask/SubscribeEenIngTask.java

@@ -1,39 +1,39 @@
-package com.izouma.nineth.service.scheduledTask;
-
-import cn.hutool.core.util.ObjectUtil;
-import com.izouma.nineth.config.SchedulingConfig;
-import com.izouma.nineth.domain.Collection;
-import com.izouma.nineth.enums.SubscribeStatus;
-import com.izouma.nineth.repo.CollectionRepo;
-import io.jsonwebtoken.lang.Collections;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.scheduling.annotation.EnableScheduling;
-import org.springframework.scheduling.annotation.SchedulingConfigurer;
-import org.springframework.scheduling.config.ScheduledTaskRegistrar;
-
-import java.time.LocalDateTime;
-import java.time.ZoneId;
-import java.util.ArrayList;
-import java.util.Comparator;
-import java.util.Date;
-import java.util.List;
-import java.util.stream.Collectors;
-
-
-
-@Configuration
-@EnableScheduling
-public class SubscribeEenIngTask extends ScheduleConfig {
-
-    @Autowired
-    private CollectionRepo collectionRepo;
-
-
-    private List<Collection> collections = new ArrayList();
-    private Date time;
-    @Override
-    public void configureTasks(ScheduledTaskRegistrar taskRegistrar) {
+//package com.izouma.nineth.service.scheduledTask;
+//
+//import cn.hutool.core.util.ObjectUtil;
+//import com.izouma.nineth.config.SchedulingConfig;
+//import com.izouma.nineth.domain.Collection;
+//import com.izouma.nineth.enums.SubscribeStatus;
+//import com.izouma.nineth.repo.CollectionRepo;
+//import io.jsonwebtoken.lang.Collections;
+//import org.springframework.beans.factory.annotation.Autowired;
+//import org.springframework.context.annotation.Configuration;
+//import org.springframework.scheduling.annotation.EnableScheduling;
+//import org.springframework.scheduling.annotation.SchedulingConfigurer;
+//import org.springframework.scheduling.config.ScheduledTaskRegistrar;
+//
+//import java.time.LocalDateTime;
+//import java.time.ZoneId;
+//import java.util.ArrayList;
+//import java.util.Comparator;
+//import java.util.Date;
+//import java.util.List;
+//import java.util.stream.Collectors;
+//
+//
+//
+//@Configuration
+//@EnableScheduling
+//public class SubscribeEenIngTask extends ScheduleConfig {
+//
+//    @Autowired
+//    private CollectionRepo collectionRepo;
+//
+//
+//    private List<Collection> collections = new ArrayList();
+//    private Date time;
+//    @Override
+//    public void configureTasks(ScheduledTaskRegistrar taskRegistrar) {
 //        taskRegistrar.addTriggerTask(() -> {
 //            b:
 //            if (Collections.isEmpty(collections)){
@@ -62,5 +62,5 @@ public class SubscribeEenIngTask extends ScheduleConfig {
 //            }
 //            return time;
 //        });
-    }
-}
+//    }
+//}

src/main/java/com/izouma/nineth/service/scheduledTask/SubscribeTask.java

@@ -38,24 +38,24 @@ public class SubscribeTask {
         LocalDateTime endTime = startTime.plusSeconds(5);
         //根据开始时间和结束时间去数据库把这两个时间段中 符合的预约发布时间中获取藏品
         List<Collection> ongoingList = collectionRepo
-                .findAllByStartTimeGreaterThanAndStartTimeGreaterThanEqual(startTime, endTime);
+                .findAllByStartTimeGreaterThanAndStartTimeEquals(startTime, endTime);
         //预约发布时间判断
         if (!Collections.isEmpty(ongoingList)) {
             for (Collection collection : ongoingList) {
                 if (collection.getStartTime().isAfter(startTime) && collection.getStartTime().isAfter(endTime)) {
                     int i = collectionRepo.updateSubscribeStatus(collection.getId(), SubscribeStatus.ONGOING);
-                    System.out.println("影响的行数为: " + i);
+                    log.info("发布预约时间状态更改的行数为: " + i);
                 }
             }
         }
         //预约结束时间判断
         List<Collection> subscribeEndingList = collectionRepo
-                .findAllByEndTimeGreaterThanAndEndTimeGreaterThanEqual(startTime, endTime);
+                .findAllByEndTimeGreaterThanAndEndTimeEquals(startTime, endTime);
         if (!Collections.isEmpty(subscribeEndingList)) {
             for (Collection collection : subscribeEndingList) {
                 if (collection.getEndTime().isAfter(startTime) && collection.getEndTime().isAfter(endTime)) {
                     int i = collectionRepo.updateSubscribeStatus(collection.getId(), SubscribeStatus.SUBSCRIBE_ENDING);
-                    System.out.println("影响的行数为: " + i);
+                    log.info("预约结束时间状态更改的行数为: " + i);
                 }
             }
         }
@@ -83,23 +83,23 @@ public class SubscribeTask {
         }
         //购买资格公布时间
         List<Collection> announcingList = collectionRepo
-                .findAllByPublishTimeGreaterThanAndPublishTimeGreaterThanEqual(startTime, endTime);
+                .findAllByPublishTimeGreaterThanAndPublishTimeEquals(startTime, endTime);
         if (!Collections.isEmpty(announcingList)) {
             for (Collection collection : announcingList) {
                 if (collection.getPublishTime().isAfter(startTime) && collection.getPublishTime().isAfter(endTime)) {
                     int i = collectionRepo.updateSubscribeStatus(collection.getId(), SubscribeStatus.ANNOUNCING);
-                    System.out.println("影响的行数为: " + i);
+                    log.info("购买资格公布时间状态更改的行数为: " + i);
                 }
             }
         }
         //购买时间
         List<Collection> onSaleList = collectionRepo
-                .findAllByPurchaseTimeGreaterThanAndPurchaseTimeGreaterThanEqual(startTime, endTime);
+                .findAllByPurchaseTimeGreaterThanAndPurchaseTimeEquals(startTime, endTime);
         if (!Collections.isEmpty(onSaleList)) {
             for (Collection collection : onSaleList) {
                 if (collection.getPurchaseTime().isAfter(startTime) && collection.getPurchaseTime().isAfter(endTime)) {
                     int i = collectionRepo.updateSubscribeStatus(collection.getId(), SubscribeStatus.ON_SALE);
-                    System.out.println("影响的行数为: " + i);
+                    log.info("购买时间状态更改的行数为: " + i);
                 }
             }
         }