From f3aa9e35dfc2852e0ae1ae807bc5cc844cd7ca74 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期二, 06 一月 2026 09:45:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/DataStatisticsController.java | 29 ++++++++++++++++++++++-------
1 files changed, 22 insertions(+), 7 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/DataStatisticsController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/DataStatisticsController.java
index 42804eb..fdb4fcc 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/DataStatisticsController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/DataStatisticsController.java
@@ -1,5 +1,6 @@
package com.ruoyi.web.controller.api;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.system.model.*;
@@ -13,6 +14,7 @@
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import java.util.Objects;
import java.util.stream.Collectors;
@Api(tags = "数据大屏")
@@ -31,8 +33,9 @@
private final TLargeVolunteerService largeVolunteerService;
private final TLargeKeyGridUserService largeKeyGridUserService;
private final TLargeKeyPersonnelTypeService largeKeyPersonnelTypeService;
+ private final THelpNeedsService tHelpNeedsService;
@Autowired
- public DataStatisticsController(TAppealServicesService appealServicesService, TOldsterWarningService oldsterWarningService, THtmlConfigService htmlConfigService, TLargeDeptService largeDeptService, TLargeUserService largeUserService, TLargeOrganizationService largeOrganizationService, TLargeResourceService largeResourceService, TLargeSocialWorkerService largeSocialWorkerService, TLargeVolunteerService largeVolunteerService, TLargeKeyGridUserService largeKeyGridUserService, TLargeKeyPersonnelTypeService largeKeyPersonnelTypeService) {
+ public DataStatisticsController(TAppealServicesService appealServicesService, TOldsterWarningService oldsterWarningService, THtmlConfigService htmlConfigService, TLargeDeptService largeDeptService, TLargeUserService largeUserService, TLargeOrganizationService largeOrganizationService, TLargeResourceService largeResourceService, TLargeSocialWorkerService largeSocialWorkerService, TLargeVolunteerService largeVolunteerService, TLargeKeyGridUserService largeKeyGridUserService, TLargeKeyPersonnelTypeService largeKeyPersonnelTypeService, THelpNeedsService tHelpNeedsService) {
this.appealServicesService = appealServicesService;
this.oldsterWarningService = oldsterWarningService;
this.htmlConfigService = htmlConfigService;
@@ -44,6 +47,7 @@
this.largeVolunteerService = largeVolunteerService;
this.largeKeyGridUserService = largeKeyGridUserService;
this.largeKeyPersonnelTypeService = largeKeyPersonnelTypeService;
+ this.tHelpNeedsService = tHelpNeedsService;
}
/**
@@ -58,11 +62,11 @@
/**
* 获取组织人员管理列表
*/
- @ApiOperation(value = "获取组织人员分页列表")
+ @ApiOperation(value = "获取组织人员列表")
@GetMapping(value = "/largeUserList")
- public R<List<TLargeUser>> largeUserList(@RequestParam String deptId) {
+ public R<List<TLargeUser>> largeUserList(String deptId) {
List<TLargeUser> list = largeUserService.list(Wrappers.lambdaQuery(TLargeUser.class)
- .eq(TLargeUser::getDeptId, deptId)
+ .eq(Objects.nonNull(deptId),TLargeUser::getDeptId, deptId)
.orderByDesc(TLargeUser::getCreateTime));
return R.ok(list);
}
@@ -77,9 +81,18 @@
long appealServicesCount = appealServicesService.count();
// 养老告警事件
long warningCount = oldsterWarningService.count();
+ // 随手拍
+ long photoCount = appealServicesService.count(new LambdaQueryWrapper<TAppealServices>().eq(TAppealServices::getAppealType,2));
+ // 诉求服务
+ long appealCount = appealServicesService.count(new LambdaQueryWrapper<TAppealServices>().eq(TAppealServices::getAppealType,1));
+ // 助需
+ long helpNeedsCount = tHelpNeedsService.count();
Map<String,Long> map = new HashMap<>();
- map.put("appealServicesCount",appealServicesCount);
+ map.put("appealServicesCount",appealServicesCount+photoCount+appealCount+helpNeedsCount);
map.put("warningCount",warningCount);
+ map.put("photoCount",photoCount);
+ map.put("appealCount",appealCount);
+ map.put("helpNeedsCount",helpNeedsCount);
return R.ok(map);
}
@@ -131,7 +144,8 @@
.eq(TLargeKeyGridUser::getUserType, 2));
Map<String,Long> map = new HashMap<>();
map.put("keyCount",keyCount);
- map.put("gridCount",gridCount);
+ map.put("gridCount",17079L);
+// map.put("gridCount",gridCount);
return R.ok(map);
}
@@ -142,7 +156,8 @@
@GetMapping(value = "/keyPersonnelSituation")
public R<List<TLargeKeyPersonnelType>> keyPersonnelSituation() {
List<TLargeKeyPersonnelType> list = largeKeyPersonnelTypeService.list();
- List<TLargeKeyGridUser> largeKeyGridUsers = largeKeyGridUserService.list();
+ List<TLargeKeyGridUser> largeKeyGridUsers = largeKeyGridUserService.list(Wrappers.lambdaQuery(TLargeKeyGridUser.class)
+ .eq(TLargeKeyGridUser::getUserType, 1));
for (TLargeKeyPersonnelType largeKeyPersonnelType : list) {
if(largeKeyPersonnelType.getShowType() == 2 && !CollectionUtils.isEmpty(largeKeyGridUsers)){
// 查询真实的汇总数据
--
Gitblit v1.7.1