From 99d5e944c228fc07ace318427a25d340b16612ac Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Wed, 06 Jul 2022 20:59:58 +0800
Subject: [PATCH] 大屏接口对接
---
src/main/java/org/springblade/common/config/BladeConfiguration.java | 1
src/main/java/org/springblade/modules/sale/mapper/SaleMapper.java | 3 +
src/main/java/org/springblade/modules/sale/mapper/SaleMapper.xml | 58 +++++++++++++++++++++++-----
src/main/java/org/springblade/modules/sale/service/impl/SaleServiceImpl.java | 8 +++-
src/main/java/org/springblade/modules/sale/service/ISaleService.java | 3 +
src/main/java/org/springblade/modules/sale/controller/SaleController.java | 15 +++++--
6 files changed, 69 insertions(+), 19 deletions(-)
diff --git a/src/main/java/org/springblade/common/config/BladeConfiguration.java b/src/main/java/org/springblade/common/config/BladeConfiguration.java
index 91f5890..3809125 100644
--- a/src/main/java/org/springblade/common/config/BladeConfiguration.java
+++ b/src/main/java/org/springblade/common/config/BladeConfiguration.java
@@ -59,6 +59,7 @@
secureRegistry.excludePathPatterns("/task/task/**");
secureRegistry.excludePathPatterns("/recovery/**");
secureRegistry.excludePathPatterns("/farm/**");
+ secureRegistry.excludePathPatterns("/sale/sale/**");
secureRegistry.excludePathPatterns("/farmingRecord/**");
secureRegistry.excludePathPatterns("/blade-user/**");
secureRegistry.excludePathPatterns("/soldrecord/soldrecord/**");
diff --git a/src/main/java/org/springblade/modules/sale/controller/SaleController.java b/src/main/java/org/springblade/modules/sale/controller/SaleController.java
index 706737e..2e4bbb2 100644
--- a/src/main/java/org/springblade/modules/sale/controller/SaleController.java
+++ b/src/main/java/org/springblade/modules/sale/controller/SaleController.java
@@ -137,17 +137,24 @@
/**
* 大屏销售统计
*/
- @PostMapping("/selctSaletCount")
- public R selctSaletCount(String year) {
- return R.data(saleService.selctSaletCount(year));
+ @GetMapping("/selctSaletCount")
+ public R selctSaletCount() {
+ return R.data(saleService.selctSaletCount());
}
/**
* 统计今年和去年的销售总额
*/
- @PostMapping("/selctSaletZ")
+ @GetMapping("/selctSaletZ")
public R selctSaletZ() {
return R.data(saleService.selctSaletZ());
}
+ /**
+ * 统计市场流通/去年流通量/本月流通量
+ */
+ @GetMapping("/selectMarketCirculate")
+ public R selectMarketCirculate() {
+ return R.data(saleService.selectMarketCirculate());
+ }
}
diff --git a/src/main/java/org/springblade/modules/sale/mapper/SaleMapper.java b/src/main/java/org/springblade/modules/sale/mapper/SaleMapper.java
index 0ec3356..46cecdd 100644
--- a/src/main/java/org/springblade/modules/sale/mapper/SaleMapper.java
+++ b/src/main/java/org/springblade/modules/sale/mapper/SaleMapper.java
@@ -39,6 +39,7 @@
* @return
*/
List<SaleVO> selectSalePage(IPage page, SaleVO sale);
- Map<String, String> selctSaletCount(String year);
+ Map<String, String> selctSaletCount();
List<Map<Object,String>> selctSaletZ();
+ List<Map<Object,String>> selectMarketCirculate();
}
diff --git a/src/main/java/org/springblade/modules/sale/mapper/SaleMapper.xml b/src/main/java/org/springblade/modules/sale/mapper/SaleMapper.xml
index 79095ea..854039b 100644
--- a/src/main/java/org/springblade/modules/sale/mapper/SaleMapper.xml
+++ b/src/main/java/org/springblade/modules/sale/mapper/SaleMapper.xml
@@ -30,24 +30,60 @@
<!--大屏销售每个月统计-->
<select id="selctSaletCount" resultType="java.util.HashMap">
- SELECT SUM(CASE WHEN MONTH ( s.sale_time ) = 1 THEN s.sale_price END ) AS '1', SUM(CASE WHEN MONTH ( s.sale_time ) = 2 THEN s.sale_price END ) AS '2', SUM(CASE WHEN MONTH ( s.sale_time ) = 3 THEN s.sale_price END ) AS '3', SUM(CASE WHEN MONTH ( s.sale_time ) = 4 THEN s.sale_price END ) AS '4', SUM(CASE WHEN MONTH ( s.sale_time ) = 5 THEN s.sale_price END ) AS '5', SUM(CASE WHEN MONTH ( s.sale_time ) = 6 THEN s.sale_price END ) AS '6', SUM(CASE WHEN MONTH ( s.sale_time ) = 7 THEN s.sale_price END ) AS '7', SUM(CASE WHEN MONTH ( s.sale_time ) = 8 THEN s.sale_price END ) AS '8', SUM(CASE WHEN MONTH ( s.sale_time ) = 9 THEN s.sale_price END ) AS '9', SUM(CASE WHEN MONTH ( s.sale_time ) = 10 THEN s.sale_price END ) AS '10', SUM(CASE WHEN MONTH ( s.sale_time ) = 11 THEN s.sale_price END ) AS '11', SUM(CASE WHEN MONTH ( s.sale_time ) = 12 THEN s.sale_price END ) AS '12'
- FROM sys_sale AS s
+ SELECT
+ IFNULL(SUM( CASE WHEN MONTH ( s.sale_time ) = 1 THEN s.sale_num * sale_price END ),0) AS '1',
+ IFNULL(SUM( CASE WHEN MONTH ( s.sale_time ) = 2 THEN s.sale_num * sale_price END ),0) AS '2',
+ IFNULL(SUM( CASE WHEN MONTH ( s.sale_time ) = 3 THEN s.sale_num * sale_price END ),0) AS '3',
+ IFNULL(SUM( CASE WHEN MONTH ( s.sale_time ) = 4 THEN s.sale_num * sale_price END ),0) AS '4',
+ IFNULL(SUM( CASE WHEN MONTH ( s.sale_time ) = 5 THEN s.sale_num * sale_price END ),0) AS '5',
+ IFNULL(SUM( CASE WHEN MONTH ( s.sale_time ) = 6 THEN s.sale_num * sale_price END ),0) AS '6',
+ IFNULL(SUM( CASE WHEN MONTH ( s.sale_time ) = 7 THEN s.sale_num * sale_price END ),0) AS '7',
+ IFNULL(SUM( CASE WHEN MONTH ( s.sale_time ) = 8 THEN s.sale_num * sale_price END ),0) AS '8',
+ IFNULL(SUM( CASE WHEN MONTH ( s.sale_time ) = 9 THEN s.sale_num * sale_price END ),0) AS '9',
+ IFNULL(SUM( CASE WHEN MONTH ( s.sale_time ) = 10 THEN s.sale_num * sale_price END ),0) AS '10',
+ IFNULL(SUM( CASE WHEN MONTH ( s.sale_time ) = 11 THEN s.sale_num * sale_price END ),0) AS '11',
+ IFNULL(SUM( CASE WHEN MONTH ( s.sale_time ) = 12 THEN s.sale_num * sale_price END ),0) AS '12'
+ FROM
+ sys_sale AS s
WHERE
- YEAR ( s.sale_time ) = #{year}
+ YEAR ( sale_time ) = YEAR ( NOW( ) )
</select>
<!--统计今年和去年的销售总额-->
<select id="selctSaletZ" resultType="java.util.HashMap" >
- SELECT IFNULL(SUM(sale_num), 0) AS num
- FROM sys_sale
+ SELECT
+ IFNULL( SUM( sale_num * sale_price), 0 ) AS num
+ FROM
+ sys_sale
WHERE
- YEAR ( sale_time ) = YEAR ( NOW( ) )
- UNION ALL
- SELECT IFNULL(SUM(sale_num), 0) AS num
- FROM sys_sale
+ YEAR ( sale_time ) = YEAR ( NOW( ) ) UNION ALL
+ SELECT
+ IFNULL( SUM( sale_num * sale_price ), 0 ) AS num
+ FROM
+ sys_sale
WHERE
- YEAR ( sale_time ) = YEAR ( date_sub( now( )
- , INTERVAL 1 YEAR ) );
+ YEAR ( sale_time ) = YEAR ( date_sub( now( ), INTERVAL 1 YEAR ) )
+ </select>
+ <!--统计市场流通/去年流通量/本月流通量-->
+ <select id="selectMarketCirculate" resultType="java.util.HashMap" >
+ SELECT
+ IFNULL( SUM( sale_num ), 0 ) AS num
+ FROM
+ sys_sale
+ WHERE
+ YEAR ( sale_time ) = YEAR ( NOW( ) ) UNION ALL
+ SELECT
+ IFNULL( SUM( sale_num ), 0 ) AS num
+ FROM
+ sys_sale
+ WHERE
+ YEAR ( sale_time ) = YEAR ( date_sub( now( ), INTERVAL 1 YEAR ) ) UNION ALL
+ SELECT
+ IFNULL( SUM( sale_num ), 0 ) AS num
+ FROM
+ sys_sale
+ WHERE
+ DATE_FORMAT( sale_time, '%Y%m' ) = DATE_FORMAT( CURDATE( ), '%Y%m' )
</select>
</mapper>
diff --git a/src/main/java/org/springblade/modules/sale/service/ISaleService.java b/src/main/java/org/springblade/modules/sale/service/ISaleService.java
index 17e5de4..3c627b9 100644
--- a/src/main/java/org/springblade/modules/sale/service/ISaleService.java
+++ b/src/main/java/org/springblade/modules/sale/service/ISaleService.java
@@ -40,6 +40,7 @@
* @return
*/
IPage<SaleVO> selectSalePage(IPage<SaleVO> page, SaleVO sale);
- Map<String, String> selctSaletCount(String year);
+ Map<String, String> selctSaletCount();
List<Map<Object,String>> selctSaletZ();
+ List<Map<Object,String>> selectMarketCirculate();
}
diff --git a/src/main/java/org/springblade/modules/sale/service/impl/SaleServiceImpl.java b/src/main/java/org/springblade/modules/sale/service/impl/SaleServiceImpl.java
index f7033ef..0f97440 100644
--- a/src/main/java/org/springblade/modules/sale/service/impl/SaleServiceImpl.java
+++ b/src/main/java/org/springblade/modules/sale/service/impl/SaleServiceImpl.java
@@ -42,13 +42,17 @@
}
@Override
- public Map<String, String> selctSaletCount(String year) {
- return baseMapper.selctSaletCount(year);
+ public Map<String, String> selctSaletCount() {
+ return baseMapper.selctSaletCount();
}
@Override
public List<Map<Object, String>> selctSaletZ() {
return baseMapper.selctSaletZ();
}
+ @Override
+ public List<Map<Object, String>> selectMarketCirculate() {
+ return baseMapper.selectMarketCirculate();
+ }
}
--
Gitblit v1.9.3