From f87760efbc6b10685540a003e1d4ae7e4d9d00fa Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期五, 23 一月 2026 14:11:51 +0800
Subject: [PATCH] 大屏项目接口
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/ProjectController.java | 29 ++++++++++++++++++++---------
1 files changed, 20 insertions(+), 9 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/ProjectController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/ProjectController.java
index c64b7e1..993ea13 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/ProjectController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/ProjectController.java
@@ -21,10 +21,7 @@
import javax.validation.Valid;
import java.math.BigDecimal;
import java.math.RoundingMode;
-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;
@@ -105,6 +102,8 @@
if(task!=null){
projectVo.setCheckTime(task.getUpdateTime());
}
+ List<DeviceCountVo> list = deviceUsageService.getProjectDeviceCount(id);
+ projectVo.setDeviceCountVos(list);
return R.ok(projectVo);
}
@@ -164,10 +163,10 @@
}
- @ApiOperation(value = "获取隐患详情")
- @GetMapping("/getHiddenDangerDetail/{problemId}")
- public R<?> getHiddenDangerDetail(@PathVariable Integer problemId) {
- var record = recordService.getHiddenDangerDetail(problemId);
+ @ApiOperation(value = "获取隐患详情",response = ProblemVo.class)
+ @GetMapping("/getHiddenDangerDetail/{id}")
+ public R<ProblemVo> getHiddenDangerDetail(@PathVariable Integer id) {
+ ProblemVo record = recordService.getHiddenDangerDetail(id);
return R.ok(record);
}
@@ -197,8 +196,20 @@
@GetMapping("/getDeviceDetailCheckPlanList")
public R<List<Check>> getDeviceDetailCheckPlanList(@RequestParam Integer planId) {
List<Check> list = checkService.list(new LambdaQueryWrapper<Check>().eq(Check::getPlanId,planId).orderByDesc(Check::getTime));
+ if(!list.isEmpty()){
+ List<Integer> planIds = list.stream().map(Check::getPlanId).toList();
+ List<Plan> plans = planService.listByIds(planIds);
+
+ List<Integer> projectIds = list.stream().map(Check::getProjectId).toList();
+ List<Project> projects = projectService.listByIds(projectIds);
+ list.forEach(check -> {
+ check.setPlanName(Objects.requireNonNull(plans.stream().filter(plan -> plan.getId().equals(check.getPlanId())).findFirst().orElse(null)).getName());
+ check.setProjectName(Objects.requireNonNull(projects.stream().filter(project -> project.getId().equals(check.getProjectId())).findFirst().orElse(null)).getName());
+ });
+ }
return R.ok(list);
}
+
@ApiOperation(value = "获取检查资料详情")
@GetMapping("/getDeviceDetailCheckPlanDetail")
@@ -206,7 +217,6 @@
Check check = checkService.getDeviceDetailCheckPlanDetail(id);
return R.ok(check);
}
-
@ApiOperation(value = "获取大屏人员在岗信息")
@@ -248,6 +258,7 @@
return R.ok(list);
}
+
@ApiOperation(value = "获取人员在岗列表",response = ProjectPersonOnDutyListVo.class)
@PostMapping("/getProjectOnDutyList")
public R<Page<ProjectPersonOnDutyListVo>> getProjectOnDutyList(@RequestBody @Valid ProjectPersonListQuery query) {
--
Gitblit v1.7.1