From 67ac6f18da66cc5b703e1ec849e96bdac586d6d1 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期三, 10 五月 2023 18:16:26 +0800
Subject: [PATCH] BUG修改
---
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/THomePageController.java | 77 +++++++++++++++++++++++++++++++++++---
1 files changed, 70 insertions(+), 7 deletions(-)
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/THomePageController.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/THomePageController.java
index 99cbd75..f72a8aa 100644
--- a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/THomePageController.java
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/THomePageController.java
@@ -59,6 +59,13 @@
*/
@RequestMapping("/map")
public String map(Integer agentId,Integer type,Model model) {
+
+ Integer objectId = ShiroKit.getUser().getObjectId();
+ Integer roleType = ShiroKit.getUser().getRoleType();
+ if(roleType == 3 && Objects.nonNull(objectId)){
+ agentId = objectId;
+ }
+
// 查询所有代理商
List<TAgent> agentList = tAgentService.selectList(new EntityWrapper<TAgent>()
.ne("status", StatusEnum.DELETE.getCode())
@@ -115,6 +122,11 @@
@RequestMapping("/getMap")
@ResponseBody
public Object getMap(Integer agentId,Integer type,Model model) {
+ Integer objectId = ShiroKit.getUser().getObjectId();
+ Integer roleType = ShiroKit.getUser().getRoleType();
+ if(roleType == 3 && Objects.nonNull(objectId)){
+ agentId = objectId;
+ }
HashMap<String, Object> map = new HashMap<>();
// 查询所有代理商
List<TAgent> agentList = tAgentService.selectList(new EntityWrapper<TAgent>()
@@ -128,9 +140,22 @@
.eq("agentId", agentId)
.eq("serverStatus", 2));
map.put("onLineDriverCount",onLineDriver.size());
- tOrderService.getDataStatisticsCountGetMap(agentId,map);
+// tOrderService.getDataStatisticsCountGetMap(agentId,map);
+// // 查询服务中的订单列表
+// List<TOrderServerResp> orderServerRespList = tOrderService.getDataStatisticsServerList(agentId);
+// // 查询司机
+// for (TOrderServerResp tOrderServerResp : orderServerRespList) {
+// TDriver tDriver = tDriverService.selectById(tOrderServerResp.getDriverId());
+// tOrderServerResp.setAvatar(tDriver.getAvatar());
+// tOrderServerResp.setDriverName(tDriver.getName());
+// }
+// map.put("serverList",orderServerRespList);
+ List<TAgent> tAgentAllList = tAgentService.selectList(new EntityWrapper<TAgent>());
+ List<Integer> allIds = tAgentAllList.stream().map(TAgent::getId).collect(Collectors.toList());
+ tOrderService.getDataStatisticsCountByIdsGetMap(allIds,map);
+
// 查询服务中的订单列表
- List<TOrderServerResp> orderServerRespList = tOrderService.getDataStatisticsServerList(agentId);
+ List<TOrderServerResp> orderServerRespList = tOrderService.getDataStatisticsServerListByIds(allIds);
// 查询司机
for (TOrderServerResp tOrderServerResp : orderServerRespList) {
TDriver tDriver = tDriverService.selectById(tOrderServerResp.getDriverId());
@@ -173,9 +198,13 @@
.eq("serverStatus", 2));
map.put("onLineDriverCount",onLineDriver.size());
- tOrderService.getDataStatisticsCountByIdsGetMap(ids,map);
+
+ List<TAgent> tAgentAllList = tAgentService.selectList(new EntityWrapper<TAgent>());
+ List<Integer> allIds = tAgentAllList.stream().map(TAgent::getId).collect(Collectors.toList());
+ tOrderService.getDataStatisticsCountByIdsGetMap(allIds,map);
+
// 查询服务中的订单列表
- List<TOrderServerResp> orderServerRespList = tOrderService.getDataStatisticsServerListByIds(ids);
+ List<TOrderServerResp> orderServerRespList = tOrderService.getDataStatisticsServerListByIds(allIds);
// 查询司机
for (TOrderServerResp tOrderServerResp : orderServerRespList) {
TDriver tDriver = tDriverService.selectById(tOrderServerResp.getDriverId());
@@ -184,7 +213,7 @@
}
map.put("serverList",orderServerRespList);
// 查询今天所有订单
- List<TOrder> allList = tOrderService.getDataStatisticsAllListByIds(ids,type);
+ List<TOrder> allList = tOrderService.getDataStatisticsAllListByIds(allIds,type);
List<List<String>> list = new ArrayList<>(allList.size());
for (TOrder tOrder : allList) {
List<String> obj = new ArrayList<>(3);
@@ -215,6 +244,11 @@
@RequestMapping("/getServerOrder")
@ResponseBody
public Object getServerOrder(Integer agentId,Model model) {
+ Integer objectId = ShiroKit.getUser().getObjectId();
+ Integer roleType = ShiroKit.getUser().getRoleType();
+ if(roleType == 3 && Objects.nonNull(objectId)){
+ agentId = objectId;
+ }
HashMap<String, Object> map = new HashMap<>();
if(Objects.nonNull(agentId)){
// 查询服务中的订单列表
@@ -227,8 +261,7 @@
}
map.put("serverList",orderServerRespList);
}else {
- List<TAgent> tAgentList = tAgentService.selectList(new EntityWrapper<TAgent>()
- .eq("provinceCode", "440000"));
+ List<TAgent> tAgentList = tAgentService.selectList(new EntityWrapper<TAgent>());
List<Integer> ids = tAgentList.stream().map(TAgent::getId).collect(Collectors.toList());
// 查询服务中的订单列表
List<TOrderServerResp> orderServerRespList = tOrderService.getDataStatisticsServerListByIds(ids);
@@ -248,6 +281,11 @@
*/
@RequestMapping("/statistics")
public String statistics(Integer agentId,String dayDate,String yearDate,String monthDate,Integer type,Model model) {
+ Integer objectId = ShiroKit.getUser().getObjectId();
+ Integer roleType = ShiroKit.getUser().getRoleType();
+ if(roleType == 3 && Objects.nonNull(objectId)){
+ agentId = objectId;
+ }
if(Objects.isNull(type)){
type = 1;
}
@@ -317,6 +355,11 @@
@RequestMapping("/statisticsByAgentId")
@ResponseBody
public Map<String, Object> statisticsByAgentId(Integer agentId, String dayDate, String yearDate, String monthDate, Integer type, Model model) {
+ Integer objectId = ShiroKit.getUser().getObjectId();
+ Integer roleType = ShiroKit.getUser().getRoleType();
+ if(roleType == 3 && Objects.nonNull(objectId)){
+ agentId = objectId;
+ }
Map<String, Object> map = new HashMap<>();
if(Objects.nonNull(agentId)){
// 统计代理商
@@ -350,6 +393,11 @@
@RequestMapping("/statisticsMonthByAgentId")
@ResponseBody
public Map<String, Object> statisticsMonthByAgentId(Integer agentId, String dayDate,Model model) {
+ Integer objectId = ShiroKit.getUser().getObjectId();
+ Integer roleType = ShiroKit.getUser().getRoleType();
+ if(roleType == 3 && Objects.nonNull(objectId)){
+ agentId = objectId;
+ }
dayDate = new SimpleDateFormat("yyyy-MM").format(new Date());
Map<String, Object> map = new HashMap<>();
if(Objects.nonNull(agentId)){
@@ -372,6 +420,11 @@
@RequestMapping("/statisticsYearByAgentId")
@ResponseBody
public Map<String, Object> statisticsYearByAgentId(Integer agentId, String yearDate,Model model) {
+ Integer objectId = ShiroKit.getUser().getObjectId();
+ Integer roleType = ShiroKit.getUser().getRoleType();
+ if(roleType == 3 && Objects.nonNull(objectId)){
+ agentId = objectId;
+ }
if(!StringUtils.hasLength(yearDate)){
yearDate = new SimpleDateFormat("yyyy").format(new Date());
}
@@ -395,6 +448,11 @@
@RequestMapping("/statisticsOrderByAgentId")
@ResponseBody
public Map<String, Object> statisticsOrderByAgentId(Integer agentId, String monthDate,Integer type,Model model) {
+ Integer objectId = ShiroKit.getUser().getObjectId();
+ Integer roleType = ShiroKit.getUser().getRoleType();
+ if(roleType == 3 && Objects.nonNull(objectId)){
+ agentId = objectId;
+ }
if(Objects.isNull(type)){
type = 1;
}
@@ -434,6 +492,11 @@
@RequestMapping("/statisticsDriverByAgentId")
@ResponseBody
public Map<String, Object> statisticsDriverByAgentId(Integer agentId,Model model) {
+ Integer objectId = ShiroKit.getUser().getObjectId();
+ Integer roleType = ShiroKit.getUser().getRoleType();
+ if(roleType == 3 && Objects.nonNull(objectId)){
+ agentId = objectId;
+ }
Map<String, Object> map = new HashMap<>();
if(Objects.nonNull(agentId)){
// 统计司机数
--
Gitblit v1.7.1