From 8f222e38b489014798a420a88dc0c8aaba56eefe Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期三, 28 一月 2026 13:51:34 +0800
Subject: [PATCH] 大屏项目接口
---
ruoyi-system/src/main/java/com/ruoyi/system/vo/ScreenUserVo.java | 6 ++++++
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/DashboardStatisticsController.java | 4 ++++
ruoyi-system/src/main/java/com/ruoyi/system/model/ErrorReview.java | 3 +++
3 files changed, 13 insertions(+), 0 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 375954c..05489a3 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
@@ -78,6 +78,8 @@
screenUserVo.setCommentType(param.getCommentType());
screenUserVo.setSafetyId(param.getSafetyId());
screenUserVo.setDeviceTemplateId(param.getDeviceTemplateId());
+ screenUserVo.setBigHiddenDanger(param.getBigHiddenDanger());
+ screenUserVo.setGeneralHiddenDanger(param.getGeneralHiddenDanger());
}
}else if(type==2){
Project project = projectService.getById(id);
@@ -90,6 +92,8 @@
screenUserVo.setCommentType(param.getCommentType());
screenUserVo.setSafetyId(param.getSafetyId());
screenUserVo.setDeviceTemplateId(param.getDeviceTemplateId());
+ screenUserVo.setBigHiddenDanger(param.getBigHiddenDanger());
+ screenUserVo.setGeneralHiddenDanger(param.getGeneralHiddenDanger());
}
screenUserVo.setName(project.getName());
screenUserVo.setPermissionProject(project.getPermission());
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/model/ErrorReview.java b/ruoyi-system/src/main/java/com/ruoyi/system/model/ErrorReview.java
index b6d71e1..ae31b68 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/model/ErrorReview.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/model/ErrorReview.java
@@ -6,6 +6,7 @@
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -35,12 +36,14 @@
private Integer id;
@TableField("create_time")
@ApiModelProperty(value = "创建时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date createTime;
private Boolean deleted;
@ApiModelProperty(value = "名称")
private String name;
@TableField("update_time")
@ApiModelProperty(value = "更新时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date updateTime;
@ApiModelProperty(value = "复核内容")
private String content;
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/vo/ScreenUserVo.java b/ruoyi-system/src/main/java/com/ruoyi/system/vo/ScreenUserVo.java
index fc22371..fe00ce3 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/vo/ScreenUserVo.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/vo/ScreenUserVo.java
@@ -28,4 +28,10 @@
@ApiModelProperty(value = "设备模板id")
private Integer deviceTemplateId;
+
+ @ApiModelProperty(value = "1开启 2关闭 重大隐患")
+ private Integer bigHiddenDanger;
+
+ @ApiModelProperty(value = "1开启 2关闭 一般隐患")
+ private Integer generalHiddenDanger;
}
--
Gitblit v1.7.1