10.12设备档案排序和修改

dev
xiaohuo 9 months ago
parent 0d8f6f3992
commit 55d93dfe66
  1. 1
      ALOps_sys_backend/alops-admin/src/main/java/com/alops/web/controller/equManagement/EquBaseController.java
  2. 5
      ALOps_sys_backend/alops-system/src/main/java/com/alops/system/domain/EquBase.java
  3. 1
      ALOps_sys_backend/alops-system/src/main/resources/mapper/system/EquBaseMapper.xml

@ -86,6 +86,7 @@ public class EquBaseController extends BaseController
} }
/** /**
* 获取设备最新时间的历史监控信息 * 获取设备最新时间的历史监控信息
* @param id 查询对象包含设备ID开始时间和结束时间 * @param id 查询对象包含设备ID开始时间和结束时间

@ -6,6 +6,7 @@ import java.util.Date;
import com.alops.common.annotation.Excel; import com.alops.common.annotation.Excel;
import com.alops.common.core.domain.BaseEntity; import com.alops.common.core.domain.BaseEntity;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Data; import lombok.Data;
import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle; import org.apache.commons.lang3.builder.ToStringStyle;
@ -89,6 +90,7 @@ public class EquBase
private Long warranty; private Long warranty;
/** 添加日期 */ /** 添加日期 */
@JsonProperty(access = JsonProperty.Access.READ_ONLY)
@JsonFormat(pattern = "yyyy-MM-dd") @JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "添加日期", width = 30, dateFormat = "yyyy-MM-dd") @Excel(name = "添加日期", width = 30, dateFormat = "yyyy-MM-dd")
private Date createDate; private Date createDate;
@ -113,7 +115,8 @@ public class EquBase
@Excel(name = "采集次数") @Excel(name = "采集次数")
private Long gatherFrequency; private Long gatherFrequency;
@Excel(name = "采集次数") @JsonProperty(access = JsonProperty.Access.READ_ONLY)
@Excel(name = "创新人id")
private Long createBy; private Long createBy;
@Excel(name = "设备图片地址") @Excel(name = "设备图片地址")

@ -188,6 +188,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
AND b.create_date <= #{maxTime} AND b.create_date <= #{maxTime}
</if> </if>
</where> </where>
ORDER BY b.create_date DESC
</select> </select>
<select id="selectEquMonitorListPaged" resultType="MonitorListDto"> <select id="selectEquMonitorListPaged" resultType="MonitorListDto">

Loading…
Cancel
Save