From 6dc8be1639a2b9c42b45bf11a94bdf3aa35e8d62 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期四, 23 十月 2025 15:20:45 +0800
Subject: [PATCH] 首页点位信息
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TDataStatisticsController.java | 28 +++++++++++++++++++++++-----
1 files changed, 23 insertions(+), 5 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TDataStatisticsController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TDataStatisticsController.java
index 1f6dd6b..4bd65ca 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TDataStatisticsController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TDataStatisticsController.java
@@ -3,7 +3,9 @@
import com.alibaba.fastjson2.JSONArray;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.ruoyi.common.constant.Constants;
import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.redis.RedisCache;
import com.ruoyi.framework.web.service.TokenService;
import com.ruoyi.system.dto.EquipmentDto;
import com.ruoyi.system.model.*;
@@ -24,10 +26,7 @@
import java.time.Duration;
import java.time.LocalDate;
import java.time.LocalDateTime;
-import java.util.ArrayList;
-import java.util.Comparator;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
import java.util.stream.Collectors;
import static java.util.stream.Collectors.groupingBy;
@@ -53,8 +52,9 @@
private final TMissionAssignRuleService missionReassignService;
private final TAppUserEquipmentService appUserEquipmentService;
private final TEquipmentService equipmentService;
+ private final RedisCache redisCache;
@Autowired
- public TDataStatisticsController(TMissionService missionService, TokenService tokenService, TMissionUserService missionUserService, TAppUserService appUserService, TDivisionTeamService divisionTeamService, TMissionAssignRuleService missionReassignService1, TAppUserEquipmentService appUserEquipmentService, TEquipmentService equipmentService) {
+ public TDataStatisticsController(TMissionService missionService, TokenService tokenService, TMissionUserService missionUserService, TAppUserService appUserService, TDivisionTeamService divisionTeamService, TMissionAssignRuleService missionReassignService1, TAppUserEquipmentService appUserEquipmentService, TEquipmentService equipmentService, RedisCache redisCache) {
this.missionService = missionService;
this.tokenService = tokenService;
this.missionUserService = missionUserService;
@@ -63,6 +63,7 @@
this.missionReassignService = missionReassignService1;
this.appUserEquipmentService = appUserEquipmentService;
this.equipmentService = equipmentService;
+ this.redisCache = redisCache;
}
@ApiOperation(value = "获取数据-第一部分")
@@ -238,6 +239,23 @@
return R.ok(indexDataVo);
}
+ @ApiOperation(value = "获取数据-第三部分 点位信息")
+ @GetMapping(value = "/open/t-data-statistics/getDataThree")
+ public R<HashMap<String, Object>> getDataThree() {
+ List<TMission> list = missionService.list();
+ List<TAppUser> list1 = appUserService.list();
+ HashMap<String, Object> map = new HashMap<>();
+ ArrayList<Object> appUserLocations = new ArrayList<>();
+ for (TAppUser appUser : list1) {
+ Object cacheObject = redisCache.getCacheObject(Constants.LOCATION + appUser.getId());
+ if(cacheObject!=null){
+ appUserLocations.add(cacheObject);
+ }
+ }
+ map.put("mission", list);
+ map.put("appUser", appUserLocations);
+ return R.ok(map);
+ }
public static void main(String[] args) {
String format = String.format("%05d", 2);
--
Gitblit v1.7.1