From f3eedd864469ff2d409019ed10db41c24094fc06 Mon Sep 17 00:00:00 2001 From: sunjiabei Date: Tue, 29 Jul 2025 16:47:58 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E9=87=91=E8=B1=86=E7=9B=AE=E5=BD=95?= =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../demo/controller/bean/BeanRechargeController.java | 13 +++++++++++++ .../com/example/demo/mapper/bean/BeanRechargeMapper.java | 14 ++++++++++++++ .../com/example/demo/service/bean/BeanRechargeService.java | 14 ++++++++++++++ .../demo/serviceImpl/bean/BeanRechargeServiceImpl.java | 13 +++++++++++++ 4 files changed, 54 insertions(+) create mode 100644 src/main/java/com/example/demo/controller/bean/BeanRechargeController.java create mode 100644 src/main/java/com/example/demo/mapper/bean/BeanRechargeMapper.java create mode 100644 src/main/java/com/example/demo/service/bean/BeanRechargeService.java create mode 100644 src/main/java/com/example/demo/serviceImpl/bean/BeanRechargeServiceImpl.java diff --git a/src/main/java/com/example/demo/controller/bean/BeanRechargeController.java b/src/main/java/com/example/demo/controller/bean/BeanRechargeController.java new file mode 100644 index 0000000..1bd711e --- /dev/null +++ b/src/main/java/com/example/demo/controller/bean/BeanRechargeController.java @@ -0,0 +1,13 @@ +package com.example.demo.controller.bean; + +/** + * @program: gold-java + * @ClassName BeanRechrageController + * @description: + * @author: Double + * @create: 2025−07-29 16:46 + * @Version 1.0 + **/ + +public class BeanRechargeController { +} diff --git a/src/main/java/com/example/demo/mapper/bean/BeanRechargeMapper.java b/src/main/java/com/example/demo/mapper/bean/BeanRechargeMapper.java new file mode 100644 index 0000000..aebf03b --- /dev/null +++ b/src/main/java/com/example/demo/mapper/bean/BeanRechargeMapper.java @@ -0,0 +1,14 @@ +package com.example.demo.mapper.bean; + + +/** + * @program: gold-java + * @ClassName BeanRechargeMapper + * @description: + * @author: Double + * @create: 2025−07-29 16:46 + * @Version 1.0 + **/ + +public interface BeanRechargeMapper { +} diff --git a/src/main/java/com/example/demo/service/bean/BeanRechargeService.java b/src/main/java/com/example/demo/service/bean/BeanRechargeService.java new file mode 100644 index 0000000..87b1e20 --- /dev/null +++ b/src/main/java/com/example/demo/service/bean/BeanRechargeService.java @@ -0,0 +1,14 @@ +package com.example.demo.service.bean; + + +/** + * @program: gold-java + * @ClassName BeanRechargeService + * @description: + * @author: Double + * @create: 2025−07-29 16:47 + * @Version 1.0 + **/ + +public interface BeanRechargeService { +} diff --git a/src/main/java/com/example/demo/serviceImpl/bean/BeanRechargeServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/bean/BeanRechargeServiceImpl.java new file mode 100644 index 0000000..e4d5d9e --- /dev/null +++ b/src/main/java/com/example/demo/serviceImpl/bean/BeanRechargeServiceImpl.java @@ -0,0 +1,13 @@ +package com.example.demo.serviceImpl.bean; + +/** + * @program: gold-java + * @ClassName BeanRechargeServiceImpl + * @description: + * @author: Double + * @create: 2025−07-29 16:47 + * @Version 1.0 + **/ + +public class BeanRechargeServiceImpl { +} From 38dc238bef66ac387f2ac85088470761e52abba0 Mon Sep 17 00:00:00 2001 From: sunjiabei Date: Tue, 29 Jul 2025 16:50:37 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E9=87=91=E8=B1=86=E7=9B=AE=E5=BD=95?= =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/example/demo/domain/vo/bean/BeanRecharge.java | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 src/main/java/com/example/demo/domain/vo/bean/BeanRecharge.java diff --git a/src/main/java/com/example/demo/domain/vo/bean/BeanRecharge.java b/src/main/java/com/example/demo/domain/vo/bean/BeanRecharge.java new file mode 100644 index 0000000..ef9c6de --- /dev/null +++ b/src/main/java/com/example/demo/domain/vo/bean/BeanRecharge.java @@ -0,0 +1,13 @@ +package com.example.demo.domain.vo.bean; + +/** + * @program: gold-java + * @ClassName BeanRecharge + * @description: + * @author: Double + * @create: 2025−07-29 16:50 + * @Version 1.0 + **/ + +public class BeanRecharge { +} From 591c5b7f2665b77517fe64284b36bd8b55eb117d Mon Sep 17 00:00:00 2001 From: sunjiabei Date: Tue, 29 Jul 2025 16:51:08 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E9=87=91=E8=B1=86=E7=9B=AE=E5=BD=95?= =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/mapper/bean/BeanRechargeMapper | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 src/main/resources/mapper/bean/BeanRechargeMapper diff --git a/src/main/resources/mapper/bean/BeanRechargeMapper b/src/main/resources/mapper/bean/BeanRechargeMapper new file mode 100644 index 0000000..e69de29 From 776170d761525cb13f03afaca990393f87de515e Mon Sep 17 00:00:00 2001 From: sunjiabei Date: Tue, 29 Jul 2025 16:57:40 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E9=87=91=E8=B1=86=E7=9B=AE=E5=BD=95?= =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/jindouMapper/BeanRechargeMapper.xml | 203 +++++++++++++++++++++ src/main/resources/mapper/bean/BeanRechargeMapper | 0 2 files changed, 203 insertions(+) create mode 100644 src/main/resources/jindouMapper/BeanRechargeMapper.xml delete mode 100644 src/main/resources/mapper/bean/BeanRechargeMapper diff --git a/src/main/resources/jindouMapper/BeanRechargeMapper.xml b/src/main/resources/jindouMapper/BeanRechargeMapper.xml new file mode 100644 index 0000000..71efa7e --- /dev/null +++ b/src/main/resources/jindouMapper/BeanRechargeMapper.xml @@ -0,0 +1,203 @@ + + + + + + + + + + + + INSERT INTO user_gold_record + + order_code, + jwcode, + activity, + sum_gold, + permanent_gold, + free_june, + free_december, + rate_id, + money, + voucher, + pay_platform, + pay_model, + pay_time, + remark, + admin_id, + type, + audit_status, + create_time + + VALUES + + #{orderCode}, + #{jwcode}, + #{activity}, + #{sumGold}, + #{permanentGold}, + #{freeJune}, + #{freeDecember}, + #{rateId}, + #{money}, + #{voucher}, + #{payPlatform}, + #{payModel}, + #{payTime}, + #{remark}, + #{adminId}, + #{type}, + #{auditStatus}, + #{createTime} + + + \ No newline at end of file diff --git a/src/main/resources/mapper/bean/BeanRechargeMapper b/src/main/resources/mapper/bean/BeanRechargeMapper deleted file mode 100644 index e69de29..0000000 From bc8928c1dabea1e9f3141cdcbf2d51708f3a0eec Mon Sep 17 00:00:00 2001 From: lijianlin Date: Tue, 29 Jul 2025 17:42:33 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E9=87=91=E5=B8=81=E7=9B=AE=E5=BD=95?= =?UTF-8?q?=E6=95=B4=E5=90=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/example/demo/Export/ExportService.java | 2 +- .../com/example/demo/Export/ExportServiceImpl.java | 10 +- .../com/example/demo/Mysql/MysqlController.java | 2 +- .../com/example/demo/Mysql/MysqlServiceImpl.java | 5 +- .../com/example/demo/Util/CacheRefreshTask.java | 4 +- .../example/demo/Util/ExecutionContextUtil.java | 2 +- .../com/example/demo/Util/ExecutionTimeAspect.java | 2 +- .../com/example/demo/Util/FeiShuAlertUtil.java | 2 +- .../java/com/example/demo/config/RedisConfig.java | 2 +- .../controller/{ => coin}/AdminController.java | 10 +- .../controller/{ => coin}/AuditController.java | 8 +- .../controller/{ => coin}/ConsumeController.java | 14 +- .../controller/{ => coin}/ExportController.java | 9 +- .../controller/{ => coin}/GeneralController.java | 10 +- .../{ => coin}/GoldDetailController.java | 13 +- .../controller/{ => coin}/MarketController.java | 6 +- .../demo/controller/{ => coin}/MenuController.java | 11 +- .../{ => coin}/PermissionController.java | 11 +- .../demo/controller/{ => coin}/RateController.java | 10 +- .../controller/{ => coin}/RechargeController.java | 7 +- .../controller/{ => coin}/RefundController.java | 8 +- .../demo/controller/{ => coin}/RoleController.java | 12 +- .../{ => coin}/StatisticsController.java | 11 +- .../demo/controller/{ => coin}/UserController.java | 10 +- .../controller/{ => coin}/WorkbenchController.java | 15 +- .../com/example/demo/domain/DTO/ConsumeDTO.java | 2 +- .../com/example/demo/domain/DTO/GoldDetailDTO.java | 2 +- .../com/example/demo/domain/DTO/RechargeDTO.java | 2 +- .../com/example/demo/domain/DTO/RefundDTO.java | 2 +- .../example/demo/domain/vo/{ => coin}/AdminVo.java | 2 +- .../vo/{ => coin}/AiEmotionExportRecordVO.java | 2 +- .../demo/domain/vo/{ => coin}/AuditRequest.java | 2 +- .../demo/domain/vo/{ => coin}/ConsumeUser.java | 2 +- .../domain/vo/{ => coin}/ExecutionContext.java | 2 +- .../demo/domain/vo/{ => coin}/ExportVo.java | 2 +- .../example/demo/domain/vo/{ => coin}/Gold.java | 2 +- .../demo/domain/vo/{ => coin}/GoldDetail.java | 2 +- .../demo/domain/vo/{ => coin}/GoldUser.java | 2 +- .../domain/vo/{ => coin}/MarketRechargeStat.java | 2 +- .../example/demo/domain/vo/{ => coin}/MenuVo.java | 2 +- .../example/demo/domain/vo/{ => coin}/Page.java | 2 +- .../demo/domain/vo/{ => coin}/Password.java | 2 +- .../demo/domain/vo/{ => coin}/Permission.java | 2 +- .../demo/domain/vo/{ => coin}/RateDetail.java | 2 +- .../demo/domain/vo/{ => coin}/RechargeAudit.java | 2 +- .../demo/domain/vo/{ => coin}/RechargeUser.java | 2 +- .../demo/domain/vo/{ => coin}/RefundAudit.java | 2 +- .../demo/domain/vo/{ => coin}/RefundUser.java | 2 +- .../example/demo/domain/vo/{ => coin}/Result.java | 2 +- .../demo/domain/vo/{ => coin}/RoleMenu.java | 2 +- .../example/demo/domain/vo/{ => coin}/RoleVo.java | 2 +- .../demo/domain/vo/{ => coin}/TestRequest.java | 2 +- .../example/demo/domain/vo/{ => coin}/Total.java | 2 +- .../demo/domain/vo/{ => coin}/WorkbenchCard.java | 2 +- .../vo/{ => coin}/WorkbenchFullStatistics.java | 2 +- .../domain/vo/{ => coin}/WorkbenchMarketCard.java | 2 +- .../domain/vo/{ => coin}/WorkbenchMarketGraph.java | 2 +- .../demo/mapper/{ => coin}/AdminMapper.java | 2 +- .../demo/mapper/{ => coin}/AiEmotionMapper.java | 4 +- .../demo/mapper/{ => coin}/AuditMapper.java | 7 +- .../demo/mapper/{ => coin}/ConsumeMapper.java | 4 +- .../demo/mapper/{ => coin}/ExportMapper.java | 5 +- .../demo/mapper/{ => coin}/GeneralMapper.java | 2 +- .../demo/mapper/{ => coin}/GoldDetailMapper.java | 6 +- .../demo/mapper/{ => coin}/MarketMapper.java | 2 +- .../example/demo/mapper/{ => coin}/MenuMapper.java | 9 +- .../demo/mapper/{ => coin}/PermissionMapper.java | 6 +- .../example/demo/mapper/{ => coin}/RateMapper.java | 4 +- .../demo/mapper/{ => coin}/RechargeMapper.java | 6 +- .../demo/mapper/{ => coin}/RefundMapper.java | 6 +- .../example/demo/mapper/{ => coin}/RoleMapper.java | 4 +- .../demo/mapper/{ => coin}/StatisticsMapper.java | 4 +- .../example/demo/mapper/{ => coin}/UserMapper.java | 7 +- .../demo/mapper/{ => coin}/WorkBenchMapper.java | 6 +- .../com/example/demo/security/SecurityConfig.java | 2 +- .../demo/service/{ => coin}/AdminService.java | 6 +- .../demo/service/{ => coin}/AiEmotionService.java | 6 +- .../demo/service/{ => coin}/AuditService.java | 8 +- .../demo/service/{ => coin}/ConsumeService.java | 9 +- .../service/{ => coin}/ExportExcelService.java | 2 +- .../demo/service/{ => coin}/GeneralService.java | 5 +- .../demo/service/{ => coin}/GoldDetailService.java | 5 +- .../demo/service/{ => coin}/MarketService.java | 2 +- .../demo/service/{ => coin}/MenuService.java | 8 +- .../demo/service/{ => coin}/PermissionService.java | 8 +- .../demo/service/{ => coin}/RateService.java | 6 +- .../demo/service/{ => coin}/RechargeService.java | 10 +- .../demo/service/{ => coin}/RefundService.java | 10 +- .../demo/service/{ => coin}/RoleService.java | 8 +- .../demo/service/{ => coin}/StatisticsService.java | 6 +- .../demo/service/{ => coin}/UserService.java | 10 +- .../demo/service/{ => coin}/WorkbenchService.java | 7 +- .../service/listen/AiEmotionExportListener.java | 4 +- .../demo/service/listen/ConsumeListener.java | 5 +- .../example/demo/service/listen/GoldListener.java | 5 +- .../demo/service/listen/RechargeListener.java | 5 +- .../demo/service/listen/RefundListener.java | 5 +- .../serviceImpl/{ => coin}/AdminServiceImpl.java | 10 +- .../{ => coin}/AiEmotionServiceImpl.java | 12 +- .../serviceImpl/{ => coin}/AuditServiceImpl.java | 22 ++- .../serviceImpl/{ => coin}/ConsumeServiceImpl.java | 20 +-- .../{ => coin}/ExportExcelServiceImpl.java | 22 +-- .../serviceImpl/{ => coin}/GeneralServiceImpl.java | 6 +- .../{ => coin}/GoldDetailServiceImpl.java | 11 +- .../serviceImpl/{ => coin}/MarketServiceImpl.java | 8 +- .../serviceImpl/{ => coin}/MenuServiceImpl.java | 16 +- .../{ => coin}/PermissionServiceImpl.java | 18 +- .../serviceImpl/{ => coin}/RateServiceImpl.java | 12 +- .../{ => coin}/RechargeServiceImpl.java | 16 +- .../serviceImpl/{ => coin}/RefundServiceImpl.java | 19 +- .../serviceImpl/{ => coin}/RoleServiceImpl.java | 21 +-- .../{ => coin}/StatisticsServiceImpl.java | 11 +- .../{ => coin}/UserDetailServiceImpl.java | 4 +- .../serviceImpl/{ => coin}/UserServiceImpl.java | 16 +- .../{ => coin}/WorkbenchServiceImpl.java | 19 +- .../resources/jindouMapper/BeanRechargeMapper.xml | 199 +-------------------- src/main/resources/mapper/AdminMapper.xml | 2 +- src/main/resources/mapper/AiEmotionMapper.xml | 4 +- src/main/resources/mapper/AuditMapper.xml | 6 +- src/main/resources/mapper/ConsumeMapper.xml | 8 +- src/main/resources/mapper/ExportMapper.xml | 4 +- src/main/resources/mapper/GeneralMapper.xml | 2 +- src/main/resources/mapper/GoldDetailMapper.xml | 10 +- src/main/resources/mapper/MarketMapper.xml | 2 +- src/main/resources/mapper/MenuMapper.xml | 4 +- src/main/resources/mapper/PermissionMapper.xml | 4 +- src/main/resources/mapper/RateMapper.xml | 4 +- src/main/resources/mapper/RechargeMapper.xml | 6 +- src/main/resources/mapper/RefundMapper.xml | 8 +- src/main/resources/mapper/RoleMapper.xml | 12 +- src/main/resources/mapper/StatisticsMapper.xml | 2 +- src/main/resources/mapper/UserMapper.xml | 8 +- src/main/resources/mapper/WorkBenchMapper.xml | 6 +- 133 files changed, 376 insertions(+), 664 deletions(-) rename src/main/java/com/example/demo/controller/{ => coin}/AdminController.java (92%) rename src/main/java/com/example/demo/controller/{ => coin}/AuditController.java (96%) rename src/main/java/com/example/demo/controller/{ => coin}/ConsumeController.java (93%) rename src/main/java/com/example/demo/controller/{ => coin}/ExportController.java (94%) rename src/main/java/com/example/demo/controller/{ => coin}/GeneralController.java (89%) rename src/main/java/com/example/demo/controller/{ => coin}/GoldDetailController.java (96%) rename src/main/java/com/example/demo/controller/{ => coin}/MarketController.java (81%) rename src/main/java/com/example/demo/controller/{ => coin}/MenuController.java (81%) rename src/main/java/com/example/demo/controller/{ => coin}/PermissionController.java (93%) rename src/main/java/com/example/demo/controller/{ => coin}/RateController.java (88%) rename src/main/java/com/example/demo/controller/{ => coin}/RechargeController.java (96%) rename src/main/java/com/example/demo/controller/{ => coin}/RefundController.java (96%) rename src/main/java/com/example/demo/controller/{ => coin}/RoleController.java (91%) rename src/main/java/com/example/demo/controller/{ => coin}/StatisticsController.java (83%) rename src/main/java/com/example/demo/controller/{ => coin}/UserController.java (89%) rename src/main/java/com/example/demo/controller/{ => coin}/WorkbenchController.java (87%) rename src/main/java/com/example/demo/domain/vo/{ => coin}/AdminVo.java (98%) rename src/main/java/com/example/demo/domain/vo/{ => coin}/AiEmotionExportRecordVO.java (93%) rename src/main/java/com/example/demo/domain/vo/{ => coin}/AuditRequest.java (91%) rename src/main/java/com/example/demo/domain/vo/{ => coin}/ConsumeUser.java (98%) rename src/main/java/com/example/demo/domain/vo/{ => coin}/ExecutionContext.java (92%) rename src/main/java/com/example/demo/domain/vo/{ => coin}/ExportVo.java (90%) rename src/main/java/com/example/demo/domain/vo/{ => coin}/Gold.java (94%) rename src/main/java/com/example/demo/domain/vo/{ => coin}/GoldDetail.java (98%) rename src/main/java/com/example/demo/domain/vo/{ => coin}/GoldUser.java (98%) rename src/main/java/com/example/demo/domain/vo/{ => coin}/MarketRechargeStat.java (90%) rename src/main/java/com/example/demo/domain/vo/{ => coin}/MenuVo.java (93%) rename src/main/java/com/example/demo/domain/vo/{ => coin}/Page.java (94%) rename src/main/java/com/example/demo/domain/vo/{ => coin}/Password.java (92%) rename src/main/java/com/example/demo/domain/vo/{ => coin}/Permission.java (94%) rename src/main/java/com/example/demo/domain/vo/{ => coin}/RateDetail.java (95%) rename src/main/java/com/example/demo/domain/vo/{ => coin}/RechargeAudit.java (98%) rename src/main/java/com/example/demo/domain/vo/{ => coin}/RechargeUser.java (98%) rename src/main/java/com/example/demo/domain/vo/{ => coin}/RefundAudit.java (98%) rename src/main/java/com/example/demo/domain/vo/{ => coin}/RefundUser.java (98%) rename src/main/java/com/example/demo/domain/vo/{ => coin}/Result.java (98%) rename src/main/java/com/example/demo/domain/vo/{ => coin}/RoleMenu.java (88%) rename src/main/java/com/example/demo/domain/vo/{ => coin}/RoleVo.java (96%) rename src/main/java/com/example/demo/domain/vo/{ => coin}/TestRequest.java (88%) rename src/main/java/com/example/demo/domain/vo/{ => coin}/Total.java (91%) rename src/main/java/com/example/demo/domain/vo/{ => coin}/WorkbenchCard.java (96%) rename src/main/java/com/example/demo/domain/vo/{ => coin}/WorkbenchFullStatistics.java (95%) rename src/main/java/com/example/demo/domain/vo/{ => coin}/WorkbenchMarketCard.java (98%) rename src/main/java/com/example/demo/domain/vo/{ => coin}/WorkbenchMarketGraph.java (95%) rename src/main/java/com/example/demo/mapper/{ => coin}/AdminMapper.java (93%) rename src/main/java/com/example/demo/mapper/{ => coin}/AiEmotionMapper.java (85%) rename src/main/java/com/example/demo/mapper/{ => coin}/AuditMapper.java (89%) rename src/main/java/com/example/demo/mapper/{ => coin}/ConsumeMapper.java (89%) rename src/main/java/com/example/demo/mapper/{ => coin}/ExportMapper.java (81%) rename src/main/java/com/example/demo/mapper/{ => coin}/GeneralMapper.java (94%) rename src/main/java/com/example/demo/mapper/{ => coin}/GoldDetailMapper.java (90%) rename src/main/java/com/example/demo/mapper/{ => coin}/MarketMapper.java (77%) rename src/main/java/com/example/demo/mapper/{ => coin}/MenuMapper.java (76%) rename src/main/java/com/example/demo/mapper/{ => coin}/PermissionMapper.java (86%) rename src/main/java/com/example/demo/mapper/{ => coin}/RateMapper.java (75%) rename src/main/java/com/example/demo/mapper/{ => coin}/RechargeMapper.java (79%) rename src/main/java/com/example/demo/mapper/{ => coin}/RefundMapper.java (82%) rename src/main/java/com/example/demo/mapper/{ => coin}/RoleMapper.java (92%) rename src/main/java/com/example/demo/mapper/{ => coin}/StatisticsMapper.java (97%) rename src/main/java/com/example/demo/mapper/{ => coin}/UserMapper.java (89%) rename src/main/java/com/example/demo/mapper/{ => coin}/WorkBenchMapper.java (93%) rename src/main/java/com/example/demo/service/{ => coin}/AdminService.java (80%) rename src/main/java/com/example/demo/service/{ => coin}/AiEmotionService.java (68%) rename src/main/java/com/example/demo/service/{ => coin}/AuditService.java (82%) rename src/main/java/com/example/demo/service/{ => coin}/ConsumeService.java (74%) rename src/main/java/com/example/demo/service/{ => coin}/ExportExcelService.java (93%) rename src/main/java/com/example/demo/service/{ => coin}/GeneralService.java (91%) rename src/main/java/com/example/demo/service/{ => coin}/GoldDetailService.java (91%) rename src/main/java/com/example/demo/service/{ => coin}/MarketService.java (87%) rename src/main/java/com/example/demo/service/{ => coin}/MenuService.java (69%) rename src/main/java/com/example/demo/service/{ => coin}/PermissionService.java (83%) rename src/main/java/com/example/demo/service/{ => coin}/RateService.java (67%) rename src/main/java/com/example/demo/service/{ => coin}/RechargeService.java (73%) rename src/main/java/com/example/demo/service/{ => coin}/RefundService.java (77%) rename src/main/java/com/example/demo/service/{ => coin}/RoleService.java (80%) rename src/main/java/com/example/demo/service/{ => coin}/StatisticsService.java (84%) rename src/main/java/com/example/demo/service/{ => coin}/UserService.java (76%) rename src/main/java/com/example/demo/service/{ => coin}/WorkbenchService.java (90%) rename src/main/java/com/example/demo/serviceImpl/{ => coin}/AdminServiceImpl.java (97%) rename src/main/java/com/example/demo/serviceImpl/{ => coin}/AiEmotionServiceImpl.java (71%) rename src/main/java/com/example/demo/serviceImpl/{ => coin}/AuditServiceImpl.java (94%) rename src/main/java/com/example/demo/serviceImpl/{ => coin}/ConsumeServiceImpl.java (93%) rename src/main/java/com/example/demo/serviceImpl/{ => coin}/ExportExcelServiceImpl.java (98%) rename src/main/java/com/example/demo/serviceImpl/{ => coin}/GeneralServiceImpl.java (97%) rename src/main/java/com/example/demo/serviceImpl/{ => coin}/GoldDetailServiceImpl.java (97%) rename src/main/java/com/example/demo/serviceImpl/{ => coin}/MarketServiceImpl.java (87%) rename src/main/java/com/example/demo/serviceImpl/{ => coin}/MenuServiceImpl.java (94%) rename src/main/java/com/example/demo/serviceImpl/{ => coin}/PermissionServiceImpl.java (93%) rename src/main/java/com/example/demo/serviceImpl/{ => coin}/RateServiceImpl.java (79%) rename src/main/java/com/example/demo/serviceImpl/{ => coin}/RechargeServiceImpl.java (91%) rename src/main/java/com/example/demo/serviceImpl/{ => coin}/RefundServiceImpl.java (93%) rename src/main/java/com/example/demo/serviceImpl/{ => coin}/RoleServiceImpl.java (94%) rename src/main/java/com/example/demo/serviceImpl/{ => coin}/StatisticsServiceImpl.java (89%) rename src/main/java/com/example/demo/serviceImpl/{ => coin}/UserDetailServiceImpl.java (91%) rename src/main/java/com/example/demo/serviceImpl/{ => coin}/UserServiceImpl.java (87%) rename src/main/java/com/example/demo/serviceImpl/{ => coin}/WorkbenchServiceImpl.java (97%) diff --git a/src/main/java/com/example/demo/Export/ExportService.java b/src/main/java/com/example/demo/Export/ExportService.java index f8a35ad..6598c9b 100644 --- a/src/main/java/com/example/demo/Export/ExportService.java +++ b/src/main/java/com/example/demo/Export/ExportService.java @@ -4,7 +4,7 @@ import com.example.demo.domain.DTO.ConsumeDTO; import com.example.demo.domain.DTO.GoldDetailDTO; import com.example.demo.domain.DTO.RechargeDTO; import com.example.demo.domain.DTO.RefundDTO; -import com.example.demo.domain.vo.Result; +import com.example.demo.domain.vo.coin.Result; /** * @program: GOLD diff --git a/src/main/java/com/example/demo/Export/ExportServiceImpl.java b/src/main/java/com/example/demo/Export/ExportServiceImpl.java index b3aeaf9..adf13eb 100644 --- a/src/main/java/com/example/demo/Export/ExportServiceImpl.java +++ b/src/main/java/com/example/demo/Export/ExportServiceImpl.java @@ -5,13 +5,11 @@ import com.example.demo.domain.DTO.ConsumeDTO; import com.example.demo.domain.DTO.RechargeDTO; import com.example.demo.domain.DTO.RefundDTO; import com.example.demo.domain.entity.Admin; -import com.example.demo.domain.entity.User; -import com.example.demo.domain.vo.Result; +import com.example.demo.domain.vo.coin.Result; import com.example.demo.exception.SystemException; -import com.example.demo.mapper.GoldDetailMapper; +import com.example.demo.mapper.coin.GoldDetailMapper; import com.example.demo.Util.RedisUtil; -import com.example.demo.service.AdminService; -import com.example.demo.service.UserService; +import com.example.demo.service.coin.AdminService; import com.fasterxml.jackson.databind.ObjectMapper; import jakarta.servlet.http.HttpServletRequest; import org.springframework.beans.factory.annotation.Autowired; @@ -25,8 +23,6 @@ import java.time.format.DateTimeFormatter; import java.util.HashMap; import java.util.Map; -import static net.sf.jsqlparser.util.validation.metadata.NamedObject.user; - /** * @program: GOLD * @ClassName ExportServiceImpl diff --git a/src/main/java/com/example/demo/Mysql/MysqlController.java b/src/main/java/com/example/demo/Mysql/MysqlController.java index 6bd0bd8..65352ed 100644 --- a/src/main/java/com/example/demo/Mysql/MysqlController.java +++ b/src/main/java/com/example/demo/Mysql/MysqlController.java @@ -1,6 +1,6 @@ package com.example.demo.Mysql; -import com.example.demo.domain.vo.Result; +import com.example.demo.domain.vo.coin.Result; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/main/java/com/example/demo/Mysql/MysqlServiceImpl.java b/src/main/java/com/example/demo/Mysql/MysqlServiceImpl.java index 0a89bb8..fb0cb06 100644 --- a/src/main/java/com/example/demo/Mysql/MysqlServiceImpl.java +++ b/src/main/java/com/example/demo/Mysql/MysqlServiceImpl.java @@ -3,15 +3,14 @@ package com.example.demo.Mysql; import com.example.demo.Util.BaseDES; import com.example.demo.domain.entity.User; -import com.example.demo.service.AdminService; -import com.example.demo.service.UserService; +import com.example.demo.service.coin.AdminService; +import com.example.demo.service.coin.UserService; import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.boot.autoconfigure.security.SecurityProperties; import org.springframework.http.*; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Service; diff --git a/src/main/java/com/example/demo/Util/CacheRefreshTask.java b/src/main/java/com/example/demo/Util/CacheRefreshTask.java index 87aef3b..fd4c6c3 100644 --- a/src/main/java/com/example/demo/Util/CacheRefreshTask.java +++ b/src/main/java/com/example/demo/Util/CacheRefreshTask.java @@ -1,7 +1,7 @@ package com.example.demo.Util; -import com.example.demo.service.GeneralService; -import com.example.demo.service.WorkbenchService; +import com.example.demo.service.coin.GeneralService; +import com.example.demo.service.coin.WorkbenchService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/main/java/com/example/demo/Util/ExecutionContextUtil.java b/src/main/java/com/example/demo/Util/ExecutionContextUtil.java index 10bafa4..3fcd681 100644 --- a/src/main/java/com/example/demo/Util/ExecutionContextUtil.java +++ b/src/main/java/com/example/demo/Util/ExecutionContextUtil.java @@ -1,7 +1,7 @@ package com.example.demo.Util; -import com.example.demo.domain.vo.ExecutionContext; +import com.example.demo.domain.vo.coin.ExecutionContext; import jakarta.servlet.http.HttpServletRequest; import org.springframework.web.context.request.RequestContextHolder; import org.springframework.web.context.request.ServletRequestAttributes; diff --git a/src/main/java/com/example/demo/Util/ExecutionTimeAspect.java b/src/main/java/com/example/demo/Util/ExecutionTimeAspect.java index 201ee1b..2f305cf 100644 --- a/src/main/java/com/example/demo/Util/ExecutionTimeAspect.java +++ b/src/main/java/com/example/demo/Util/ExecutionTimeAspect.java @@ -18,7 +18,7 @@ import org.springframework.stereotype.Component; @Component public class ExecutionTimeAspect { - @Around("execution(* com.example.demo.serviceImpl.WorkbenchServiceImpl.*(..))") + @Around("execution(* com.example.demo.serviceImpl.coin.WorkbenchServiceImpl.*(..))") public Object logExecutionTime(ProceedingJoinPoint joinPoint) throws Throwable { long start = System.currentTimeMillis(); Object proceed = joinPoint.proceed(); diff --git a/src/main/java/com/example/demo/Util/FeiShuAlertUtil.java b/src/main/java/com/example/demo/Util/FeiShuAlertUtil.java index 45e1401..2cd59cf 100644 --- a/src/main/java/com/example/demo/Util/FeiShuAlertUtil.java +++ b/src/main/java/com/example/demo/Util/FeiShuAlertUtil.java @@ -2,7 +2,7 @@ package com.example.demo.Util; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; -import com.example.demo.domain.vo.ExecutionContext; +import com.example.demo.domain.vo.coin.ExecutionContext; import com.example.demo.config.EnvConfig; import org.apache.http.HttpResponse; import org.apache.http.HttpStatus; diff --git a/src/main/java/com/example/demo/config/RedisConfig.java b/src/main/java/com/example/demo/config/RedisConfig.java index a019ee2..74c59ae 100644 --- a/src/main/java/com/example/demo/config/RedisConfig.java +++ b/src/main/java/com/example/demo/config/RedisConfig.java @@ -1,7 +1,7 @@ package com.example.demo.config; -import com.example.demo.domain.vo.WorkbenchCard; +import com.example.demo.domain.vo.coin.WorkbenchCard; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.cache.CacheProperties; import org.springframework.boot.context.properties.EnableConfigurationProperties; diff --git a/src/main/java/com/example/demo/controller/AdminController.java b/src/main/java/com/example/demo/controller/coin/AdminController.java similarity index 92% rename from src/main/java/com/example/demo/controller/AdminController.java rename to src/main/java/com/example/demo/controller/coin/AdminController.java index c95afe1..cad2616 100644 --- a/src/main/java/com/example/demo/controller/AdminController.java +++ b/src/main/java/com/example/demo/controller/coin/AdminController.java @@ -1,11 +1,11 @@ -package com.example.demo.controller; +package com.example.demo.controller.coin; import com.example.demo.Util.JWTUtil; import com.example.demo.domain.entity.Admin; -import com.example.demo.domain.vo.Password; -import com.example.demo.domain.vo.Result; -import com.example.demo.mapper.AdminMapper; -import com.example.demo.service.AdminService; +import com.example.demo.domain.vo.coin.Password; +import com.example.demo.domain.vo.coin.Result; +import com.example.demo.mapper.coin.AdminMapper; +import com.example.demo.service.coin.AdminService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/main/java/com/example/demo/controller/AuditController.java b/src/main/java/com/example/demo/controller/coin/AuditController.java similarity index 96% rename from src/main/java/com/example/demo/controller/AuditController.java rename to src/main/java/com/example/demo/controller/coin/AuditController.java index 1a0df66..82a89d8 100644 --- a/src/main/java/com/example/demo/controller/AuditController.java +++ b/src/main/java/com/example/demo/controller/coin/AuditController.java @@ -1,20 +1,18 @@ -package com.example.demo.controller; +package com.example.demo.controller.coin; import com.example.demo.Util.JWTUtil; import com.example.demo.domain.entity.Admin; -import com.example.demo.domain.vo.*; -import com.example.demo.service.AuditService; +import com.example.demo.service.coin.AuditService; import com.github.pagehelper.PageInfo; import jakarta.servlet.http.HttpServletRequest; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.ResponseEntity; -import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.*; import org.springframework.web.context.request.RequestContextHolder; import org.springframework.web.context.request.ServletRequestAttributes; - +import com.example.demo.domain.vo.coin.*; import java.util.Arrays; import java.util.List; diff --git a/src/main/java/com/example/demo/controller/ConsumeController.java b/src/main/java/com/example/demo/controller/coin/ConsumeController.java similarity index 93% rename from src/main/java/com/example/demo/controller/ConsumeController.java rename to src/main/java/com/example/demo/controller/coin/ConsumeController.java index 63d0709..f89a901 100644 --- a/src/main/java/com/example/demo/controller/ConsumeController.java +++ b/src/main/java/com/example/demo/controller/coin/ConsumeController.java @@ -1,15 +1,13 @@ -package com.example.demo.controller; +package com.example.demo.controller.coin; import com.example.demo.Util.JWTUtil; import com.example.demo.domain.entity.Admin; -import com.example.demo.domain.entity.UserGoldRecord; -import com.example.demo.domain.vo.ConsumeUser; -import com.example.demo.domain.vo.Gold; -import com.example.demo.domain.vo.Page; -import com.example.demo.domain.vo.Result; -import com.example.demo.service.ConsumeService; +import com.example.demo.domain.vo.coin.ConsumeUser; +import com.example.demo.domain.vo.coin.Gold; +import com.example.demo.domain.vo.coin.Page; +import com.example.demo.domain.vo.coin.Result; +import com.example.demo.service.coin.ConsumeService; import jakarta.servlet.http.HttpServletRequest; -import jakarta.validation.Valid; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/main/java/com/example/demo/controller/ExportController.java b/src/main/java/com/example/demo/controller/coin/ExportController.java similarity index 94% rename from src/main/java/com/example/demo/controller/ExportController.java rename to src/main/java/com/example/demo/controller/coin/ExportController.java index f4f4408..17c8462 100644 --- a/src/main/java/com/example/demo/controller/ExportController.java +++ b/src/main/java/com/example/demo/controller/coin/ExportController.java @@ -1,4 +1,4 @@ -package com.example.demo.controller; +package com.example.demo.controller.coin; import com.example.demo.Util.BusinessException; import com.example.demo.Util.JWTUtil; @@ -8,9 +8,9 @@ import com.example.demo.domain.DTO.RechargeDTO; import com.example.demo.domain.DTO.RefundDTO; import com.example.demo.domain.entity.Admin; import com.example.demo.domain.entity.Export; -import com.example.demo.domain.vo.Result; -import com.example.demo.service.ExportExcelService; -import com.example.demo.service.GoldDetailService; +import com.example.demo.domain.vo.coin.Result; +import com.example.demo.service.coin.ExportExcelService; +import com.example.demo.service.coin.GoldDetailService; import com.example.demo.Export.ExportService; import jakarta.validation.Valid; import lombok.RequiredArgsConstructor; @@ -19,7 +19,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.core.userdetails.UserDetails; import org.springframework.web.bind.annotation.*; -import java.util.List; import java.util.UUID; /** diff --git a/src/main/java/com/example/demo/controller/GeneralController.java b/src/main/java/com/example/demo/controller/coin/GeneralController.java similarity index 89% rename from src/main/java/com/example/demo/controller/GeneralController.java rename to src/main/java/com/example/demo/controller/coin/GeneralController.java index b7af0fb..9ab2863 100644 --- a/src/main/java/com/example/demo/controller/GeneralController.java +++ b/src/main/java/com/example/demo/controller/coin/GeneralController.java @@ -1,9 +1,9 @@ -package com.example.demo.controller; +package com.example.demo.controller.coin; -import com.example.demo.domain.vo.AdminVo; -import com.example.demo.domain.vo.Result; -import com.example.demo.domain.vo.RoleVo; -import com.example.demo.service.GeneralService; +import com.example.demo.domain.vo.coin.AdminVo; +import com.example.demo.domain.vo.coin.Result; +import com.example.demo.domain.vo.coin.RoleVo; +import com.example.demo.service.coin.GeneralService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/main/java/com/example/demo/controller/GoldDetailController.java b/src/main/java/com/example/demo/controller/coin/GoldDetailController.java similarity index 96% rename from src/main/java/com/example/demo/controller/GoldDetailController.java rename to src/main/java/com/example/demo/controller/coin/GoldDetailController.java index 7a7aad6..e3ace4b 100644 --- a/src/main/java/com/example/demo/controller/GoldDetailController.java +++ b/src/main/java/com/example/demo/controller/coin/GoldDetailController.java @@ -1,4 +1,4 @@ -package com.example.demo.controller; +package com.example.demo.controller.coin; import com.example.demo.Util.BusinessException; import com.example.demo.Util.JWTUtil; @@ -7,11 +7,11 @@ import com.example.demo.domain.DTO.GoldDetailDTO; import com.example.demo.domain.DTO.GoldUserDTO; import com.example.demo.domain.entity.Admin; import com.example.demo.domain.entity.User; -import com.example.demo.domain.vo.GoldDetail; -import com.example.demo.domain.vo.Page; -import com.example.demo.domain.vo.Result; -import com.example.demo.service.GoldDetailService; -import com.example.demo.serviceImpl.AiEmotionServiceImpl; +import com.example.demo.domain.vo.coin.GoldDetail; +import com.example.demo.domain.vo.coin.Page; +import com.example.demo.domain.vo.coin.Result; +import com.example.demo.service.coin.GoldDetailService; +import com.example.demo.serviceImpl.coin.AiEmotionServiceImpl; import jakarta.servlet.http.HttpServletRequest; import jakarta.validation.Valid; import lombok.RequiredArgsConstructor; @@ -24,7 +24,6 @@ import org.springframework.web.context.request.RequestContextHolder; import org.springframework.web.context.request.ServletRequestAttributes; import java.util.Arrays; -import java.util.Collections; import java.util.List; import java.util.UUID; diff --git a/src/main/java/com/example/demo/controller/MarketController.java b/src/main/java/com/example/demo/controller/coin/MarketController.java similarity index 81% rename from src/main/java/com/example/demo/controller/MarketController.java rename to src/main/java/com/example/demo/controller/coin/MarketController.java index afd8bc8..c69eb43 100644 --- a/src/main/java/com/example/demo/controller/MarketController.java +++ b/src/main/java/com/example/demo/controller/coin/MarketController.java @@ -1,7 +1,7 @@ -package com.example.demo.controller; +package com.example.demo.controller.coin; -import com.example.demo.domain.vo.Result; -import com.example.demo.service.MarketService; +import com.example.demo.domain.vo.coin.Result; +import com.example.demo.service.coin.MarketService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/main/java/com/example/demo/controller/MenuController.java b/src/main/java/com/example/demo/controller/coin/MenuController.java similarity index 81% rename from src/main/java/com/example/demo/controller/MenuController.java rename to src/main/java/com/example/demo/controller/coin/MenuController.java index 5ddbae0..baba959 100644 --- a/src/main/java/com/example/demo/controller/MenuController.java +++ b/src/main/java/com/example/demo/controller/coin/MenuController.java @@ -1,13 +1,12 @@ -package com.example.demo.controller; +package com.example.demo.controller.coin; -import com.example.demo.domain.vo.MenuVo; -import com.example.demo.domain.vo.Result; -import com.example.demo.domain.vo.RoleVo; -import com.example.demo.service.MenuService; +import com.example.demo.domain.vo.coin.MenuVo; +import com.example.demo.domain.vo.coin.Result; +import com.example.demo.domain.vo.coin.RoleVo; +import com.example.demo.service.coin.MenuService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.*; import java.util.List; diff --git a/src/main/java/com/example/demo/controller/PermissionController.java b/src/main/java/com/example/demo/controller/coin/PermissionController.java similarity index 93% rename from src/main/java/com/example/demo/controller/PermissionController.java rename to src/main/java/com/example/demo/controller/coin/PermissionController.java index b3482f4..46510f9 100644 --- a/src/main/java/com/example/demo/controller/PermissionController.java +++ b/src/main/java/com/example/demo/controller/coin/PermissionController.java @@ -1,13 +1,12 @@ -package com.example.demo.controller; +package com.example.demo.controller.coin; import com.example.demo.Util.JWTUtil; import com.example.demo.domain.entity.Admin; import com.example.demo.domain.entity.AdminRole; -import com.example.demo.domain.vo.AdminVo; -import com.example.demo.domain.vo.Page; -import com.example.demo.domain.vo.Permission; -import com.example.demo.domain.vo.Result; -import com.example.demo.service.PermissionService; +import com.example.demo.domain.vo.coin.AdminVo; +import com.example.demo.domain.vo.coin.Page; +import com.example.demo.domain.vo.coin.Result; +import com.example.demo.service.coin.PermissionService; import jakarta.servlet.http.HttpServletRequest; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/example/demo/controller/RateController.java b/src/main/java/com/example/demo/controller/coin/RateController.java similarity index 88% rename from src/main/java/com/example/demo/controller/RateController.java rename to src/main/java/com/example/demo/controller/coin/RateController.java index 847c82c..06ae901 100644 --- a/src/main/java/com/example/demo/controller/RateController.java +++ b/src/main/java/com/example/demo/controller/coin/RateController.java @@ -1,16 +1,14 @@ -package com.example.demo.controller; +package com.example.demo.controller.coin; import com.example.demo.domain.entity.Rate; -import com.example.demo.domain.vo.Page; -import com.example.demo.domain.vo.Result; -import com.example.demo.mapper.RateMapper; -import com.example.demo.service.RateService; +import com.example.demo.domain.vo.coin.Page; +import com.example.demo.domain.vo.coin.Result; +import com.example.demo.service.coin.RateService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.ObjectUtils; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; import java.math.BigDecimal; diff --git a/src/main/java/com/example/demo/controller/RechargeController.java b/src/main/java/com/example/demo/controller/coin/RechargeController.java similarity index 96% rename from src/main/java/com/example/demo/controller/RechargeController.java rename to src/main/java/com/example/demo/controller/coin/RechargeController.java index eef30d8..9552fb5 100644 --- a/src/main/java/com/example/demo/controller/RechargeController.java +++ b/src/main/java/com/example/demo/controller/coin/RechargeController.java @@ -1,10 +1,9 @@ -package com.example.demo.controller; +package com.example.demo.controller.coin; import com.example.demo.Util.JWTUtil; import com.example.demo.domain.entity.Admin; -import com.example.demo.domain.vo.*; -import com.example.demo.service.ConsumeService; -import com.example.demo.service.RechargeService; +import com.example.demo.domain.vo.coin.*; +import com.example.demo.service.coin.RechargeService; import jakarta.servlet.http.HttpServletRequest; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/example/demo/controller/RefundController.java b/src/main/java/com/example/demo/controller/coin/RefundController.java similarity index 96% rename from src/main/java/com/example/demo/controller/RefundController.java rename to src/main/java/com/example/demo/controller/coin/RefundController.java index 06710c2..e730265 100644 --- a/src/main/java/com/example/demo/controller/RefundController.java +++ b/src/main/java/com/example/demo/controller/coin/RefundController.java @@ -1,10 +1,8 @@ -package com.example.demo.controller; +package com.example.demo.controller.coin; import com.example.demo.Util.JWTUtil; import com.example.demo.domain.entity.Admin; -import com.example.demo.domain.vo.*; -import com.example.demo.service.ConsumeService; -import com.example.demo.service.RefundService; +import com.example.demo.service.coin.RefundService; import jakarta.servlet.http.HttpServletRequest; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -13,7 +11,7 @@ import org.springframework.util.ObjectUtils; import org.springframework.web.bind.annotation.*; import org.springframework.web.context.request.RequestContextHolder; import org.springframework.web.context.request.ServletRequestAttributes; - +import com.example.demo.domain.vo.coin.*; import java.util.Arrays; import java.util.List; diff --git a/src/main/java/com/example/demo/controller/RoleController.java b/src/main/java/com/example/demo/controller/coin/RoleController.java similarity index 91% rename from src/main/java/com/example/demo/controller/RoleController.java rename to src/main/java/com/example/demo/controller/coin/RoleController.java index 3dc466d..72663cb 100644 --- a/src/main/java/com/example/demo/controller/RoleController.java +++ b/src/main/java/com/example/demo/controller/coin/RoleController.java @@ -1,13 +1,11 @@ -package com.example.demo.controller; +package com.example.demo.controller.coin; import com.example.demo.Util.JWTUtil; import com.example.demo.domain.entity.Admin; -import com.example.demo.domain.entity.Role; -import com.example.demo.domain.vo.Page; -import com.example.demo.domain.vo.Result; -import com.example.demo.domain.vo.RoleVo; -import com.example.demo.service.RefundService; -import com.example.demo.service.RoleService; +import com.example.demo.domain.vo.coin.Page; +import com.example.demo.domain.vo.coin.Result; +import com.example.demo.domain.vo.coin.RoleVo; +import com.example.demo.service.coin.RoleService; import jakarta.servlet.http.HttpServletRequest; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/example/demo/controller/StatisticsController.java b/src/main/java/com/example/demo/controller/coin/StatisticsController.java similarity index 83% rename from src/main/java/com/example/demo/controller/StatisticsController.java rename to src/main/java/com/example/demo/controller/coin/StatisticsController.java index 0b9e37f..20c2f44 100644 --- a/src/main/java/com/example/demo/controller/StatisticsController.java +++ b/src/main/java/com/example/demo/controller/coin/StatisticsController.java @@ -1,9 +1,7 @@ -package com.example.demo.controller; +package com.example.demo.controller.coin; -import com.example.demo.domain.entity.Statistics; -import com.example.demo.domain.vo.Result; -import com.example.demo.service.GeneralService; -import com.example.demo.service.StatisticsService; +import com.example.demo.service.coin.GeneralService; +import com.example.demo.service.coin.StatisticsService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; @@ -12,9 +10,6 @@ import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import java.util.Date; -import java.util.List; - /** * @program: gold-java * @ClassName StatisticsController diff --git a/src/main/java/com/example/demo/controller/UserController.java b/src/main/java/com/example/demo/controller/coin/UserController.java similarity index 89% rename from src/main/java/com/example/demo/controller/UserController.java rename to src/main/java/com/example/demo/controller/coin/UserController.java index 1a02d95..5900f88 100644 --- a/src/main/java/com/example/demo/controller/UserController.java +++ b/src/main/java/com/example/demo/controller/coin/UserController.java @@ -1,11 +1,9 @@ -package com.example.demo.controller; +package com.example.demo.controller.coin; import com.example.demo.domain.entity.User; -import com.example.demo.domain.vo.Gold; -import com.example.demo.domain.vo.GoldUser; -import com.example.demo.domain.vo.Result; -import com.example.demo.service.ConsumeService; -import com.example.demo.service.UserService; +import com.example.demo.domain.vo.coin.GoldUser; +import com.example.demo.domain.vo.coin.Result; +import com.example.demo.service.coin.UserService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/main/java/com/example/demo/controller/WorkbenchController.java b/src/main/java/com/example/demo/controller/coin/WorkbenchController.java similarity index 87% rename from src/main/java/com/example/demo/controller/WorkbenchController.java rename to src/main/java/com/example/demo/controller/coin/WorkbenchController.java index 8f64591..8029bce 100644 --- a/src/main/java/com/example/demo/controller/WorkbenchController.java +++ b/src/main/java/com/example/demo/controller/coin/WorkbenchController.java @@ -1,26 +1,23 @@ -package com.example.demo.controller; +package com.example.demo.controller.coin; import com.example.demo.Util.JWTUtil; import com.example.demo.domain.entity.Admin; -import com.example.demo.domain.vo.WorkbenchCard; -import com.example.demo.mapper.StatisticsMapper; -import com.example.demo.service.GeneralService; -import com.example.demo.service.StatisticsService; -import com.example.demo.service.WorkbenchService; +import com.example.demo.domain.vo.coin.WorkbenchCard; +import com.example.demo.mapper.coin.StatisticsMapper; +import com.example.demo.service.coin.GeneralService; +import com.example.demo.service.coin.StatisticsService; +import com.example.demo.service.coin.WorkbenchService; import jakarta.servlet.http.HttpServletRequest; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.security.core.annotation.AuthenticationPrincipal; import org.springframework.web.bind.annotation.*; import org.springframework.web.context.request.RequestContextHolder; import org.springframework.web.context.request.ServletRequestAttributes; -import java.util.Date; import java.util.List; -import java.util.Map; /** * @program: gold-java diff --git a/src/main/java/com/example/demo/domain/DTO/ConsumeDTO.java b/src/main/java/com/example/demo/domain/DTO/ConsumeDTO.java index efc7e18..28aa272 100644 --- a/src/main/java/com/example/demo/domain/DTO/ConsumeDTO.java +++ b/src/main/java/com/example/demo/domain/DTO/ConsumeDTO.java @@ -1,6 +1,6 @@ package com.example.demo.domain.DTO; -import com.example.demo.domain.vo.ConsumeUser; +import com.example.demo.domain.vo.coin.ConsumeUser; import jakarta.validation.constraints.NotNull; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/src/main/java/com/example/demo/domain/DTO/GoldDetailDTO.java b/src/main/java/com/example/demo/domain/DTO/GoldDetailDTO.java index 86b7918..637a138 100644 --- a/src/main/java/com/example/demo/domain/DTO/GoldDetailDTO.java +++ b/src/main/java/com/example/demo/domain/DTO/GoldDetailDTO.java @@ -1,6 +1,6 @@ package com.example.demo.domain.DTO; -import com.example.demo.domain.vo.GoldDetail; +import com.example.demo.domain.vo.coin.GoldDetail; import jakarta.validation.constraints.NotNull; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/src/main/java/com/example/demo/domain/DTO/RechargeDTO.java b/src/main/java/com/example/demo/domain/DTO/RechargeDTO.java index d7bdedf..aa94c35 100644 --- a/src/main/java/com/example/demo/domain/DTO/RechargeDTO.java +++ b/src/main/java/com/example/demo/domain/DTO/RechargeDTO.java @@ -1,6 +1,6 @@ package com.example.demo.domain.DTO; -import com.example.demo.domain.vo.RechargeUser; +import com.example.demo.domain.vo.coin.RechargeUser; import jakarta.validation.constraints.NotNull; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/src/main/java/com/example/demo/domain/DTO/RefundDTO.java b/src/main/java/com/example/demo/domain/DTO/RefundDTO.java index 94664d7..3ec4359 100644 --- a/src/main/java/com/example/demo/domain/DTO/RefundDTO.java +++ b/src/main/java/com/example/demo/domain/DTO/RefundDTO.java @@ -1,6 +1,6 @@ package com.example.demo.domain.DTO; -import com.example.demo.domain.vo.RefundUser; +import com.example.demo.domain.vo.coin.RefundUser; import jakarta.validation.constraints.NotNull; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/src/main/java/com/example/demo/domain/vo/AdminVo.java b/src/main/java/com/example/demo/domain/vo/coin/AdminVo.java similarity index 98% rename from src/main/java/com/example/demo/domain/vo/AdminVo.java rename to src/main/java/com/example/demo/domain/vo/coin/AdminVo.java index 6f4c9fb..5fa2d05 100644 --- a/src/main/java/com/example/demo/domain/vo/AdminVo.java +++ b/src/main/java/com/example/demo/domain/vo/coin/AdminVo.java @@ -1,4 +1,4 @@ -package com.example.demo.domain.vo; +package com.example.demo.domain.vo.coin; import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonIgnore; diff --git a/src/main/java/com/example/demo/domain/vo/AiEmotionExportRecordVO.java b/src/main/java/com/example/demo/domain/vo/coin/AiEmotionExportRecordVO.java similarity index 93% rename from src/main/java/com/example/demo/domain/vo/AiEmotionExportRecordVO.java rename to src/main/java/com/example/demo/domain/vo/coin/AiEmotionExportRecordVO.java index 8f4a5e8..3f0eb98 100644 --- a/src/main/java/com/example/demo/domain/vo/AiEmotionExportRecordVO.java +++ b/src/main/java/com/example/demo/domain/vo/coin/AiEmotionExportRecordVO.java @@ -1,4 +1,4 @@ -package com.example.demo.domain.vo; +package com.example.demo.domain.vo.coin; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/src/main/java/com/example/demo/domain/vo/AuditRequest.java b/src/main/java/com/example/demo/domain/vo/coin/AuditRequest.java similarity index 91% rename from src/main/java/com/example/demo/domain/vo/AuditRequest.java rename to src/main/java/com/example/demo/domain/vo/coin/AuditRequest.java index 6276f91..35a4fa6 100644 --- a/src/main/java/com/example/demo/domain/vo/AuditRequest.java +++ b/src/main/java/com/example/demo/domain/vo/coin/AuditRequest.java @@ -1,4 +1,4 @@ -package com.example.demo.domain.vo; +package com.example.demo.domain.vo.coin; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/src/main/java/com/example/demo/domain/vo/ConsumeUser.java b/src/main/java/com/example/demo/domain/vo/coin/ConsumeUser.java similarity index 98% rename from src/main/java/com/example/demo/domain/vo/ConsumeUser.java rename to src/main/java/com/example/demo/domain/vo/coin/ConsumeUser.java index baf77cf..d00c03a 100644 --- a/src/main/java/com/example/demo/domain/vo/ConsumeUser.java +++ b/src/main/java/com/example/demo/domain/vo/coin/ConsumeUser.java @@ -1,4 +1,4 @@ -package com.example.demo.domain.vo; +package com.example.demo.domain.vo.coin; import com.alibaba.excel.annotation.ExcelIgnore; import com.alibaba.excel.annotation.ExcelProperty; diff --git a/src/main/java/com/example/demo/domain/vo/ExecutionContext.java b/src/main/java/com/example/demo/domain/vo/coin/ExecutionContext.java similarity index 92% rename from src/main/java/com/example/demo/domain/vo/ExecutionContext.java rename to src/main/java/com/example/demo/domain/vo/coin/ExecutionContext.java index 76d3213..da7cf7f 100644 --- a/src/main/java/com/example/demo/domain/vo/ExecutionContext.java +++ b/src/main/java/com/example/demo/domain/vo/coin/ExecutionContext.java @@ -1,4 +1,4 @@ -package com.example.demo.domain.vo; +package com.example.demo.domain.vo.coin; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/src/main/java/com/example/demo/domain/vo/ExportVo.java b/src/main/java/com/example/demo/domain/vo/coin/ExportVo.java similarity index 90% rename from src/main/java/com/example/demo/domain/vo/ExportVo.java rename to src/main/java/com/example/demo/domain/vo/coin/ExportVo.java index 3042db9..cd93a9c 100644 --- a/src/main/java/com/example/demo/domain/vo/ExportVo.java +++ b/src/main/java/com/example/demo/domain/vo/coin/ExportVo.java @@ -1,4 +1,4 @@ -package com.example.demo.domain.vo; +package com.example.demo.domain.vo.coin; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/src/main/java/com/example/demo/domain/vo/Gold.java b/src/main/java/com/example/demo/domain/vo/coin/Gold.java similarity index 94% rename from src/main/java/com/example/demo/domain/vo/Gold.java rename to src/main/java/com/example/demo/domain/vo/coin/Gold.java index f94ff96..0d68ad8 100644 --- a/src/main/java/com/example/demo/domain/vo/Gold.java +++ b/src/main/java/com/example/demo/domain/vo/coin/Gold.java @@ -1,4 +1,4 @@ -package com.example.demo.domain.vo; +package com.example.demo.domain.vo.coin; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/src/main/java/com/example/demo/domain/vo/GoldDetail.java b/src/main/java/com/example/demo/domain/vo/coin/GoldDetail.java similarity index 98% rename from src/main/java/com/example/demo/domain/vo/GoldDetail.java rename to src/main/java/com/example/demo/domain/vo/coin/GoldDetail.java index 673b640..668167f 100644 --- a/src/main/java/com/example/demo/domain/vo/GoldDetail.java +++ b/src/main/java/com/example/demo/domain/vo/coin/GoldDetail.java @@ -1,4 +1,4 @@ -package com.example.demo.domain.vo; +package com.example.demo.domain.vo.coin; import com.alibaba.excel.annotation.ExcelIgnore; import com.alibaba.excel.annotation.ExcelProperty; diff --git a/src/main/java/com/example/demo/domain/vo/GoldUser.java b/src/main/java/com/example/demo/domain/vo/coin/GoldUser.java similarity index 98% rename from src/main/java/com/example/demo/domain/vo/GoldUser.java rename to src/main/java/com/example/demo/domain/vo/coin/GoldUser.java index 5185e7d..ade5773 100644 --- a/src/main/java/com/example/demo/domain/vo/GoldUser.java +++ b/src/main/java/com/example/demo/domain/vo/coin/GoldUser.java @@ -1,4 +1,4 @@ -package com.example.demo.domain.vo; +package com.example.demo.domain.vo.coin; import com.alibaba.excel.annotation.ExcelProperty; import com.fasterxml.jackson.annotation.JsonFormat; diff --git a/src/main/java/com/example/demo/domain/vo/MarketRechargeStat.java b/src/main/java/com/example/demo/domain/vo/coin/MarketRechargeStat.java similarity index 90% rename from src/main/java/com/example/demo/domain/vo/MarketRechargeStat.java rename to src/main/java/com/example/demo/domain/vo/coin/MarketRechargeStat.java index ac6e1ca..73639f4 100644 --- a/src/main/java/com/example/demo/domain/vo/MarketRechargeStat.java +++ b/src/main/java/com/example/demo/domain/vo/coin/MarketRechargeStat.java @@ -1,4 +1,4 @@ -package com.example.demo.domain.vo; +package com.example.demo.domain.vo.coin; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/src/main/java/com/example/demo/domain/vo/MenuVo.java b/src/main/java/com/example/demo/domain/vo/coin/MenuVo.java similarity index 93% rename from src/main/java/com/example/demo/domain/vo/MenuVo.java rename to src/main/java/com/example/demo/domain/vo/coin/MenuVo.java index bd4cb9a..bacdaad 100644 --- a/src/main/java/com/example/demo/domain/vo/MenuVo.java +++ b/src/main/java/com/example/demo/domain/vo/coin/MenuVo.java @@ -1,4 +1,4 @@ -package com.example.demo.domain.vo; +package com.example.demo.domain.vo.coin; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/src/main/java/com/example/demo/domain/vo/Page.java b/src/main/java/com/example/demo/domain/vo/coin/Page.java similarity index 94% rename from src/main/java/com/example/demo/domain/vo/Page.java rename to src/main/java/com/example/demo/domain/vo/coin/Page.java index d4e2efd..d06d6bb 100644 --- a/src/main/java/com/example/demo/domain/vo/Page.java +++ b/src/main/java/com/example/demo/domain/vo/coin/Page.java @@ -1,4 +1,4 @@ -package com.example.demo.domain.vo; +package com.example.demo.domain.vo.coin; import com.example.demo.domain.entity.User; import lombok.Data; diff --git a/src/main/java/com/example/demo/domain/vo/Password.java b/src/main/java/com/example/demo/domain/vo/coin/Password.java similarity index 92% rename from src/main/java/com/example/demo/domain/vo/Password.java rename to src/main/java/com/example/demo/domain/vo/coin/Password.java index 545ab2f..a5b5d56 100644 --- a/src/main/java/com/example/demo/domain/vo/Password.java +++ b/src/main/java/com/example/demo/domain/vo/coin/Password.java @@ -1,4 +1,4 @@ -package com.example.demo.domain.vo; +package com.example.demo.domain.vo.coin; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/src/main/java/com/example/demo/domain/vo/Permission.java b/src/main/java/com/example/demo/domain/vo/coin/Permission.java similarity index 94% rename from src/main/java/com/example/demo/domain/vo/Permission.java rename to src/main/java/com/example/demo/domain/vo/coin/Permission.java index bf38802..18157a7 100644 --- a/src/main/java/com/example/demo/domain/vo/Permission.java +++ b/src/main/java/com/example/demo/domain/vo/coin/Permission.java @@ -1,4 +1,4 @@ -package com.example.demo.domain.vo; +package com.example.demo.domain.vo.coin; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/src/main/java/com/example/demo/domain/vo/RateDetail.java b/src/main/java/com/example/demo/domain/vo/coin/RateDetail.java similarity index 95% rename from src/main/java/com/example/demo/domain/vo/RateDetail.java rename to src/main/java/com/example/demo/domain/vo/coin/RateDetail.java index 37a240b..14411a6 100644 --- a/src/main/java/com/example/demo/domain/vo/RateDetail.java +++ b/src/main/java/com/example/demo/domain/vo/coin/RateDetail.java @@ -1,4 +1,4 @@ -package com.example.demo.domain.vo; +package com.example.demo.domain.vo.coin; import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; diff --git a/src/main/java/com/example/demo/domain/vo/RechargeAudit.java b/src/main/java/com/example/demo/domain/vo/coin/RechargeAudit.java similarity index 98% rename from src/main/java/com/example/demo/domain/vo/RechargeAudit.java rename to src/main/java/com/example/demo/domain/vo/coin/RechargeAudit.java index 66de20e..30e3726 100644 --- a/src/main/java/com/example/demo/domain/vo/RechargeAudit.java +++ b/src/main/java/com/example/demo/domain/vo/coin/RechargeAudit.java @@ -1,4 +1,4 @@ -package com.example.demo.domain.vo; +package com.example.demo.domain.vo.coin; import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; diff --git a/src/main/java/com/example/demo/domain/vo/RechargeUser.java b/src/main/java/com/example/demo/domain/vo/coin/RechargeUser.java similarity index 98% rename from src/main/java/com/example/demo/domain/vo/RechargeUser.java rename to src/main/java/com/example/demo/domain/vo/coin/RechargeUser.java index 5bd6c8d..60f12d8 100644 --- a/src/main/java/com/example/demo/domain/vo/RechargeUser.java +++ b/src/main/java/com/example/demo/domain/vo/coin/RechargeUser.java @@ -1,4 +1,4 @@ -package com.example.demo.domain.vo; +package com.example.demo.domain.vo.coin; import com.alibaba.excel.annotation.ExcelIgnore; import com.alibaba.excel.annotation.ExcelProperty; diff --git a/src/main/java/com/example/demo/domain/vo/RefundAudit.java b/src/main/java/com/example/demo/domain/vo/coin/RefundAudit.java similarity index 98% rename from src/main/java/com/example/demo/domain/vo/RefundAudit.java rename to src/main/java/com/example/demo/domain/vo/coin/RefundAudit.java index 9c3827f..a8e090c 100644 --- a/src/main/java/com/example/demo/domain/vo/RefundAudit.java +++ b/src/main/java/com/example/demo/domain/vo/coin/RefundAudit.java @@ -1,4 +1,4 @@ -package com.example.demo.domain.vo; +package com.example.demo.domain.vo.coin; import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; diff --git a/src/main/java/com/example/demo/domain/vo/RefundUser.java b/src/main/java/com/example/demo/domain/vo/coin/RefundUser.java similarity index 98% rename from src/main/java/com/example/demo/domain/vo/RefundUser.java rename to src/main/java/com/example/demo/domain/vo/coin/RefundUser.java index bdbe0f0..3575ae3 100644 --- a/src/main/java/com/example/demo/domain/vo/RefundUser.java +++ b/src/main/java/com/example/demo/domain/vo/coin/RefundUser.java @@ -1,4 +1,4 @@ -package com.example.demo.domain.vo; +package com.example.demo.domain.vo.coin; import com.alibaba.excel.annotation.ExcelIgnore; import com.alibaba.excel.annotation.ExcelProperty; diff --git a/src/main/java/com/example/demo/domain/vo/Result.java b/src/main/java/com/example/demo/domain/vo/coin/Result.java similarity index 98% rename from src/main/java/com/example/demo/domain/vo/Result.java rename to src/main/java/com/example/demo/domain/vo/coin/Result.java index b4ff1ef..b880050 100644 --- a/src/main/java/com/example/demo/domain/vo/Result.java +++ b/src/main/java/com/example/demo/domain/vo/coin/Result.java @@ -1,4 +1,4 @@ -package com.example.demo.domain.vo; +package com.example.demo.domain.vo.coin; import com.example.demo.Util.BusinessException; import com.fasterxml.jackson.core.JsonProcessingException; diff --git a/src/main/java/com/example/demo/domain/vo/RoleMenu.java b/src/main/java/com/example/demo/domain/vo/coin/RoleMenu.java similarity index 88% rename from src/main/java/com/example/demo/domain/vo/RoleMenu.java rename to src/main/java/com/example/demo/domain/vo/coin/RoleMenu.java index 4b709f7..73bc4b1 100644 --- a/src/main/java/com/example/demo/domain/vo/RoleMenu.java +++ b/src/main/java/com/example/demo/domain/vo/coin/RoleMenu.java @@ -1,4 +1,4 @@ -package com.example.demo.domain.vo; +package com.example.demo.domain.vo.coin; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/src/main/java/com/example/demo/domain/vo/RoleVo.java b/src/main/java/com/example/demo/domain/vo/coin/RoleVo.java similarity index 96% rename from src/main/java/com/example/demo/domain/vo/RoleVo.java rename to src/main/java/com/example/demo/domain/vo/coin/RoleVo.java index f7942d7..d3bb786 100644 --- a/src/main/java/com/example/demo/domain/vo/RoleVo.java +++ b/src/main/java/com/example/demo/domain/vo/coin/RoleVo.java @@ -1,4 +1,4 @@ -package com.example.demo.domain.vo; +package com.example.demo.domain.vo.coin; import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; diff --git a/src/main/java/com/example/demo/domain/vo/TestRequest.java b/src/main/java/com/example/demo/domain/vo/coin/TestRequest.java similarity index 88% rename from src/main/java/com/example/demo/domain/vo/TestRequest.java rename to src/main/java/com/example/demo/domain/vo/coin/TestRequest.java index 51cb98a..68018b0 100644 --- a/src/main/java/com/example/demo/domain/vo/TestRequest.java +++ b/src/main/java/com/example/demo/domain/vo/coin/TestRequest.java @@ -1,4 +1,4 @@ -package com.example.demo.domain.vo; +package com.example.demo.domain.vo.coin; import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; diff --git a/src/main/java/com/example/demo/domain/vo/Total.java b/src/main/java/com/example/demo/domain/vo/coin/Total.java similarity index 91% rename from src/main/java/com/example/demo/domain/vo/Total.java rename to src/main/java/com/example/demo/domain/vo/coin/Total.java index a7e9f18..60a12d5 100644 --- a/src/main/java/com/example/demo/domain/vo/Total.java +++ b/src/main/java/com/example/demo/domain/vo/coin/Total.java @@ -1,4 +1,4 @@ -package com.example.demo.domain.vo; +package com.example.demo.domain.vo.coin; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/src/main/java/com/example/demo/domain/vo/WorkbenchCard.java b/src/main/java/com/example/demo/domain/vo/coin/WorkbenchCard.java similarity index 96% rename from src/main/java/com/example/demo/domain/vo/WorkbenchCard.java rename to src/main/java/com/example/demo/domain/vo/coin/WorkbenchCard.java index 025490d..65c6504 100644 --- a/src/main/java/com/example/demo/domain/vo/WorkbenchCard.java +++ b/src/main/java/com/example/demo/domain/vo/coin/WorkbenchCard.java @@ -1,4 +1,4 @@ -package com.example.demo.domain.vo; +package com.example.demo.domain.vo.coin; import com.fasterxml.jackson.annotation.JsonFormat; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/example/demo/domain/vo/WorkbenchFullStatistics.java b/src/main/java/com/example/demo/domain/vo/coin/WorkbenchFullStatistics.java similarity index 95% rename from src/main/java/com/example/demo/domain/vo/WorkbenchFullStatistics.java rename to src/main/java/com/example/demo/domain/vo/coin/WorkbenchFullStatistics.java index 6b555b1..7dbd92a 100644 --- a/src/main/java/com/example/demo/domain/vo/WorkbenchFullStatistics.java +++ b/src/main/java/com/example/demo/domain/vo/coin/WorkbenchFullStatistics.java @@ -1,4 +1,4 @@ -package com.example.demo.domain.vo; +package com.example.demo.domain.vo.coin; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/src/main/java/com/example/demo/domain/vo/WorkbenchMarketCard.java b/src/main/java/com/example/demo/domain/vo/coin/WorkbenchMarketCard.java similarity index 98% rename from src/main/java/com/example/demo/domain/vo/WorkbenchMarketCard.java rename to src/main/java/com/example/demo/domain/vo/coin/WorkbenchMarketCard.java index 1554bdc..70132bf 100644 --- a/src/main/java/com/example/demo/domain/vo/WorkbenchMarketCard.java +++ b/src/main/java/com/example/demo/domain/vo/coin/WorkbenchMarketCard.java @@ -1,4 +1,4 @@ -package com.example.demo.domain.vo; +package com.example.demo.domain.vo.coin; import com.fasterxml.jackson.annotation.JsonFormat; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/example/demo/domain/vo/WorkbenchMarketGraph.java b/src/main/java/com/example/demo/domain/vo/coin/WorkbenchMarketGraph.java similarity index 95% rename from src/main/java/com/example/demo/domain/vo/WorkbenchMarketGraph.java rename to src/main/java/com/example/demo/domain/vo/coin/WorkbenchMarketGraph.java index 32d28df..26bda9b 100644 --- a/src/main/java/com/example/demo/domain/vo/WorkbenchMarketGraph.java +++ b/src/main/java/com/example/demo/domain/vo/coin/WorkbenchMarketGraph.java @@ -1,4 +1,4 @@ -package com.example.demo.domain.vo; +package com.example.demo.domain.vo.coin; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/src/main/java/com/example/demo/mapper/AdminMapper.java b/src/main/java/com/example/demo/mapper/coin/AdminMapper.java similarity index 93% rename from src/main/java/com/example/demo/mapper/AdminMapper.java rename to src/main/java/com/example/demo/mapper/coin/AdminMapper.java index a2a41ef..88eb198 100644 --- a/src/main/java/com/example/demo/mapper/AdminMapper.java +++ b/src/main/java/com/example/demo/mapper/coin/AdminMapper.java @@ -1,4 +1,4 @@ -package com.example.demo.mapper; +package com.example.demo.mapper.coin; import com.example.demo.domain.entity.Admin; import org.apache.ibatis.annotations.Mapper; diff --git a/src/main/java/com/example/demo/mapper/AiEmotionMapper.java b/src/main/java/com/example/demo/mapper/coin/AiEmotionMapper.java similarity index 85% rename from src/main/java/com/example/demo/mapper/AiEmotionMapper.java rename to src/main/java/com/example/demo/mapper/coin/AiEmotionMapper.java index 52cd24b..5f8956d 100644 --- a/src/main/java/com/example/demo/mapper/AiEmotionMapper.java +++ b/src/main/java/com/example/demo/mapper/coin/AiEmotionMapper.java @@ -1,6 +1,6 @@ -package com.example.demo.mapper; +package com.example.demo.mapper.coin; -import com.example.demo.domain.vo.AiEmotionExportRecordVO; +import com.example.demo.domain.vo.coin.AiEmotionExportRecordVO; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/src/main/java/com/example/demo/mapper/AuditMapper.java b/src/main/java/com/example/demo/mapper/coin/AuditMapper.java similarity index 89% rename from src/main/java/com/example/demo/mapper/AuditMapper.java rename to src/main/java/com/example/demo/mapper/coin/AuditMapper.java index 410d095..7b56229 100644 --- a/src/main/java/com/example/demo/mapper/AuditMapper.java +++ b/src/main/java/com/example/demo/mapper/coin/AuditMapper.java @@ -1,10 +1,9 @@ -package com.example.demo.mapper; +package com.example.demo.mapper.coin; import com.example.demo.domain.entity.User; import com.example.demo.domain.entity.UserGoldRecord; -import com.example.demo.domain.vo.RechargeAudit; -import com.example.demo.domain.vo.RefundAudit; -import com.github.pagehelper.PageInfo; +import com.example.demo.domain.vo.coin.RechargeAudit; +import com.example.demo.domain.vo.coin.RefundAudit; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/src/main/java/com/example/demo/mapper/ConsumeMapper.java b/src/main/java/com/example/demo/mapper/coin/ConsumeMapper.java similarity index 89% rename from src/main/java/com/example/demo/mapper/ConsumeMapper.java rename to src/main/java/com/example/demo/mapper/coin/ConsumeMapper.java index f682eea..89ace40 100644 --- a/src/main/java/com/example/demo/mapper/ConsumeMapper.java +++ b/src/main/java/com/example/demo/mapper/coin/ConsumeMapper.java @@ -1,7 +1,7 @@ -package com.example.demo.mapper; +package com.example.demo.mapper.coin; import com.example.demo.domain.entity.UserGoldRecord; -import com.example.demo.domain.vo.ConsumeUser; +import com.example.demo.domain.vo.coin.ConsumeUser; import org.apache.ibatis.annotations.Mapper; import java.util.List; diff --git a/src/main/java/com/example/demo/mapper/ExportMapper.java b/src/main/java/com/example/demo/mapper/coin/ExportMapper.java similarity index 81% rename from src/main/java/com/example/demo/mapper/ExportMapper.java rename to src/main/java/com/example/demo/mapper/coin/ExportMapper.java index 09a268d..83d57ab 100644 --- a/src/main/java/com/example/demo/mapper/ExportMapper.java +++ b/src/main/java/com/example/demo/mapper/coin/ExportMapper.java @@ -1,8 +1,7 @@ -package com.example.demo.mapper; +package com.example.demo.mapper.coin; import com.example.demo.domain.entity.Export; -import com.example.demo.domain.vo.ExportVo; -import io.lettuce.core.StrAlgoArgs; +import com.example.demo.domain.vo.coin.ExportVo; import org.apache.ibatis.annotations.Mapper; import java.util.List; diff --git a/src/main/java/com/example/demo/mapper/GeneralMapper.java b/src/main/java/com/example/demo/mapper/coin/GeneralMapper.java similarity index 94% rename from src/main/java/com/example/demo/mapper/GeneralMapper.java rename to src/main/java/com/example/demo/mapper/coin/GeneralMapper.java index dff92af..0601f1b 100644 --- a/src/main/java/com/example/demo/mapper/GeneralMapper.java +++ b/src/main/java/com/example/demo/mapper/coin/GeneralMapper.java @@ -1,4 +1,4 @@ -package com.example.demo.mapper; +package com.example.demo.mapper.coin; import org.apache.ibatis.annotations.Mapper; diff --git a/src/main/java/com/example/demo/mapper/GoldDetailMapper.java b/src/main/java/com/example/demo/mapper/coin/GoldDetailMapper.java similarity index 90% rename from src/main/java/com/example/demo/mapper/GoldDetailMapper.java rename to src/main/java/com/example/demo/mapper/coin/GoldDetailMapper.java index 93fccb9..8fb20b3 100644 --- a/src/main/java/com/example/demo/mapper/GoldDetailMapper.java +++ b/src/main/java/com/example/demo/mapper/coin/GoldDetailMapper.java @@ -1,8 +1,8 @@ -package com.example.demo.mapper; +package com.example.demo.mapper.coin; import com.example.demo.domain.entity.User; -import com.example.demo.domain.vo.GoldDetail; -import com.example.demo.domain.vo.Total; +import com.example.demo.domain.vo.coin.GoldDetail; +import com.example.demo.domain.vo.coin.Total; import lombok.Data; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/src/main/java/com/example/demo/mapper/MarketMapper.java b/src/main/java/com/example/demo/mapper/coin/MarketMapper.java similarity index 77% rename from src/main/java/com/example/demo/mapper/MarketMapper.java rename to src/main/java/com/example/demo/mapper/coin/MarketMapper.java index 91b99c6..a043938 100644 --- a/src/main/java/com/example/demo/mapper/MarketMapper.java +++ b/src/main/java/com/example/demo/mapper/coin/MarketMapper.java @@ -1,4 +1,4 @@ -package com.example.demo.mapper; +package com.example.demo.mapper.coin; import com.example.demo.domain.entity.Market; diff --git a/src/main/java/com/example/demo/mapper/MenuMapper.java b/src/main/java/com/example/demo/mapper/coin/MenuMapper.java similarity index 76% rename from src/main/java/com/example/demo/mapper/MenuMapper.java rename to src/main/java/com/example/demo/mapper/coin/MenuMapper.java index d123e72..299b29b 100644 --- a/src/main/java/com/example/demo/mapper/MenuMapper.java +++ b/src/main/java/com/example/demo/mapper/coin/MenuMapper.java @@ -1,11 +1,10 @@ -package com.example.demo.mapper; +package com.example.demo.mapper.coin; import com.example.demo.domain.entity.Menu; -import com.example.demo.domain.entity.Role; -import com.example.demo.domain.vo.MenuVo; -import com.example.demo.domain.vo.RoleMenu; -import com.example.demo.domain.vo.RoleVo; +import com.example.demo.domain.vo.coin.MenuVo; +import com.example.demo.domain.vo.coin.RoleMenu; +import com.example.demo.domain.vo.coin.RoleVo; import org.apache.ibatis.annotations.Mapper; import java.util.List; diff --git a/src/main/java/com/example/demo/mapper/PermissionMapper.java b/src/main/java/com/example/demo/mapper/coin/PermissionMapper.java similarity index 86% rename from src/main/java/com/example/demo/mapper/PermissionMapper.java rename to src/main/java/com/example/demo/mapper/coin/PermissionMapper.java index 8bb0c9e..58a8e7a 100644 --- a/src/main/java/com/example/demo/mapper/PermissionMapper.java +++ b/src/main/java/com/example/demo/mapper/coin/PermissionMapper.java @@ -1,10 +1,10 @@ -package com.example.demo.mapper; +package com.example.demo.mapper.coin; import com.example.demo.domain.entity.Admin; import com.example.demo.domain.entity.AdminRole; import com.example.demo.domain.entity.Role; -import com.example.demo.domain.vo.AdminVo; -import com.example.demo.domain.vo.Permission; +import com.example.demo.domain.vo.coin.AdminVo; +import com.example.demo.domain.vo.coin.Permission; import org.apache.ibatis.annotations.Mapper; import java.util.List; diff --git a/src/main/java/com/example/demo/mapper/RateMapper.java b/src/main/java/com/example/demo/mapper/coin/RateMapper.java similarity index 75% rename from src/main/java/com/example/demo/mapper/RateMapper.java rename to src/main/java/com/example/demo/mapper/coin/RateMapper.java index 0f50eca..242d100 100644 --- a/src/main/java/com/example/demo/mapper/RateMapper.java +++ b/src/main/java/com/example/demo/mapper/coin/RateMapper.java @@ -1,7 +1,7 @@ -package com.example.demo.mapper; +package com.example.demo.mapper.coin; import com.example.demo.domain.entity.Rate; -import com.example.demo.domain.vo.RateDetail; +import com.example.demo.domain.vo.coin.RateDetail; import org.apache.ibatis.annotations.Mapper; import java.util.List; diff --git a/src/main/java/com/example/demo/mapper/RechargeMapper.java b/src/main/java/com/example/demo/mapper/coin/RechargeMapper.java similarity index 79% rename from src/main/java/com/example/demo/mapper/RechargeMapper.java rename to src/main/java/com/example/demo/mapper/coin/RechargeMapper.java index 4a5170a..822b02e 100644 --- a/src/main/java/com/example/demo/mapper/RechargeMapper.java +++ b/src/main/java/com/example/demo/mapper/coin/RechargeMapper.java @@ -1,9 +1,9 @@ -package com.example.demo.mapper; +package com.example.demo.mapper.coin; import com.example.demo.domain.entity.UserGoldRecord; -import com.example.demo.domain.vo.RechargeUser; -import com.example.demo.domain.vo.RefundUser; +import com.example.demo.domain.vo.coin.RechargeUser; +import com.example.demo.domain.vo.coin.RefundUser; import org.apache.ibatis.annotations.Mapper; import java.util.List; diff --git a/src/main/java/com/example/demo/mapper/RefundMapper.java b/src/main/java/com/example/demo/mapper/coin/RefundMapper.java similarity index 82% rename from src/main/java/com/example/demo/mapper/RefundMapper.java rename to src/main/java/com/example/demo/mapper/coin/RefundMapper.java index 2c9c54d..d94af1c 100644 --- a/src/main/java/com/example/demo/mapper/RefundMapper.java +++ b/src/main/java/com/example/demo/mapper/coin/RefundMapper.java @@ -1,8 +1,8 @@ -package com.example.demo.mapper; +package com.example.demo.mapper.coin; import com.example.demo.domain.entity.UserGoldRecord; -import com.example.demo.domain.vo.ConsumeUser; -import com.example.demo.domain.vo.RefundUser; +import com.example.demo.domain.vo.coin.ConsumeUser; +import com.example.demo.domain.vo.coin.RefundUser; import org.apache.ibatis.annotations.Mapper; import java.util.List; diff --git a/src/main/java/com/example/demo/mapper/RoleMapper.java b/src/main/java/com/example/demo/mapper/coin/RoleMapper.java similarity index 92% rename from src/main/java/com/example/demo/mapper/RoleMapper.java rename to src/main/java/com/example/demo/mapper/coin/RoleMapper.java index 4b38036..6871533 100644 --- a/src/main/java/com/example/demo/mapper/RoleMapper.java +++ b/src/main/java/com/example/demo/mapper/coin/RoleMapper.java @@ -1,8 +1,8 @@ -package com.example.demo.mapper; +package com.example.demo.mapper.coin; import com.example.demo.domain.entity.Role; -import com.example.demo.domain.vo.RoleVo; +import com.example.demo.domain.vo.coin.RoleVo; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/src/main/java/com/example/demo/mapper/StatisticsMapper.java b/src/main/java/com/example/demo/mapper/coin/StatisticsMapper.java similarity index 97% rename from src/main/java/com/example/demo/mapper/StatisticsMapper.java rename to src/main/java/com/example/demo/mapper/coin/StatisticsMapper.java index 35b2e00..e8747d5 100644 --- a/src/main/java/com/example/demo/mapper/StatisticsMapper.java +++ b/src/main/java/com/example/demo/mapper/coin/StatisticsMapper.java @@ -1,8 +1,8 @@ -package com.example.demo.mapper; +package com.example.demo.mapper.coin; import com.example.demo.domain.entity.Statistics; import com.example.demo.domain.entity.UserGoldRecord; -import com.example.demo.domain.vo.MarketRechargeStat; +import com.example.demo.domain.vo.coin.MarketRechargeStat; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/src/main/java/com/example/demo/mapper/UserMapper.java b/src/main/java/com/example/demo/mapper/coin/UserMapper.java similarity index 89% rename from src/main/java/com/example/demo/mapper/UserMapper.java rename to src/main/java/com/example/demo/mapper/coin/UserMapper.java index b6bb6bc..ac4c50c 100644 --- a/src/main/java/com/example/demo/mapper/UserMapper.java +++ b/src/main/java/com/example/demo/mapper/coin/UserMapper.java @@ -1,9 +1,8 @@ -package com.example.demo.mapper; +package com.example.demo.mapper.coin; import com.example.demo.domain.entity.User; -import com.example.demo.domain.vo.Gold; -import com.example.demo.domain.vo.GoldUser; -import lombok.Data; +import com.example.demo.domain.vo.coin.Gold; +import com.example.demo.domain.vo.coin.GoldUser; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/src/main/java/com/example/demo/mapper/WorkBenchMapper.java b/src/main/java/com/example/demo/mapper/coin/WorkBenchMapper.java similarity index 93% rename from src/main/java/com/example/demo/mapper/WorkBenchMapper.java rename to src/main/java/com/example/demo/mapper/coin/WorkBenchMapper.java index e4e5f9f..3f35e19 100644 --- a/src/main/java/com/example/demo/mapper/WorkBenchMapper.java +++ b/src/main/java/com/example/demo/mapper/coin/WorkBenchMapper.java @@ -1,7 +1,7 @@ -package com.example.demo.mapper; +package com.example.demo.mapper.coin; -import com.example.demo.domain.vo.WorkbenchCard; -import com.example.demo.domain.vo.WorkbenchFullStatistics; +import com.example.demo.domain.vo.coin.WorkbenchCard; +import com.example.demo.domain.vo.coin.WorkbenchFullStatistics; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/src/main/java/com/example/demo/security/SecurityConfig.java b/src/main/java/com/example/demo/security/SecurityConfig.java index 44d0741..4e452cd 100644 --- a/src/main/java/com/example/demo/security/SecurityConfig.java +++ b/src/main/java/com/example/demo/security/SecurityConfig.java @@ -2,7 +2,7 @@ package com.example.demo.security; -import com.example.demo.domain.vo.Result; +import com.example.demo.domain.vo.coin.Result; import jakarta.servlet.http.HttpServletResponse; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Bean; diff --git a/src/main/java/com/example/demo/service/AdminService.java b/src/main/java/com/example/demo/service/coin/AdminService.java similarity index 80% rename from src/main/java/com/example/demo/service/AdminService.java rename to src/main/java/com/example/demo/service/coin/AdminService.java index 6d6f95a..8f1665e 100644 --- a/src/main/java/com/example/demo/service/AdminService.java +++ b/src/main/java/com/example/demo/service/coin/AdminService.java @@ -1,8 +1,8 @@ -package com.example.demo.service; +package com.example.demo.service.coin; import com.example.demo.domain.entity.Admin; -import com.example.demo.domain.vo.Password; -import com.example.demo.domain.vo.Result; +import com.example.demo.domain.vo.coin.Password; +import com.example.demo.domain.vo.coin.Result; /** * @program: GOLD diff --git a/src/main/java/com/example/demo/service/AiEmotionService.java b/src/main/java/com/example/demo/service/coin/AiEmotionService.java similarity index 68% rename from src/main/java/com/example/demo/service/AiEmotionService.java rename to src/main/java/com/example/demo/service/coin/AiEmotionService.java index c9b4f96..a2f1560 100644 --- a/src/main/java/com/example/demo/service/AiEmotionService.java +++ b/src/main/java/com/example/demo/service/coin/AiEmotionService.java @@ -1,7 +1,7 @@ -package com.example.demo.service; +package com.example.demo.service.coin; -import com.example.demo.domain.vo.AiEmotionExportRecordVO; -import com.example.demo.domain.vo.ExportVo; +import com.example.demo.domain.vo.coin.AiEmotionExportRecordVO; +import com.example.demo.domain.vo.coin.ExportVo; /** * @program: GOLD diff --git a/src/main/java/com/example/demo/service/AuditService.java b/src/main/java/com/example/demo/service/coin/AuditService.java similarity index 82% rename from src/main/java/com/example/demo/service/AuditService.java rename to src/main/java/com/example/demo/service/coin/AuditService.java index 5324288..0ccd564 100644 --- a/src/main/java/com/example/demo/service/AuditService.java +++ b/src/main/java/com/example/demo/service/coin/AuditService.java @@ -1,8 +1,8 @@ -package com.example.demo.service; +package com.example.demo.service.coin; -import com.example.demo.domain.vo.Gold; -import com.example.demo.domain.vo.RechargeAudit; -import com.example.demo.domain.vo.RefundAudit; +import com.example.demo.domain.vo.coin.Gold; +import com.example.demo.domain.vo.coin.RechargeAudit; +import com.example.demo.domain.vo.coin.RefundAudit; import com.github.pagehelper.PageInfo; /** diff --git a/src/main/java/com/example/demo/service/ConsumeService.java b/src/main/java/com/example/demo/service/coin/ConsumeService.java similarity index 74% rename from src/main/java/com/example/demo/service/ConsumeService.java rename to src/main/java/com/example/demo/service/coin/ConsumeService.java index 802564e..c478efa 100644 --- a/src/main/java/com/example/demo/service/ConsumeService.java +++ b/src/main/java/com/example/demo/service/coin/ConsumeService.java @@ -1,10 +1,9 @@ -package com.example.demo.service; +package com.example.demo.service.coin; -import com.example.demo.domain.entity.UserGoldRecord; -import com.example.demo.domain.vo.ConsumeUser; -import com.example.demo.domain.vo.Gold; -import com.example.demo.domain.vo.Result; +import com.example.demo.domain.vo.coin.ConsumeUser; +import com.example.demo.domain.vo.coin.Gold; +import com.example.demo.domain.vo.coin.Result; import com.github.pagehelper.PageInfo; /** diff --git a/src/main/java/com/example/demo/service/ExportExcelService.java b/src/main/java/com/example/demo/service/coin/ExportExcelService.java similarity index 93% rename from src/main/java/com/example/demo/service/ExportExcelService.java rename to src/main/java/com/example/demo/service/coin/ExportExcelService.java index bf7134c..3001598 100644 --- a/src/main/java/com/example/demo/service/ExportExcelService.java +++ b/src/main/java/com/example/demo/service/coin/ExportExcelService.java @@ -1,4 +1,4 @@ -package com.example.demo.service; +package com.example.demo.service.coin; import com.example.demo.domain.entity.Export; diff --git a/src/main/java/com/example/demo/service/GeneralService.java b/src/main/java/com/example/demo/service/coin/GeneralService.java similarity index 91% rename from src/main/java/com/example/demo/service/GeneralService.java rename to src/main/java/com/example/demo/service/coin/GeneralService.java index 6e01eae..23d7a01 100644 --- a/src/main/java/com/example/demo/service/GeneralService.java +++ b/src/main/java/com/example/demo/service/coin/GeneralService.java @@ -1,8 +1,5 @@ -package com.example.demo.service; +package com.example.demo.service.coin; -import java.time.LocalDateTime; -import java.time.LocalTime; -import java.time.ZoneId; import java.util.Date; import java.util.List; diff --git a/src/main/java/com/example/demo/service/GoldDetailService.java b/src/main/java/com/example/demo/service/coin/GoldDetailService.java similarity index 91% rename from src/main/java/com/example/demo/service/GoldDetailService.java rename to src/main/java/com/example/demo/service/coin/GoldDetailService.java index 7ecc838..d944af3 100644 --- a/src/main/java/com/example/demo/service/GoldDetailService.java +++ b/src/main/java/com/example/demo/service/coin/GoldDetailService.java @@ -1,10 +1,9 @@ -package com.example.demo.service; +package com.example.demo.service.coin; import com.example.demo.domain.DTO.GoldDetailDTO; import com.example.demo.domain.DTO.GoldUserDTO; import com.example.demo.domain.entity.User; -import com.example.demo.domain.vo.*; - +import com.example.demo.domain.vo.coin.*; import com.github.pagehelper.PageInfo; diff --git a/src/main/java/com/example/demo/service/MarketService.java b/src/main/java/com/example/demo/service/coin/MarketService.java similarity index 87% rename from src/main/java/com/example/demo/service/MarketService.java rename to src/main/java/com/example/demo/service/coin/MarketService.java index 85010d1..54de093 100644 --- a/src/main/java/com/example/demo/service/MarketService.java +++ b/src/main/java/com/example/demo/service/coin/MarketService.java @@ -1,4 +1,4 @@ -package com.example.demo.service; +package com.example.demo.service.coin; import com.example.demo.domain.entity.Market; diff --git a/src/main/java/com/example/demo/service/MenuService.java b/src/main/java/com/example/demo/service/coin/MenuService.java similarity index 69% rename from src/main/java/com/example/demo/service/MenuService.java rename to src/main/java/com/example/demo/service/coin/MenuService.java index b3fefbe..0617457 100644 --- a/src/main/java/com/example/demo/service/MenuService.java +++ b/src/main/java/com/example/demo/service/coin/MenuService.java @@ -1,9 +1,9 @@ -package com.example.demo.service; +package com.example.demo.service.coin; import java.util.List; -import com.example.demo.domain.vo.MenuVo; -import com.example.demo.domain.vo.Result; -import com.example.demo.domain.vo.RoleVo; +import com.example.demo.domain.vo.coin.MenuVo; +import com.example.demo.domain.vo.coin.Result; +import com.example.demo.domain.vo.coin.RoleVo; /** * @program: gold-java diff --git a/src/main/java/com/example/demo/service/PermissionService.java b/src/main/java/com/example/demo/service/coin/PermissionService.java similarity index 83% rename from src/main/java/com/example/demo/service/PermissionService.java rename to src/main/java/com/example/demo/service/coin/PermissionService.java index 87659ab..a985d6e 100644 --- a/src/main/java/com/example/demo/service/PermissionService.java +++ b/src/main/java/com/example/demo/service/coin/PermissionService.java @@ -1,11 +1,11 @@ -package com.example.demo.service; +package com.example.demo.service.coin; import com.example.demo.domain.entity.Admin; import com.example.demo.domain.entity.AdminRole; import com.example.demo.domain.entity.Role; -import com.example.demo.domain.vo.AdminVo; -import com.example.demo.domain.vo.Permission; -import com.example.demo.domain.vo.Result; +import com.example.demo.domain.vo.coin.AdminVo; +import com.example.demo.domain.vo.coin.Permission; +import com.example.demo.domain.vo.coin.Result; import com.github.pagehelper.PageInfo; import java.util.List; diff --git a/src/main/java/com/example/demo/service/RateService.java b/src/main/java/com/example/demo/service/coin/RateService.java similarity index 67% rename from src/main/java/com/example/demo/service/RateService.java rename to src/main/java/com/example/demo/service/coin/RateService.java index e0b2b1f..852c0ba 100644 --- a/src/main/java/com/example/demo/service/RateService.java +++ b/src/main/java/com/example/demo/service/coin/RateService.java @@ -1,8 +1,8 @@ -package com.example.demo.service; +package com.example.demo.service.coin; import com.example.demo.domain.entity.Rate; -import com.example.demo.domain.vo.RateDetail; -import com.example.demo.domain.vo.Result; +import com.example.demo.domain.vo.coin.RateDetail; +import com.example.demo.domain.vo.coin.Result; import com.github.pagehelper.PageInfo; public interface RateService { diff --git a/src/main/java/com/example/demo/service/RechargeService.java b/src/main/java/com/example/demo/service/coin/RechargeService.java similarity index 73% rename from src/main/java/com/example/demo/service/RechargeService.java rename to src/main/java/com/example/demo/service/coin/RechargeService.java index db5f019..3cf8a1c 100644 --- a/src/main/java/com/example/demo/service/RechargeService.java +++ b/src/main/java/com/example/demo/service/coin/RechargeService.java @@ -1,9 +1,9 @@ -package com.example.demo.service; +package com.example.demo.service.coin; -import com.example.demo.domain.vo.ConsumeUser; -import com.example.demo.domain.vo.Gold; -import com.example.demo.domain.vo.RechargeUser; -import com.example.demo.domain.vo.Result; +import com.example.demo.domain.vo.coin.ConsumeUser; +import com.example.demo.domain.vo.coin.Gold; +import com.example.demo.domain.vo.coin.RechargeUser; +import com.example.demo.domain.vo.coin.Result; import com.github.pagehelper.PageInfo; /** diff --git a/src/main/java/com/example/demo/service/RefundService.java b/src/main/java/com/example/demo/service/coin/RefundService.java similarity index 77% rename from src/main/java/com/example/demo/service/RefundService.java rename to src/main/java/com/example/demo/service/coin/RefundService.java index 5d958da..5c10024 100644 --- a/src/main/java/com/example/demo/service/RefundService.java +++ b/src/main/java/com/example/demo/service/coin/RefundService.java @@ -1,10 +1,10 @@ -package com.example.demo.service; +package com.example.demo.service.coin; -import com.example.demo.domain.vo.ConsumeUser; -import com.example.demo.domain.vo.Gold; -import com.example.demo.domain.vo.RefundUser; -import com.example.demo.domain.vo.Result; +import com.example.demo.domain.vo.coin.ConsumeUser; +import com.example.demo.domain.vo.coin.Gold; +import com.example.demo.domain.vo.coin.RefundUser; +import com.example.demo.domain.vo.coin.Result; import com.github.pagehelper.PageInfo; import java.util.List; diff --git a/src/main/java/com/example/demo/service/RoleService.java b/src/main/java/com/example/demo/service/coin/RoleService.java similarity index 80% rename from src/main/java/com/example/demo/service/RoleService.java rename to src/main/java/com/example/demo/service/coin/RoleService.java index 9f9f3fc..c47e595 100644 --- a/src/main/java/com/example/demo/service/RoleService.java +++ b/src/main/java/com/example/demo/service/coin/RoleService.java @@ -1,9 +1,9 @@ -package com.example.demo.service; +package com.example.demo.service.coin; -import com.example.demo.domain.vo.ConsumeUser; -import com.example.demo.domain.vo.Result; -import com.example.demo.domain.vo.RoleVo; +import com.example.demo.domain.vo.coin.ConsumeUser; +import com.example.demo.domain.vo.coin.Result; +import com.example.demo.domain.vo.coin.RoleVo; import com.github.pagehelper.PageInfo; import java.util.List; diff --git a/src/main/java/com/example/demo/service/StatisticsService.java b/src/main/java/com/example/demo/service/coin/StatisticsService.java similarity index 84% rename from src/main/java/com/example/demo/service/StatisticsService.java rename to src/main/java/com/example/demo/service/coin/StatisticsService.java index 52f5a69..7fb9e2f 100644 --- a/src/main/java/com/example/demo/service/StatisticsService.java +++ b/src/main/java/com/example/demo/service/coin/StatisticsService.java @@ -1,8 +1,4 @@ -package com.example.demo.service; - -import com.example.demo.domain.entity.Statistics; - -import java.util.Date; +package com.example.demo.service.coin; /** * @program: gold-java diff --git a/src/main/java/com/example/demo/service/UserService.java b/src/main/java/com/example/demo/service/coin/UserService.java similarity index 76% rename from src/main/java/com/example/demo/service/UserService.java rename to src/main/java/com/example/demo/service/coin/UserService.java index 583e3b8..917682f 100644 --- a/src/main/java/com/example/demo/service/UserService.java +++ b/src/main/java/com/example/demo/service/coin/UserService.java @@ -1,11 +1,9 @@ -package com.example.demo.service; +package com.example.demo.service.coin; import com.example.demo.domain.entity.User; -import com.example.demo.domain.vo.Gold; -import com.example.demo.domain.vo.GoldUser; -import com.example.demo.domain.vo.Result; - -import java.util.List; +import com.example.demo.domain.vo.coin.Gold; +import com.example.demo.domain.vo.coin.GoldUser; +import com.example.demo.domain.vo.coin.Result; /** * @program: gold-java diff --git a/src/main/java/com/example/demo/service/WorkbenchService.java b/src/main/java/com/example/demo/service/coin/WorkbenchService.java similarity index 90% rename from src/main/java/com/example/demo/service/WorkbenchService.java rename to src/main/java/com/example/demo/service/coin/WorkbenchService.java index abdb02f..4126d4c 100644 --- a/src/main/java/com/example/demo/service/WorkbenchService.java +++ b/src/main/java/com/example/demo/service/coin/WorkbenchService.java @@ -1,12 +1,11 @@ -package com.example.demo.service; +package com.example.demo.service.coin; import com.example.demo.domain.entity.Statistics; -import com.example.demo.domain.vo.WorkbenchCard; -import com.example.demo.domain.vo.WorkbenchMarketCard; +import com.example.demo.domain.vo.coin.WorkbenchCard; +import com.example.demo.domain.vo.coin.WorkbenchMarketCard; import java.util.Date; import java.util.List; -import java.util.Map; /** * @program: gold-java diff --git a/src/main/java/com/example/demo/service/listen/AiEmotionExportListener.java b/src/main/java/com/example/demo/service/listen/AiEmotionExportListener.java index 635ecdb..2fe592c 100644 --- a/src/main/java/com/example/demo/service/listen/AiEmotionExportListener.java +++ b/src/main/java/com/example/demo/service/listen/AiEmotionExportListener.java @@ -6,8 +6,8 @@ import cn.hutool.core.util.StrUtil; import com.example.demo.Util.ExecutionContextUtil; import com.example.demo.Util.FeiShuAlertUtil; import com.example.demo.Util.RedisUtil; -import com.example.demo.domain.vo.ExecutionContext; -import com.example.demo.service.ExportExcelService; +import com.example.demo.domain.vo.coin.ExecutionContext; +import com.example.demo.service.coin.ExportExcelService; import com.example.demo.service.queue.AbstractMessageListener; diff --git a/src/main/java/com/example/demo/service/listen/ConsumeListener.java b/src/main/java/com/example/demo/service/listen/ConsumeListener.java index 853b0be..bcf76b1 100644 --- a/src/main/java/com/example/demo/service/listen/ConsumeListener.java +++ b/src/main/java/com/example/demo/service/listen/ConsumeListener.java @@ -1,12 +1,11 @@ package com.example.demo.service.listen; import cn.hutool.core.util.StrUtil; -import com.example.demo.Export.ExportService; import com.example.demo.Util.ExecutionContextUtil; import com.example.demo.Util.FeiShuAlertUtil; import com.example.demo.Util.RedisUtil; -import com.example.demo.domain.vo.ExecutionContext; -import com.example.demo.service.ExportExcelService; +import com.example.demo.domain.vo.coin.ExecutionContext; +import com.example.demo.service.coin.ExportExcelService; import com.example.demo.service.queue.AbstractMessageListener; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; diff --git a/src/main/java/com/example/demo/service/listen/GoldListener.java b/src/main/java/com/example/demo/service/listen/GoldListener.java index 3736216..e454fa2 100644 --- a/src/main/java/com/example/demo/service/listen/GoldListener.java +++ b/src/main/java/com/example/demo/service/listen/GoldListener.java @@ -5,9 +5,8 @@ import cn.hutool.core.util.StrUtil; import com.example.demo.Util.ExecutionContextUtil; import com.example.demo.Util.FeiShuAlertUtil; import com.example.demo.Util.RedisUtil; -import com.example.demo.domain.vo.ExecutionContext; -import com.example.demo.service.ExportExcelService; -import com.example.demo.service.GoldDetailService; +import com.example.demo.domain.vo.coin.ExecutionContext; +import com.example.demo.service.coin.ExportExcelService; import com.example.demo.service.queue.AbstractMessageListener; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; diff --git a/src/main/java/com/example/demo/service/listen/RechargeListener.java b/src/main/java/com/example/demo/service/listen/RechargeListener.java index 8240be4..79f961f 100644 --- a/src/main/java/com/example/demo/service/listen/RechargeListener.java +++ b/src/main/java/com/example/demo/service/listen/RechargeListener.java @@ -1,12 +1,11 @@ package com.example.demo.service.listen; import cn.hutool.core.util.StrUtil; -import com.example.demo.Export.ExportService; import com.example.demo.Util.ExecutionContextUtil; import com.example.demo.Util.FeiShuAlertUtil; import com.example.demo.Util.RedisUtil; -import com.example.demo.domain.vo.ExecutionContext; -import com.example.demo.service.ExportExcelService; +import com.example.demo.domain.vo.coin.ExecutionContext; +import com.example.demo.service.coin.ExportExcelService; import com.example.demo.service.queue.AbstractMessageListener; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; diff --git a/src/main/java/com/example/demo/service/listen/RefundListener.java b/src/main/java/com/example/demo/service/listen/RefundListener.java index fa71944..791ab30 100644 --- a/src/main/java/com/example/demo/service/listen/RefundListener.java +++ b/src/main/java/com/example/demo/service/listen/RefundListener.java @@ -1,12 +1,11 @@ package com.example.demo.service.listen; import cn.hutool.core.util.StrUtil; -import com.example.demo.Export.ExportService; import com.example.demo.Util.ExecutionContextUtil; import com.example.demo.Util.FeiShuAlertUtil; import com.example.demo.Util.RedisUtil; -import com.example.demo.domain.vo.ExecutionContext; -import com.example.demo.service.ExportExcelService; +import com.example.demo.domain.vo.coin.ExecutionContext; +import com.example.demo.service.coin.ExportExcelService; import com.example.demo.service.queue.AbstractMessageListener; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; diff --git a/src/main/java/com/example/demo/serviceImpl/AdminServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/coin/AdminServiceImpl.java similarity index 97% rename from src/main/java/com/example/demo/serviceImpl/AdminServiceImpl.java rename to src/main/java/com/example/demo/serviceImpl/coin/AdminServiceImpl.java index 959f37c..1014c4e 100644 --- a/src/main/java/com/example/demo/serviceImpl/AdminServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/coin/AdminServiceImpl.java @@ -1,10 +1,10 @@ -package com.example.demo.serviceImpl; +package com.example.demo.serviceImpl.coin; import com.example.demo.domain.entity.Admin; -import com.example.demo.domain.vo.Password; -import com.example.demo.domain.vo.Result; -import com.example.demo.mapper.AdminMapper; -import com.example.demo.service.AdminService; +import com.example.demo.domain.vo.coin.Password; +import com.example.demo.domain.vo.coin.Result; +import com.example.demo.mapper.coin.AdminMapper; +import com.example.demo.service.coin.AdminService; import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.authentication.AuthenticationManager; diff --git a/src/main/java/com/example/demo/serviceImpl/AiEmotionServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/coin/AiEmotionServiceImpl.java similarity index 71% rename from src/main/java/com/example/demo/serviceImpl/AiEmotionServiceImpl.java rename to src/main/java/com/example/demo/serviceImpl/coin/AiEmotionServiceImpl.java index 3d68db2..7d615af 100644 --- a/src/main/java/com/example/demo/serviceImpl/AiEmotionServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/coin/AiEmotionServiceImpl.java @@ -1,10 +1,10 @@ -package com.example.demo.serviceImpl; +package com.example.demo.serviceImpl.coin; -import com.example.demo.domain.vo.AiEmotionExportRecordVO; -import com.example.demo.domain.vo.ExportVo; -import com.example.demo.mapper.AiEmotionMapper; -import com.example.demo.mapper.ExportMapper; -import com.example.demo.service.AiEmotionService; +import com.example.demo.domain.vo.coin.AiEmotionExportRecordVO; +import com.example.demo.domain.vo.coin.ExportVo; +import com.example.demo.mapper.coin.AiEmotionMapper; +import com.example.demo.mapper.coin.ExportMapper; +import com.example.demo.service.coin.AiEmotionService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/src/main/java/com/example/demo/serviceImpl/AuditServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/coin/AuditServiceImpl.java similarity index 94% rename from src/main/java/com/example/demo/serviceImpl/AuditServiceImpl.java rename to src/main/java/com/example/demo/serviceImpl/coin/AuditServiceImpl.java index 03108ea..7a8b769 100644 --- a/src/main/java/com/example/demo/serviceImpl/AuditServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/coin/AuditServiceImpl.java @@ -1,25 +1,23 @@ -package com.example.demo.serviceImpl; +package com.example.demo.serviceImpl.coin; import com.example.demo.Util.GoldTistV2; import com.example.demo.domain.entity.User; import com.example.demo.domain.entity.UserGoldRecord; -import com.example.demo.domain.vo.Gold; -import com.example.demo.domain.vo.GoldUser; -import com.example.demo.domain.vo.RechargeAudit; -import com.example.demo.domain.vo.RefundAudit; -import com.example.demo.mapper.AuditMapper; -import com.example.demo.mapper.UserMapper; -import com.example.demo.service.AdminService; -import com.example.demo.service.AuditService; -import com.example.demo.service.GeneralService; -import com.example.demo.service.PermissionService; +import com.example.demo.domain.vo.coin.Gold; +import com.example.demo.domain.vo.coin.GoldUser; +import com.example.demo.domain.vo.coin.RechargeAudit; +import com.example.demo.domain.vo.coin.RefundAudit; +import com.example.demo.mapper.coin.AuditMapper; +import com.example.demo.mapper.coin.UserMapper; +import com.example.demo.service.coin.AdminService; +import com.example.demo.service.coin.AuditService; +import com.example.demo.service.coin.GeneralService; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import java.util.Arrays; import java.util.Date; import java.util.List; diff --git a/src/main/java/com/example/demo/serviceImpl/ConsumeServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/coin/ConsumeServiceImpl.java similarity index 93% rename from src/main/java/com/example/demo/serviceImpl/ConsumeServiceImpl.java rename to src/main/java/com/example/demo/serviceImpl/coin/ConsumeServiceImpl.java index d147f16..3babb05 100644 --- a/src/main/java/com/example/demo/serviceImpl/ConsumeServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/coin/ConsumeServiceImpl.java @@ -1,31 +1,27 @@ -package com.example.demo.serviceImpl; +package com.example.demo.serviceImpl.coin; import com.example.demo.Util.GoldTistV2; import com.example.demo.domain.entity.User; import com.example.demo.domain.entity.UserGoldRecord; -import com.example.demo.domain.vo.ConsumeUser; -import com.example.demo.domain.vo.Gold; -import com.example.demo.domain.vo.GoldUser; -import com.example.demo.domain.vo.Result; -import com.example.demo.mapper.ConsumeMapper; -import com.example.demo.mapper.UserMapper; -import com.example.demo.service.AdminService; -import com.example.demo.service.ConsumeService; -import com.example.demo.service.GeneralService; +import com.example.demo.domain.vo.coin.ConsumeUser; +import com.example.demo.domain.vo.coin.Gold; +import com.example.demo.domain.vo.coin.GoldUser; +import com.example.demo.domain.vo.coin.Result; +import com.example.demo.mapper.coin.ConsumeMapper; +import com.example.demo.mapper.coin.UserMapper; +import com.example.demo.service.coin.ConsumeService; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import java.math.BigDecimal; import java.time.LocalDate; import java.time.LocalDateTime; import java.time.format.DateTimeFormatter; import java.util.Date; import java.util.List; import java.util.Random; -import java.util.concurrent.atomic.AtomicInteger; /** * @program: gold-java diff --git a/src/main/java/com/example/demo/serviceImpl/ExportExcelServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/coin/ExportExcelServiceImpl.java similarity index 98% rename from src/main/java/com/example/demo/serviceImpl/ExportExcelServiceImpl.java rename to src/main/java/com/example/demo/serviceImpl/coin/ExportExcelServiceImpl.java index e4c38c7..b2895f1 100644 --- a/src/main/java/com/example/demo/serviceImpl/ExportExcelServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/coin/ExportExcelServiceImpl.java @@ -1,42 +1,38 @@ -package com.example.demo.serviceImpl; +package com.example.demo.serviceImpl.coin; import cn.hutool.log.AbstractLog; import com.alibaba.excel.EasyExcel; import com.alibaba.excel.ExcelWriter; import com.alibaba.excel.write.metadata.WriteSheet; import com.example.demo.Util.ExcelUploadUtil; -import com.example.demo.Util.ExecutionContextUtil; import com.example.demo.Util.JWTUtil; -import com.example.demo.controller.ConsumeController; -import com.example.demo.controller.GoldDetailController; -import com.example.demo.controller.RechargeController; -import com.example.demo.controller.RefundController; +import com.example.demo.controller.coin.ConsumeController; +import com.example.demo.controller.coin.GoldDetailController; +import com.example.demo.controller.coin.RechargeController; +import com.example.demo.controller.coin.RefundController; import com.example.demo.domain.entity.Admin; import com.example.demo.domain.entity.Export; import com.example.demo.domain.entity.User; import com.example.demo.domain.export.Goldmingxi; -import com.example.demo.domain.vo.*; +import com.example.demo.domain.vo.coin.*; -import com.example.demo.mapper.ExportMapper; -import com.example.demo.service.ExportExcelService; +import com.example.demo.mapper.coin.ExportMapper; +import com.example.demo.service.coin.ExportExcelService; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; -import com.example.demo.service.AiEmotionService; +import com.example.demo.service.coin.AiEmotionService; import com.github.pagehelper.PageInfo; -import jakarta.servlet.http.HttpServletRequest; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.security.authentication.AuthenticationManager; -import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; import org.springframework.security.core.Authentication; import org.springframework.security.core.context.SecurityContextHolder; -import org.springframework.security.core.userdetails.UserDetails; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/src/main/java/com/example/demo/serviceImpl/GeneralServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/coin/GeneralServiceImpl.java similarity index 97% rename from src/main/java/com/example/demo/serviceImpl/GeneralServiceImpl.java rename to src/main/java/com/example/demo/serviceImpl/coin/GeneralServiceImpl.java index a8602b2..25ea11f 100644 --- a/src/main/java/com/example/demo/serviceImpl/GeneralServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/coin/GeneralServiceImpl.java @@ -1,7 +1,7 @@ -package com.example.demo.serviceImpl; +package com.example.demo.serviceImpl.coin; -import com.example.demo.mapper.GeneralMapper; -import com.example.demo.service.GeneralService; +import com.example.demo.mapper.coin.GeneralMapper; +import com.example.demo.service.coin.GeneralService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/main/java/com/example/demo/serviceImpl/GoldDetailServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/coin/GoldDetailServiceImpl.java similarity index 97% rename from src/main/java/com/example/demo/serviceImpl/GoldDetailServiceImpl.java rename to src/main/java/com/example/demo/serviceImpl/coin/GoldDetailServiceImpl.java index ed51f40..a6d5ddb 100644 --- a/src/main/java/com/example/demo/serviceImpl/GoldDetailServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/coin/GoldDetailServiceImpl.java @@ -1,4 +1,4 @@ -package com.example.demo.serviceImpl; +package com.example.demo.serviceImpl.coin; import com.example.demo.Util.JWTUtil; import com.example.demo.Util.RedisUtil; @@ -6,11 +6,10 @@ import com.example.demo.domain.DTO.GoldDetailDTO; import com.example.demo.domain.DTO.GoldUserDTO; import com.example.demo.domain.entity.Admin; import com.example.demo.domain.entity.User; -import com.example.demo.domain.vo.*; import com.example.demo.exception.SystemException; -import com.example.demo.mapper.GoldDetailMapper; -import com.example.demo.service.AdminService; -import com.example.demo.service.GoldDetailService; +import com.example.demo.mapper.coin.GoldDetailMapper; +import com.example.demo.service.coin.AdminService; +import com.example.demo.service.coin.GoldDetailService; import com.fasterxml.jackson.databind.ObjectMapper; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; @@ -20,8 +19,8 @@ import org.springframework.security.core.userdetails.UserDetails; import org.springframework.stereotype.Service; import org.springframework.web.context.request.RequestContextHolder; import org.springframework.web.context.request.ServletRequestAttributes; +import com.example.demo.domain.vo.coin.*; -import java.io.IOException; import java.time.LocalDateTime; import java.time.format.DateTimeFormatter; import java.util.HashMap; diff --git a/src/main/java/com/example/demo/serviceImpl/MarketServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/coin/MarketServiceImpl.java similarity index 87% rename from src/main/java/com/example/demo/serviceImpl/MarketServiceImpl.java rename to src/main/java/com/example/demo/serviceImpl/coin/MarketServiceImpl.java index 64bd0a5..f0c9424 100644 --- a/src/main/java/com/example/demo/serviceImpl/MarketServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/coin/MarketServiceImpl.java @@ -1,9 +1,9 @@ -package com.example.demo.serviceImpl; +package com.example.demo.serviceImpl.coin; import com.example.demo.domain.entity.Market; -import com.example.demo.domain.vo.MenuVo; -import com.example.demo.mapper.MarketMapper; -import com.example.demo.service.MarketService; +import com.example.demo.domain.vo.coin.MenuVo; +import com.example.demo.mapper.coin.MarketMapper; +import com.example.demo.service.coin.MarketService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/src/main/java/com/example/demo/serviceImpl/MenuServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/coin/MenuServiceImpl.java similarity index 94% rename from src/main/java/com/example/demo/serviceImpl/MenuServiceImpl.java rename to src/main/java/com/example/demo/serviceImpl/coin/MenuServiceImpl.java index 801ef9d..e88867b 100644 --- a/src/main/java/com/example/demo/serviceImpl/MenuServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/coin/MenuServiceImpl.java @@ -1,13 +1,13 @@ -package com.example.demo.serviceImpl; +package com.example.demo.serviceImpl.coin; import com.example.demo.domain.entity.Role; -import com.example.demo.domain.vo.MenuVo; -import com.example.demo.domain.vo.Result; -import com.example.demo.domain.vo.RoleMenu; -import com.example.demo.domain.vo.RoleVo; -import com.example.demo.mapper.MenuMapper; -import com.example.demo.mapper.RoleMapper; -import com.example.demo.service.MenuService; +import com.example.demo.domain.vo.coin.MenuVo; +import com.example.demo.domain.vo.coin.Result; +import com.example.demo.domain.vo.coin.RoleMenu; +import com.example.demo.domain.vo.coin.RoleVo; +import com.example.demo.mapper.coin.MenuMapper; +import com.example.demo.mapper.coin.RoleMapper; +import com.example.demo.service.coin.MenuService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/src/main/java/com/example/demo/serviceImpl/PermissionServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/coin/PermissionServiceImpl.java similarity index 93% rename from src/main/java/com/example/demo/serviceImpl/PermissionServiceImpl.java rename to src/main/java/com/example/demo/serviceImpl/coin/PermissionServiceImpl.java index 5a6b2f1..8931a28 100644 --- a/src/main/java/com/example/demo/serviceImpl/PermissionServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/coin/PermissionServiceImpl.java @@ -1,17 +1,15 @@ -package com.example.demo.serviceImpl; +package com.example.demo.serviceImpl.coin; import com.example.demo.domain.entity.Admin; import com.example.demo.domain.entity.AdminRole; import com.example.demo.domain.entity.Role; -import com.example.demo.domain.vo.AdminVo; -import com.example.demo.domain.vo.Password; -import com.example.demo.domain.vo.Permission; -import com.example.demo.domain.vo.Result; -import com.example.demo.mapper.AdminMapper; -import com.example.demo.mapper.PermissionMapper; -import com.example.demo.service.AdminService; -import com.example.demo.service.GeneralService; -import com.example.demo.service.PermissionService; +import com.example.demo.domain.vo.coin.AdminVo; +import com.example.demo.domain.vo.coin.Password; +import com.example.demo.domain.vo.coin.Permission; +import com.example.demo.domain.vo.coin.Result; +import com.example.demo.mapper.coin.AdminMapper; +import com.example.demo.mapper.coin.PermissionMapper; +import com.example.demo.service.coin.PermissionService; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/main/java/com/example/demo/serviceImpl/RateServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/coin/RateServiceImpl.java similarity index 79% rename from src/main/java/com/example/demo/serviceImpl/RateServiceImpl.java rename to src/main/java/com/example/demo/serviceImpl/coin/RateServiceImpl.java index e60f2aa..8e94b9c 100644 --- a/src/main/java/com/example/demo/serviceImpl/RateServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/coin/RateServiceImpl.java @@ -1,11 +1,11 @@ -package com.example.demo.serviceImpl; +package com.example.demo.serviceImpl.coin; import com.example.demo.domain.entity.Rate; -import com.example.demo.domain.vo.ConsumeUser; -import com.example.demo.domain.vo.RateDetail; -import com.example.demo.domain.vo.Result; -import com.example.demo.mapper.RateMapper; -import com.example.demo.service.RateService; +import com.example.demo.domain.vo.coin.ConsumeUser; +import com.example.demo.domain.vo.coin.RateDetail; +import com.example.demo.domain.vo.coin.Result; +import com.example.demo.mapper.coin.RateMapper; +import com.example.demo.service.coin.RateService; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/main/java/com/example/demo/serviceImpl/RechargeServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/coin/RechargeServiceImpl.java similarity index 91% rename from src/main/java/com/example/demo/serviceImpl/RechargeServiceImpl.java rename to src/main/java/com/example/demo/serviceImpl/coin/RechargeServiceImpl.java index 4ceffd1..3644526 100644 --- a/src/main/java/com/example/demo/serviceImpl/RechargeServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/coin/RechargeServiceImpl.java @@ -1,26 +1,20 @@ -package com.example.demo.serviceImpl; +package com.example.demo.serviceImpl.coin; -import com.example.demo.domain.entity.User; import com.example.demo.domain.entity.UserGoldRecord; -import com.example.demo.domain.vo.*; -import com.example.demo.mapper.ConsumeMapper; -import com.example.demo.mapper.RechargeMapper; -import com.example.demo.mapper.UserMapper; -import com.example.demo.service.AdminService; -import com.example.demo.service.GeneralService; -import com.example.demo.service.RechargeService; +import com.example.demo.mapper.coin.RechargeMapper; +import com.example.demo.mapper.coin.UserMapper; +import com.example.demo.service.coin.RechargeService; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; - +import com.example.demo.domain.vo.coin.*; import java.time.LocalDate; import java.time.LocalDateTime; import java.time.format.DateTimeFormatter; import java.util.Date; import java.util.List; import java.util.Random; -import java.util.concurrent.atomic.AtomicInteger; /** * @program: gold-java diff --git a/src/main/java/com/example/demo/serviceImpl/RefundServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/coin/RefundServiceImpl.java similarity index 93% rename from src/main/java/com/example/demo/serviceImpl/RefundServiceImpl.java rename to src/main/java/com/example/demo/serviceImpl/coin/RefundServiceImpl.java index f1dcdb5..58edfb6 100644 --- a/src/main/java/com/example/demo/serviceImpl/RefundServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/coin/RefundServiceImpl.java @@ -1,28 +1,21 @@ -package com.example.demo.serviceImpl; +package com.example.demo.serviceImpl.coin; import com.example.demo.domain.entity.UserGoldRecord; -import com.example.demo.domain.vo.*; -import com.example.demo.mapper.ConsumeMapper; -import com.example.demo.mapper.RefundMapper; -import com.example.demo.mapper.UserMapper; -import com.example.demo.service.AdminService; -import com.example.demo.service.GeneralService; -import com.example.demo.service.RefundService; +import com.example.demo.mapper.coin.ConsumeMapper; +import com.example.demo.mapper.coin.RefundMapper; +import com.example.demo.mapper.coin.UserMapper; +import com.example.demo.service.coin.RefundService; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; - -import java.io.Console; +import com.example.demo.domain.vo.coin.*; import java.time.LocalDate; -import java.time.LocalDateTime; -import java.time.format.DateTimeFormatter; import java.util.ArrayList; import java.util.Date; import java.util.List; import java.util.Objects; -import java.util.concurrent.atomic.AtomicInteger; import java.util.stream.Collectors; /** diff --git a/src/main/java/com/example/demo/serviceImpl/RoleServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/coin/RoleServiceImpl.java similarity index 94% rename from src/main/java/com/example/demo/serviceImpl/RoleServiceImpl.java rename to src/main/java/com/example/demo/serviceImpl/coin/RoleServiceImpl.java index b90cdb5..895a4a6 100644 --- a/src/main/java/com/example/demo/serviceImpl/RoleServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/coin/RoleServiceImpl.java @@ -1,19 +1,16 @@ -package com.example.demo.serviceImpl; +package com.example.demo.serviceImpl.coin; import com.example.demo.Util.JWTUtil; import com.example.demo.domain.entity.Admin; import com.example.demo.domain.entity.Role; -import com.example.demo.domain.vo.ConsumeUser; -import com.example.demo.domain.vo.MenuVo; -import com.example.demo.domain.vo.Result; -import com.example.demo.domain.vo.RoleVo; -import com.example.demo.mapper.MenuMapper; -import com.example.demo.mapper.RefundMapper; -import com.example.demo.mapper.RoleMapper; -import com.example.demo.service.AdminService; -import com.example.demo.service.GeneralService; -import com.example.demo.service.MenuService; -import com.example.demo.service.RoleService; +import com.example.demo.domain.vo.coin.ConsumeUser; +import com.example.demo.domain.vo.coin.MenuVo; +import com.example.demo.domain.vo.coin.Result; +import com.example.demo.domain.vo.coin.RoleVo; +import com.example.demo.mapper.coin.MenuMapper; +import com.example.demo.mapper.coin.RoleMapper; +import com.example.demo.service.coin.MenuService; +import com.example.demo.service.coin.RoleService; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import jakarta.servlet.http.HttpServletRequest; diff --git a/src/main/java/com/example/demo/serviceImpl/StatisticsServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/coin/StatisticsServiceImpl.java similarity index 89% rename from src/main/java/com/example/demo/serviceImpl/StatisticsServiceImpl.java rename to src/main/java/com/example/demo/serviceImpl/coin/StatisticsServiceImpl.java index 5f5a1cc..ae87cfa 100644 --- a/src/main/java/com/example/demo/serviceImpl/StatisticsServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/coin/StatisticsServiceImpl.java @@ -1,11 +1,8 @@ -package com.example.demo.serviceImpl; +package com.example.demo.serviceImpl.coin; import com.example.demo.domain.entity.Statistics; -import com.example.demo.domain.entity.UserGoldRecord; -import com.example.demo.mapper.StatisticsMapper; -import com.example.demo.service.GeneralService; -import com.example.demo.service.StatisticsService; -import com.example.demo.service.WorkbenchService; +import com.example.demo.mapper.coin.StatisticsMapper; +import com.example.demo.service.coin.StatisticsService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -13,10 +10,8 @@ import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Service; import java.time.LocalDate; -import java.time.LocalDateTime; import java.time.LocalTime; import java.time.ZoneId; -import java.time.format.DateTimeFormatter; import java.util.*; /** diff --git a/src/main/java/com/example/demo/serviceImpl/UserDetailServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/coin/UserDetailServiceImpl.java similarity index 91% rename from src/main/java/com/example/demo/serviceImpl/UserDetailServiceImpl.java rename to src/main/java/com/example/demo/serviceImpl/coin/UserDetailServiceImpl.java index 0ebcbbc..f2e6596 100644 --- a/src/main/java/com/example/demo/serviceImpl/UserDetailServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/coin/UserDetailServiceImpl.java @@ -1,8 +1,8 @@ -package com.example.demo.serviceImpl; +package com.example.demo.serviceImpl.coin; import com.example.demo.domain.entity.Admin; -import com.example.demo.mapper.AdminMapper; +import com.example.demo.mapper.coin.AdminMapper; import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.core.userdetails.UserDetails; diff --git a/src/main/java/com/example/demo/serviceImpl/UserServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/coin/UserServiceImpl.java similarity index 87% rename from src/main/java/com/example/demo/serviceImpl/UserServiceImpl.java rename to src/main/java/com/example/demo/serviceImpl/coin/UserServiceImpl.java index 7f51f31..d14404c 100644 --- a/src/main/java/com/example/demo/serviceImpl/UserServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/coin/UserServiceImpl.java @@ -1,19 +1,15 @@ -package com.example.demo.serviceImpl; +package com.example.demo.serviceImpl.coin; import com.example.demo.Util.JWTUtil; import com.example.demo.domain.entity.Admin; import com.example.demo.domain.entity.User; -import com.example.demo.domain.vo.Gold; -import com.example.demo.domain.vo.GoldUser; -import com.example.demo.domain.vo.Result; -import com.example.demo.mapper.ConsumeMapper; -import com.example.demo.mapper.UserMapper; -import com.example.demo.service.AdminService; -import com.example.demo.service.GeneralService; -import com.example.demo.service.UserService; +import com.example.demo.domain.vo.coin.Gold; +import com.example.demo.domain.vo.coin.GoldUser; +import com.example.demo.domain.vo.coin.Result; +import com.example.demo.mapper.coin.UserMapper; +import com.example.demo.service.coin.UserService; import jakarta.servlet.http.HttpServletRequest; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Service; import org.springframework.web.context.request.RequestContextHolder; import org.springframework.web.context.request.ServletRequestAttributes; diff --git a/src/main/java/com/example/demo/serviceImpl/WorkbenchServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/coin/WorkbenchServiceImpl.java similarity index 97% rename from src/main/java/com/example/demo/serviceImpl/WorkbenchServiceImpl.java rename to src/main/java/com/example/demo/serviceImpl/coin/WorkbenchServiceImpl.java index ee20c63..a123b13 100644 --- a/src/main/java/com/example/demo/serviceImpl/WorkbenchServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/coin/WorkbenchServiceImpl.java @@ -1,19 +1,16 @@ -package com.example.demo.serviceImpl; +package com.example.demo.serviceImpl.coin; import com.example.demo.domain.entity.Statistics; -import com.example.demo.domain.vo.WorkbenchCard; -import com.example.demo.domain.vo.WorkbenchFullStatistics; -import com.example.demo.domain.vo.WorkbenchMarketCard; -import com.example.demo.domain.vo.WorkbenchMarketGraph; -import com.example.demo.mapper.StatisticsMapper; -import com.example.demo.mapper.WorkBenchMapper; -import com.example.demo.service.GeneralService; -import com.example.demo.service.StatisticsService; -import com.example.demo.service.WorkbenchService; +import com.example.demo.domain.vo.coin.WorkbenchCard; +import com.example.demo.domain.vo.coin.WorkbenchFullStatistics; +import com.example.demo.domain.vo.coin.WorkbenchMarketCard; +import com.example.demo.domain.vo.coin.WorkbenchMarketGraph; +import com.example.demo.mapper.coin.StatisticsMapper; +import com.example.demo.mapper.coin.WorkBenchMapper; +import com.example.demo.service.coin.WorkbenchService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.cache.annotation.Cacheable; import org.springframework.data.redis.core.RedisTemplate; import org.springframework.stereotype.Service; diff --git a/src/main/resources/jindouMapper/BeanRechargeMapper.xml b/src/main/resources/jindouMapper/BeanRechargeMapper.xml index 71efa7e..7f1b697 100644 --- a/src/main/resources/jindouMapper/BeanRechargeMapper.xml +++ b/src/main/resources/jindouMapper/BeanRechargeMapper.xml @@ -1,203 +1,6 @@ - + - - - - - - - - INSERT INTO user_gold_record - - order_code, - jwcode, - activity, - sum_gold, - permanent_gold, - free_june, - free_december, - rate_id, - money, - voucher, - pay_platform, - pay_model, - pay_time, - remark, - admin_id, - type, - audit_status, - create_time - - VALUES - - #{orderCode}, - #{jwcode}, - #{activity}, - #{sumGold}, - #{permanentGold}, - #{freeJune}, - #{freeDecember}, - #{rateId}, - #{money}, - #{voucher}, - #{payPlatform}, - #{payModel}, - #{payTime}, - #{remark}, - #{adminId}, - #{type}, - #{auditStatus}, - #{createTime} - - \ No newline at end of file diff --git a/src/main/resources/mapper/AdminMapper.xml b/src/main/resources/mapper/AdminMapper.xml index 1687ab4..a245806 100644 --- a/src/main/resources/mapper/AdminMapper.xml +++ b/src/main/resources/mapper/AdminMapper.xml @@ -1,6 +1,6 @@ - + + \ No newline at end of file diff --git a/src/main/resources/mapper/AuditMapper.xml b/src/main/resources/mapper/AuditMapper.xml index e82557f..7ab53f9 100644 --- a/src/main/resources/mapper/AuditMapper.xml +++ b/src/main/resources/mapper/AuditMapper.xml @@ -1,6 +1,6 @@ - + update user_gold_record @@ -43,7 +43,7 @@ limit 1 - SELECT ugr.*, (COALESCE(ugr.free_june, 0) + COALESCE(ugr.free_december, 0)) AS freeGold, u.name as name, @@ -97,7 +97,7 @@ - SELECT ugr.*, (COALESCE(ugr.free_june, 0) + COALESCE(ugr.free_december, 0)) AS freeGold, u.name as name, diff --git a/src/main/resources/mapper/ConsumeMapper.xml b/src/main/resources/mapper/ConsumeMapper.xml index 624f93b..79f0bda 100644 --- a/src/main/resources/mapper/ConsumeMapper.xml +++ b/src/main/resources/mapper/ConsumeMapper.xml @@ -1,9 +1,9 @@ - + - SELECT u.name AS name, ugr.jwcode AS jwcode, u.market AS market, @@ -72,7 +72,7 @@ - SELECT u.name AS name, ugr.jwcode AS jwcode, u.market AS market, @@ -153,7 +153,7 @@ - SELECT ugr.jwcode AS jwcode, ugr.order_code AS orderCode, ugr.is_refund AS isRefund diff --git a/src/main/resources/mapper/ExportMapper.xml b/src/main/resources/mapper/ExportMapper.xml index 361a9de..6c16689 100644 --- a/src/main/resources/mapper/ExportMapper.xml +++ b/src/main/resources/mapper/ExportMapper.xml @@ -1,6 +1,6 @@ - + UPDATE export @@ -12,7 +12,7 @@ WHERE id = #{recordId} - select id,file_name,url,state from export where id=#{recordId} select DISTINCT market from user diff --git a/src/main/resources/mapper/GoldDetailMapper.xml b/src/main/resources/mapper/GoldDetailMapper.xml index 140c4cf..a3bd91c 100644 --- a/src/main/resources/mapper/GoldDetailMapper.xml +++ b/src/main/resources/mapper/GoldDetailMapper.xml @@ -1,12 +1,12 @@ - + insert into export (account,type,state,url,file_name,data_num) values(#{account},#{type},#{state},#{url},#{fileName},#{dataNum}) - select `user`.name, `user`.jwcode, `user`.market, `ugr`.pay_platform, `ugr`.type, `ugr`.sum_gold, `ugr`.permanent_gold, `ugr`.free_june, `ugr`.free_december, `ugr`.task_gold, `admin`.admin_name, `ugr`.audit_time, `ugr`.free_june+`ugr`.free_december as free_gold from user_gold_record ugr @@ -44,7 +44,7 @@ - select sum(sum_gold) as Goldtotal, sum(permanent_gold) as permanentGold, sum(free_june+free_december) as freeGold, sum(task_gold) as taskGold from user_gold_record ugr @@ -93,7 +93,7 @@ - select sum(current_permanent_gold) as permanentGold, sum(current_free_june + current_free_december) as freeGold, @@ -112,7 +112,7 @@ - select `user`.name, `user`.jwcode, `user`.market, `ugr`.pay_platform, `ugr`.type, `ugr`.sum_gold, `ugr`.permanent_gold, `ugr`.free_june, `ugr`.free_december, `ugr`.task_gold, `admin`.admin_name, `ugr`.audit_time from user_gold_record ugr left join `user` on `user`.jwcode = `ugr`.jwcode diff --git a/src/main/resources/mapper/MarketMapper.xml b/src/main/resources/mapper/MarketMapper.xml index 7a402b8..6904cbd 100644 --- a/src/main/resources/mapper/MarketMapper.xml +++ b/src/main/resources/mapper/MarketMapper.xml @@ -1,6 +1,6 @@ - + diff --git a/src/main/resources/mapper/MenuMapper.xml b/src/main/resources/mapper/MenuMapper.xml index 336cc3f..7350aaf 100644 --- a/src/main/resources/mapper/MenuMapper.xml +++ b/src/main/resources/mapper/MenuMapper.xml @@ -1,6 +1,6 @@ - + UPDATE role_menu @@ -17,7 +17,7 @@ WHERE role_id = #{id} - SELECT DISTINCT m.id, m.menu_name, diff --git a/src/main/resources/mapper/PermissionMapper.xml b/src/main/resources/mapper/PermissionMapper.xml index 2b6285e..3740d89 100644 --- a/src/main/resources/mapper/PermissionMapper.xml +++ b/src/main/resources/mapper/PermissionMapper.xml @@ -1,6 +1,6 @@ - + insert into admin(admin_name, machine_id, account, password, market, postiton, remark, admin_status, role_id) values (#{adminName}, #{machineId}, #{account}, #{password}, #{market[0]}, #{postiton}, #{remark}, 1 ,#{roleId}) @@ -69,7 +69,7 @@ select distinct market from admin - select admin.id as id,admin.machine_id,admin.admin_name as name,admin.account,admin.market,admin.postiton,admin.remark,admin.admin_status as adminStatus,admin.role_id,role.role_name from admin diff --git a/src/main/resources/mapper/RateMapper.xml b/src/main/resources/mapper/RateMapper.xml index e67a6fd..99a0744 100644 --- a/src/main/resources/mapper/RateMapper.xml +++ b/src/main/resources/mapper/RateMapper.xml @@ -1,7 +1,7 @@ - - SELECT r.id,r.rate_name rateName,r.num,r.admin_id adminId,r.create_time createTime,r.update_time updateTime FROM rate r diff --git a/src/main/resources/mapper/RechargeMapper.xml b/src/main/resources/mapper/RechargeMapper.xml index 71efa7e..08d3527 100644 --- a/src/main/resources/mapper/RechargeMapper.xml +++ b/src/main/resources/mapper/RechargeMapper.xml @@ -1,9 +1,9 @@ - + - SELECT u.name AS name, ugr.jwcode AS jwcode, @@ -72,7 +72,7 @@ - SELECT u.name AS name, ugr.jwcode AS jwcode, diff --git a/src/main/resources/mapper/RefundMapper.xml b/src/main/resources/mapper/RefundMapper.xml index 2e08618..eae9331 100644 --- a/src/main/resources/mapper/RefundMapper.xml +++ b/src/main/resources/mapper/RefundMapper.xml @@ -1,9 +1,9 @@ - + - SELECT u.name AS name, ugr.jwcode AS jwcode, u.market AS market, @@ -73,7 +73,7 @@ - SELECT u.name AS name, ugr.jwcode AS jwcode, u.market AS market, @@ -209,7 +209,7 @@ from user_gold_record - SELECT ugr.goods_name AS goodsName, diff --git a/src/main/resources/mapper/RoleMapper.xml b/src/main/resources/mapper/RoleMapper.xml index e5a201b..c176265 100644 --- a/src/main/resources/mapper/RoleMapper.xml +++ b/src/main/resources/mapper/RoleMapper.xml @@ -1,6 +1,6 @@ - + UPDATE role @@ -33,7 +33,7 @@ - SELECT id,role_name FROM role @@ -45,7 +45,7 @@ - SELECT id,role_name,priority FROM role father_id = #{id} @@ -54,7 +54,7 @@ - + INSERT INTO role (role_name, priority, father_id, market) VALUES (#{roleName}, #{priority}, #{fatherId}, #{market}) @@ -70,7 +70,7 @@ - SELECT r.id AS id, r.role_name AS roleName, r.priority AS priority, @@ -101,7 +101,7 @@ ORDER BY r.update_time DESC,r.priority DESC - select r.id as id, r.role_name as roleName, r.market as market, diff --git a/src/main/resources/mapper/StatisticsMapper.xml b/src/main/resources/mapper/StatisticsMapper.xml index 96057f5..557bbb5 100644 --- a/src/main/resources/mapper/StatisticsMapper.xml +++ b/src/main/resources/mapper/StatisticsMapper.xml @@ -1,6 +1,6 @@ - + INSERT INTO statistics ( diff --git a/src/main/resources/mapper/UserMapper.xml b/src/main/resources/mapper/UserMapper.xml index ddb9823..11478d8 100644 --- a/src/main/resources/mapper/UserMapper.xml +++ b/src/main/resources/mapper/UserMapper.xml @@ -1,6 +1,6 @@ - + INSERT INTO user( name,jwcode,market @@ -12,7 +12,7 @@ - SELECT name AS "name", jwcode AS "jwcode", @@ -37,7 +37,7 @@ - SELECT name AS "name", jwcode AS "jwcode", @@ -74,7 +74,7 @@ WHERE jwcode = #{jwcode} - SELECT current_permanent_gold AS "NowPermanentGold", (COALESCE(current_free_june, 0) + COALESCE(current_free_december, 0)) AS "NowFreeGold", diff --git a/src/main/resources/mapper/WorkBenchMapper.xml b/src/main/resources/mapper/WorkBenchMapper.xml index d6b30b7..52e417c 100644 --- a/src/main/resources/mapper/WorkBenchMapper.xml +++ b/src/main/resources/mapper/WorkBenchMapper.xml @@ -1,6 +1,6 @@ - + - SELECT SUM(s.recharge) AS totalRecharge, SUM(s.money) AS totalMoney, @@ -111,7 +111,7 @@ AND s.current_datetime BETWEEN #{startDate} AND #{endDate}; + SELECT + m.nickname AS name, + m.jwcode AS jwcode, + m.loc_market AS market, + y.jinbi_free AS freeBean, + y.jinbi_buy AS permanentBean + FROM + fx_member m + INNER JOIN + fx_yaoqing y ON m.id = y.uid + + m.jwcode = #{jwcode} + + + + \ No newline at end of file From 00566d17cfaa9b23dcfd4a5d197bb967051c3071 Mon Sep 17 00:00:00 2001 From: sunjiabei Date: Wed, 30 Jul 2025 11:23:58 +0800 Subject: [PATCH 7/7] =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=8D=A1=E7=89=87?= =?UTF-8?q?=E5=92=8C=E6=95=B0=E6=8D=AE=E6=BA=90=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/example/demo/config/Mysql2DataSourceConfig.java | 5 +++++ .../java/com/example/demo/controller/bean/BeanUserController.java | 2 +- src/main/java/com/example/demo/service/bean/BeanUserService.java | 3 ++- .../java/com/example/demo/serviceImpl/bean/BeanUserServiceImpl.java | 3 +-- 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/example/demo/config/Mysql2DataSourceConfig.java b/src/main/java/com/example/demo/config/Mysql2DataSourceConfig.java index 2e94cf2..225424b 100644 --- a/src/main/java/com/example/demo/config/Mysql2DataSourceConfig.java +++ b/src/main/java/com/example/demo/config/Mysql2DataSourceConfig.java @@ -5,6 +5,7 @@ import lombok.extern.slf4j.Slf4j; import org.apache.ibatis.session.SqlSessionFactory; import org.mybatis.spring.SqlSessionFactoryBean; import org.mybatis.spring.SqlSessionTemplate; +import org.mybatis.spring.annotation.MapperScan; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.boot.jdbc.DataSourceBuilder; @@ -16,6 +17,10 @@ import javax.sql.DataSource; @Slf4j @Configuration +@MapperScan( + basePackages = "com.example.demo.mapper.bean", // 扫描coin包 + sqlSessionTemplateRef = "mysql2SqlSessionTemplate" +) public class Mysql2DataSourceConfig { @Bean(name = "mysql2DataSource") diff --git a/src/main/java/com/example/demo/controller/bean/BeanUserController.java b/src/main/java/com/example/demo/controller/bean/BeanUserController.java index bcd2d17..5fb72ba 100644 --- a/src/main/java/com/example/demo/controller/bean/BeanUserController.java +++ b/src/main/java/com/example/demo/controller/bean/BeanUserController.java @@ -1,8 +1,8 @@ package com.example.demo.controller.bean; import com.example.demo.domain.entity.User; -import com.example.demo.domain.vo.Result; import com.example.demo.domain.vo.bean.BeanUserCard; +import com.example.demo.domain.vo.coin.Result; import com.example.demo.service.bean.BeanUserService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/example/demo/service/bean/BeanUserService.java b/src/main/java/com/example/demo/service/bean/BeanUserService.java index 57e7a97..e50db56 100644 --- a/src/main/java/com/example/demo/service/bean/BeanUserService.java +++ b/src/main/java/com/example/demo/service/bean/BeanUserService.java @@ -1,8 +1,9 @@ package com.example.demo.service.bean; -import com.example.demo.domain.vo.Result; + import com.example.demo.domain.vo.bean.BeanUserCard; +import com.example.demo.domain.vo.coin.Result; /** * @program: gold-java diff --git a/src/main/java/com/example/demo/serviceImpl/bean/BeanUserServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/bean/BeanUserServiceImpl.java index 90b87e0..ca21b09 100644 --- a/src/main/java/com/example/demo/serviceImpl/bean/BeanUserServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/bean/BeanUserServiceImpl.java @@ -2,9 +2,8 @@ package com.example.demo.serviceImpl.bean; import com.example.demo.Util.JWTUtil; import com.example.demo.domain.entity.Admin; -import com.example.demo.domain.vo.GoldUser; -import com.example.demo.domain.vo.Result; import com.example.demo.domain.vo.bean.BeanUserCard; +import com.example.demo.domain.vo.coin.Result; import com.example.demo.mapper.bean.BeanUserMapper; import com.example.demo.service.bean.BeanUserService; import jakarta.servlet.http.HttpServletRequest;