From 1c973a8fd4e126c3dbd9b95af68a963363b35a34 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期三, 21 一月 2026 17:20:12 +0800
Subject: [PATCH] 大屏项目接口
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/ProjectController.java | 38 ++++++++++++++++++++++++++++++++++++++
1 files changed, 38 insertions(+), 0 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 41c35aa..34c6365 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
@@ -5,6 +5,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.system.dto.EditHiddenDangerResponsiblePersonDto;
+import com.ruoyi.system.enums.DeviceType;
import com.ruoyi.system.model.*;
import com.ruoyi.system.model.Record;
import com.ruoyi.system.query.*;
@@ -21,6 +22,7 @@
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.stream.Collectors;
@@ -270,4 +272,40 @@
return R.ok(list);
}
+ @ApiOperation(value = "设备类型")
+ @GetMapping("/deviceTypes")
+ public R<?> deviceTypeOptions(@RequestParam(value = "title", required = false) String title) {
+ return R.ok(SelectOptionVo.buildOptions(title, DeviceType.values()));
+ }
+
+
+ @ApiOperation(value = "各分项隐患趋势")
+ @GetMapping("/getProjectHiddenDangerTrend")
+ public R<List<ProjectHiddenDangerTrendVo>> getProjectHiddenDangerTrend(@RequestParam Integer projectId,@RequestParam(value = "desc", required = true) Boolean desc,@RequestParam(value = "type", required = true)Integer type) {
+ List<ProjectHiddenDangerTrendVo> list = projectInfoService.getProjectHiddenDangerTrend(projectId);
+ if(type==1){
+ if(desc){
+ list = list.stream().sorted(Comparator.comparingInt(ProjectHiddenDangerTrendVo::getThisMonth).reversed()).toList();
+ }else {
+ list = list.stream().sorted(Comparator.comparingInt(ProjectHiddenDangerTrendVo::getThisMonth)).toList();
+ }
+ }else {
+ if(desc){
+ list = list.stream().sorted(Comparator.comparingDouble(ProjectHiddenDangerTrendVo::getRate).reversed()).toList();
+ }else {
+ list = list.stream().sorted(Comparator.comparingDouble(ProjectHiddenDangerTrendVo::getRate)).toList();
+ }
+ }
+
+ return R.ok(list);
+ }
+
+
+ @ApiOperation(value = "各分项隐患趋势列表")
+ @PostMapping("/getProjectHiddenDangerTrendList")
+ public R<List<ProjectHiddenDangerList>> getProjectHiddenDangerTrendList(@RequestBody @Valid ProjectHiddenDangerTrendListQuery query) {
+ List<ProjectHiddenDangerList> list = projectInfoService.getProjectHiddenDangerTrendList(query);
+ return R.ok(list);
+ }
+
}
--
Gitblit v1.7.1