From f9f71576760387332a4b6704f39b41575e92d083 Mon Sep 17 00:00:00 2001 From: huangqizhen <15552608129@163.com> Date: Sat, 19 Apr 2025 15:53:33 +0800 Subject: [PATCH] =?UTF-8?q?4.18=20=20=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../demo/config/Mysql1DataSourceConfig.java | 32 ++++++++++++---------- .../com/example/demo/controller/DouController.java | 9 +++--- .../com/example/demo/domain/dou/RechargeTotal.java | 30 ++++++++++++++++++++ .../com/example/demo/domain/dou/SpendTotal.java | 18 +++++++++--- .../java/com/example/demo/mapperPay/PayMapper.java | 2 ++ .../example/demo/serviceImpl/DouServiceImpl.java | 5 ++++ .../java/com/example/demo/sevice/DouService.java | 1 + src/main/resources/application.yml | 10 ++++++- src/main/resources/mapperLink/DouMapper.xml | 1 - src/main/resources/mapperPay/PayMapper.xml | 26 ++++++++++++++++++ 10 files changed, 110 insertions(+), 24 deletions(-) create mode 100644 src/main/java/com/example/demo/domain/dou/RechargeTotal.java diff --git a/src/main/java/com/example/demo/config/Mysql1DataSourceConfig.java b/src/main/java/com/example/demo/config/Mysql1DataSourceConfig.java index 51de7a4..b7225d5 100644 --- a/src/main/java/com/example/demo/config/Mysql1DataSourceConfig.java +++ b/src/main/java/com/example/demo/config/Mysql1DataSourceConfig.java @@ -20,20 +20,24 @@ import javax.sql.DataSource; @Configuration public class Mysql1DataSourceConfig { - @Bean(name = "mysql1DataSource") -// @Primary - public DataSource mysql1DataSource() { - HikariDataSource dataSource = new HikariDataSource(); - dataSource.setJdbcUrl("jdbc:mysql://54.251.137.151:10701/hwgold?serverTimezone=Asia/Shanghai&useSSL=false&useUnicode=true&characterEncoding=UTF-8"); - dataSource.setUsername("hwgold"); - dataSource.setPassword("AGX4Z3YMxiCG3GR2"); - dataSource.setDriverClassName("com.mysql.cj.jdbc.Driver"); - dataSource.setMaximumPoolSize(10); - dataSource.setPoolName("mysql1HikariCP"); - log.info("mysql1 DataSource initialized with pool-name: {}", dataSource.getPoolName()); - return dataSource; - } - +// @Bean(name = "mysql1DataSource") +//// @Primary +// public DataSource mysql1DataSource() { +// HikariDataSource dataSource = new HikariDataSource(); +// dataSource.setJdbcUrl("jdbc:mysql://54.251.137.151:10701/hwgold?serverTimezone=Asia/Shanghai&useSSL=false&useUnicode=true&characterEncoding=UTF-8"); +// dataSource.setUsername("hwgold"); +// dataSource.setPassword("AGX4Z3YMxiCG3GR2"); +// dataSource.setDriverClassName("com.mysql.cj.jdbc.Driver"); +// dataSource.setMaximumPoolSize(10); +// dataSource.setPoolName("mysql1HikariCP"); +// log.info("mysql1 DataSource initialized with pool-name: {}", dataSource.getPoolName()); +// return dataSource; +// } +@Bean(name = "mysql1DataSource") +@ConfigurationProperties(prefix = "spring.datasource.mysql1") +public DataSource mysql2DataSource() { + return DataSourceBuilder.create().type(HikariDataSource.class).build(); +} @Bean(name = "mysql1SqlSessionFactory") // @Primary public SqlSessionFactory mysql1SqlSessionFactory(@Qualifier("mysql1DataSource") DataSource dataSource, diff --git a/src/main/java/com/example/demo/controller/DouController.java b/src/main/java/com/example/demo/controller/DouController.java index 0935ea2..1ad6cd0 100644 --- a/src/main/java/com/example/demo/controller/DouController.java +++ b/src/main/java/com/example/demo/controller/DouController.java @@ -2,10 +2,7 @@ package com.example.demo.controller; -import com.example.demo.domain.dou.Records; -import com.example.demo.domain.dou.Searchinfo; -import com.example.demo.domain.dou.SpendTotal; -import com.example.demo.domain.dou.YveTotal; +import com.example.demo.domain.dou.*; import com.example.demo.domain.vo.Page; import com.example.demo.domain.vo.Result; import com.example.demo.sevice.DouService; @@ -93,4 +90,8 @@ public class DouController { public Result getSpendTotal(@RequestBody SpendTotal spendTotal){ return Result.success(douService.getSpendTotal(spendTotal)); } + @RequestMapping("/getRechargeTotal") + public Result getRechargeTotal(@RequestBody RechargeTotal rechargeTotal){ + return Result.success(douService.getRechargeTotal(rechargeTotal)); + } } diff --git a/src/main/java/com/example/demo/domain/dou/RechargeTotal.java b/src/main/java/com/example/demo/domain/dou/RechargeTotal.java new file mode 100644 index 0000000..de69f52 --- /dev/null +++ b/src/main/java/com/example/demo/domain/dou/RechargeTotal.java @@ -0,0 +1,30 @@ +package com.example.demo.domain.dou; + +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; +import org.springframework.format.annotation.DateTimeFormat; + +import java.math.BigDecimal; +import java.util.Date; + +@Data +@NoArgsConstructor +@AllArgsConstructor +public class RechargeTotal { + private String token; + private Integer jwcode; + private String OrderNo; + private String type; + private BigDecimal priceTotal; + private Integer countTotal; + private Integer payStyle; + private String deptName; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai") + @DateTimeFormat(pattern = "yyyy-MM-dd") + private Date startTime; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai") + @DateTimeFormat(pattern = "yyyy-MM-dd") + private Date endTime; +} diff --git a/src/main/java/com/example/demo/domain/dou/SpendTotal.java b/src/main/java/com/example/demo/domain/dou/SpendTotal.java index 1d42380..c332113 100644 --- a/src/main/java/com/example/demo/domain/dou/SpendTotal.java +++ b/src/main/java/com/example/demo/domain/dou/SpendTotal.java @@ -14,14 +14,24 @@ import java.util.Date; public class SpendTotal { private String token; private Integer SpendTotal; + private String jwcode; + private String nickname; + private String ipAddress; + private Integer jinbi; + private Integer jinbiFree; + private Integer jinbiBuy; + private Integer jinbiCostTotal; + private String sortField; + private String sortOrder; + private String sourceName; + private String content; + private Integer payType; + private Integer sourceType; + private Integer time; @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai") @DateTimeFormat(pattern = "yyyy-MM-dd") private Date startTime; @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai") @DateTimeFormat(pattern = "yyyy-MM-dd") private Date endTime; - private String jwcode; - private String sourceName; - private Integer payType; - private String ipAddress; } diff --git a/src/main/java/com/example/demo/mapperPay/PayMapper.java b/src/main/java/com/example/demo/mapperPay/PayMapper.java index b1c3830..325c1e7 100644 --- a/src/main/java/com/example/demo/mapperPay/PayMapper.java +++ b/src/main/java/com/example/demo/mapperPay/PayMapper.java @@ -1,6 +1,7 @@ package com.example.demo.mapperPay; import com.example.demo.domain.dou.Pay; +import com.example.demo.domain.dou.RechargeTotal; import org.apache.ibatis.annotations.Mapper; import java.util.List; @@ -10,5 +11,6 @@ public interface PayMapper { List getPay(Pay pay); List getPayIp(); List getStyle(); + RechargeTotal getRechargeTotal(RechargeTotal rechargeTotal); } diff --git a/src/main/java/com/example/demo/serviceImpl/DouServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/DouServiceImpl.java index 37aee7b..6789af9 100644 --- a/src/main/java/com/example/demo/serviceImpl/DouServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/DouServiceImpl.java @@ -158,4 +158,9 @@ public class DouServiceImpl implements DouService { public Integer getSpendTotal(SpendTotal spendTotal) { return douMapper.getSpendTotal(spendTotal); } + + @Override + public RechargeTotal getRechargeTotal(RechargeTotal rechargeTotal) { + return payMapper.getRechargeTotal(rechargeTotal); + } } diff --git a/src/main/java/com/example/demo/sevice/DouService.java b/src/main/java/com/example/demo/sevice/DouService.java index 95c6b80..e10a629 100644 --- a/src/main/java/com/example/demo/sevice/DouService.java +++ b/src/main/java/com/example/demo/sevice/DouService.java @@ -22,4 +22,5 @@ public interface DouService { List getSpend(Spend spend); Object searchSpend(Integer pageNum, Integer pageSize, Spend spend); Integer getSpendTotal(SpendTotal spendTotal); + RechargeTotal getRechargeTotal(RechargeTotal rechargeTotal); } diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index d5aea6f..4bcc885 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -3,8 +3,16 @@ spring: deserialization: fail-on-unknown-properties: false datasource: +# mysql1: +# jdbc-url: jdbc:mysql://54.251.137.151:10701/hwgold?serverTimezone=Asia/Shanghai +# username: hwgold +# password: AGX4Z3YMxiCG3GR2 +# driver-class-name: com.mysql.cj.jdbc.Driver +# hikari: +# pool-name: mysql1HikariCP +# maximum-pool-size: 10 mysql1: - jdbc-url: jdbc:mysql://54.251.137.151:10701/hwgold?serverTimezone=Asia/Shanghai + jdbc-url: jdbc:mysql://39.101.133.168:3306/hwgold?serverTimezone=Asia/Shanghai username: hwgold password: AGX4Z3YMxiCG3GR2 driver-class-name: com.mysql.cj.jdbc.Driver diff --git a/src/main/resources/mapperLink/DouMapper.xml b/src/main/resources/mapperLink/DouMapper.xml index d6a523d..d887aef 100644 --- a/src/main/resources/mapperLink/DouMapper.xml +++ b/src/main/resources/mapperLink/DouMapper.xml @@ -114,7 +114,6 @@ SELECT DISTINCT `name` FROM g_pay_style + \ No newline at end of file