From 764f066d8d459b49da0bdafa8abbcb98672365ef Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Sat, 09 Jul 2022 09:52:35 +0800
Subject: [PATCH] 大屏接口对接
---
src/main/java/org/springblade/modules/sale/mapper/SaleMapper.java | 1
src/main/java/org/springblade/modules/sale/mapper/SaleMapper.xml | 18 ++++++++
src/main/java/org/springblade/modules/sale/service/impl/SaleServiceImpl.java | 4 ++
src/main/java/org/springblade/modules/task/service/impl/TaskServiceImpl.java | 9 ++++
src/main/java/org/springblade/modules/task/service/ITaskService.java | 4 ++
src/main/java/org/springblade/modules/task/mapper/TaskMapper.xml | 10 +++++
src/main/java/org/springblade/modules/task/controller/TaskController.java | 8 ++++
src/main/java/org/springblade/modules/task/mapper/TaskMapper.java | 2 +
src/main/java/org/springblade/modules/sale/service/ISaleService.java | 1
src/main/java/org/springblade/modules/sale/controller/SaleController.java | 8 ++++
10 files changed, 64 insertions(+), 1 deletions(-)
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 2e4bbb2..bc157cb 100644
--- a/src/main/java/org/springblade/modules/sale/controller/SaleController.java
+++ b/src/main/java/org/springblade/modules/sale/controller/SaleController.java
@@ -157,4 +157,12 @@
public R selectMarketCirculate() {
return R.data(saleService.selectMarketCirculate());
}
+
+ /**
+ * 按行政区统计市场流通
+ */
+ @GetMapping("/selectMarketDistrict")
+ public R selectMarketDistrict() {
+ return R.data(saleService.selectMarketDistrict());
+ }
}
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 46cecdd..f4df1f4 100644
--- a/src/main/java/org/springblade/modules/sale/mapper/SaleMapper.java
+++ b/src/main/java/org/springblade/modules/sale/mapper/SaleMapper.java
@@ -42,4 +42,5 @@
Map<String, String> selctSaletCount();
List<Map<Object,String>> selctSaletZ();
List<Map<Object,String>> selectMarketCirculate();
+ List<Map<Object,String>> selectMarketDistrict();
}
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 854039b..6cc54f8 100644
--- a/src/main/java/org/springblade/modules/sale/mapper/SaleMapper.xml
+++ b/src/main/java/org/springblade/modules/sale/mapper/SaleMapper.xml
@@ -56,7 +56,7 @@
FROM
sys_sale
WHERE
- YEAR ( sale_time ) = YEAR ( NOW( ) ) UNION ALL
+ YEAR ( sale_time ) = YEAR ( NOW( )-1 ) UNION ALL
SELECT
IFNULL( SUM( sale_num * sale_price ), 0 ) AS num
FROM
@@ -85,5 +85,21 @@
WHERE
DATE_FORMAT( sale_time, '%Y%m' ) = DATE_FORMAT( CURDATE( ), '%Y%m' )
</select>
+ <select id="selectMarketDistrict" resultType="java.util.HashMap" >
+ SELECT
+ IFNULL( SUM( sale_num ), 0 ) AS num,
+ dis.`name`,
+ dis.lat,
+ dis.lng
+ FROM
+ sys_sale sale
+ LEFT JOIN sys_district dis ON sale.sale_destination = dis.CODE
+ WHERE
+ YEAR ( sale_time ) = YEAR ( NOW( ) )
+ GROUP BY
+ dis.NAME,
+ dis.lat,
+ dis.lng
+ </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 3c627b9..97d7b3b 100644
--- a/src/main/java/org/springblade/modules/sale/service/ISaleService.java
+++ b/src/main/java/org/springblade/modules/sale/service/ISaleService.java
@@ -43,4 +43,5 @@
Map<String, String> selctSaletCount();
List<Map<Object,String>> selctSaletZ();
List<Map<Object,String>> selectMarketCirculate();
+ List<Map<Object,String>> selectMarketDistrict();
}
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 0f97440..dd49e94 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
@@ -54,5 +54,9 @@
public List<Map<Object, String>> selectMarketCirculate() {
return baseMapper.selectMarketCirculate();
}
+ @Override
+ public List<Map<Object, String>> selectMarketDistrict() {
+ return baseMapper.selectMarketDistrict();
+ }
}
diff --git a/src/main/java/org/springblade/modules/task/controller/TaskController.java b/src/main/java/org/springblade/modules/task/controller/TaskController.java
index 4f30694..c9f9d71 100644
--- a/src/main/java/org/springblade/modules/task/controller/TaskController.java
+++ b/src/main/java/org/springblade/modules/task/controller/TaskController.java
@@ -152,4 +152,12 @@
map.put("num",i);
return R.data(map);
}
+
+ /**
+ * 统计任务总数
+ */
+ @GetMapping("/countTaskNum")
+ public R countTaskNum(String year) {
+ return R.data(taskService.countTaskNum(year));
+ }
}
diff --git a/src/main/java/org/springblade/modules/task/mapper/TaskMapper.java b/src/main/java/org/springblade/modules/task/mapper/TaskMapper.java
index 6ea0a18..d8210de 100644
--- a/src/main/java/org/springblade/modules/task/mapper/TaskMapper.java
+++ b/src/main/java/org/springblade/modules/task/mapper/TaskMapper.java
@@ -22,6 +22,7 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import java.util.List;
+import java.util.Map;
/**
* Mapper 接口
@@ -41,4 +42,5 @@
List<TaskVO> selectTaskPage(IPage page, TaskVO task);
int selectCount(String taskuser);
+ List<Map<Object,String>> countTaskNum(String year);
}
diff --git a/src/main/java/org/springblade/modules/task/mapper/TaskMapper.xml b/src/main/java/org/springblade/modules/task/mapper/TaskMapper.xml
index fc4fdfd..09704bd 100644
--- a/src/main/java/org/springblade/modules/task/mapper/TaskMapper.xml
+++ b/src/main/java/org/springblade/modules/task/mapper/TaskMapper.xml
@@ -172,4 +172,14 @@
sys_task
WHERE 1=1 and YEAR (create_time)=#{time};
</select>
+
+ <select id="countTaskNum" resultType="java.util.HashMap">
+ SELECT
+ date_format( time , '%Y-%m' ) AS y,
+ count( * ) AS count
+ FROM
+ sys_task
+ WHERE 1=1 and YEAR (time)=#{year}
+ GROUP BY y;
+ </select>
</mapper>
diff --git a/src/main/java/org/springblade/modules/task/service/ITaskService.java b/src/main/java/org/springblade/modules/task/service/ITaskService.java
index e048c93..20c7d1a 100644
--- a/src/main/java/org/springblade/modules/task/service/ITaskService.java
+++ b/src/main/java/org/springblade/modules/task/service/ITaskService.java
@@ -21,6 +21,9 @@
import org.springblade.core.mp.base.BaseService;
import com.baomidou.mybatisplus.core.metadata.IPage;
+import java.util.List;
+import java.util.Map;
+
/**
* 服务类
*
@@ -38,4 +41,5 @@
*/
IPage<TaskVO> selectTaskPage(IPage<TaskVO> page, TaskVO task);
int selectCount(String taskuser);
+ List<Map<Object,String>> countTaskNum(String year);
}
diff --git a/src/main/java/org/springblade/modules/task/service/impl/TaskServiceImpl.java b/src/main/java/org/springblade/modules/task/service/impl/TaskServiceImpl.java
index ba7a431..238c562 100644
--- a/src/main/java/org/springblade/modules/task/service/impl/TaskServiceImpl.java
+++ b/src/main/java/org/springblade/modules/task/service/impl/TaskServiceImpl.java
@@ -24,6 +24,9 @@
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.core.metadata.IPage;
+import java.util.List;
+import java.util.Map;
+
/**
* 服务实现类
*
@@ -43,4 +46,10 @@
return baseMapper.selectCount(taskuser);
}
+ @Override
+ public List<Map<Object, String>> countTaskNum(String year) {
+ return baseMapper.countTaskNum(year);
+ }
+
+
}
--
Gitblit v1.9.3