diff --git a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/vo/RecordVo.java b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/vo/RecordVo.java index 1a38f23..bffa7dc 100644 --- a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/vo/RecordVo.java +++ b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/vo/RecordVo.java @@ -33,6 +33,9 @@ public class RecordVo { @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private LocalDateTime endTime; + @ApiModelProperty("持续时间") + private String lastTime; + @ApiModelProperty("测试位置") private String location; diff --git a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/DataServiceImpl.java b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/DataServiceImpl.java index 4967409..7645b1e 100644 --- a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/DataServiceImpl.java +++ b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/DataServiceImpl.java @@ -39,6 +39,7 @@ import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import java.text.DecimalFormat; +import java.time.Duration; import java.util.*; import java.util.stream.Collectors; @@ -114,7 +115,23 @@ public class DataServiceImpl implements IDataService { record.setItemStartTime(beginDay); record.setItemEndTime(endDay); record.setDataSource(param.getDataSource()); - return wlRecordFeignClient.findDevBaseDataByLineId(record).getData(); + List list = wlRecordFeignClient.findDevBaseDataByLineId(record).getData(); + if (CollUtil.isNotEmpty(list)) { + list.forEach(item->{ + if (Objects.nonNull(item.getEndTime())) { + Duration duration = Duration.between(item.getStartTime(), item.getEndTime()); + long totalMinutes = duration.toMinutes(); + long completeHours = totalMinutes / 60; + long remainingMinutes = totalMinutes % 60; + long millis = duration.getSeconds(); + if (completeHours == 0 && remainingMinutes == 0 && millis <= 60) { + remainingMinutes = 1; + } + item.setLastTime(completeHours + "小时" + remainingMinutes + "分钟"); + } + }); + } + return list; } @Override