From bb4d98583ffbd02c28e7a90974f615003f8c6d8a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=85=95=E4=B8=8B?= <484014559@qq.com> Date: Thu, 29 Aug 2024 11:30:25 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A5=A8=E5=8A=A1=E6=8A=BD=E6=95=B0=E6=94=B9?= =?UTF-8?q?=E9=80=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/app/saledata/SaleDataApi.java | 6 ---- .../dataobject/checkticket/CheckTicket.java | 3 +- .../checkticket/CheckTicketToday.java | 21 -------------- .../CheckTicketTodayRepository.java | 28 ------------------- .../checkticket/CheckTicketServiceImpl.java | 4 +-- 5 files changed, 4 insertions(+), 58 deletions(-) delete mode 100644 ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/dal/dataobject/checkticket/CheckTicketToday.java delete mode 100644 ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/dal/mongodb/checkticket/CheckTicketTodayRepository.java diff --git a/ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/controller/app/saledata/SaleDataApi.java b/ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/controller/app/saledata/SaleDataApi.java index a92c8362e..7847219ac 100644 --- a/ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/controller/app/saledata/SaleDataApi.java +++ b/ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/controller/app/saledata/SaleDataApi.java @@ -1,7 +1,6 @@ package cn.iocoder.yudao.module.datacenter.controller.app.saledata; import cn.iocoder.yudao.module.datacenter.service.saledata.SaleDataService; -import cn.iocoder.yudao.module.infra.api.websocket.WebSocketSenderApi; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import org.springframework.validation.annotation.Validated; @@ -9,13 +8,8 @@ import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import java.math.BigDecimal; -import java.time.LocalDateTime; -import java.util.Calendar; -import java.util.Date; import java.util.List; import java.util.Map; -import java.util.regex.Matcher; -import java.util.regex.Pattern; /** * @Description 售票 diff --git a/ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/dal/dataobject/checkticket/CheckTicket.java b/ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/dal/dataobject/checkticket/CheckTicket.java index ba82b053c..5ed2ca101 100644 --- a/ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/dal/dataobject/checkticket/CheckTicket.java +++ b/ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/dal/dataobject/checkticket/CheckTicket.java @@ -3,7 +3,8 @@ package cn.iocoder.yudao.module.datacenter.dal.dataobject.checkticket; import lombok.Data; import org.springframework.data.mongodb.core.mapping.Document; -@Document("checkticket") +//@Document("checkticket") +@Document("check_ticket_today") //@Document("checktickettest") @Data public class CheckTicket { diff --git a/ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/dal/dataobject/checkticket/CheckTicketToday.java b/ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/dal/dataobject/checkticket/CheckTicketToday.java deleted file mode 100644 index dd9ae3274..000000000 --- a/ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/dal/dataobject/checkticket/CheckTicketToday.java +++ /dev/null @@ -1,21 +0,0 @@ -package cn.iocoder.yudao.module.datacenter.dal.dataobject.checkticket; - -import lombok.Data; -import org.springframework.data.mongodb.core.mapping.Document; - -@Document("check_ticket_today") -//@Document("checktickettest") -@Data -public class CheckTicketToday { - private String id; - private String dataId; - private String checkstation; - private String checkstationname; - private String ticket; - private String checkticketdate; - private String checktickettime; - private Integer personcount; - private String sdshipping; - private String salepropetyvaluename; - -} \ No newline at end of file diff --git a/ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/dal/mongodb/checkticket/CheckTicketTodayRepository.java b/ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/dal/mongodb/checkticket/CheckTicketTodayRepository.java deleted file mode 100644 index 17199a002..000000000 --- a/ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/dal/mongodb/checkticket/CheckTicketTodayRepository.java +++ /dev/null @@ -1,28 +0,0 @@ -package cn.iocoder.yudao.module.datacenter.dal.mongodb.checkticket; - - -import cn.iocoder.yudao.module.datacenter.dal.dataobject.checkticket.CheckTicket; -import org.springframework.data.domain.Page; -import org.springframework.data.domain.PageRequest; -import org.springframework.data.mongodb.repository.MongoRepository; -import org.springframework.data.mongodb.repository.Query; -import org.springframework.stereotype.Repository; - -import java.util.List; - -@Repository -public interface CheckTicketTodayRepository extends MongoRepository { - @Query("{'name': {'$regex': '?0', '$options': 'i'}}") - Page findByName(String q, PageRequest pageable); - - @Query("{'checkticketdate':{'$gte': ?0, '$lt': ?1}}") - List countByCheckticketdateBetween(String starTime, String endTime); - - @Query("{'checktickettime':{'$gte': ?0, '$lt': ?1},'checkticketdate':{'$dt': ?2}}") - List findByTimestampBetweenAndCheckticketdate(String startTime, String endTime,String day); - - List findByCheckticketdateAndChecktickettimeBetween(String day,String startTime, String endTime); - - @Query("{'checkticketdate':{'$gte': ?0, '$lt': ?1} , 'checktickettime':{'$gte': ?2, '$lt': ?3}}") - List findByCheckticketdateBetweenAndChecktickettimeBetween(String startTime, String endTime,String beingTime, String resultTime); -} diff --git a/ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/service/checkticket/CheckTicketServiceImpl.java b/ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/service/checkticket/CheckTicketServiceImpl.java index c7f192eed..4edb574d2 100644 --- a/ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/service/checkticket/CheckTicketServiceImpl.java +++ b/ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/service/checkticket/CheckTicketServiceImpl.java @@ -2,7 +2,7 @@ package cn.iocoder.yudao.module.datacenter.service.checkticket; import cn.iocoder.yudao.module.datacenter.dal.dataobject.checkticket.CheckTicket; -import cn.iocoder.yudao.module.datacenter.dal.mongodb.checkticket.CheckTicketTodayRepository; +import cn.iocoder.yudao.module.datacenter.dal.mongodb.checkticket.CheckTicketRepository; import org.springframework.stereotype.Service; import org.springframework.validation.annotation.Validated; @@ -26,7 +26,7 @@ import java.util.Map; public class CheckTicketServiceImpl implements CheckTicketService { @Resource - private CheckTicketTodayRepository checkTicketRepository; + private CheckTicketRepository checkTicketRepository; @Override -- 2.45.2