From 285115e16ac13dd027419f0ef24fb3cadc3d5481 Mon Sep 17 00:00:00 2001
From: huangqizhen <15552608129@163.com>
Date: Fri, 11 Apr 2025 10:29:21 +0800
Subject: [PATCH] =?UTF-8?q?4.10=E5=A4=9A=E6=95=B0=E6=8D=AE=E5=BA=93?=
=?UTF-8?q?=E7=9A=84=E9=93=BE=E6=8E=A5=E5=8F=8A=E5=B7=A5=E4=BD=9C=E5=8F=B0?=
=?UTF-8?q?=E6=9F=B1=E7=8A=B6=E5=9B=BE=E7=9A=84=E5=9C=B0=E5=8C=BA=E7=AD=9B?=
=?UTF-8?q?=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pom.xml | 16 ++-
.../java/com/example/demo/DemoApplication.java | 6 +-
.../java/com/example/demo/config/DBSrcArticle.java | 84 ++++++++------
.../com/example/demo/config/DataSourceConfig.java | 29 -----
.../java/com/example/demo/config/WebConfig.java | 1 -
.../java/com/example/demo/config/dBSrcUser.java | 80 +++++++------
.../example/demo/controller/AuditController.java | 2 +-
.../demo/controller/StatisticsController.java | 2 +-
.../com/example/demo/domain/vo/RechargeVo.java | 14 ++-
.../java/com/example/demo/domain/vo/SumCoin.java | 3 +
.../demo/mapper/{db1 => }/ActivityMapper.java | 2 +-
.../example/demo/mapper/{db1 => }/AdminMapper.java | 2 +-
.../example/demo/mapper/{db1 => }/AuditMapper.java | 2 +-
.../demo/mapper/{db1 => }/ConsumeMapper.java | 2 +-
.../demo/mapper/{db1 => }/DetailMapper.java | 2 +-
.../demo/mapper/{db1 => }/DetailYMapper.java | 2 +-
.../example/demo/mapper/{db1 => }/OneMapper.java | 2 +-
.../example/demo/mapper/{db1 => }/OtherMapper.java | 2 +-
.../demo/mapper/{db1 => }/PermissionMapper.java | 2 +-
.../demo/mapper/{db1 => }/ProductMapper.java | 2 +-
.../example/demo/mapper/{db1 => }/RateMapper.java | 2 +-
.../demo/mapper/{db1 => }/RechargeMapper.java | 2 +-
.../demo/mapper/{db1 => }/RefundMapper.java | 2 +-
.../demo/mapper/{db1 => }/StatisticsMapper.java | 126 ++++++++++----------
.../example/demo/mapper/{db1 => }/UserMapper.java | 2 +-
.../demo/serviceImpl/ActivityServiceImpl.java | 2 +-
.../example/demo/serviceImpl/AdminServiceImpl.java | 2 +-
.../example/demo/serviceImpl/AuditServiceImpl.java | 8 +-
.../demo/serviceImpl/ConsumeServiceImpl.java | 4 +-
.../demo/serviceImpl/DetailServiceImpl.java | 2 +-
.../demo/serviceImpl/DetailYServiceImpl.java | 2 +-
.../example/demo/serviceImpl/OneServiceImpl.java | 2 +-
.../example/demo/serviceImpl/OtherServiceImpl.java | 8 +-
.../demo/serviceImpl/PermissionServiceImpl.java | 2 +-
.../demo/serviceImpl/ProductServiceImpl.java | 2 +-
.../example/demo/serviceImpl/RateServiceImpl.java | 2 +-
.../demo/serviceImpl/RechargeServiceImpl.java | 8 +-
.../demo/serviceImpl/RefundServiceImpl.java | 2 +-
.../demo/serviceImpl/StatisticsServiceImpl.java | 23 ++--
.../demo/serviceImpl/UserDetailServiceImpl.java | 2 +-
.../example/demo/serviceImpl/UserServiceImpl.java | 2 +-
.../com/example/demo/sevice/DataExportService.java | 2 +-
src/main/resources/application.yml | 74 ++++--------
.../resources/mapper/{db1 => }/ConsumeMapper.xml | 2 +-
.../resources/mapper/{db1 => }/DetailYMapper.xml | 2 +-
src/main/resources/mapper/{db1 => }/OneMapper.xml | 2 +-
.../resources/mapper/{db1 => }/ProductMapper.xml | 2 +-
.../resources/mapper/{db1 => }/RechargeMapper.xml | 2 +-
.../resources/mapper/{db1 => }/RefundMapper.xml | 2 +-
src/main/resources/mapper/StatisticsMapper.xml | 127 +++++++++++++++++++++
src/main/resources/mapper/{db1 => }/UserMapper.xml | 2 +-
src/main/resources/mapper/db1/StatisticsMapper.xml | 41 -------
52 files changed, 396 insertions(+), 326 deletions(-)
delete mode 100644 src/main/java/com/example/demo/config/DataSourceConfig.java
rename src/main/java/com/example/demo/mapper/{db1 => }/ActivityMapper.java (98%)
rename src/main/java/com/example/demo/mapper/{db1 => }/AdminMapper.java (98%)
rename src/main/java/com/example/demo/mapper/{db1 => }/AuditMapper.java (98%)
rename src/main/java/com/example/demo/mapper/{db1 => }/ConsumeMapper.java (99%)
rename src/main/java/com/example/demo/mapper/{db1 => }/DetailMapper.java (98%)
rename src/main/java/com/example/demo/mapper/{db1 => }/DetailYMapper.java (99%)
rename src/main/java/com/example/demo/mapper/{db1 => }/OneMapper.java (91%)
rename src/main/java/com/example/demo/mapper/{db1 => }/OtherMapper.java (87%)
rename src/main/java/com/example/demo/mapper/{db1 => }/PermissionMapper.java (89%)
rename src/main/java/com/example/demo/mapper/{db1 => }/ProductMapper.java (92%)
rename src/main/java/com/example/demo/mapper/{db1 => }/RateMapper.java (98%)
rename src/main/java/com/example/demo/mapper/{db1 => }/RechargeMapper.java (99%)
rename src/main/java/com/example/demo/mapper/{db1 => }/RefundMapper.java (99%)
rename src/main/java/com/example/demo/mapper/{db1 => }/StatisticsMapper.java (87%)
rename src/main/java/com/example/demo/mapper/{db1 => }/UserMapper.java (99%)
rename src/main/resources/mapper/{db1 => }/ConsumeMapper.xml (97%)
rename src/main/resources/mapper/{db1 => }/DetailYMapper.xml (99%)
rename src/main/resources/mapper/{db1 => }/OneMapper.xml (99%)
rename src/main/resources/mapper/{db1 => }/ProductMapper.xml (89%)
rename src/main/resources/mapper/{db1 => }/RechargeMapper.xml (98%)
rename src/main/resources/mapper/{db1 => }/RefundMapper.xml (98%)
create mode 100644 src/main/resources/mapper/StatisticsMapper.xml
rename src/main/resources/mapper/{db1 => }/UserMapper.xml (89%)
delete mode 100644 src/main/resources/mapper/db1/StatisticsMapper.xml
diff --git a/pom.xml b/pom.xml
index a7ef6dc..83a33d9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -25,6 +25,12 @@
spring-boot-starter-thymeleaf
+
+ com.zaxxer
+ HikariCP
+ 5.1.0
+
+
@@ -45,7 +51,7 @@
com.alibaba
druid
- 1.1.0
+ 1.2.9
@@ -166,6 +172,14 @@
+
diff --git a/src/main/java/com/example/demo/DemoApplication.java b/src/main/java/com/example/demo/DemoApplication.java
index 2dc9ce5..14aea91 100644
--- a/src/main/java/com/example/demo/DemoApplication.java
+++ b/src/main/java/com/example/demo/DemoApplication.java
@@ -9,9 +9,9 @@ import org.springframework.cache.annotation.EnableCaching;
@EnableCaching
-@SpringBootApplication(exclude = {DataSourceAutoConfiguration.class})
-@MapperScan(basePackages = {"com.example.demo.mapper.db1"}, sqlSessionFactoryRef = "sqlSessionFactoryArticle")
-@MapperScan(basePackages = {"com.example.demo.mapper.db2"}, sqlSessionFactoryRef = "sqlSessionFactoryUser")
+@SpringBootApplication
+@MapperScan(basePackages = "com.example.demo.mapper", sqlSessionTemplateRef = "mysql1SqlSessionTemplate")
+@MapperScan(basePackages = "com.example.demo.mapperLink", sqlSessionTemplateRef = "mysql2SqlSessionTemplate")
public class DemoApplication {
public static void main(String[] args) {
diff --git a/src/main/java/com/example/demo/config/DBSrcArticle.java b/src/main/java/com/example/demo/config/DBSrcArticle.java
index 6da0dbf..742b16f 100644
--- a/src/main/java/com/example/demo/config/DBSrcArticle.java
+++ b/src/main/java/com/example/demo/config/DBSrcArticle.java
@@ -1,34 +1,50 @@
-package com.example.demo.config;
-
-import org.apache.ibatis.session.SqlSessionFactory;
-import org.mybatis.spring.SqlSessionTemplate;
-import org.mybatis.spring.SqlSessionFactoryBean; // 正确导入SqlSessionFactoryBean
-import org.mybatis.spring.annotation.MapperScan;
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.core.io.support.PathMatchingResourcePatternResolver;
-
-import javax.sql.DataSource;
-
-/**
- * 数据库leadnews_article配置
- */
-@Configuration
-@MapperScan(basePackages = {"com.example.demo.mapper.db1"}, sqlSessionFactoryRef = "sqlSessionFactoryArticle")
-public class DBSrcArticle {
-
- @Bean
- public SqlSessionFactory sqlSessionFactoryArticle(@Qualifier("mysql1") DataSource dataSource) throws Exception {
- SqlSessionFactoryBean sqlSessionFactory = new SqlSessionFactoryBean(); // 修正类名
- sqlSessionFactory.setDataSource(dataSource);
- sqlSessionFactory.setMapperLocations(new PathMatchingResourcePatternResolver()
- .getResources("classpath:mapper/db1/*.xml"));
- return sqlSessionFactory.getObject();
- }
-
- @Bean
- public SqlSessionTemplate sqlSessionTemplateArticle(@Qualifier("sqlSessionFactoryArticle") SqlSessionFactory sqlSessionFactory) throws Exception {
- return new SqlSessionTemplate(sqlSessionFactory);
- }
-}
+//package com.example.demo.config;
+//
+//import com.zaxxer.hikari.HikariDataSource;
+//import org.apache.ibatis.session.SqlSessionFactory;
+//import org.mybatis.spring.SqlSessionTemplate;
+//import org.mybatis.spring.SqlSessionFactoryBean; // 正确导入SqlSessionFactoryBean
+//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;
+//import org.springframework.context.annotation.Bean;
+//import org.springframework.context.annotation.Configuration;
+//import org.springframework.context.annotation.Primary;
+//import org.springframework.core.io.support.PathMatchingResourcePatternResolver;
+//
+//import javax.sql.DataSource;
+//
+//
+//
+///**
+// * 数据库leadnews_article配置
+// */
+//@Configuration
+//@MapperScan(basePackages = {"com.example.demo.mapper"}, sqlSessionFactoryRef = "sqlSessionFactoryArticle")
+//public class DBSrcArticle {
+//
+// @Bean(name = "mysql1DataSource")
+// @Primary // 因为这是默认数据源,因此标记为Primary
+// @ConfigurationProperties(prefix = "spring.datasource.mysql1")
+// public DataSource cmsDataSource() {
+// HikariDataSource dataSource = DataSourceBuilder.create().type(HikariDataSource.class).build();
+//// log.info("mysql1 DataSource initialized with pool-name: {}", dataSource.getPoolName());
+// return dataSource;
+// }
+//
+// @Bean(name = "mysql1SqlSessionFactory")
+// @Primary // 默认SqlSessionFactory
+// public SqlSessionFactory cmsSqlSessionFactory(@Qualifier("mysql1DataSource") DataSource dataSource) throws Exception {
+// SqlSessionFactoryBean sessionFactory = new SqlSessionFactoryBean();
+// sessionFactory.setDataSource(dataSource);
+// sessionFactory.setMapperLocations(new PathMatchingResourcePatternResolver().getResources("classpath:mapper/*.xml"));
+// return sessionFactory.getObject();
+// }
+//
+// @Bean(name = "mysql1SqlSessionTemplate")
+// @Primary // 默认SqlSessionTemplate
+// public SqlSessionTemplate cmsSqlSessionTemplate(@Qualifier("mysql1SqlSessionFactory") SqlSessionFactory sqlSessionFactory) {
+// return new SqlSessionTemplate(sqlSessionFactory);
+// }
+//}
diff --git a/src/main/java/com/example/demo/config/DataSourceConfig.java b/src/main/java/com/example/demo/config/DataSourceConfig.java
deleted file mode 100644
index bff4174..0000000
--- a/src/main/java/com/example/demo/config/DataSourceConfig.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package com.example.demo.config;
-
-import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.boot.jdbc.DataSourceBuilder;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Primary;
-
-import javax.sql.DataSource;
-
-/**
- * 数据源配置
- */
-@Configuration
-public class DataSourceConfig {
- @Primary
- @Bean(name = "mysql1")
- @ConfigurationProperties(prefix = "spring.datasource.mysql1")
- public DataSource dBSrcArticle() {
- return DataSourceBuilder.create().build();
- }
-
- @Primary
- @Bean(name = "mysql2")
- @ConfigurationProperties(prefix = "spring.datasource.mysql2")
- public DataSource dBSrcUser() {
- return DataSourceBuilder.create().build();
- }
-}
diff --git a/src/main/java/com/example/demo/config/WebConfig.java b/src/main/java/com/example/demo/config/WebConfig.java
index 9a4045d..aacdfb5 100644
--- a/src/main/java/com/example/demo/config/WebConfig.java
+++ b/src/main/java/com/example/demo/config/WebConfig.java
@@ -6,7 +6,6 @@ import org.springframework.context.annotation.Configuration;
import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
-@Configurable
@Configuration
public class WebConfig implements WebMvcConfigurer {
@Value("${upload.path}")
diff --git a/src/main/java/com/example/demo/config/dBSrcUser.java b/src/main/java/com/example/demo/config/dBSrcUser.java
index fcc9561..33b0c97 100644
--- a/src/main/java/com/example/demo/config/dBSrcUser.java
+++ b/src/main/java/com/example/demo/config/dBSrcUser.java
@@ -1,37 +1,43 @@
-package com.example.demo.config;
-
-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.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Primary;
-import org.springframework.core.io.support.PathMatchingResourcePatternResolver;
-
-import javax.sql.DataSource;
-
-/**
- * 数据库leadnews_user配置
- */
-@Configuration
-@MapperScan(basePackages = {"com.example.demo.mapper.db2"}, sqlSessionFactoryRef = "sqlSessionFactoryUser")
-public class dBSrcUser {
-
- @Bean
- @Primary
- public SqlSessionFactory sqlSessionFactoryUser(@Qualifier("mysql2") DataSource dataSource) throws Exception {
- SqlSessionFactoryBean sqlSessionFactory = new SqlSessionFactoryBean(); // 修复:使用正确类名
- sqlSessionFactory.setDataSource(dataSource);
- sqlSessionFactory.setMapperLocations(new PathMatchingResourcePatternResolver()
- .getResources("classpath:mapper/db2/*.xml")); // 确保路径正确
- return sqlSessionFactory.getObject();
- }
-
- @Bean
- @Primary
- public SqlSessionTemplate sqlSessionTemplateUser(@Qualifier("sqlSessionFactoryUser") SqlSessionFactory sqlSessionFactory) throws Exception {
- return new SqlSessionTemplate(sqlSessionFactory);
- }
-}
+//package com.example.demo.config;
+//
+//import com.zaxxer.hikari.HikariDataSource;
+//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;
+//import org.springframework.context.annotation.Bean;
+//import org.springframework.context.annotation.Configuration;
+//import org.springframework.context.annotation.Primary;
+//import org.springframework.core.io.support.PathMatchingResourcePatternResolver;
+//
+//import javax.sql.DataSource;
+//
+///**
+// * 数据库leadnews_user配置
+// */
+//@Configuration
+//@MapperScan(basePackages = {"com.example.demo.mapperLink"}, sqlSessionFactoryRef = "sqlSessionFactoryUser")
+//public class dBSrcUser {
+//
+// @Bean(name = "mysql2DataSource")
+// @ConfigurationProperties(prefix = "spring.datasource.mysql2")
+// public DataSource hljwDataSource() {
+// return DataSourceBuilder.create().type(HikariDataSource.class).build();
+// }
+//
+// @Bean(name = "mysql2SqlSessionFactory")
+// public SqlSessionFactory hljwSqlSessionFactory(@Qualifier("mysql2DataSource") DataSource dataSource) throws Exception {
+// SqlSessionFactoryBean sessionFactory = new SqlSessionFactoryBean();
+// sessionFactory.setDataSource(dataSource);
+// sessionFactory.setMapperLocations(new PathMatchingResourcePatternResolver().getResources("classpath:mapperlink/*.xml"));
+// return sessionFactory.getObject();
+// }
+//
+// @Bean(name = "mysql2SqlSessionTemplate")
+// public SqlSessionTemplate hljwSqlSessionTemplate(@Qualifier("mysql2SqlSessionFactory") SqlSessionFactory sqlSessionFactory) {
+// return new SqlSessionTemplate(sqlSessionFactory);
+// }
+//}
diff --git a/src/main/java/com/example/demo/controller/AuditController.java b/src/main/java/com/example/demo/controller/AuditController.java
index f993efe..6e29ccb 100644
--- a/src/main/java/com/example/demo/controller/AuditController.java
+++ b/src/main/java/com/example/demo/controller/AuditController.java
@@ -5,7 +5,7 @@ import com.example.demo.Util.GoldTistV2;
import com.example.demo.domain.entity.*;
import com.example.demo.domain.vo.Page;
import com.example.demo.domain.vo.Result;
-import com.example.demo.mapper.db1.*;
+import com.example.demo.mapper.*;
import com.example.demo.sevice.AuditService;
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/StatisticsController.java
index c7b2c40..0a74c4d 100644
--- a/src/main/java/com/example/demo/controller/StatisticsController.java
+++ b/src/main/java/com/example/demo/controller/StatisticsController.java
@@ -2,7 +2,7 @@ package com.example.demo.controller;
import com.example.demo.domain.vo.*;
-import com.example.demo.mapper.db1.StatisticsMapper;
+import com.example.demo.mapper.StatisticsMapper;
import com.example.demo.serviceImpl.StatisticsServiceImpl;
import com.example.demo.serviceImpl.UserServiceImpl;
import com.example.demo.sevice.StatisticsService;
diff --git a/src/main/java/com/example/demo/domain/vo/RechargeVo.java b/src/main/java/com/example/demo/domain/vo/RechargeVo.java
index e0a1bfa..1acfa64 100644
--- a/src/main/java/com/example/demo/domain/vo/RechargeVo.java
+++ b/src/main/java/com/example/demo/domain/vo/RechargeVo.java
@@ -5,13 +5,16 @@ import lombok.Data;
import lombok.NoArgsConstructor;
import org.springframework.format.annotation.DateTimeFormat;
+import java.io.Serializable; // 引入 Serializable
import java.math.BigDecimal;
import java.util.Date;
import java.util.List;
@Data
@NoArgsConstructor
-public class RechargeVo {
+public class RechargeVo implements Serializable { // 实现 Serializable 接口
+
+ private static final long serialVersionUID = 1L; // 添加 serialVersionUID
private Integer rechargeId;
private String jwcode;
@@ -25,10 +28,9 @@ public class RechargeVo {
private String rechargeVoucher;
private Integer adminId;
private String area;
-
-
private String remark;
private Integer flag;
+
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
@DateTimeFormat(pattern = "yyyy-MM-dd")
private Date createTime;
@@ -50,6 +52,8 @@ public class RechargeVo {
private String sortField;
private String sortOrder;
- private List areas;
+ private List areas; // List 类型默认是可序列化的
-}
\ No newline at end of file
+ // 如果有任何不需要序列化的字段,可以使用 transient 关键字
+ // private transient SomeNonSerializableType nonSerializableField;
+}
diff --git a/src/main/java/com/example/demo/domain/vo/SumCoin.java b/src/main/java/com/example/demo/domain/vo/SumCoin.java
index b454757..d2c6c4d 100644
--- a/src/main/java/com/example/demo/domain/vo/SumCoin.java
+++ b/src/main/java/com/example/demo/domain/vo/SumCoin.java
@@ -10,12 +10,15 @@ import java.math.BigDecimal;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.util.Date;
+import java.util.List;
@Data
@NoArgsConstructor
public class SumCoin {
+ private List areas;
+
//当前金币余量 充值金币
private BigDecimal todayRecharge;
//当前金币余量 免费金币
diff --git a/src/main/java/com/example/demo/mapper/db1/ActivityMapper.java b/src/main/java/com/example/demo/mapper/ActivityMapper.java
similarity index 98%
rename from src/main/java/com/example/demo/mapper/db1/ActivityMapper.java
rename to src/main/java/com/example/demo/mapper/ActivityMapper.java
index 8e9d1be..9b23163 100644
--- a/src/main/java/com/example/demo/mapper/db1/ActivityMapper.java
+++ b/src/main/java/com/example/demo/mapper/ActivityMapper.java
@@ -1,4 +1,4 @@
-package com.example.demo.mapper.db1;
+package com.example.demo.mapper;
diff --git a/src/main/java/com/example/demo/mapper/db1/AdminMapper.java b/src/main/java/com/example/demo/mapper/AdminMapper.java
similarity index 98%
rename from src/main/java/com/example/demo/mapper/db1/AdminMapper.java
rename to src/main/java/com/example/demo/mapper/AdminMapper.java
index ca33e8c..45ba51c 100644
--- a/src/main/java/com/example/demo/mapper/db1/AdminMapper.java
+++ b/src/main/java/com/example/demo/mapper/AdminMapper.java
@@ -1,4 +1,4 @@
-package com.example.demo.mapper.db1;
+package com.example.demo.mapper;
import com.example.demo.domain.entity.Admin;
diff --git a/src/main/java/com/example/demo/mapper/db1/AuditMapper.java b/src/main/java/com/example/demo/mapper/AuditMapper.java
similarity index 98%
rename from src/main/java/com/example/demo/mapper/db1/AuditMapper.java
rename to src/main/java/com/example/demo/mapper/AuditMapper.java
index 346703c..2518a8b 100644
--- a/src/main/java/com/example/demo/mapper/db1/AuditMapper.java
+++ b/src/main/java/com/example/demo/mapper/AuditMapper.java
@@ -1,4 +1,4 @@
-package com.example.demo.mapper.db1;
+package com.example.demo.mapper;
import com.example.demo.domain.entity.Audit;
diff --git a/src/main/java/com/example/demo/mapper/db1/ConsumeMapper.java b/src/main/java/com/example/demo/mapper/ConsumeMapper.java
similarity index 99%
rename from src/main/java/com/example/demo/mapper/db1/ConsumeMapper.java
rename to src/main/java/com/example/demo/mapper/ConsumeMapper.java
index e9b1afe..d2e9585 100644
--- a/src/main/java/com/example/demo/mapper/db1/ConsumeMapper.java
+++ b/src/main/java/com/example/demo/mapper/ConsumeMapper.java
@@ -1,4 +1,4 @@
-package com.example.demo.mapper.db1;
+package com.example.demo.mapper;
import com.example.demo.domain.entity.*;
diff --git a/src/main/java/com/example/demo/mapper/db1/DetailMapper.java b/src/main/java/com/example/demo/mapper/DetailMapper.java
similarity index 98%
rename from src/main/java/com/example/demo/mapper/db1/DetailMapper.java
rename to src/main/java/com/example/demo/mapper/DetailMapper.java
index 06e8a8f..abf6672 100644
--- a/src/main/java/com/example/demo/mapper/db1/DetailMapper.java
+++ b/src/main/java/com/example/demo/mapper/DetailMapper.java
@@ -1,4 +1,4 @@
-package com.example.demo.mapper.db1;
+package com.example.demo.mapper;
import com.example.demo.domain.entity.Detail;
diff --git a/src/main/java/com/example/demo/mapper/db1/DetailYMapper.java b/src/main/java/com/example/demo/mapper/DetailYMapper.java
similarity index 99%
rename from src/main/java/com/example/demo/mapper/db1/DetailYMapper.java
rename to src/main/java/com/example/demo/mapper/DetailYMapper.java
index 4d59e02..e06e0cc 100644
--- a/src/main/java/com/example/demo/mapper/db1/DetailYMapper.java
+++ b/src/main/java/com/example/demo/mapper/DetailYMapper.java
@@ -1,4 +1,4 @@
-package com.example.demo.mapper.db1;
+package com.example.demo.mapper;
import com.example.demo.domain.entity.DetailY;
import com.example.demo.domain.entity.UserDetailExport;
diff --git a/src/main/java/com/example/demo/mapper/db1/OneMapper.java b/src/main/java/com/example/demo/mapper/OneMapper.java
similarity index 91%
rename from src/main/java/com/example/demo/mapper/db1/OneMapper.java
rename to src/main/java/com/example/demo/mapper/OneMapper.java
index 5726016..001d78e 100644
--- a/src/main/java/com/example/demo/mapper/db1/OneMapper.java
+++ b/src/main/java/com/example/demo/mapper/OneMapper.java
@@ -1,4 +1,4 @@
-package com.example.demo.mapper.db1;
+package com.example.demo.mapper;
import com.example.demo.domain.work.One;
diff --git a/src/main/java/com/example/demo/mapper/db1/OtherMapper.java b/src/main/java/com/example/demo/mapper/OtherMapper.java
similarity index 87%
rename from src/main/java/com/example/demo/mapper/db1/OtherMapper.java
rename to src/main/java/com/example/demo/mapper/OtherMapper.java
index 1f33627..4c58b99 100644
--- a/src/main/java/com/example/demo/mapper/db1/OtherMapper.java
+++ b/src/main/java/com/example/demo/mapper/OtherMapper.java
@@ -1,4 +1,4 @@
-package com.example.demo.mapper.db1;
+package com.example.demo.mapper;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Select;
diff --git a/src/main/java/com/example/demo/mapper/db1/PermissionMapper.java b/src/main/java/com/example/demo/mapper/PermissionMapper.java
similarity index 89%
rename from src/main/java/com/example/demo/mapper/db1/PermissionMapper.java
rename to src/main/java/com/example/demo/mapper/PermissionMapper.java
index 174cf78..6407a6d 100644
--- a/src/main/java/com/example/demo/mapper/db1/PermissionMapper.java
+++ b/src/main/java/com/example/demo/mapper/PermissionMapper.java
@@ -1,4 +1,4 @@
-package com.example.demo.mapper.db1;
+package com.example.demo.mapper;
import com.example.demo.domain.entity.Permission;
import org.apache.ibatis.annotations.Mapper;
diff --git a/src/main/java/com/example/demo/mapper/db1/ProductMapper.java b/src/main/java/com/example/demo/mapper/ProductMapper.java
similarity index 92%
rename from src/main/java/com/example/demo/mapper/db1/ProductMapper.java
rename to src/main/java/com/example/demo/mapper/ProductMapper.java
index 612a0f7..521e478 100644
--- a/src/main/java/com/example/demo/mapper/db1/ProductMapper.java
+++ b/src/main/java/com/example/demo/mapper/ProductMapper.java
@@ -1,4 +1,4 @@
-package com.example.demo.mapper.db1;
+package com.example.demo.mapper;
import com.example.demo.domain.entity.Index;
diff --git a/src/main/java/com/example/demo/mapper/db1/RateMapper.java b/src/main/java/com/example/demo/mapper/RateMapper.java
similarity index 98%
rename from src/main/java/com/example/demo/mapper/db1/RateMapper.java
rename to src/main/java/com/example/demo/mapper/RateMapper.java
index 6b8737e..bf8cacc 100644
--- a/src/main/java/com/example/demo/mapper/db1/RateMapper.java
+++ b/src/main/java/com/example/demo/mapper/RateMapper.java
@@ -1,4 +1,4 @@
-package com.example.demo.mapper.db1;
+package com.example.demo.mapper;
import com.example.demo.domain.entity.Rate;
diff --git a/src/main/java/com/example/demo/mapper/db1/RechargeMapper.java b/src/main/java/com/example/demo/mapper/RechargeMapper.java
similarity index 99%
rename from src/main/java/com/example/demo/mapper/db1/RechargeMapper.java
rename to src/main/java/com/example/demo/mapper/RechargeMapper.java
index be0e3fd..3817e5c 100644
--- a/src/main/java/com/example/demo/mapper/db1/RechargeMapper.java
+++ b/src/main/java/com/example/demo/mapper/RechargeMapper.java
@@ -1,4 +1,4 @@
-package com.example.demo.mapper.db1;
+package com.example.demo.mapper;
import com.example.demo.domain.entity.Recharge;
diff --git a/src/main/java/com/example/demo/mapper/db1/RefundMapper.java b/src/main/java/com/example/demo/mapper/RefundMapper.java
similarity index 99%
rename from src/main/java/com/example/demo/mapper/db1/RefundMapper.java
rename to src/main/java/com/example/demo/mapper/RefundMapper.java
index fa0abf9..86e554f 100644
--- a/src/main/java/com/example/demo/mapper/db1/RefundMapper.java
+++ b/src/main/java/com/example/demo/mapper/RefundMapper.java
@@ -1,4 +1,4 @@
-package com.example.demo.mapper.db1;
+package com.example.demo.mapper;
import com.example.demo.domain.entity.Detail;
diff --git a/src/main/java/com/example/demo/mapper/db1/StatisticsMapper.java b/src/main/java/com/example/demo/mapper/StatisticsMapper.java
similarity index 87%
rename from src/main/java/com/example/demo/mapper/db1/StatisticsMapper.java
rename to src/main/java/com/example/demo/mapper/StatisticsMapper.java
index 9183570..47dfe52 100644
--- a/src/main/java/com/example/demo/mapper/db1/StatisticsMapper.java
+++ b/src/main/java/com/example/demo/mapper/StatisticsMapper.java
@@ -1,5 +1,5 @@
-package com.example.demo.mapper.db1;
+package com.example.demo.mapper;
@@ -198,22 +198,22 @@ public interface StatisticsMapper {
// })
- @Select({
- ""
- })
+// @Select({
+// ""
+// })
- List getMediuPayCoin(@Param("searchStartTime") Date StartTime, @Param("searchEndTime") Date searchEndTime);
+ List getMediuPayCoin(@Param("searchStartTime") Date StartTime, @Param("searchEndTime") Date searchEndTime, List areas);
//本年--1
@@ -223,51 +223,51 @@ public interface StatisticsMapper {
// "and datediff(create_time,#{searchEndTime})<=0 and update_type = '1'" +
// "GROUP BY month ORDER BY month asc"
// })
- @Select({
- ""
- })
+// @Select({
+// ""
+// })
- List getMediuConsumeCoin(@Param("searchStartTime") Date searchStartTime, @Param("searchEndTime") Date searchEndTime);
+ List getMediuConsumeCoin(@Param("searchStartTime") Date searchStartTime, @Param("searchEndTime") Date searchEndTime, List areas);
// 本月 ---0
- @Select({"select DATE_FORMAT(create_time,'%Y-%m-%d') as day,sum(recharge_coin) / 100 AS rechargeSumCoin,sum(free_coin) / 100 as freeSumCoin ,sum(task_coin) / 100 as taskSumCoin " +
- "from detail_y where datediff(create_time,#{searchStartTime})>=0 " +
- "and datediff(create_time,#{searchEndTime})<=0 and update_type = 0 group by DATE_FORMAT(create_time,'%m-%d')"
- })
- List getMediuPayCoinyue(@Param("searchStartTime") Date searchStartTime, @Param("searchEndTime") Date searchEndTime);
+// @Select({"select DATE_FORMAT(create_time,'%Y-%m-%d') as day,sum(recharge_coin) / 100 AS rechargeSumCoin,sum(free_coin) / 100 as freeSumCoin ,sum(task_coin) / 100 as taskSumCoin " +
+// "from detail_y where datediff(create_time,#{searchStartTime})>=0 " +
+// "and datediff(create_time,#{searchEndTime})<=0 and update_type = 0 group by DATE_FORMAT(create_time,'%m-%d')"
+// })
+ List getMediuPayCoinyue(@Param("searchStartTime") Date searchStartTime, @Param("searchEndTime") Date searchEndTime, List areas);
- @Select({"select DATE_FORMAT(create_time,'%Y-%m-%d') as day,sum(recharge_coin) / 100 AS rechargeSumCoin,sum(free_coin) / 100 as freeSumCoin ,sum(task_coin) / 100 as taskSumCoin " +
- "from detail_y where datediff(create_time,#{searchStartTime})>=0 " +
- "and datediff(create_time,#{searchEndTime})<=0 and update_type = 1 group by DATE_FORMAT(create_time,'%m-%d')"
- })
+// @Select({"select DATE_FORMAT(create_time,'%Y-%m-%d') as day,sum(recharge_coin) / 100 AS rechargeSumCoin,sum(free_coin) / 100 as freeSumCoin ,sum(task_coin) / 100 as taskSumCoin " +
+// "from detail_y where datediff(create_time,#{searchStartTime})>=0 " +
+// "and datediff(create_time,#{searchEndTime})<=0 and update_type = 1 group by DATE_FORMAT(create_time,'%m-%d')"
+// })
- List getMediuCounsumeCoinyue(@Param("searchStartTime") Date searchStartTime, @Param("searchEndTime") Date searchEndTime);
+ List getMediuCounsumeCoinyue(@Param("searchStartTime") Date searchStartTime, @Param("searchEndTime") Date searchEndTime, List areas);
- @Select({"SELECT DATE_FORMAT(create_time, '%Y-%m-%d') AS day,",
- "IFNULL(SUM(recharge_coin) / 100, 0) AS rechargeSumCoin,",
- "IFNULL(SUM(free_coin) / 100, 0) AS freeSumCoin,",
- "IFNULL(SUM(task_coin) / 100, 0) AS taskSumCoin",
- "FROM detail_y",
- "WHERE DATE(create_time) = #{searchEndTime}",
- "AND update_type = #{updateType}",
- "GROUP BY DATE_FORMAT(create_time, '%Y-%m-%d')"
- })
- List getMediuPayCoinday(@Param("searchEndTime") Date searchEndTime, @Param("updateType") Integer updateType);
+// @Select({"SELECT DATE_FORMAT(create_time, '%Y-%m-%d') AS day,",
+// "IFNULL(SUM(recharge_coin) / 100, 0) AS rechargeSumCoin,",
+// "IFNULL(SUM(free_coin) / 100, 0) AS freeSumCoin,",
+// "IFNULL(SUM(task_coin) / 100, 0) AS taskSumCoin",
+// "FROM detail_y",
+// "WHERE DATE(create_time) = #{searchEndTime}",
+// "AND update_type = #{updateType}",
+// "GROUP BY DATE_FORMAT(create_time, '%Y-%m-%d')"
+// })
+ List getMediuPayCoinday(@Param("searchEndTime") Date searchEndTime, @Param("updateType") Integer updateType, List areas);
@Select({"select DATE_FORMAT(create_time,'%Y-%m-%d') as day,sum(recharge_coin) AS rechargeSumCoin,sum(free_coin) as freeSumCoin ,sum(task_coin) as taskSumCoin " +
@@ -275,17 +275,17 @@ public interface StatisticsMapper {
})
List getMediuConsumeCoinday1(@Param("searchStartTime") Date searchStartTime, @Param("searchEndTime") Date searchEndTime);
- @Select({
- "SELECT DATE_FORMAT(create_time, '%Y-%m-%d') AS day,",
- "IFNULL(SUM(recharge_coin) / 100, 0) AS rechargeSumCoin,",
- "IFNULL(SUM(free_coin) / 100, 0) AS freeSumCoin,",
- "IFNULL(SUM(task_coin) / 100, 0) AS taskSumCoin",
- "FROM detail_y",
- "WHERE DATE(create_time) = #{searchEndTime}",
- "AND update_type = #{updateType}",
- "GROUP BY DATE_FORMAT(create_time, '%Y-%m-%d')"
- })
- List getMediuConsumeCoinday(@Param("searchEndTime") Date searchEndTime, @Param("updateType") Integer updateType);
+// @Select({
+// "SELECT DATE_FORMAT(create_time, '%Y-%m-%d') AS day,",
+// "IFNULL(SUM(recharge_coin) / 100, 0) AS rechargeSumCoin,",
+// "IFNULL(SUM(free_coin) / 100, 0) AS freeSumCoin,",
+// "IFNULL(SUM(task_coin) / 100, 0) AS taskSumCoin",
+// "FROM detail_y",
+// "WHERE DATE(create_time) = #{searchEndTime}",
+// "AND update_type = #{updateType}",
+// "GROUP BY DATE_FORMAT(create_time, '%Y-%m-%d')"
+// })
+ List getMediuConsumeCoinday(@Param("searchEndTime") Date searchEndTime, @Param("updateType") Integer updateType, List areas);
//给定时间段--10
diff --git a/src/main/java/com/example/demo/mapper/db1/UserMapper.java b/src/main/java/com/example/demo/mapper/UserMapper.java
similarity index 99%
rename from src/main/java/com/example/demo/mapper/db1/UserMapper.java
rename to src/main/java/com/example/demo/mapper/UserMapper.java
index c5279e4..182fda2 100644
--- a/src/main/java/com/example/demo/mapper/db1/UserMapper.java
+++ b/src/main/java/com/example/demo/mapper/UserMapper.java
@@ -1,4 +1,4 @@
-package com.example.demo.mapper.db1;
+package com.example.demo.mapper;
import com.example.demo.domain.entity.User;
diff --git a/src/main/java/com/example/demo/serviceImpl/ActivityServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/ActivityServiceImpl.java
index 9b13120..2c191e8 100644
--- a/src/main/java/com/example/demo/serviceImpl/ActivityServiceImpl.java
+++ b/src/main/java/com/example/demo/serviceImpl/ActivityServiceImpl.java
@@ -3,7 +3,7 @@ package com.example.demo.serviceImpl;
import com.example.demo.domain.entity.Activity;
-import com.example.demo.mapper.db1.ActivityMapper;
+import com.example.demo.mapper.ActivityMapper;
import com.example.demo.sevice.ActivityService;
import com.github.pagehelper.PageHelper;
import lombok.RequiredArgsConstructor;
diff --git a/src/main/java/com/example/demo/serviceImpl/AdminServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/AdminServiceImpl.java
index cd8e6f1..33d8503 100644
--- a/src/main/java/com/example/demo/serviceImpl/AdminServiceImpl.java
+++ b/src/main/java/com/example/demo/serviceImpl/AdminServiceImpl.java
@@ -2,7 +2,7 @@ package com.example.demo.serviceImpl;
import com.example.demo.domain.entity.Admin;
-import com.example.demo.mapper.db1.AdminMapper;
+import com.example.demo.mapper.AdminMapper;
import com.example.demo.security.SecurityConfig;
import com.example.demo.sevice.AdminService;
import com.github.pagehelper.PageHelper;
diff --git a/src/main/java/com/example/demo/serviceImpl/AuditServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/AuditServiceImpl.java
index 7831241..654fc81 100644
--- a/src/main/java/com/example/demo/serviceImpl/AuditServiceImpl.java
+++ b/src/main/java/com/example/demo/serviceImpl/AuditServiceImpl.java
@@ -5,10 +5,10 @@ package com.example.demo.serviceImpl;
import com.example.demo.Util.GoldTistV2;
import com.example.demo.domain.entity.*;
-import com.example.demo.mapper.db1.AuditMapper;
-import com.example.demo.mapper.db1.DetailYMapper;
-import com.example.demo.mapper.db1.RefundMapper;
-import com.example.demo.mapper.db1.UserMapper;
+import com.example.demo.mapper.AuditMapper;
+import com.example.demo.mapper.DetailYMapper;
+import com.example.demo.mapper.RefundMapper;
+import com.example.demo.mapper.UserMapper;
import com.example.demo.sevice.AuditService;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
diff --git a/src/main/java/com/example/demo/serviceImpl/ConsumeServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/ConsumeServiceImpl.java
index d97bb35..0752996 100644
--- a/src/main/java/com/example/demo/serviceImpl/ConsumeServiceImpl.java
+++ b/src/main/java/com/example/demo/serviceImpl/ConsumeServiceImpl.java
@@ -6,8 +6,8 @@ import com.example.demo.Util.GoldTistV2;
import com.example.demo.domain.entity.*;
import com.example.demo.domain.vo.ConsumeDetail;
import com.example.demo.domain.vo.SumConsume;
-import com.example.demo.mapper.db1.ConsumeMapper;
-import com.example.demo.mapper.db1.UserMapper;
+import com.example.demo.mapper.ConsumeMapper;
+import com.example.demo.mapper.UserMapper;
import com.example.demo.sevice.ConsumeService;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
diff --git a/src/main/java/com/example/demo/serviceImpl/DetailServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/DetailServiceImpl.java
index 5a3931e..a2d2afb 100644
--- a/src/main/java/com/example/demo/serviceImpl/DetailServiceImpl.java
+++ b/src/main/java/com/example/demo/serviceImpl/DetailServiceImpl.java
@@ -2,7 +2,7 @@ package com.example.demo.serviceImpl;
import com.example.demo.domain.entity.Detail;
-import com.example.demo.mapper.db1.DetailMapper;
+import com.example.demo.mapper.DetailMapper;
import com.example.demo.sevice.DetailService;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
diff --git a/src/main/java/com/example/demo/serviceImpl/DetailYServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/DetailYServiceImpl.java
index ac2215b..6841211 100644
--- a/src/main/java/com/example/demo/serviceImpl/DetailYServiceImpl.java
+++ b/src/main/java/com/example/demo/serviceImpl/DetailYServiceImpl.java
@@ -5,7 +5,7 @@ import com.example.demo.domain.entity.UserDetailExport;
import com.example.demo.domain.vo.DetailExport;
import com.example.demo.domain.vo.DetailYgold;
import com.example.demo.domain.vo.SumDetailY;
-import com.example.demo.mapper.db1.DetailYMapper;
+import com.example.demo.mapper.DetailYMapper;
import com.example.demo.sevice.DetailYService;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
diff --git a/src/main/java/com/example/demo/serviceImpl/OneServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/OneServiceImpl.java
index a3e398b..9b3417d 100644
--- a/src/main/java/com/example/demo/serviceImpl/OneServiceImpl.java
+++ b/src/main/java/com/example/demo/serviceImpl/OneServiceImpl.java
@@ -3,7 +3,7 @@ package com.example.demo.serviceImpl;
import com.example.demo.domain.work.One;
import com.example.demo.domain.work.Three;
import com.example.demo.domain.work.Two;
-import com.example.demo.mapper.db1.OneMapper;
+import com.example.demo.mapper.OneMapper;
import com.example.demo.sevice.OneService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
diff --git a/src/main/java/com/example/demo/serviceImpl/OtherServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/OtherServiceImpl.java
index 0033d4f..e4c5c4e 100644
--- a/src/main/java/com/example/demo/serviceImpl/OtherServiceImpl.java
+++ b/src/main/java/com/example/demo/serviceImpl/OtherServiceImpl.java
@@ -5,10 +5,10 @@ import com.example.demo.domain.entity.DetailY;
import com.example.demo.domain.entity.Recharge;
import com.example.demo.domain.entity.UserGold;
import com.example.demo.domain.vo.ERP;
-import com.example.demo.mapper.db1.DetailYMapper;
-import com.example.demo.mapper.db1.OtherMapper;
-import com.example.demo.mapper.db1.RechargeMapper;
-import com.example.demo.mapper.db1.UserMapper;
+import com.example.demo.mapper.DetailYMapper;
+import com.example.demo.mapper.OtherMapper;
+import com.example.demo.mapper.RechargeMapper;
+import com.example.demo.mapper.UserMapper;
import com.example.demo.sevice.OtherService;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
diff --git a/src/main/java/com/example/demo/serviceImpl/PermissionServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/PermissionServiceImpl.java
index dda436d..242065b 100644
--- a/src/main/java/com/example/demo/serviceImpl/PermissionServiceImpl.java
+++ b/src/main/java/com/example/demo/serviceImpl/PermissionServiceImpl.java
@@ -1,7 +1,7 @@
package com.example.demo.serviceImpl;
import com.example.demo.domain.entity.Permission;
-import com.example.demo.mapper.db1.PermissionMapper;
+import com.example.demo.mapper.PermissionMapper;
import com.example.demo.sevice.PermissionService;
import lombok.RequiredArgsConstructor;
import org.springframework.cache.annotation.CacheConfig;
diff --git a/src/main/java/com/example/demo/serviceImpl/ProductServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/ProductServiceImpl.java
index 39df052..975e75d 100644
--- a/src/main/java/com/example/demo/serviceImpl/ProductServiceImpl.java
+++ b/src/main/java/com/example/demo/serviceImpl/ProductServiceImpl.java
@@ -3,7 +3,7 @@ package com.example.demo.serviceImpl;
import com.example.demo.domain.entity.Index;
import com.example.demo.domain.entity.Product;
-import com.example.demo.mapper.db1.ProductMapper;
+import com.example.demo.mapper.ProductMapper;
import com.example.demo.sevice.ProductService;
import lombok.RequiredArgsConstructor;
import org.springframework.cache.annotation.CacheConfig;
diff --git a/src/main/java/com/example/demo/serviceImpl/RateServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/RateServiceImpl.java
index d7d7839..ed175ef 100644
--- a/src/main/java/com/example/demo/serviceImpl/RateServiceImpl.java
+++ b/src/main/java/com/example/demo/serviceImpl/RateServiceImpl.java
@@ -3,7 +3,7 @@ package com.example.demo.serviceImpl;
import com.example.demo.domain.entity.Rate;
import com.example.demo.domain.vo.Result;
-import com.example.demo.mapper.db1.RateMapper;
+import com.example.demo.mapper.RateMapper;
import com.example.demo.sevice.RateService;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
diff --git a/src/main/java/com/example/demo/serviceImpl/RechargeServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/RechargeServiceImpl.java
index 3a87f13..fb0c324 100644
--- a/src/main/java/com/example/demo/serviceImpl/RechargeServiceImpl.java
+++ b/src/main/java/com/example/demo/serviceImpl/RechargeServiceImpl.java
@@ -6,10 +6,10 @@ import com.example.demo.domain.entity.Recharge;
import com.example.demo.domain.vo.RechargeA;
import com.example.demo.domain.vo.RechargeVo;
import com.example.demo.domain.vo.Result;
-import com.example.demo.mapper.db1.AuditMapper;
-import com.example.demo.mapper.db1.DetailMapper;
-import com.example.demo.mapper.db1.RechargeMapper;
-import com.example.demo.mapper.db1.UserMapper;
+import com.example.demo.mapper.AuditMapper;
+import com.example.demo.mapper.DetailMapper;
+import com.example.demo.mapper.RechargeMapper;
+import com.example.demo.mapper.UserMapper;
import com.example.demo.sevice.RechargeService;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
diff --git a/src/main/java/com/example/demo/serviceImpl/RefundServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/RefundServiceImpl.java
index eb66470..1c4d176 100644
--- a/src/main/java/com/example/demo/serviceImpl/RefundServiceImpl.java
+++ b/src/main/java/com/example/demo/serviceImpl/RefundServiceImpl.java
@@ -3,7 +3,7 @@ package com.example.demo.serviceImpl;
import com.example.demo.domain.entity.Detail;
import com.example.demo.domain.vo.RefundA;
-import com.example.demo.mapper.db1.RefundMapper;
+import com.example.demo.mapper.RefundMapper;
import com.example.demo.sevice.RefundService;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
diff --git a/src/main/java/com/example/demo/serviceImpl/StatisticsServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/StatisticsServiceImpl.java
index e98e207..0dbc5fb 100644
--- a/src/main/java/com/example/demo/serviceImpl/StatisticsServiceImpl.java
+++ b/src/main/java/com/example/demo/serviceImpl/StatisticsServiceImpl.java
@@ -9,8 +9,8 @@ import com.example.demo.domain.vo.Meium;
import com.example.demo.domain.vo.Statistics;
import com.example.demo.domain.vo.Statisticss;
import com.example.demo.domain.vo.SumCoin;
-import com.example.demo.mapper.db1.StatisticsMapper;
-import com.example.demo.mapper.db1.UserMapper;
+import com.example.demo.mapper.StatisticsMapper;
+import com.example.demo.mapper.UserMapper;
import com.example.demo.sevice.StatisticsService;
import lombok.RequiredArgsConstructor;
import org.springframework.cache.annotation.CacheConfig;
@@ -417,7 +417,7 @@ public class StatisticsServiceImpl implements StatisticsService {
//}
- @Cacheable(key = "#root.method.name + #sumcoin.hashCode()")
+// @Cacheable(key = "#root.method.name + #sumcoin.hashCode()")
public List getCoinTime(SumCoin sumcoin) {
System.out.println(sumcoin + "-------sumcoin----");
@@ -425,13 +425,14 @@ public class StatisticsServiceImpl implements StatisticsService {
Date searchEndTime = sumcoin.getSearchEndTime();
Integer year = sumcoin.getYear();
Integer updateType = sumcoin.getUpdateType();
+ List areas = sumcoin.getAreas();
// 如果开始时间和结束时间都为空,则直接返回默认统计结果,即全查
if (searchStartTime == null && searchEndTime == null) {
if (1 == updateType) {
- return statisticsMapper.getMediuConsumeCoin(searchStartTime, searchEndTime);//前端没有选定时间,SQL会查询所有数据
+ return statisticsMapper.getMediuConsumeCoin(searchStartTime, searchEndTime, areas);//前端没有选定时间,SQL会查询所有数据
} else if (0 == updateType) {
- return statisticsMapper.getMediuPayCoin(null, null);
+ return statisticsMapper.getMediuPayCoin(null, null, areas);
}
return null; // 或者抛出异常,取决于业务需求
}
@@ -468,25 +469,25 @@ public class StatisticsServiceImpl implements StatisticsService {
// 如果天数差大于100天
if (year != null) {
if (1 == updateType) {
- return statisticsMapper.getMediuConsumeCoin(searchStartTime, searchEndTime);
+ return statisticsMapper.getMediuConsumeCoin(searchStartTime, searchEndTime, areas);
} else if (0 == updateType) {
- return statisticsMapper.getMediuPayCoin(searchStartTime, searchEndTime);
+ return statisticsMapper.getMediuPayCoin(searchStartTime, searchEndTime, areas);
}
}
// 如果天数差为0,即同一天
if (daysBetween == 0) {
if (1 == updateType) {
- queryResult = statisticsMapper.getMediuConsumeCoinday(searchEndTime, updateType);
+ queryResult = statisticsMapper.getMediuConsumeCoinday(searchEndTime, updateType, areas);
} else if (0 == updateType) {
- queryResult = statisticsMapper.getMediuPayCoinday(searchEndTime, updateType);
+ queryResult = statisticsMapper.getMediuPayCoinday(searchEndTime, updateType, areas);
}
}
// 如果天数差小于100天,但不为0(即跨月或较短时间段)
else {
if (1 == updateType) {
- queryResult = statisticsMapper.getMediuCounsumeCoinyue(searchStartTime, searchEndTime);
+ queryResult = statisticsMapper.getMediuCounsumeCoinyue(searchStartTime, searchEndTime, areas);
} else if (0 == updateType) {
- queryResult = statisticsMapper.getMediuPayCoinyue(searchStartTime, searchEndTime);
+ queryResult = statisticsMapper.getMediuPayCoinyue(searchStartTime, searchEndTime, areas);
}
}
diff --git a/src/main/java/com/example/demo/serviceImpl/UserDetailServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/UserDetailServiceImpl.java
index b05c49c..242de1e 100644
--- a/src/main/java/com/example/demo/serviceImpl/UserDetailServiceImpl.java
+++ b/src/main/java/com/example/demo/serviceImpl/UserDetailServiceImpl.java
@@ -2,7 +2,7 @@ package com.example.demo.serviceImpl;
import com.example.demo.domain.entity.Admin;
-import com.example.demo.mapper.db1.AdminMapper;
+import com.example.demo.mapper.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/UserServiceImpl.java
index e314d5d..fb08232 100644
--- a/src/main/java/com/example/demo/serviceImpl/UserServiceImpl.java
+++ b/src/main/java/com/example/demo/serviceImpl/UserServiceImpl.java
@@ -3,7 +3,7 @@ package com.example.demo.serviceImpl;
import com.example.demo.domain.entity.Detail;
import com.example.demo.domain.entity.User;
import com.example.demo.domain.vo.UserVo;
-import com.example.demo.mapper.db1.UserMapper;
+import com.example.demo.mapper.UserMapper;
import com.example.demo.sevice.UserSevice;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
diff --git a/src/main/java/com/example/demo/sevice/DataExportService.java b/src/main/java/com/example/demo/sevice/DataExportService.java
index 3ad47f1..66d5f15 100644
--- a/src/main/java/com/example/demo/sevice/DataExportService.java
+++ b/src/main/java/com/example/demo/sevice/DataExportService.java
@@ -1,7 +1,7 @@
package com.example.demo.sevice;
import com.example.demo.domain.entity.UserDetailExport;
-import com.example.demo.mapper.db1.DetailYMapper;
+import com.example.demo.mapper.DetailYMapper;
import jakarta.servlet.http.HttpServletResponse;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 81392b2..983b1db 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -1,50 +1,29 @@
-server:
-# port: 10702
-# port: 10010
- port: 10704
-
spring:
- jackson:
- deserialization:
- fail-on-unknown-properties: false
- servlet:
- multipart:
- max-file-size: 10MB
- max-request-size: 100MB
datasource:
mysql1:
- hikari:
- maximum-pool-size: 10
- minimum-idle: 5
- idle-timeout: 30000
- max-lifetime: 1800000
- connection-timeout: 30000
- pool-name: HwgoldHikariCP
- driver-class-name: com.mysql.cj.jdbc.Driver
- url: jdbc:mysql://54.251.137.151:10701/hwgold?serverTimezone=Asia/Shanghai
-# url: jdbc:mysql://39.101.133.168:3306/hwgold?serverTimezone=Asia/Shanghai
+ jdbc-url: jdbc:mysql://54.251.137.151:10701/hwgold?serverTimezone=Asia/Shanghai
username: hwgold
- password: 'AGX4Z3YMxiCG3GR2'
- mysql2:
+ password: AGX4Z3YMxiCG3GR2
+ driver-class-name: com.mysql.cj.jdbc.Driver
hikari:
+ pool-name: mysql1HikariCP
maximum-pool-size: 10
- minimum-idle: 5
- idle-timeout: 30000
- max-lifetime: 1800000
- connection-timeout: 30000
- pool-name: HwgoldHikariCP
- driver-class-name: com.mysql.cj.jdbc.Driver
- url: jdbc:mysql://39.101.133.168:3306/hwgold?serverTimezone=Asia/Shanghai
- username: hljw
- password: '5dmWCCKfEk3TTeyn'
+
application:
name: demo
- cache:
- type: redis
- redis:
- time-to-live: 3600000
- use-key-prefix: true
- cache-null-values: true
+ cache:
+ type: redis
+ redis:
+ time-to-live: 3600000
+ use-key-prefix: true
+ cache-null-values: true
+
+ servlet:
+ multipart:
+ enabled: true
+ max-file-size: 10MB
+ max-request-size: 10MB
+
data:
redis:
database: 1
@@ -52,28 +31,19 @@ spring:
port: 10703
password: 8912h12jhhajsd
timeout: 1000
-# host: 127.0.0.1
-# port: 6379
-# timeout: 1000
-# host: 39.99.159.73
-# port: 20001
-# password: 8912h12jhhajsd
-# timeout: 1000
-
lettuce:
pool:
max-active: 20
max-wait: -1
max-idle: 5
-
-
-
mybatis:
- mapper-locations: classpath*:mapper/*.xml
configuration:
map-underscore-to-camel-case: true
log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
upload:
- path: /home/java/haiwaiyanfa/gold1/
\ No newline at end of file
+ path: /home/java/haiwaiyanfa/gold1
+
+server:
+ port: 8080
\ No newline at end of file
diff --git a/src/main/resources/mapper/db1/ConsumeMapper.xml b/src/main/resources/mapper/ConsumeMapper.xml
similarity index 97%
rename from src/main/resources/mapper/db1/ConsumeMapper.xml
rename to src/main/resources/mapper/ConsumeMapper.xml
index 407db5e..b55e839 100644
--- a/src/main/resources/mapper/db1/ConsumeMapper.xml
+++ b/src/main/resources/mapper/ConsumeMapper.xml
@@ -2,7 +2,7 @@
-
+