Microservice/govern
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

添加测试项持续时间

Browse Source
This commit is contained in:
xy
2024-12-20 11:51:39 +08:00
parent 2206f203e8
commit 2191276185
2 changed files with 21 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/vo/RecordVo.java
View File

@@ -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;

19
cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/DataServiceImpl.java
View File

@@ -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<RecordVo> 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