From 55d93dfe6650ecdc3fb49ec0ccbfb8e9b0dc6899 Mon Sep 17 00:00:00 2001 From: xiaohuo <14141624+dsgfhrh@user.noreply.gitee.com> Date: Sun, 12 Oct 2025 22:32:35 +0800 Subject: [PATCH] =?UTF-8?q?10.12=E8=AE=BE=E5=A4=87=E6=A1=A3=E6=A1=88?= =?UTF-8?q?=E6=8E=92=E5=BA=8F=E5=92=8C=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/controller/equManagement/EquBaseController.java | 1 + .../src/main/java/com/alops/system/domain/EquBase.java | 9 ++++++--- .../src/main/resources/mapper/system/EquBaseMapper.xml | 1 + 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ALOps_sys_backend/alops-admin/src/main/java/com/alops/web/controller/equManagement/EquBaseController.java b/ALOps_sys_backend/alops-admin/src/main/java/com/alops/web/controller/equManagement/EquBaseController.java index c6dca97c..c87e6234 100644 --- a/ALOps_sys_backend/alops-admin/src/main/java/com/alops/web/controller/equManagement/EquBaseController.java +++ b/ALOps_sys_backend/alops-admin/src/main/java/com/alops/web/controller/equManagement/EquBaseController.java @@ -86,6 +86,7 @@ public class EquBaseController extends BaseController } + /** * 获取设备最新时间的历史监控信息 * @param id 查询对象，包含设备ID、开始时间和结束时间 diff --git a/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/domain/EquBase.java b/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/domain/EquBase.java index 8cbc7e76..60a8f6b2 100644 --- a/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/domain/EquBase.java +++ b/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/domain/EquBase.java @@ -6,6 +6,7 @@ import java.util.Date; import com.alops.common.annotation.Excel; import com.alops.common.core.domain.BaseEntity; import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Data; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; @@ -89,6 +90,7 @@ public class EquBase private Long warranty; /** 添加日期 */ + @JsonProperty(access = JsonProperty.Access.READ_ONLY) @JsonFormat(pattern = "yyyy-MM-dd") @Excel(name = "添加日期", width = 30, dateFormat = "yyyy-MM-dd") private Date createDate; @@ -113,11 +115,12 @@ public class EquBase @Excel(name = "采集次数") private Long gatherFrequency; - @Excel(name = "采集次数") - private Long createBy ; + @JsonProperty(access = JsonProperty.Access.READ_ONLY) + @Excel(name = "创新人id") + private Long createBy; @Excel(name = "设备图片地址") - private String equImage ; + private String equImage; public void setId(String id) diff --git a/ALOps_sys_backend/alops-system/src/main/resources/mapper/system/EquBaseMapper.xml b/ALOps_sys_backend/alops-system/src/main/resources/mapper/system/EquBaseMapper.xml index a8b32fbf..70a53d5d 100644 --- a/ALOps_sys_backend/alops-system/src/main/resources/mapper/system/EquBaseMapper.xml +++ b/ALOps_sys_backend/alops-system/src/main/resources/mapper/system/EquBaseMapper.xml @@ -188,6 +188,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" AND b.create_date <= #{maxTime} + ORDER BY b.create_date DESC