From d0c46176de41a02f4e34c3c363294163834ebaa9 Mon Sep 17 00:00:00 2001 From: XinWei <2718030729@qq.com> Date: Mon, 8 Jul 2024 20:11:39 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8A=BD=E6=95=B0=E6=A8=A1=E5=9D=97=E5=92=8C?= =?UTF-8?q?=E6=95=B4=E5=90=88xxl-job?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xxl/job/admin/api/info/JobInfoApi.java | 2 + .../job/admin/controller/IndexController.java | 1 - .../admin/controller/JobApiController.java | 2 +- .../admin/controller/JobCodeController.java | 2 +- .../admin/controller/JobGroupController.java | 2 +- .../admin/controller/JobInfoController.java | 2 +- .../admin/controller/JobLogController.java | 2 +- .../job/admin/controller/UserController.java | 2 +- .../src/main/resources/bootstrap.yaml | 4 +- .../ludu-module-sampling-biz/pom.xml | 5 +- .../rpc/config/RpcConfiguration.java | 4 +- .../yudao/module/sampling/job/DemoJob.java | 33 ----- .../module/sampling/service/SamplingJob.java | 61 -------- .../ticketing/TicketingSamplingJob.java | 132 ++++++++++++++++++ .../ticketing/vo/TicketingSamplingReqVO.java | 26 ++++ .../ticketing/vo/TicketingSamplingRespVO.java | 29 ++++ .../api/checkticket/TicketCheckTicketApi.java | 9 +- .../dto/CheckTicketSaveReqDTO.java | 40 ++++++ .../api/saledata/TicketSaleDataApi.java | 8 ++ .../api/saledata/dto/SaleDataSaveReqDTO.java | 64 +++++++++ .../checkticket/TicketCheckTicketApiImpl.java | 8 ++ .../api/saledata/TicketSaleDataApiImpl.java | 10 ++ .../vo/vo/CheckTicketSaveReqVO.java | 2 + .../admin/saledata/vo/SaleDataPageReqVO.java | 4 +- .../admin/saledata/vo/SaleDataRespVO.java | 4 +- .../admin/saledata/vo/SaleDataSaveReqVO.java | 7 +- .../ticket/dal/dataobject/asset/AssetDO.java | 7 +- .../dataobject/checkticket/CheckTicketDO.java | 5 +- .../dal/dataobject/saledata/SaleDataDO.java | 5 + pom.xml | 1 - .../ludu-job-core}/pom.xml | 2 +- .../java/com/xxl/job/core/biz/AdminBiz.java | 0 .../com/xxl/job/core/biz/ExecutorBiz.java | 0 .../job/core/biz/client/AdminBizClient.java | 0 .../core/biz/client/ExecutorBizClient.java | 0 .../job/core/biz/impl/ExecutorBizImpl.java | 0 .../core/biz/model/HandleCallbackParam.java | 0 .../xxl/job/core/biz/model/IdleBeatParam.java | 0 .../com/xxl/job/core/biz/model/KillParam.java | 0 .../com/xxl/job/core/biz/model/LogParam.java | 0 .../com/xxl/job/core/biz/model/LogResult.java | 0 .../xxl/job/core/biz/model/RegistryParam.java | 0 .../com/xxl/job/core/biz/model/ReturnT.java | 0 .../xxl/job/core/biz/model/TriggerParam.java | 0 .../xxl/job/core/context/XxlJobContext.java | 0 .../xxl/job/core/context/XxlJobHelper.java | 0 .../core/enums/ExecutorBlockStrategyEnum.java | 0 .../xxl/job/core/enums/RegistryConfig.java | 0 .../xxl/job/core/executor/XxlJobExecutor.java | 0 .../executor/impl/XxlJobSimpleExecutor.java | 0 .../executor/impl/XxlJobSpringExecutor.java | 0 .../com/xxl/job/core/glue/GlueFactory.java | 0 .../com/xxl/job/core/glue/GlueTypeEnum.java | 0 .../job/core/glue/impl/SpringGlueFactory.java | 0 .../com/xxl/job/core/handler/IJobHandler.java | 0 .../core/handler/annotation/JobHandler.java | 0 .../job/core/handler/annotation/XxlJob.java | 0 .../job/core/handler/impl/GlueJobHandler.java | 0 .../core/handler/impl/MethodJobHandler.java | 0 .../core/handler/impl/ScriptJobHandler.java | 0 .../xxl/job/core/log/XxlJobFileAppender.java | 0 .../com/xxl/job/core/server/EmbedServer.java | 0 .../core/thread/ExecutorRegistryThread.java | 0 .../core/thread/JobLogFileCleanThread.java | 0 .../com/xxl/job/core/thread/JobThread.java | 0 .../core/thread/TriggerCallbackThread.java | 0 .../java/com/xxl/job/core/util/DateUtil.java | 0 .../java/com/xxl/job/core/util/FileUtil.java | 0 .../java/com/xxl/job/core/util/GsonTool.java | 0 .../java/com/xxl/job/core/util/IpUtil.java | 0 .../xxl/job/core/util/JdkSerializeTool.java | 0 .../java/com/xxl/job/core/util/NetUtil.java | 0 .../com/xxl/job/core/util/ScriptUtil.java | 0 .../com/xxl/job/core/util/ShardingUtil.java | 0 .../com/xxl/job/core/util/ThrowableUtil.java | 0 .../xxl/job/core/util/XxlJobRemotingUtil.java | 0 yudao-framework/pom.xml | 1 + .../common/util/date/TickingDateUtils.java | 38 +++++ .../YudaoWebSecurityConfigurerAdapter.java | 1 + .../yudao-module-infra-biz/pom.xml | 11 +- .../controller/admin/job/JobController.java | 10 +- .../api/address/MemberAddressApiImpl.java | 3 +- .../convert/address/AddressConvert.java | 2 +- .../convert}/address/MemberAddressApi.java | 4 +- .../address/dto/MemberAddressRespDTO.java | 2 +- 85 files changed, 427 insertions(+), 130 deletions(-) delete mode 100644 ludu-module-sampling/ludu-module-sampling-biz/src/main/java/cn/iocoder/yudao/module/sampling/job/DemoJob.java delete mode 100644 ludu-module-sampling/ludu-module-sampling-biz/src/main/java/cn/iocoder/yudao/module/sampling/service/SamplingJob.java create mode 100644 ludu-module-sampling/ludu-module-sampling-biz/src/main/java/cn/iocoder/yudao/module/sampling/service/ticketing/TicketingSamplingJob.java create mode 100644 ludu-module-sampling/ludu-module-sampling-biz/src/main/java/cn/iocoder/yudao/module/sampling/service/ticketing/vo/TicketingSamplingReqVO.java create mode 100644 ludu-module-sampling/ludu-module-sampling-biz/src/main/java/cn/iocoder/yudao/module/sampling/service/ticketing/vo/TicketingSamplingRespVO.java create mode 100644 ludu-module-ticket-manager/ludu-module-ticket-manager-api/src/main/java/cn/iocoder/yudao/module/ticket/api/checkticket/dto/CheckTicketSaveReqDTO.java create mode 100644 ludu-module-ticket-manager/ludu-module-ticket-manager-api/src/main/java/cn/iocoder/yudao/module/ticket/api/saledata/dto/SaleDataSaveReqDTO.java rename {ludu-job-core => yudao-framework/ludu-job-core}/pom.xml (98%) rename {ludu-job-core => yudao-framework/ludu-job-core}/src/main/java/com/xxl/job/core/biz/AdminBiz.java (100%) rename {ludu-job-core => yudao-framework/ludu-job-core}/src/main/java/com/xxl/job/core/biz/ExecutorBiz.java (100%) rename {ludu-job-core => yudao-framework/ludu-job-core}/src/main/java/com/xxl/job/core/biz/client/AdminBizClient.java (100%) rename {ludu-job-core => yudao-framework/ludu-job-core}/src/main/java/com/xxl/job/core/biz/client/ExecutorBizClient.java (100%) rename {ludu-job-core => yudao-framework/ludu-job-core}/src/main/java/com/xxl/job/core/biz/impl/ExecutorBizImpl.java (100%) rename {ludu-job-core => yudao-framework/ludu-job-core}/src/main/java/com/xxl/job/core/biz/model/HandleCallbackParam.java (100%) rename {ludu-job-core => yudao-framework/ludu-job-core}/src/main/java/com/xxl/job/core/biz/model/IdleBeatParam.java (100%) rename {ludu-job-core => yudao-framework/ludu-job-core}/src/main/java/com/xxl/job/core/biz/model/KillParam.java (100%) rename {ludu-job-core => yudao-framework/ludu-job-core}/src/main/java/com/xxl/job/core/biz/model/LogParam.java (100%) rename {ludu-job-core => yudao-framework/ludu-job-core}/src/main/java/com/xxl/job/core/biz/model/LogResult.java (100%) rename {ludu-job-core => yudao-framework/ludu-job-core}/src/main/java/com/xxl/job/core/biz/model/RegistryParam.java (100%) rename {ludu-job-core => yudao-framework/ludu-job-core}/src/main/java/com/xxl/job/core/biz/model/ReturnT.java (100%) rename {ludu-job-core => yudao-framework/ludu-job-core}/src/main/java/com/xxl/job/core/biz/model/TriggerParam.java (100%) rename {ludu-job-core => yudao-framework/ludu-job-core}/src/main/java/com/xxl/job/core/context/XxlJobContext.java (100%) rename {ludu-job-core => yudao-framework/ludu-job-core}/src/main/java/com/xxl/job/core/context/XxlJobHelper.java (100%) rename {ludu-job-core => yudao-framework/ludu-job-core}/src/main/java/com/xxl/job/core/enums/ExecutorBlockStrategyEnum.java (100%) rename {ludu-job-core => yudao-framework/ludu-job-core}/src/main/java/com/xxl/job/core/enums/RegistryConfig.java (100%) rename {ludu-job-core => yudao-framework/ludu-job-core}/src/main/java/com/xxl/job/core/executor/XxlJobExecutor.java (100%) rename {ludu-job-core => yudao-framework/ludu-job-core}/src/main/java/com/xxl/job/core/executor/impl/XxlJobSimpleExecutor.java (100%) rename {ludu-job-core => yudao-framework/ludu-job-core}/src/main/java/com/xxl/job/core/executor/impl/XxlJobSpringExecutor.java (100%) rename {ludu-job-core => yudao-framework/ludu-job-core}/src/main/java/com/xxl/job/core/glue/GlueFactory.java (100%) rename {ludu-job-core => yudao-framework/ludu-job-core}/src/main/java/com/xxl/job/core/glue/GlueTypeEnum.java (100%) rename {ludu-job-core => yudao-framework/ludu-job-core}/src/main/java/com/xxl/job/core/glue/impl/SpringGlueFactory.java (100%) rename {ludu-job-core => yudao-framework/ludu-job-core}/src/main/java/com/xxl/job/core/handler/IJobHandler.java (100%) rename {ludu-job-core => yudao-framework/ludu-job-core}/src/main/java/com/xxl/job/core/handler/annotation/JobHandler.java (100%) rename {ludu-job-core => yudao-framework/ludu-job-core}/src/main/java/com/xxl/job/core/handler/annotation/XxlJob.java (100%) rename {ludu-job-core => yudao-framework/ludu-job-core}/src/main/java/com/xxl/job/core/handler/impl/GlueJobHandler.java (100%) rename {ludu-job-core => yudao-framework/ludu-job-core}/src/main/java/com/xxl/job/core/handler/impl/MethodJobHandler.java (100%) rename {ludu-job-core => yudao-framework/ludu-job-core}/src/main/java/com/xxl/job/core/handler/impl/ScriptJobHandler.java (100%) rename {ludu-job-core => yudao-framework/ludu-job-core}/src/main/java/com/xxl/job/core/log/XxlJobFileAppender.java (100%) rename {ludu-job-core => yudao-framework/ludu-job-core}/src/main/java/com/xxl/job/core/server/EmbedServer.java (100%) rename {ludu-job-core => yudao-framework/ludu-job-core}/src/main/java/com/xxl/job/core/thread/ExecutorRegistryThread.java (100%) rename {ludu-job-core => yudao-framework/ludu-job-core}/src/main/java/com/xxl/job/core/thread/JobLogFileCleanThread.java (100%) rename {ludu-job-core => yudao-framework/ludu-job-core}/src/main/java/com/xxl/job/core/thread/JobThread.java (100%) rename {ludu-job-core => yudao-framework/ludu-job-core}/src/main/java/com/xxl/job/core/thread/TriggerCallbackThread.java (100%) rename {ludu-job-core => yudao-framework/ludu-job-core}/src/main/java/com/xxl/job/core/util/DateUtil.java (100%) rename {ludu-job-core => yudao-framework/ludu-job-core}/src/main/java/com/xxl/job/core/util/FileUtil.java (100%) rename {ludu-job-core => yudao-framework/ludu-job-core}/src/main/java/com/xxl/job/core/util/GsonTool.java (100%) rename {ludu-job-core => yudao-framework/ludu-job-core}/src/main/java/com/xxl/job/core/util/IpUtil.java (100%) rename {ludu-job-core => yudao-framework/ludu-job-core}/src/main/java/com/xxl/job/core/util/JdkSerializeTool.java (100%) rename {ludu-job-core => yudao-framework/ludu-job-core}/src/main/java/com/xxl/job/core/util/NetUtil.java (100%) rename {ludu-job-core => yudao-framework/ludu-job-core}/src/main/java/com/xxl/job/core/util/ScriptUtil.java (100%) rename {ludu-job-core => yudao-framework/ludu-job-core}/src/main/java/com/xxl/job/core/util/ShardingUtil.java (100%) rename {ludu-job-core => yudao-framework/ludu-job-core}/src/main/java/com/xxl/job/core/util/ThrowableUtil.java (100%) rename {ludu-job-core => yudao-framework/ludu-job-core}/src/main/java/com/xxl/job/core/util/XxlJobRemotingUtil.java (100%) create mode 100644 yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/util/date/TickingDateUtils.java rename yudao-module-member/{yudao-module-member-api/src/main/java/cn/iocoder/yudao/module/member/api => yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/convert}/address/MemberAddressApi.java (91%) rename yudao-module-member/{yudao-module-member-api/src/main/java/cn/iocoder/yudao/module/member/api => yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/convert}/address/dto/MemberAddressRespDTO.java (95%) diff --git a/ludu-job-admin/ludu-job-admin-api/src/main/java/com/xxl/job/admin/api/info/JobInfoApi.java b/ludu-job-admin/ludu-job-admin-api/src/main/java/com/xxl/job/admin/api/info/JobInfoApi.java index abc74ca4c..1b32799c1 100644 --- a/ludu-job-admin/ludu-job-admin-api/src/main/java/com/xxl/job/admin/api/info/JobInfoApi.java +++ b/ludu-job-admin/ludu-job-admin-api/src/main/java/com/xxl/job/admin/api/info/JobInfoApi.java @@ -9,6 +9,7 @@ import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import java.util.List; @@ -19,6 +20,7 @@ import java.util.Map; */ @FeignClient(name = ApiConstants.NAME) @Tag(name = "RPC 服务 - 任务信息管理") +@RequestMapping("") public interface JobInfoApi { String PREFIX = ApiConstants.PREFIX + "/info"; @GetMapping(PREFIX + "/page") diff --git a/ludu-job-admin/ludu-job-admin-biz/src/main/java/com/xxl/job/admin/controller/IndexController.java b/ludu-job-admin/ludu-job-admin-biz/src/main/java/com/xxl/job/admin/controller/IndexController.java index f6d364d5a..eb63f0bd4 100644 --- a/ludu-job-admin/ludu-job-admin-biz/src/main/java/com/xxl/job/admin/controller/IndexController.java +++ b/ludu-job-admin/ludu-job-admin-biz/src/main/java/com/xxl/job/admin/controller/IndexController.java @@ -27,7 +27,6 @@ import java.util.Map; * @author xuxueli 2015-12-19 16:13:16 */ @Controller -@RequestMapping("/xxl-job-admin") public class IndexController { @Resource diff --git a/ludu-job-admin/ludu-job-admin-biz/src/main/java/com/xxl/job/admin/controller/JobApiController.java b/ludu-job-admin/ludu-job-admin-biz/src/main/java/com/xxl/job/admin/controller/JobApiController.java index 1370ea617..aa51e7390 100644 --- a/ludu-job-admin/ludu-job-admin-biz/src/main/java/com/xxl/job/admin/controller/JobApiController.java +++ b/ludu-job-admin/ludu-job-admin-biz/src/main/java/com/xxl/job/admin/controller/JobApiController.java @@ -22,7 +22,7 @@ import java.util.List; * Created by xuxueli on 17/5/10. */ @Controller -@RequestMapping("/xxl-job-admin/api") +@RequestMapping("/api") public class JobApiController { @Resource diff --git a/ludu-job-admin/ludu-job-admin-biz/src/main/java/com/xxl/job/admin/controller/JobCodeController.java b/ludu-job-admin/ludu-job-admin-biz/src/main/java/com/xxl/job/admin/controller/JobCodeController.java index d3d7710f8..fe4a0e848 100644 --- a/ludu-job-admin/ludu-job-admin-biz/src/main/java/com/xxl/job/admin/controller/JobCodeController.java +++ b/ludu-job-admin/ludu-job-admin-biz/src/main/java/com/xxl/job/admin/controller/JobCodeController.java @@ -22,7 +22,7 @@ import java.util.List; * @author xuxueli 2015-12-19 16:13:16 */ @Controller -@RequestMapping("/xxl-job-admin/jobcode") +@RequestMapping("/jobcode") public class JobCodeController { @Resource diff --git a/ludu-job-admin/ludu-job-admin-biz/src/main/java/com/xxl/job/admin/controller/JobGroupController.java b/ludu-job-admin/ludu-job-admin-biz/src/main/java/com/xxl/job/admin/controller/JobGroupController.java index 5ca97419b..8e0c5a4d5 100644 --- a/ludu-job-admin/ludu-job-admin-biz/src/main/java/com/xxl/job/admin/controller/JobGroupController.java +++ b/ludu-job-admin/ludu-job-admin-biz/src/main/java/com/xxl/job/admin/controller/JobGroupController.java @@ -24,7 +24,7 @@ import java.util.*; * @author xuxueli 2016-10-02 20:52:56 */ @Controller -@RequestMapping("/xxl-job-admin/jobgroup") +@RequestMapping("/jobgroup") public class JobGroupController { @Resource diff --git a/ludu-job-admin/ludu-job-admin-biz/src/main/java/com/xxl/job/admin/controller/JobInfoController.java b/ludu-job-admin/ludu-job-admin-biz/src/main/java/com/xxl/job/admin/controller/JobInfoController.java index a0978d750..516dce418 100644 --- a/ludu-job-admin/ludu-job-admin-biz/src/main/java/com/xxl/job/admin/controller/JobInfoController.java +++ b/ludu-job-admin/ludu-job-admin-biz/src/main/java/com/xxl/job/admin/controller/JobInfoController.java @@ -33,7 +33,7 @@ import java.util.*; * @author xuxueli 2015-12-19 16:13:16 */ @Controller -@RequestMapping("/xxl-job-admin/jobinfo") +@RequestMapping("/jobinfo") public class JobInfoController { private static Logger logger = LoggerFactory.getLogger(JobInfoController.class); diff --git a/ludu-job-admin/ludu-job-admin-biz/src/main/java/com/xxl/job/admin/controller/JobLogController.java b/ludu-job-admin/ludu-job-admin-biz/src/main/java/com/xxl/job/admin/controller/JobLogController.java index 302a88909..bff91989e 100644 --- a/ludu-job-admin/ludu-job-admin-biz/src/main/java/com/xxl/job/admin/controller/JobLogController.java +++ b/ludu-job-admin/ludu-job-admin-biz/src/main/java/com/xxl/job/admin/controller/JobLogController.java @@ -38,7 +38,7 @@ import java.util.Map; * @author xuxueli 2015-12-19 16:13:16 */ @Controller -@RequestMapping("/xxl-job-admin/joblog") +@RequestMapping("/joblog") public class JobLogController { private static Logger logger = LoggerFactory.getLogger(JobLogController.class); diff --git a/ludu-job-admin/ludu-job-admin-biz/src/main/java/com/xxl/job/admin/controller/UserController.java b/ludu-job-admin/ludu-job-admin-biz/src/main/java/com/xxl/job/admin/controller/UserController.java index 11a301aaa..3f4c7559b 100644 --- a/ludu-job-admin/ludu-job-admin-biz/src/main/java/com/xxl/job/admin/controller/UserController.java +++ b/ludu-job-admin/ludu-job-admin-biz/src/main/java/com/xxl/job/admin/controller/UserController.java @@ -26,7 +26,7 @@ import java.util.Map; * @author xuxueli 2019-05-04 16:39:50 */ @Controller -@RequestMapping("/xxl-job-admin/user") +@RequestMapping("/user") public class UserController { @Resource diff --git a/ludu-job-admin/ludu-job-admin-biz/src/main/resources/bootstrap.yaml b/ludu-job-admin/ludu-job-admin-biz/src/main/resources/bootstrap.yaml index 184587608..79517ff5c 100644 --- a/ludu-job-admin/ludu-job-admin-biz/src/main/resources/bootstrap.yaml +++ b/ludu-job-admin/ludu-job-admin-biz/src/main/resources/bootstrap.yaml @@ -7,8 +7,8 @@ spring: server: port: 9090 -# servlet: -# context-path: /xxl-job-admin + servlet: + context-path: /xxl-job-admin # 日志文件配置。注意，如果 logging.file.name 不放在 bootstrap.yaml 配置文件，而是放在 application.yaml 中，会导致出现 LOG_FILE_IS_UNDEFINED 文件 logging: diff --git a/ludu-module-sampling/ludu-module-sampling-biz/pom.xml b/ludu-module-sampling/ludu-module-sampling-biz/pom.xml index d2b88d27a..b020ba28f 100644 --- a/ludu-module-sampling/ludu-module-sampling-biz/pom.xml +++ b/ludu-module-sampling/ludu-module-sampling-biz/pom.xml @@ -13,11 +13,12 @@ ${project.artifactId} - ticket 模块，我们票务业务。 - 例如说：设备管理等等 + sampling 模块，我们抽数模块。 + 例如说：检票和售票的数据抽数等等 + cn.iocoder.cloud ludu-job-core diff --git a/ludu-module-sampling/ludu-module-sampling-biz/src/main/java/cn/iocoder/yudao/module/sampling/framework/rpc/config/RpcConfiguration.java b/ludu-module-sampling/ludu-module-sampling-biz/src/main/java/cn/iocoder/yudao/module/sampling/framework/rpc/config/RpcConfiguration.java index 30407d965..ea646b821 100644 --- a/ludu-module-sampling/ludu-module-sampling-biz/src/main/java/cn/iocoder/yudao/module/sampling/framework/rpc/config/RpcConfiguration.java +++ b/ludu-module-sampling/ludu-module-sampling-biz/src/main/java/cn/iocoder/yudao/module/sampling/framework/rpc/config/RpcConfiguration.java @@ -1,6 +1,8 @@ package cn.iocoder.yudao.module.sampling.framework.rpc.config; import cn.iocoder.yudao.module.ticket.api.asset.TicketAssetApi; +import cn.iocoder.yudao.module.ticket.api.checkticket.TicketCheckTicketApi; +import cn.iocoder.yudao.module.ticket.api.saledata.TicketSaleDataApi; import org.springframework.cloud.openfeign.EnableFeignClients; import org.springframework.context.annotation.Configuration; @@ -8,6 +10,6 @@ import org.springframework.context.annotation.Configuration; * @Description TODO */ @Configuration(proxyBeanMethods = false) -@EnableFeignClients(clients = {TicketAssetApi.class}) +@EnableFeignClients(clients = {TicketAssetApi.class, TicketSaleDataApi.class, TicketCheckTicketApi.class}) public class RpcConfiguration { } diff --git a/ludu-module-sampling/ludu-module-sampling-biz/src/main/java/cn/iocoder/yudao/module/sampling/job/DemoJob.java b/ludu-module-sampling/ludu-module-sampling-biz/src/main/java/cn/iocoder/yudao/module/sampling/job/DemoJob.java deleted file mode 100644 index ac3679b8c..000000000 --- a/ludu-module-sampling/ludu-module-sampling-biz/src/main/java/cn/iocoder/yudao/module/sampling/job/DemoJob.java +++ /dev/null @@ -1,33 +0,0 @@ -package cn.iocoder.yudao.module.sampling.job; - -import com.xxl.job.core.biz.model.ReturnT; -import com.xxl.job.core.handler.IJobHandler; -import com.xxl.job.core.handler.annotation.XxlJob; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.stereotype.Component; - -import java.util.concurrent.atomic.AtomicInteger; - -/** - * @Description TODO - */ -@Component -public class DemoJob extends IJobHandler { - - private Logger logger = LoggerFactory.getLogger(getClass()); - - private final AtomicInteger counts = new AtomicInteger(); - @XxlJob("demoJob") - public ReturnT demoJobHandler(String param) throws Exception { - logger.info("XXL-JOB, Hello World."); - System.out.println("zxxxx"); - logger.info("XXL-JOB, Hello World end."); - return ReturnT.SUCCESS; - } - - @Override - public void execute() throws Exception { - - } -} diff --git a/ludu-module-sampling/ludu-module-sampling-biz/src/main/java/cn/iocoder/yudao/module/sampling/service/SamplingJob.java b/ludu-module-sampling/ludu-module-sampling-biz/src/main/java/cn/iocoder/yudao/module/sampling/service/SamplingJob.java deleted file mode 100644 index 5c5cf4817..000000000 --- a/ludu-module-sampling/ludu-module-sampling-biz/src/main/java/cn/iocoder/yudao/module/sampling/service/SamplingJob.java +++ /dev/null @@ -1,61 +0,0 @@ -package cn.iocoder.yudao.module.sampling.service; - -import cn.hutool.http.HttpUtil; -import cn.hutool.json.JSONUtil; -import com.fasterxml.jackson.databind.ObjectMapper; -import com.xxl.job.core.context.XxlJobHelper; -import com.xxl.job.core.handler.annotation.XxlJob; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.stereotype.Component; - -import java.math.BigDecimal; -import java.util.HashMap; -import java.util.Map; -import java.util.concurrent.TimeUnit; - -/** - * @Description 抽数服务 - */ -@Component -public class SamplingJob { - private static Logger logger = LoggerFactory.getLogger(SamplingJob.class); - @XxlJob("getSaleData") - public void demoJobHandler() throws Exception { - XxlJobHelper.log("XXL-JOB, Hello World."); - Map map = new HashMap<>(); - map.put("service", "apiSaleService"); - map.put("method", "SaleDetail"); - map.put("queryDate", "20240704"); - map.put("pageNumber", 1); - map.put("pageSize", 2000); - String str = HttpUtil.post("http://shinanlundu.pro.jiutianda.com/joytime-erp-eportal/console/openapi/handler", JSONUtil.toJsonStr(map)); - - /*System.out.println(str); - ObjectMapper objectMapper = new ObjectMapper(); - com.example.snlundu.domain.Test data = objectMapper.readValue(str, com.example.snlundu.domain.Test.class); -// HeartbeatLog data = objectMapper.readValue(str, HeartbeatLog.class); - for (Map stringObjectMap : data.getDataMapList()) { - SaleData saleData=new SaleData(); - saleData.setDataId((String)stringObjectMap.get("dataId")); - saleData.setSdno((String)stringObjectMap.get("sdno")); - saleData.setTransactiontypeno((String)stringObjectMap.get("transactiontypeno")); - saleData.setSddate((String)stringObjectMap.get("sddate")); - saleData.setSdtime((String)stringObjectMap.get("sdtime")); - BigDecimal amountString = new BigDecimal(stringObjectMap.get("amount").toString()); - saleData.setAmount(amountString); - Integer quantity = (Integer) stringObjectMap.get("quantity"); - saleData.setQuantity(quantity); - saleData.setCertificatetype((String)stringObjectMap.get("certificatetype")); - saleData.setCertificateno((String)stringObjectMap.get("certificateno")); - saleData.setProductbatchno((String)stringObjectMap.get("productbatchno")); - saleData.setItem((String)stringObjectMap.get("item")); - saleData.setItemtypename((String)stringObjectMap.get("itemtypename")); - saleData.setItemtype((String)stringObjectMap.get("itemtype")); - saleData.setItemname((String)stringObjectMap.get("itemname")); - saleData.setSalepropetyvaluename((String)stringObjectMap.get("salepropetyvaluename")); - saleDataRepository.save(saleData); - }*/ - // default success - } -} diff --git a/ludu-module-sampling/ludu-module-sampling-biz/src/main/java/cn/iocoder/yudao/module/sampling/service/ticketing/TicketingSamplingJob.java b/ludu-module-sampling/ludu-module-sampling-biz/src/main/java/cn/iocoder/yudao/module/sampling/service/ticketing/TicketingSamplingJob.java new file mode 100644 index 000000000..51ff21635 --- /dev/null +++ b/ludu-module-sampling/ludu-module-sampling-biz/src/main/java/cn/iocoder/yudao/module/sampling/service/ticketing/TicketingSamplingJob.java @@ -0,0 +1,132 @@ +package cn.iocoder.yudao.module.sampling.service.ticketing; + +import cn.hutool.http.HttpUtil; +import cn.hutool.json.JSONUtil; +import cn.iocoder.yudao.framework.common.util.date.TickingDateUtils; +import cn.iocoder.yudao.module.sampling.service.ticketing.vo.TicketingSamplingReqVO; +import cn.iocoder.yudao.module.sampling.service.ticketing.vo.TicketingSamplingRespVO; +import cn.iocoder.yudao.module.ticket.api.checkticket.TicketCheckTicketApi; +import cn.iocoder.yudao.module.ticket.api.checkticket.dto.CheckTicketSaveReqDTO; +import cn.iocoder.yudao.module.ticket.api.saledata.TicketSaleDataApi; +import cn.iocoder.yudao.module.ticket.api.saledata.dto.SaleDataSaveReqDTO; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.xxl.job.core.context.XxlJobHelper; +import com.xxl.job.core.handler.annotation.XxlJob; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.stereotype.Component; + +import javax.annotation.Resource; +import java.math.BigDecimal; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * @Description 抽数服务 + */ +@Component +public class TicketingSamplingJob { + private static Logger logger = LoggerFactory.getLogger(TicketingSamplingJob.class); + + private static final int PAGE_SIZE = 500; + @Resource + private TicketSaleDataApi ticketSaleDataApi; + + @Resource + private TicketCheckTicketApi ticketCheckTicketApi; + + @XxlJob("getSaleData") + public void getSaleDataHandler() throws Exception { + int failedCount = 0; + int pageNumber = 1; + XxlJobHelper.log("抽数服务：销售数据开始抽数..."); + // 准备请求参数 + TicketingSamplingReqVO ticketingSamplingReqVO = new TicketingSamplingReqVO(); + ticketingSamplingReqVO.setService("apiSaleService"); + ticketingSamplingReqVO.setMethod("SaleDetail"); + ticketingSamplingReqVO.setQueryDate(TickingDateUtils.getNowDayFormat()); + ticketingSamplingReqVO.setPageNumber(pageNumber); + ticketingSamplingReqVO.setPageSize(PAGE_SIZE); + // 先发起第一次请求 + String str = HttpUtil.post("http://shinanlundu.pro.jiutianda.com/joytime-erp-eportal/console/openapi/handler", JSONUtil.toJsonStr(ticketingSamplingReqVO)); + // 解析读取响应数据 + TicketingSamplingRespVO ticketingSamplingRespVO = new ObjectMapper().readValue(str, TicketingSamplingRespVO.class); + // 如果访问失败则让调度中心重新调用 + if (!ticketingSamplingRespVO.isPassflag()) { + // 让调度中心重新调用 + XxlJobHelper.log("抽数服务：销售数据抽数失败，返回消息：" + ticketingSamplingRespVO.getRtnMsg()); + XxlJobHelper.handleFail("销售数据抽数失败,请重试"); + return; + } + int totalRows = ticketingSamplingRespVO.getTotalRows(); + List> mapList = ticketingSamplingRespVO.getDataMapList(); + // 总条数小于等于每页条数 则直接按照总条数进行插入即可 + if (totalRows <= PAGE_SIZE) { + for (int i = 0; i < ticketingSamplingRespVO.getTotalRows(); i++) { + Map currentMap = mapList.get(i); + // 装配数据 + SaleDataSaveReqDTO saleData = new SaleDataSaveReqDTO(); + saleData.setDataId((String) currentMap.get("dataId")); + saleData.setSdno((String) currentMap.get("sdno")); + saleData.setTransactiontypeno((String) currentMap.get("transactiontypeno")); + saleData.setSddate((String) currentMap.get("sddate")); + saleData.setSdtime((String) currentMap.get("sdtime")); + saleData.setAmount(new BigDecimal(currentMap.get("amount").toString())); + saleData.setQuantity((Integer) currentMap.get("quantity")); + saleData.setCertificatetype((String) currentMap.get("certificatetype")); + saleData.setCertificateno((String) currentMap.get("certificateno")); + saleData.setProductbatchno((String) currentMap.get("productbatchno")); + saleData.setItem((String) currentMap.get("item")); + saleData.setItemtypename((String) currentMap.get("itemtypename")); + saleData.setItemtype((String) currentMap.get("itemtype")); + saleData.setItemname((String) currentMap.get("itemname")); + saleData.setSalepropetyvaluename((String) currentMap.get("salepropetyvaluename")); + saleData.setTenant_id(1L); + if (ticketSaleDataApi.createSaleData(saleData).getCode() != 0) { + failedCount++; + XxlJobHelper.log("第{}条数据插入失败，数据值为：{}", ((pageNumber - 1) * PAGE_SIZE + i + 1), currentMap); + } + } + } + // TODO 由于小于大于都要执行第一次插入数据，只是长度不同，同时小于执行完直接return就行 + // 总条数大于每页条数 执行完第一次插入后根据返回的页数继续进行请求和插入 + for (int i = pageNumber; i <= totalRows; i++) { + // 请求 + // 插入 + } + + XxlJobHelper.log("抽数服务：销售数据抽数正常结束！总共：{}条数据，{}条数据插入失败！", totalRows, failedCount); + } + + @XxlJob("getCheckTicket") + public void getCheckTicketHandler() throws Exception { + XxlJobHelper.log("抽数服务：检票数据开始抽数"); + Map map = new HashMap<>(); + map.put("service", "apiCheckService"); + map.put("method", "CheckDetail"); + map.put("queryDate", "20240707"); + map.put("pageNumber", 1); + map.put("pageSize", 2000); + String str = HttpUtil.post("http://shinanlundu.pro.jiutianda.com/joytime-erp-eportal/console/openapi/handler", JSONUtil.toJsonStr(map)); + TicketingSamplingRespVO ticketingSamplingRespVO = new ObjectMapper().readValue(str, TicketingSamplingRespVO.class); + int successNum = 0; + for (Map stringObjectMap : ticketingSamplingRespVO.getDataMapList()) { + + CheckTicketSaveReqDTO checkTicket = new CheckTicketSaveReqDTO(); + checkTicket.setDataId((String) stringObjectMap.get("dataId")); + checkTicket.setTicket((String) stringObjectMap.get("ticket")); + checkTicket.setCheckticketdate((String) stringObjectMap.get("checkticketdate")); + checkTicket.setChecktickettime((String) stringObjectMap.get("checktickettime")); + checkTicket.setPersoncount((Integer) stringObjectMap.get("personcount")); + checkTicket.setCheckstation((String) stringObjectMap.get("checkstation")); + checkTicket.setCheckstationname((String) stringObjectMap.get("checkstationname")); + checkTicket.setSdshipping((String) stringObjectMap.get("sdshipping")); + checkTicket.setSalepropetyvaluename((String) stringObjectMap.get("salepropetyvaluename")); + checkTicket.setTenant_id(1L); + ticketCheckTicketApi.createCheckTicket(checkTicket); + successNum++; + } + + } +} diff --git a/ludu-module-sampling/ludu-module-sampling-biz/src/main/java/cn/iocoder/yudao/module/sampling/service/ticketing/vo/TicketingSamplingReqVO.java b/ludu-module-sampling/ludu-module-sampling-biz/src/main/java/cn/iocoder/yudao/module/sampling/service/ticketing/vo/TicketingSamplingReqVO.java new file mode 100644 index 000000000..01544d376 --- /dev/null +++ b/ludu-module-sampling/ludu-module-sampling-biz/src/main/java/cn/iocoder/yudao/module/sampling/service/ticketing/vo/TicketingSamplingReqVO.java @@ -0,0 +1,26 @@ +package cn.iocoder.yudao.module.sampling.service.ticketing.vo; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +/** + * @Description 票务抽数请求实体类 + */ +@Data +@Schema(description = "票务抽数请求类") +public class TicketingSamplingReqVO { + @Schema(description = "服务名") + private String service; + @Schema(description = "方法名") + private String method; + @Schema(description = "查询日期") + private String queryDate; + @Schema(description = "分页，第几页") + private Integer pageNumber; + @Schema(description = "分页，每页多少条，每页最多2000条") + private Integer pageSize; + @Schema(description = "开始时间") + private String startTime; + @Schema(description = "结束时间") + private String endTime; +} diff --git a/ludu-module-sampling/ludu-module-sampling-biz/src/main/java/cn/iocoder/yudao/module/sampling/service/ticketing/vo/TicketingSamplingRespVO.java b/ludu-module-sampling/ludu-module-sampling-biz/src/main/java/cn/iocoder/yudao/module/sampling/service/ticketing/vo/TicketingSamplingRespVO.java new file mode 100644 index 000000000..8d0c9a319 --- /dev/null +++ b/ludu-module-sampling/ludu-module-sampling-biz/src/main/java/cn/iocoder/yudao/module/sampling/service/ticketing/vo/TicketingSamplingRespVO.java @@ -0,0 +1,29 @@ +package cn.iocoder.yudao.module.sampling.service.ticketing.vo; + +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +import java.util.List; +import java.util.Map; + +/** + * @Description 票务抽数响应实体类 + */ +@Data +@Schema(description = "票务抽数响应类") +@JsonIgnoreProperties(ignoreUnknown = true) +public class TicketingSamplingRespVO { + @Schema(description = "接口访问是否成功") + private boolean passflag; + @Schema(description = "提示信息") + private String rtnMsg; + @Schema(description = "分页，第几页") + private Integer pageNumber; + @Schema(description = "分页，每页多少条，每页最多2000条") + private Integer pageSize; + @Schema(description = "总条数") + private Integer totalRows; + @Schema(description = "数据数组") + private List> dataMapList; +} diff --git a/ludu-module-ticket-manager/ludu-module-ticket-manager-api/src/main/java/cn/iocoder/yudao/module/ticket/api/checkticket/TicketCheckTicketApi.java b/ludu-module-ticket-manager/ludu-module-ticket-manager-api/src/main/java/cn/iocoder/yudao/module/ticket/api/checkticket/TicketCheckTicketApi.java index 8e4592e7d..d00fccbbf 100644 --- a/ludu-module-ticket-manager/ludu-module-ticket-manager-api/src/main/java/cn/iocoder/yudao/module/ticket/api/checkticket/TicketCheckTicketApi.java +++ b/ludu-module-ticket-manager/ludu-module-ticket-manager-api/src/main/java/cn/iocoder/yudao/module/ticket/api/checkticket/TicketCheckTicketApi.java @@ -1,13 +1,18 @@ package cn.iocoder.yudao.module.ticket.api.checkticket; import cn.iocoder.yudao.framework.common.pojo.CommonResult; +import cn.iocoder.yudao.module.ticket.api.checkticket.dto.CheckTicketSaveReqDTO; +import cn.iocoder.yudao.module.ticket.api.saledata.dto.SaleDataSaveReqDTO; import cn.iocoder.yudao.module.ticket.enums.ApiConstants; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import javax.validation.Valid; import java.util.List; import java.util.Map; @@ -23,5 +28,7 @@ public interface TicketCheckTicketApi { @GetMapping(PREFIX + "/qushi/{day}") @Operation(summary = "获取日期当天各个时段的检票人数") public CommonResult>> findbytimetemp(@PathVariable("day") String day); - + @PostMapping(PREFIX + "/create") + @Operation(summary = "插入检票记录") + public CommonResult createCheckTicket(@Valid @RequestBody CheckTicketSaveReqDTO checkTicketSaveReqDTO); } diff --git a/ludu-module-ticket-manager/ludu-module-ticket-manager-api/src/main/java/cn/iocoder/yudao/module/ticket/api/checkticket/dto/CheckTicketSaveReqDTO.java b/ludu-module-ticket-manager/ludu-module-ticket-manager-api/src/main/java/cn/iocoder/yudao/module/ticket/api/checkticket/dto/CheckTicketSaveReqDTO.java new file mode 100644 index 000000000..474fc3bd8 --- /dev/null +++ b/ludu-module-ticket-manager/ludu-module-ticket-manager-api/src/main/java/cn/iocoder/yudao/module/ticket/api/checkticket/dto/CheckTicketSaveReqDTO.java @@ -0,0 +1,40 @@ +package cn.iocoder.yudao.module.ticket.api.checkticket.dto; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +@Schema(description = "管理后台 - 检票新增/修改 Request VO") +@Data +public class CheckTicketSaveReqDTO { + @Schema(description = "ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "16476") + private Long id; + @Schema(description = "数据ID", example = "15422") + private String dataId; + + @Schema(description = "检票点ID") + private String checkstation; + + @Schema(description = "检票点名称", example = "李四") + private String checkstationname; + + @Schema(description = "检票日期") + private String checkticketdate; + + @Schema(description = "检票时间") + private String checktickettime; + + @Schema(description = "人数", example = "23164") + private Integer personcount; + + @Schema(description = "订单明细ID") + private String sdshipping; + + @Schema(description = "票ID") + private String ticket; + + @Schema(description = "销售特征名称（票种名称）", example = "张三") + private String salepropetyvaluename; + + @Schema(description = "租户编号") + private Long tenant_id; +} diff --git a/ludu-module-ticket-manager/ludu-module-ticket-manager-api/src/main/java/cn/iocoder/yudao/module/ticket/api/saledata/TicketSaleDataApi.java b/ludu-module-ticket-manager/ludu-module-ticket-manager-api/src/main/java/cn/iocoder/yudao/module/ticket/api/saledata/TicketSaleDataApi.java index dc6645303..af86a0ca5 100644 --- a/ludu-module-ticket-manager/ludu-module-ticket-manager-api/src/main/java/cn/iocoder/yudao/module/ticket/api/saledata/TicketSaleDataApi.java +++ b/ludu-module-ticket-manager/ludu-module-ticket-manager-api/src/main/java/cn/iocoder/yudao/module/ticket/api/saledata/TicketSaleDataApi.java @@ -1,13 +1,17 @@ package cn.iocoder.yudao.module.ticket.api.saledata; import cn.iocoder.yudao.framework.common.pojo.CommonResult; +import cn.iocoder.yudao.module.ticket.api.saledata.dto.SaleDataSaveReqDTO; import cn.iocoder.yudao.module.ticket.enums.ApiConstants; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import javax.validation.Valid; import java.math.BigDecimal; import java.util.List; import java.util.Map; @@ -60,4 +64,8 @@ public interface TicketSaleDataApi { @GetMapping(PREFIX + "/lastyear/nianjun") @Operation(summary = "查询去年年度售票平均金额") public CommonResult findmoneylastyear(); + + @PostMapping(PREFIX + "/create") + @Operation(summary = "插入售票记录") + public CommonResult createSaleData(@Valid @RequestBody SaleDataSaveReqDTO saleDataSaveReqDTO); } \ No newline at end of file diff --git a/ludu-module-ticket-manager/ludu-module-ticket-manager-api/src/main/java/cn/iocoder/yudao/module/ticket/api/saledata/dto/SaleDataSaveReqDTO.java b/ludu-module-ticket-manager/ludu-module-ticket-manager-api/src/main/java/cn/iocoder/yudao/module/ticket/api/saledata/dto/SaleDataSaveReqDTO.java new file mode 100644 index 000000000..23d1d9ffd --- /dev/null +++ b/ludu-module-ticket-manager/ludu-module-ticket-manager-api/src/main/java/cn/iocoder/yudao/module/ticket/api/saledata/dto/SaleDataSaveReqDTO.java @@ -0,0 +1,64 @@ +package cn.iocoder.yudao.module.ticket.api.saledata.dto; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +import java.math.BigDecimal; + +/** + * @Description TODO + */ +@Schema(description = "RPC 服务 - 销售数据 Request DTO") +@Data +public class SaleDataSaveReqDTO { + @Schema(description = "ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "16476") + private Long id; + @Schema(description = "数据id", example = "32044") + private String dataId; + + @Schema(description = "金额") + private BigDecimal amount; + + @Schema(description = "证件号") + private String certificateno; + + @Schema(description = "证件类别", example = "2") + private String certificatetype; + + @Schema(description = "产品ID") + private String item; + + @Schema(description = "产品名称", example = "张三") + private String itemname; + + @Schema(description = "产品类型ID", example = "2") + private String itemtype; + + @Schema(description = "产品类型名称", example = "张三") + private String itemtypename; + + @Schema(description = "出游日期") + private String productbatchno; + + @Schema(description = "数量") + private Integer quantity; + + @Schema(description = "销售日期") + private String sddate; + + @Schema(description = "订单号") + private String sdno; + + @Schema(description = "销售时间") + private String sdtime; + + @Schema(description = "交易类别（订单类型）") + private String transactiontypeno; + + @Schema(description = "销售特征名称（票种名称）", example = "赵六") + private String salepropetyvaluename; + + @Schema(description = "租户编号") + private Long tenant_id; + +} diff --git a/ludu-module-ticket-manager/ludu-module-ticket-manager-biz/src/main/java/cn/iocoder/yudao/module/ticket/api/checkticket/TicketCheckTicketApiImpl.java b/ludu-module-ticket-manager/ludu-module-ticket-manager-biz/src/main/java/cn/iocoder/yudao/module/ticket/api/checkticket/TicketCheckTicketApiImpl.java index ba9eefa53..1fcd2a4c8 100644 --- a/ludu-module-ticket-manager/ludu-module-ticket-manager-biz/src/main/java/cn/iocoder/yudao/module/ticket/api/checkticket/TicketCheckTicketApiImpl.java +++ b/ludu-module-ticket-manager/ludu-module-ticket-manager-biz/src/main/java/cn/iocoder/yudao/module/ticket/api/checkticket/TicketCheckTicketApiImpl.java @@ -1,6 +1,9 @@ package cn.iocoder.yudao.module.ticket.api.checkticket; import cn.iocoder.yudao.framework.common.pojo.CommonResult; +import cn.iocoder.yudao.framework.common.util.object.BeanUtils; +import cn.iocoder.yudao.module.ticket.api.checkticket.dto.CheckTicketSaveReqDTO; +import cn.iocoder.yudao.module.ticket.controller.admin.checkticket.vo.vo.CheckTicketSaveReqVO; import cn.iocoder.yudao.module.ticket.service.checkticket.CheckTicketService; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.RestController; @@ -28,4 +31,9 @@ public class TicketCheckTicketApiImpl implements TicketCheckTicketApi{ public CommonResult>> findbytimetemp(String day) { return success(checkTicketService.findbytimetemp(day)); } + + @Override + public CommonResult createCheckTicket(CheckTicketSaveReqDTO checkTicketSaveReqDTO) { + return success(checkTicketService.createCheckTicket(BeanUtils.toBean(checkTicketSaveReqDTO, CheckTicketSaveReqVO.class))); + } } diff --git a/ludu-module-ticket-manager/ludu-module-ticket-manager-biz/src/main/java/cn/iocoder/yudao/module/ticket/api/saledata/TicketSaleDataApiImpl.java b/ludu-module-ticket-manager/ludu-module-ticket-manager-biz/src/main/java/cn/iocoder/yudao/module/ticket/api/saledata/TicketSaleDataApiImpl.java index 3b056dcdf..c6cfc6bdc 100644 --- a/ludu-module-ticket-manager/ludu-module-ticket-manager-biz/src/main/java/cn/iocoder/yudao/module/ticket/api/saledata/TicketSaleDataApiImpl.java +++ b/ludu-module-ticket-manager/ludu-module-ticket-manager-biz/src/main/java/cn/iocoder/yudao/module/ticket/api/saledata/TicketSaleDataApiImpl.java @@ -1,12 +1,17 @@ package cn.iocoder.yudao.module.ticket.api.saledata; import cn.iocoder.yudao.framework.common.pojo.CommonResult; +import cn.iocoder.yudao.framework.common.util.object.BeanUtils; +import cn.iocoder.yudao.module.ticket.api.saledata.dto.SaleDataSaveReqDTO; +import cn.iocoder.yudao.module.ticket.controller.admin.saledata.vo.SaleDataSaveReqVO; import cn.iocoder.yudao.module.ticket.dal.dataobject.saledata.SaleDataDO; import cn.iocoder.yudao.module.ticket.service.saledata.SaleDataService; import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; +import javax.validation.Valid; import java.math.BigDecimal; import java.util.List; import java.util.Map; @@ -91,4 +96,9 @@ public class TicketSaleDataApiImpl implements TicketSaleDataApi{ public CommonResult findmoneylastyear() { return success(saleDataService.findyearJun(saleDataService.findEventsLastYear())); } + + @Override + public CommonResult createSaleData(@Valid @RequestBody SaleDataSaveReqDTO saleDataSaveReqDTO) { + return success(saleDataService.createSaleData(BeanUtils.toBean(saleDataSaveReqDTO, SaleDataSaveReqVO.class))); + } } diff --git a/ludu-module-ticket-manager/ludu-module-ticket-manager-biz/src/main/java/cn/iocoder/yudao/module/ticket/controller/admin/checkticket/vo/vo/CheckTicketSaveReqVO.java b/ludu-module-ticket-manager/ludu-module-ticket-manager-biz/src/main/java/cn/iocoder/yudao/module/ticket/controller/admin/checkticket/vo/vo/CheckTicketSaveReqVO.java index 5267f30e3..8e10c9903 100644 --- a/ludu-module-ticket-manager/ludu-module-ticket-manager-biz/src/main/java/cn/iocoder/yudao/module/ticket/controller/admin/checkticket/vo/vo/CheckTicketSaveReqVO.java +++ b/ludu-module-ticket-manager/ludu-module-ticket-manager-biz/src/main/java/cn/iocoder/yudao/module/ticket/controller/admin/checkticket/vo/vo/CheckTicketSaveReqVO.java @@ -35,4 +35,6 @@ public class CheckTicketSaveReqVO { @Schema(description = "销售特征名称（票种名称）", example = "张三") private String salepropetyvaluename; + @Schema(description = "租户编号") + private Long tenant_id; } \ No newline at end of file diff --git a/ludu-module-ticket-manager/ludu-module-ticket-manager-biz/src/main/java/cn/iocoder/yudao/module/ticket/controller/admin/saledata/vo/SaleDataPageReqVO.java b/ludu-module-ticket-manager/ludu-module-ticket-manager-biz/src/main/java/cn/iocoder/yudao/module/ticket/controller/admin/saledata/vo/SaleDataPageReqVO.java index 89a51a507..0409e3aa0 100644 --- a/ludu-module-ticket-manager/ludu-module-ticket-manager-biz/src/main/java/cn/iocoder/yudao/module/ticket/controller/admin/saledata/vo/SaleDataPageReqVO.java +++ b/ludu-module-ticket-manager/ludu-module-ticket-manager-biz/src/main/java/cn/iocoder/yudao/module/ticket/controller/admin/saledata/vo/SaleDataPageReqVO.java @@ -1,6 +1,8 @@ package cn.iocoder.yudao.module.ticket.controller.admin.saledata.vo; import lombok.*; + +import java.math.BigDecimal; import java.util.*; import io.swagger.v3.oas.annotations.media.Schema; import cn.iocoder.yudao.framework.common.pojo.PageParam; @@ -22,7 +24,7 @@ public class SaleDataPageReqVO extends PageParam { private String dataId; @Schema(description = "金额") - private Long amount; + private BigDecimal amount; @Schema(description = "证件号") private String certificateno; diff --git a/ludu-module-ticket-manager/ludu-module-ticket-manager-biz/src/main/java/cn/iocoder/yudao/module/ticket/controller/admin/saledata/vo/SaleDataRespVO.java b/ludu-module-ticket-manager/ludu-module-ticket-manager-biz/src/main/java/cn/iocoder/yudao/module/ticket/controller/admin/saledata/vo/SaleDataRespVO.java index 4358070ab..cd066b65f 100644 --- a/ludu-module-ticket-manager/ludu-module-ticket-manager-biz/src/main/java/cn/iocoder/yudao/module/ticket/controller/admin/saledata/vo/SaleDataRespVO.java +++ b/ludu-module-ticket-manager/ludu-module-ticket-manager-biz/src/main/java/cn/iocoder/yudao/module/ticket/controller/admin/saledata/vo/SaleDataRespVO.java @@ -2,6 +2,8 @@ package cn.iocoder.yudao.module.ticket.controller.admin.saledata.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; + +import java.math.BigDecimal; import java.util.*; import java.util.*; import com.alibaba.excel.annotation.*; @@ -21,7 +23,7 @@ public class SaleDataRespVO { @Schema(description = "金额") @ExcelProperty("金额") - private Long amount; + private BigDecimal amount; @Schema(description = "证件号") @ExcelProperty("证件号") diff --git a/ludu-module-ticket-manager/ludu-module-ticket-manager-biz/src/main/java/cn/iocoder/yudao/module/ticket/controller/admin/saledata/vo/SaleDataSaveReqVO.java b/ludu-module-ticket-manager/ludu-module-ticket-manager-biz/src/main/java/cn/iocoder/yudao/module/ticket/controller/admin/saledata/vo/SaleDataSaveReqVO.java index 98ff56a7c..d2f59ad24 100644 --- a/ludu-module-ticket-manager/ludu-module-ticket-manager-biz/src/main/java/cn/iocoder/yudao/module/ticket/controller/admin/saledata/vo/SaleDataSaveReqVO.java +++ b/ludu-module-ticket-manager/ludu-module-ticket-manager-biz/src/main/java/cn/iocoder/yudao/module/ticket/controller/admin/saledata/vo/SaleDataSaveReqVO.java @@ -2,6 +2,8 @@ package cn.iocoder.yudao.module.ticket.controller.admin.saledata.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; + +import java.math.BigDecimal; import java.util.*; import javax.validation.constraints.*; @@ -14,7 +16,7 @@ public class SaleDataSaveReqVO { private String dataId; @Schema(description = "金额") - private Long amount; + private BigDecimal amount; @Schema(description = "证件号") private String certificateno; @@ -55,4 +57,7 @@ public class SaleDataSaveReqVO { @Schema(description = "销售特征名称（票种名称）", example = "赵六") private String salepropetyvaluename; + @Schema(description = "租户编号") + private Long tenant_id; + } \ No newline at end of file diff --git a/ludu-module-ticket-manager/ludu-module-ticket-manager-biz/src/main/java/cn/iocoder/yudao/module/ticket/dal/dataobject/asset/AssetDO.java b/ludu-module-ticket-manager/ludu-module-ticket-manager-biz/src/main/java/cn/iocoder/yudao/module/ticket/dal/dataobject/asset/AssetDO.java index 3e425bb48..654400e38 100644 --- a/ludu-module-ticket-manager/ludu-module-ticket-manager-biz/src/main/java/cn/iocoder/yudao/module/ticket/dal/dataobject/asset/AssetDO.java +++ b/ludu-module-ticket-manager/ludu-module-ticket-manager-biz/src/main/java/cn/iocoder/yudao/module/ticket/dal/dataobject/asset/AssetDO.java @@ -46,12 +46,15 @@ public class AssetDO extends BaseDO { /** * 设备状态 * - * 枚举 {@link TODO asset_status_type 对应的类} + * 枚举 {asset_status_type 对应的类} */ private String isOnline; /** * 最后一次反馈时间 */ private Long lastfeedbacktime; - + /** + * 租户编号 + */ + private Long tenant_id; } \ No newline at end of file diff --git a/ludu-module-ticket-manager/ludu-module-ticket-manager-biz/src/main/java/cn/iocoder/yudao/module/ticket/dal/dataobject/checkticket/CheckTicketDO.java b/ludu-module-ticket-manager/ludu-module-ticket-manager-biz/src/main/java/cn/iocoder/yudao/module/ticket/dal/dataobject/checkticket/CheckTicketDO.java index ede1b5373..a64697590 100644 --- a/ludu-module-ticket-manager/ludu-module-ticket-manager-biz/src/main/java/cn/iocoder/yudao/module/ticket/dal/dataobject/checkticket/CheckTicketDO.java +++ b/ludu-module-ticket-manager/ludu-module-ticket-manager-biz/src/main/java/cn/iocoder/yudao/module/ticket/dal/dataobject/checkticket/CheckTicketDO.java @@ -63,5 +63,8 @@ public class CheckTicketDO extends BaseDO { * 销售特征名称（票种名称） */ private String salepropetyvaluename; - + /** + * 租户编号 + */ + private Long tenant_id; } \ No newline at end of file diff --git a/ludu-module-ticket-manager/ludu-module-ticket-manager-biz/src/main/java/cn/iocoder/yudao/module/ticket/dal/dataobject/saledata/SaleDataDO.java b/ludu-module-ticket-manager/ludu-module-ticket-manager-biz/src/main/java/cn/iocoder/yudao/module/ticket/dal/dataobject/saledata/SaleDataDO.java index e01488b92..96021dccd 100644 --- a/ludu-module-ticket-manager/ludu-module-ticket-manager-biz/src/main/java/cn/iocoder/yudao/module/ticket/dal/dataobject/saledata/SaleDataDO.java +++ b/ludu-module-ticket-manager/ludu-module-ticket-manager-biz/src/main/java/cn/iocoder/yudao/module/ticket/dal/dataobject/saledata/SaleDataDO.java @@ -90,4 +90,9 @@ public class SaleDataDO extends BaseDO { */ private String salepropetyvaluename; + /** + * 租户编号 + */ + private Long tenant_id; + } \ No newline at end of file diff --git a/pom.xml b/pom.xml index 1805916a2..adfe58568 100644 --- a/pom.xml +++ b/pom.xml @@ -19,7 +19,6 @@ ludu-module-sampling ludu-module-sampling/ludu-module-sampling-api ludu-module-sampling/ludu-module-sampling-biz - ludu-job-core ludu-job-admin ludu-job-admin/ludu-job-admin-biz diff --git a/ludu-job-core/pom.xml b/yudao-framework/ludu-job-core/pom.xml similarity index 98% rename from ludu-job-core/pom.xml rename to yudao-framework/ludu-job-core/pom.xml index 78ff2762a..52ffffeff 100644 --- a/ludu-job-core/pom.xml +++ b/yudao-framework/ludu-job-core/pom.xml @@ -2,8 +2,8 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - yudao cn.iocoder.cloud + yudao-framework ${revision} ludu-job-core diff --git a/ludu-job-core/src/main/java/com/xxl/job/core/biz/AdminBiz.java b/yudao-framework/ludu-job-core/src/main/java/com/xxl/job/core/biz/AdminBiz.java similarity index 100% rename from ludu-job-core/src/main/java/com/xxl/job/core/biz/AdminBiz.java rename to yudao-framework/ludu-job-core/src/main/java/com/xxl/job/core/biz/AdminBiz.java diff --git a/ludu-job-core/src/main/java/com/xxl/job/core/biz/ExecutorBiz.java b/yudao-framework/ludu-job-core/src/main/java/com/xxl/job/core/biz/ExecutorBiz.java similarity index 100% rename from ludu-job-core/src/main/java/com/xxl/job/core/biz/ExecutorBiz.java rename to yudao-framework/ludu-job-core/src/main/java/com/xxl/job/core/biz/ExecutorBiz.java diff --git a/ludu-job-core/src/main/java/com/xxl/job/core/biz/client/AdminBizClient.java b/yudao-framework/ludu-job-core/src/main/java/com/xxl/job/core/biz/client/AdminBizClient.java similarity index 100% rename from ludu-job-core/src/main/java/com/xxl/job/core/biz/client/AdminBizClient.java rename to yudao-framework/ludu-job-core/src/main/java/com/xxl/job/core/biz/client/AdminBizClient.java diff --git a/ludu-job-core/src/main/java/com/xxl/job/core/biz/client/ExecutorBizClient.java b/yudao-framework/ludu-job-core/src/main/java/com/xxl/job/core/biz/client/ExecutorBizClient.java similarity index 100% rename from ludu-job-core/src/main/java/com/xxl/job/core/biz/client/ExecutorBizClient.java rename to yudao-framework/ludu-job-core/src/main/java/com/xxl/job/core/biz/client/ExecutorBizClient.java diff --git a/ludu-job-core/src/main/java/com/xxl/job/core/biz/impl/ExecutorBizImpl.java b/yudao-framework/ludu-job-core/src/main/java/com/xxl/job/core/biz/impl/ExecutorBizImpl.java similarity index 100% rename from ludu-job-core/src/main/java/com/xxl/job/core/biz/impl/ExecutorBizImpl.java rename to yudao-framework/ludu-job-core/src/main/java/com/xxl/job/core/biz/impl/ExecutorBizImpl.java diff --git a/ludu-job-core/src/main/java/com/xxl/job/core/biz/model/HandleCallbackParam.java b/yudao-framework/ludu-job-core/src/main/java/com/xxl/job/core/biz/model/HandleCallbackParam.java similarity index 100% rename from ludu-job-core/src/main/java/com/xxl/job/core/biz/model/HandleCallbackParam.java rename to yudao-framework/ludu-job-core/src/main/java/com/xxl/job/core/biz/model/HandleCallbackParam.java diff --git a/ludu-job-core/src/main/java/com/xxl/job/core/biz/model/IdleBeatParam.java b/yudao-framework/ludu-job-core/src/main/java/com/xxl/job/core/biz/model/IdleBeatParam.java similarity index 100% rename from ludu-job-core/src/main/java/com/xxl/job/core/biz/model/IdleBeatParam.java rename to yudao-framework/ludu-job-core/src/main/java/com/xxl/job/core/biz/model/IdleBeatParam.java diff --git a/ludu-job-core/src/main/java/com/xxl/job/core/biz/model/KillParam.java b/yudao-framework/ludu-job-core/src/main/java/com/xxl/job/core/biz/model/KillParam.java similarity index 100% rename from ludu-job-core/src/main/java/com/xxl/job/core/biz/model/KillParam.java rename to yudao-framework/ludu-job-core/src/main/java/com/xxl/job/core/biz/model/KillParam.java diff --git a/ludu-job-core/src/main/java/com/xxl/job/core/biz/model/LogParam.java b/yudao-framework/ludu-job-core/src/main/java/com/xxl/job/core/biz/model/LogParam.java similarity index 100% rename from ludu-job-core/src/main/java/com/xxl/job/core/biz/model/LogParam.java rename to yudao-framework/ludu-job-core/src/main/java/com/xxl/job/core/biz/model/LogParam.java diff --git a/ludu-job-core/src/main/java/com/xxl/job/core/biz/model/LogResult.java b/yudao-framework/ludu-job-core/src/main/java/com/xxl/job/core/biz/model/LogResult.java similarity index 100% rename from ludu-job-core/src/main/java/com/xxl/job/core/biz/model/LogResult.java rename to yudao-framework/ludu-job-core/src/main/java/com/xxl/job/core/biz/model/LogResult.java diff --git a/ludu-job-core/src/main/java/com/xxl/job/core/biz/model/RegistryParam.java b/yudao-framework/ludu-job-core/src/main/java/com/xxl/job/core/biz/model/RegistryParam.java similarity index 100% rename from ludu-job-core/src/main/java/com/xxl/job/core/biz/model/RegistryParam.java rename to yudao-framework/ludu-job-core/src/main/java/com/xxl/job/core/biz/model/RegistryParam.java diff --git a/ludu-job-core/src/main/java/com/xxl/job/core/biz/model/ReturnT.java b/yudao-framework/ludu-job-core/src/main/java/com/xxl/job/core/biz/model/ReturnT.java similarity index 100% rename from ludu-job-core/src/main/java/com/xxl/job/core/biz/model/ReturnT.java rename to yudao-framework/ludu-job-core/src/main/java/com/xxl/job/core/biz/model/ReturnT.java diff --git a/ludu-job-core/src/main/java/com/xxl/job/core/biz/model/TriggerParam.java b/yudao-framework/ludu-job-core/src/main/java/com/xxl/job/core/biz/model/TriggerParam.java similarity index 100% rename from ludu-job-core/src/main/java/com/xxl/job/core/biz/model/TriggerParam.java rename to yudao-framework/ludu-job-core/src/main/java/com/xxl/job/core/biz/model/TriggerParam.java diff --git a/ludu-job-core/src/main/java/com/xxl/job/core/context/XxlJobContext.java b/yudao-framework/ludu-job-core/src/main/java/com/xxl/job/core/context/XxlJobContext.java similarity index 100% rename from ludu-job-core/src/main/java/com/xxl/job/core/context/XxlJobContext.java rename to yudao-framework/ludu-job-core/src/main/java/com/xxl/job/core/context/XxlJobContext.java diff --git a/ludu-job-core/src/main/java/com/xxl/job/core/context/XxlJobHelper.java b/yudao-framework/ludu-job-core/src/main/java/com/xxl/job/core/context/XxlJobHelper.java similarity index 100% rename from ludu-job-core/src/main/java/com/xxl/job/core/context/XxlJobHelper.java rename to yudao-framework/ludu-job-core/src/main/java/com/xxl/job/core/context/XxlJobHelper.java diff --git a/ludu-job-core/src/main/java/com/xxl/job/core/enums/ExecutorBlockStrategyEnum.java b/yudao-framework/ludu-job-core/src/main/java/com/xxl/job/core/enums/ExecutorBlockStrategyEnum.java similarity index 100% rename from ludu-job-core/src/main/java/com/xxl/job/core/enums/ExecutorBlockStrategyEnum.java rename to yudao-framework/ludu-job-core/src/main/java/com/xxl/job/core/enums/ExecutorBlockStrategyEnum.java diff --git a/ludu-job-core/src/main/java/com/xxl/job/core/enums/RegistryConfig.java b/yudao-framework/ludu-job-core/src/main/java/com/xxl/job/core/enums/RegistryConfig.java similarity index 100% rename from ludu-job-core/src/main/java/com/xxl/job/core/enums/RegistryConfig.java rename to yudao-framework/ludu-job-core/src/main/java/com/xxl/job/core/enums/RegistryConfig.java diff --git a/ludu-job-core/src/main/java/com/xxl/job/core/executor/XxlJobExecutor.java b/yudao-framework/ludu-job-core/src/main/java/com/xxl/job/core/executor/XxlJobExecutor.java similarity index 100% rename from ludu-job-core/src/main/java/com/xxl/job/core/executor/XxlJobExecutor.java rename to yudao-framework/ludu-job-core/src/main/java/com/xxl/job/core/executor/XxlJobExecutor.java diff --git a/ludu-job-core/src/main/java/com/xxl/job/core/executor/impl/XxlJobSimpleExecutor.java b/yudao-framework/ludu-job-core/src/main/java/com/xxl/job/core/executor/impl/XxlJobSimpleExecutor.java similarity index 100% rename from ludu-job-core/src/main/java/com/xxl/job/core/executor/impl/XxlJobSimpleExecutor.java rename to yudao-framework/ludu-job-core/src/main/java/com/xxl/job/core/executor/impl/XxlJobSimpleExecutor.java diff --git a/ludu-job-core/src/main/java/com/xxl/job/core/executor/impl/XxlJobSpringExecutor.java b/yudao-framework/ludu-job-core/src/main/java/com/xxl/job/core/executor/impl/XxlJobSpringExecutor.java similarity index 100% rename from ludu-job-core/src/main/java/com/xxl/job/core/executor/impl/XxlJobSpringExecutor.java rename to yudao-framework/ludu-job-core/src/main/java/com/xxl/job/core/executor/impl/XxlJobSpringExecutor.java diff --git a/ludu-job-core/src/main/java/com/xxl/job/core/glue/GlueFactory.java b/yudao-framework/ludu-job-core/src/main/java/com/xxl/job/core/glue/GlueFactory.java similarity index 100% rename from ludu-job-core/src/main/java/com/xxl/job/core/glue/GlueFactory.java rename to yudao-framework/ludu-job-core/src/main/java/com/xxl/job/core/glue/GlueFactory.java diff --git a/ludu-job-core/src/main/java/com/xxl/job/core/glue/GlueTypeEnum.java b/yudao-framework/ludu-job-core/src/main/java/com/xxl/job/core/glue/GlueTypeEnum.java similarity index 100% rename from ludu-job-core/src/main/java/com/xxl/job/core/glue/GlueTypeEnum.java rename to yudao-framework/ludu-job-core/src/main/java/com/xxl/job/core/glue/GlueTypeEnum.java diff --git a/ludu-job-core/src/main/java/com/xxl/job/core/glue/impl/SpringGlueFactory.java b/yudao-framework/ludu-job-core/src/main/java/com/xxl/job/core/glue/impl/SpringGlueFactory.java similarity index 100% rename from ludu-job-core/src/main/java/com/xxl/job/core/glue/impl/SpringGlueFactory.java rename to yudao-framework/ludu-job-core/src/main/java/com/xxl/job/core/glue/impl/SpringGlueFactory.java diff --git a/ludu-job-core/src/main/java/com/xxl/job/core/handler/IJobHandler.java b/yudao-framework/ludu-job-core/src/main/java/com/xxl/job/core/handler/IJobHandler.java similarity index 100% rename from ludu-job-core/src/main/java/com/xxl/job/core/handler/IJobHandler.java rename to yudao-framework/ludu-job-core/src/main/java/com/xxl/job/core/handler/IJobHandler.java diff --git a/ludu-job-core/src/main/java/com/xxl/job/core/handler/annotation/JobHandler.java b/yudao-framework/ludu-job-core/src/main/java/com/xxl/job/core/handler/annotation/JobHandler.java similarity index 100% rename from ludu-job-core/src/main/java/com/xxl/job/core/handler/annotation/JobHandler.java rename to yudao-framework/ludu-job-core/src/main/java/com/xxl/job/core/handler/annotation/JobHandler.java diff --git a/ludu-job-core/src/main/java/com/xxl/job/core/handler/annotation/XxlJob.java b/yudao-framework/ludu-job-core/src/main/java/com/xxl/job/core/handler/annotation/XxlJob.java similarity index 100% rename from ludu-job-core/src/main/java/com/xxl/job/core/handler/annotation/XxlJob.java rename to yudao-framework/ludu-job-core/src/main/java/com/xxl/job/core/handler/annotation/XxlJob.java diff --git a/ludu-job-core/src/main/java/com/xxl/job/core/handler/impl/GlueJobHandler.java b/yudao-framework/ludu-job-core/src/main/java/com/xxl/job/core/handler/impl/GlueJobHandler.java similarity index 100% rename from ludu-job-core/src/main/java/com/xxl/job/core/handler/impl/GlueJobHandler.java rename to yudao-framework/ludu-job-core/src/main/java/com/xxl/job/core/handler/impl/GlueJobHandler.java diff --git a/ludu-job-core/src/main/java/com/xxl/job/core/handler/impl/MethodJobHandler.java b/yudao-framework/ludu-job-core/src/main/java/com/xxl/job/core/handler/impl/MethodJobHandler.java similarity index 100% rename from ludu-job-core/src/main/java/com/xxl/job/core/handler/impl/MethodJobHandler.java rename to yudao-framework/ludu-job-core/src/main/java/com/xxl/job/core/handler/impl/MethodJobHandler.java diff --git a/ludu-job-core/src/main/java/com/xxl/job/core/handler/impl/ScriptJobHandler.java b/yudao-framework/ludu-job-core/src/main/java/com/xxl/job/core/handler/impl/ScriptJobHandler.java similarity index 100% rename from ludu-job-core/src/main/java/com/xxl/job/core/handler/impl/ScriptJobHandler.java rename to yudao-framework/ludu-job-core/src/main/java/com/xxl/job/core/handler/impl/ScriptJobHandler.java diff --git a/ludu-job-core/src/main/java/com/xxl/job/core/log/XxlJobFileAppender.java b/yudao-framework/ludu-job-core/src/main/java/com/xxl/job/core/log/XxlJobFileAppender.java similarity index 100% rename from ludu-job-core/src/main/java/com/xxl/job/core/log/XxlJobFileAppender.java rename to yudao-framework/ludu-job-core/src/main/java/com/xxl/job/core/log/XxlJobFileAppender.java diff --git a/ludu-job-core/src/main/java/com/xxl/job/core/server/EmbedServer.java b/yudao-framework/ludu-job-core/src/main/java/com/xxl/job/core/server/EmbedServer.java similarity index 100% rename from ludu-job-core/src/main/java/com/xxl/job/core/server/EmbedServer.java rename to yudao-framework/ludu-job-core/src/main/java/com/xxl/job/core/server/EmbedServer.java diff --git a/ludu-job-core/src/main/java/com/xxl/job/core/thread/ExecutorRegistryThread.java b/yudao-framework/ludu-job-core/src/main/java/com/xxl/job/core/thread/ExecutorRegistryThread.java similarity index 100% rename from ludu-job-core/src/main/java/com/xxl/job/core/thread/ExecutorRegistryThread.java rename to yudao-framework/ludu-job-core/src/main/java/com/xxl/job/core/thread/ExecutorRegistryThread.java diff --git a/ludu-job-core/src/main/java/com/xxl/job/core/thread/JobLogFileCleanThread.java b/yudao-framework/ludu-job-core/src/main/java/com/xxl/job/core/thread/JobLogFileCleanThread.java similarity index 100% rename from ludu-job-core/src/main/java/com/xxl/job/core/thread/JobLogFileCleanThread.java rename to yudao-framework/ludu-job-core/src/main/java/com/xxl/job/core/thread/JobLogFileCleanThread.java diff --git a/ludu-job-core/src/main/java/com/xxl/job/core/thread/JobThread.java b/yudao-framework/ludu-job-core/src/main/java/com/xxl/job/core/thread/JobThread.java similarity index 100% rename from ludu-job-core/src/main/java/com/xxl/job/core/thread/JobThread.java rename to yudao-framework/ludu-job-core/src/main/java/com/xxl/job/core/thread/JobThread.java diff --git a/ludu-job-core/src/main/java/com/xxl/job/core/thread/TriggerCallbackThread.java b/yudao-framework/ludu-job-core/src/main/java/com/xxl/job/core/thread/TriggerCallbackThread.java similarity index 100% rename from ludu-job-core/src/main/java/com/xxl/job/core/thread/TriggerCallbackThread.java rename to yudao-framework/ludu-job-core/src/main/java/com/xxl/job/core/thread/TriggerCallbackThread.java diff --git a/ludu-job-core/src/main/java/com/xxl/job/core/util/DateUtil.java b/yudao-framework/ludu-job-core/src/main/java/com/xxl/job/core/util/DateUtil.java similarity index 100% rename from ludu-job-core/src/main/java/com/xxl/job/core/util/DateUtil.java rename to yudao-framework/ludu-job-core/src/main/java/com/xxl/job/core/util/DateUtil.java diff --git a/ludu-job-core/src/main/java/com/xxl/job/core/util/FileUtil.java b/yudao-framework/ludu-job-core/src/main/java/com/xxl/job/core/util/FileUtil.java similarity index 100% rename from ludu-job-core/src/main/java/com/xxl/job/core/util/FileUtil.java rename to yudao-framework/ludu-job-core/src/main/java/com/xxl/job/core/util/FileUtil.java diff --git a/ludu-job-core/src/main/java/com/xxl/job/core/util/GsonTool.java b/yudao-framework/ludu-job-core/src/main/java/com/xxl/job/core/util/GsonTool.java similarity index 100% rename from ludu-job-core/src/main/java/com/xxl/job/core/util/GsonTool.java rename to yudao-framework/ludu-job-core/src/main/java/com/xxl/job/core/util/GsonTool.java diff --git a/ludu-job-core/src/main/java/com/xxl/job/core/util/IpUtil.java b/yudao-framework/ludu-job-core/src/main/java/com/xxl/job/core/util/IpUtil.java similarity index 100% rename from ludu-job-core/src/main/java/com/xxl/job/core/util/IpUtil.java rename to yudao-framework/ludu-job-core/src/main/java/com/xxl/job/core/util/IpUtil.java diff --git a/ludu-job-core/src/main/java/com/xxl/job/core/util/JdkSerializeTool.java b/yudao-framework/ludu-job-core/src/main/java/com/xxl/job/core/util/JdkSerializeTool.java similarity index 100% rename from ludu-job-core/src/main/java/com/xxl/job/core/util/JdkSerializeTool.java rename to yudao-framework/ludu-job-core/src/main/java/com/xxl/job/core/util/JdkSerializeTool.java diff --git a/ludu-job-core/src/main/java/com/xxl/job/core/util/NetUtil.java b/yudao-framework/ludu-job-core/src/main/java/com/xxl/job/core/util/NetUtil.java similarity index 100% rename from ludu-job-core/src/main/java/com/xxl/job/core/util/NetUtil.java rename to yudao-framework/ludu-job-core/src/main/java/com/xxl/job/core/util/NetUtil.java diff --git a/ludu-job-core/src/main/java/com/xxl/job/core/util/ScriptUtil.java b/yudao-framework/ludu-job-core/src/main/java/com/xxl/job/core/util/ScriptUtil.java similarity index 100% rename from ludu-job-core/src/main/java/com/xxl/job/core/util/ScriptUtil.java rename to yudao-framework/ludu-job-core/src/main/java/com/xxl/job/core/util/ScriptUtil.java diff --git a/ludu-job-core/src/main/java/com/xxl/job/core/util/ShardingUtil.java b/yudao-framework/ludu-job-core/src/main/java/com/xxl/job/core/util/ShardingUtil.java similarity index 100% rename from ludu-job-core/src/main/java/com/xxl/job/core/util/ShardingUtil.java rename to yudao-framework/ludu-job-core/src/main/java/com/xxl/job/core/util/ShardingUtil.java diff --git a/ludu-job-core/src/main/java/com/xxl/job/core/util/ThrowableUtil.java b/yudao-framework/ludu-job-core/src/main/java/com/xxl/job/core/util/ThrowableUtil.java similarity index 100% rename from ludu-job-core/src/main/java/com/xxl/job/core/util/ThrowableUtil.java rename to yudao-framework/ludu-job-core/src/main/java/com/xxl/job/core/util/ThrowableUtil.java diff --git a/ludu-job-core/src/main/java/com/xxl/job/core/util/XxlJobRemotingUtil.java b/yudao-framework/ludu-job-core/src/main/java/com/xxl/job/core/util/XxlJobRemotingUtil.java similarity index 100% rename from ludu-job-core/src/main/java/com/xxl/job/core/util/XxlJobRemotingUtil.java rename to yudao-framework/ludu-job-core/src/main/java/com/xxl/job/core/util/XxlJobRemotingUtil.java diff --git a/yudao-framework/pom.xml b/yudao-framework/pom.xml index 732364068..3148a9d4c 100644 --- a/yudao-framework/pom.xml +++ b/yudao-framework/pom.xml @@ -31,6 +31,7 @@ yudao-spring-boot-starter-biz-tenant yudao-spring-boot-starter-biz-data-permission yudao-spring-boot-starter-biz-ip + ludu-job-core yudao-framework diff --git a/yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/util/date/TickingDateUtils.java b/yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/util/date/TickingDateUtils.java new file mode 100644 index 000000000..672e1e019 --- /dev/null +++ b/yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/util/date/TickingDateUtils.java @@ -0,0 +1,38 @@ +package cn.iocoder.yudao.framework.common.util.date; + +import cn.hutool.core.date.DatePattern; + +import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.util.Date; + +/** + * @Description 票务模块时间工具类 + */ +public class TickingDateUtils { + // yyyyMMdd + public static final String timeFormat = DatePattern.PURE_DATE_PATTERN; + + public static SimpleDateFormat simpleDateFormat = new SimpleDateFormat(timeFormat); + + private TickingDateUtils() { + } + + public static Date parse(String time) { + Date parseDate = null; + try { + parseDate = simpleDateFormat.parse(time); + } catch (ParseException e) { + throw new RuntimeException(e); + } + return parseDate; + } + + public static String format(Date date){ + return simpleDateFormat.format(date); + } + + public static String getNowDayFormat(){ + return TickingDateUtils.format(new Date()); + } +} diff --git a/yudao-framework/yudao-spring-boot-starter-security/src/main/java/cn/iocoder/yudao/framework/security/config/YudaoWebSecurityConfigurerAdapter.java b/yudao-framework/yudao-spring-boot-starter-security/src/main/java/cn/iocoder/yudao/framework/security/config/YudaoWebSecurityConfigurerAdapter.java index f40a230f9..84fbe1213 100644 --- a/yudao-framework/yudao-spring-boot-starter-security/src/main/java/cn/iocoder/yudao/framework/security/config/YudaoWebSecurityConfigurerAdapter.java +++ b/yudao-framework/yudao-spring-boot-starter-security/src/main/java/cn/iocoder/yudao/framework/security/config/YudaoWebSecurityConfigurerAdapter.java @@ -148,6 +148,7 @@ public class YudaoWebSecurityConfigurerAdapter { // // ③：兜底规则，必须认证 // .authorizeRequests() // .anyRequest().authenticated(); + // TODO 暂时先放行，用于调度中心后台查看 httpSecurity.authorizeRequests().anyRequest().permitAll(); // 添加 Token Filter diff --git a/yudao-module-infra/yudao-module-infra-biz/pom.xml b/yudao-module-infra/yudao-module-infra-biz/pom.xml index 77b5e7900..e7adaa6ac 100644 --- a/yudao-module-infra/yudao-module-infra-biz/pom.xml +++ b/yudao-module-infra/yudao-module-infra-biz/pom.xml @@ -24,6 +24,11 @@ ludu-job-admin-api ${revision} + + cn.iocoder.cloud + ludu-job-core + ${revision} + org.springframework.cloud @@ -97,11 +102,7 @@ cn.iocoder.cloud yudao-spring-boot-starter-job - - cn.iocoder.cloud - ludu-job-core - ${revision} - + diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/job/JobController.java b/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/job/JobController.java index 10d3b6ad3..6ec7146ff 100644 --- a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/job/JobController.java +++ b/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/job/JobController.java @@ -30,8 +30,8 @@ import static cn.iocoder.yudao.framework.common.pojo.CommonResult.error; @RequestMapping("/infra/job") @Validated public class JobController { - @Resource - private JobInfoApi jobInfoApi; + /*@Resource + private JobInfoApi jobInfoApi;*/ // private static final String XXL_JOB_URL = "http://127.0.0.1:9090/xxl-job-admin"; // private static final String USERNAME = "admin"; // TODO 可以直接读取配置中的账号和密码 @@ -53,13 +53,13 @@ public class JobController { // TODO 如果登录失败，则不会有Set-Cookie的值，抛出异常，使用全局异常处理类 } }*/ - - @GetMapping("/page") + // TODO 出现未知错误 JobInfoApi 无法创建 bean + /*@GetMapping("/page") @Operation(summary = "获得定时任务分页") @PreAuthorize("@ss.hasPermission('infra:job:query')") public CommonResult> getJobPage(@RequestParam(value = "pageNo") Integer pageNo, @RequestParam(value = "pageSize") Integer pageSize, @RequestParam(required = false, value = "name") String name, @RequestParam(required = false, value = "status") Integer status, @RequestParam(required = false, value = "handlerName") String handlerName) { return jobInfoApi.getPage(pageNo, pageSize, name, status, handlerName); - } + }*/ } diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/api/address/MemberAddressApiImpl.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/api/address/MemberAddressApiImpl.java index f81b297f8..de8bb0b5f 100644 --- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/api/address/MemberAddressApiImpl.java +++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/api/address/MemberAddressApiImpl.java @@ -1,7 +1,8 @@ package cn.iocoder.yudao.module.member.api.address; import cn.iocoder.yudao.framework.common.pojo.CommonResult; -import cn.iocoder.yudao.module.member.api.address.dto.MemberAddressRespDTO; +import cn.iocoder.yudao.module.member.convert.address.MemberAddressApi; +import cn.iocoder.yudao.module.member.convert.address.dto.MemberAddressRespDTO; import cn.iocoder.yudao.module.member.convert.address.AddressConvert; import cn.iocoder.yudao.module.member.service.address.AddressService; import org.springframework.validation.annotation.Validated; diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/convert/address/AddressConvert.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/convert/address/AddressConvert.java index 39dc9fa98..783e1be6a 100644 --- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/convert/address/AddressConvert.java +++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/convert/address/AddressConvert.java @@ -1,7 +1,7 @@ package cn.iocoder.yudao.module.member.convert.address; import cn.iocoder.yudao.framework.ip.core.utils.AreaUtils; -import cn.iocoder.yudao.module.member.api.address.dto.MemberAddressRespDTO; +import cn.iocoder.yudao.module.member.convert.address.dto.MemberAddressRespDTO; import cn.iocoder.yudao.module.member.controller.admin.address.vo.AddressRespVO; import cn.iocoder.yudao.module.member.controller.app.address.vo.AppAddressCreateReqVO; import cn.iocoder.yudao.module.member.controller.app.address.vo.AppAddressRespVO; diff --git a/yudao-module-member/yudao-module-member-api/src/main/java/cn/iocoder/yudao/module/member/api/address/MemberAddressApi.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/convert/address/MemberAddressApi.java similarity index 91% rename from yudao-module-member/yudao-module-member-api/src/main/java/cn/iocoder/yudao/module/member/api/address/MemberAddressApi.java rename to yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/convert/address/MemberAddressApi.java index 5dd696a72..93648a565 100644 --- a/yudao-module-member/yudao-module-member-api/src/main/java/cn/iocoder/yudao/module/member/api/address/MemberAddressApi.java +++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/convert/address/MemberAddressApi.java @@ -1,7 +1,7 @@ -package cn.iocoder.yudao.module.member.api.address; +package cn.iocoder.yudao.module.member.convert.address; import cn.iocoder.yudao.framework.common.pojo.CommonResult; -import cn.iocoder.yudao.module.member.api.address.dto.MemberAddressRespDTO; +import cn.iocoder.yudao.module.member.convert.address.dto.MemberAddressRespDTO; import cn.iocoder.yudao.module.member.enums.ApiConstants; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; diff --git a/yudao-module-member/yudao-module-member-api/src/main/java/cn/iocoder/yudao/module/member/api/address/dto/MemberAddressRespDTO.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/convert/address/dto/MemberAddressRespDTO.java similarity index 95% rename from yudao-module-member/yudao-module-member-api/src/main/java/cn/iocoder/yudao/module/member/api/address/dto/MemberAddressRespDTO.java rename to yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/convert/address/dto/MemberAddressRespDTO.java index e2b88744a..70f375df5 100644 --- a/yudao-module-member/yudao-module-member-api/src/main/java/cn/iocoder/yudao/module/member/api/address/dto/MemberAddressRespDTO.java +++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/convert/address/dto/MemberAddressRespDTO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.member.api.address.dto; +package cn.iocoder.yudao.module.member.convert.address.dto; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data;