From f4f653b1f69eae7eee5249b9f41e43bdf3239aa1 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期四, 09 四月 2026 15:45:56 +0800
Subject: [PATCH] 修改bug
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/DashboardStatisticsController.java | 40 ++++++++++++++++++++++++++++++++--------
1 files changed, 32 insertions(+), 8 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/DashboardStatisticsController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/DashboardStatisticsController.java
index 1ada1c9..46cd4e3 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/DashboardStatisticsController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/DashboardStatisticsController.java
@@ -3,8 +3,6 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.core.domain.R;
-import com.ruoyi.common.core.domain.model.LoginUser;
-import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.framework.web.service.TokenService;
import com.ruoyi.system.model.*;
import com.ruoyi.system.query.StoryListQuery;
@@ -15,15 +13,11 @@
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
-import org.checkerframework.checker.units.qual.A;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Lazy;
-import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
-import java.util.HashMap;
import java.util.List;
-import java.util.Optional;
/**
* 数据统计面板 前端控制器
@@ -62,6 +56,7 @@
public R<ScreenUserVo> getLoginInfo(Integer type, Integer id) {
ScreenUserVo screenUserVo = new ScreenUserVo();
screenUserVo.setType(type);
+
if(type!=null && id !=null){
if(type==1){
@@ -69,6 +64,7 @@
if(client==null){
return R.fail("委托方不存在");
}
+ screenUserVo.setClientId(id);
ClientParam param = clientParamService.getOne(new LambdaQueryWrapper<ClientParam>().eq(ClientParam::getClientId, client.getId()));
if(param!=null){
screenUserVo.setLogo(param.getLogo());
@@ -76,6 +72,15 @@
screenUserVo.setPermissionClient(param.getPermissionClient());
screenUserVo.setPermissionProject(param.getPermissionProject());
screenUserVo.setCommentType(param.getCommentType());
+ screenUserVo.setSafetyId(param.getSafetyId());
+ String name = clientParamService.getTemplateName(param.getSafetyId());
+ screenUserVo.setSafetyName(name);
+
+ screenUserVo.setDeviceTemplateId(param.getDeviceTemplateId());
+ screenUserVo.setDeviceTemplateName(clientParamService.getTemplateName(param.getDeviceTemplateId()));
+
+ screenUserVo.setBigHiddenDanger(param.getBigHiddenDanger());
+ screenUserVo.setGeneralHiddenDanger(param.getGeneralHiddenDanger());
}
}else if(type==2){
Project project = projectService.getById(id);
@@ -83,11 +88,22 @@
return R.fail("项目不存在");
}
Client client = clientService.getById(project.getClientId());
+ screenUserVo.setClientId(client.getId());
ClientParam param = clientParamService.getOne(new LambdaQueryWrapper<ClientParam>().eq(ClientParam::getClientId, client.getId()));
if(param!=null){
+ screenUserVo.setLogo(param.getLogo());
+ screenUserVo.setName(param.getName());
screenUserVo.setCommentType(param.getCommentType());
+ screenUserVo.setSafetyId(param.getSafetyId());
+ String name = clientParamService.getTemplateName(param.getSafetyId());
+ screenUserVo.setSafetyName(name);
+ screenUserVo.setDeviceTemplateId(param.getDeviceTemplateId());
+ String name1 = clientParamService.getTemplateName(param.getDeviceTemplateId());
+ screenUserVo.setDeviceTemplateName(name1);
+ screenUserVo.setBigHiddenDanger(param.getBigHiddenDanger());
+ screenUserVo.setGeneralHiddenDanger(param.getGeneralHiddenDanger());
}
- screenUserVo.setName(project.getName());
+ screenUserVo.setProjectName(project.getName());
screenUserVo.setPermissionProject(project.getPermission());
}
@@ -106,9 +122,17 @@
List<AccidentClassification> list = accidentClassificationService.list(new LambdaQueryWrapper<AccidentClassification>().eq(AccidentClassification::getDeleted, false));
LambdaQueryWrapper<AccidentBrief> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(AccidentBrief::getState,1);
+ wrapper.eq(AccidentBrief::getDeleted,false);
if(query.getCity()!=null && !query.getCity().isEmpty()){
wrapper.eq(AccidentBrief::getCity, query.getCity());
}
+ if(query.getProvince()!=null && !query.getProvince().isEmpty()){
+ wrapper.eq(AccidentBrief::getProvince, query.getProvince());
+ }
+ if(query.getArea()!=null && !query.getArea().isEmpty()){
+ wrapper.eq(AccidentBrief::getArea, query.getArea());
+ }
+
if(query.getClassifyId()!=null){
wrapper.eq(AccidentBrief::getClassifyId, query.getClassifyId());
}
@@ -180,7 +204,7 @@
* @return 统计数据
*/
@PostMapping("/index")
- @ApiOperation("获取委托方大屏首页统计数据")
+ @ApiOperation(value = "获取委托方大屏首页统计数据",tags = {"委托方端"})
public R<ClientDashboardVO> index(@RequestBody ClientDashboardQuery query) {
ClientDashboardVO dashboard = clientService.getClientDashboard(query);
return R.ok(dashboard);
--
Gitblit v1.7.1