From db5112e82b4701c242aa724c47ebc1d2b17835c5 Mon Sep 17 00:00:00 2001 From: xy <748613696@qq.com> Date: Wed, 5 Jun 2024 18:57:12 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/njcn/device/pq/pojo/vo/LineDetailDataVO.java | 6 ++++++ .../com/njcn/device/pq/service/impl/LineServiceImpl.java | 1 + 2 files changed, 7 insertions(+) diff --git a/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/vo/LineDetailDataVO.java b/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/vo/LineDetailDataVO.java index 54031f1e4..986c30a09 100644 --- a/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/vo/LineDetailDataVO.java +++ b/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/vo/LineDetailDataVO.java @@ -1,10 +1,12 @@ package com.njcn.device.pq.pojo.vo; +import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.time.LocalDate; +import java.time.LocalDateTime; /** * @author denghuajun @@ -115,4 +117,8 @@ public class LineDetailDataVO { @ApiModelProperty(name = "投运日期") private LocalDate loginTime; + @ApiModelProperty(name = "最新数据时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime updateTime; + } diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/LineServiceImpl.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/LineServiceImpl.java index 2c30d654a..8d46b66ae 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/LineServiceImpl.java +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/LineServiceImpl.java @@ -156,6 +156,7 @@ public class LineServiceImpl extends ServiceImpl implements Li lineDetailDataVO.setOwnerTel(lineDetail.getOwnerTel()); lineDetailDataVO.setWiringDiagram(lineDetail.getWiringDiagram()); lineDetailDataVO.setPtPhaseType(lineDetail.getPtPhaseType()); + lineDetailDataVO.setUpdateTime(device.getUpdateTime()); return lineDetailDataVO; }