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

修改时间

Browse Source
This commit is contained in:
huangzj
2023-11-02 15:53:00 +08:00
parent f4de861a3b
commit 925f48ff81
3 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/pojo/vo/ThdDataVO.java
View File

@@ -1,9 +1,12 @@
package com.njcn.csharmonic.pojo.vo; package com.njcn.csharmonic.pojo.vo;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.njcn.common.utils.serializer.InstantDateSerializer;
import lombok.Data; import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat; import org.springframework.format.annotation.DateTimeFormat;
import java.time.Instant;
import java.time.LocalDateTime; import java.time.LocalDateTime;
/** /**
@@ -15,9 +18,8 @@ import java.time.LocalDateTime;
*/ */
@Data @Data
public class ThdDataVO { public class ThdDataVO {
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") @JsonSerialize(using = InstantDateSerializer.class)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") private Instant time;
private LocalDateTime time;
private String lineId; private String lineId;
private String position; private String position;
private String lineName; private String lineName;

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

@@ -64,7 +64,7 @@ public class DeviceDataTrendServiceImpl implements DeviceDataTrendService {
vo.setLineId(statisticalDataDTO.getLineId()); vo.setLineId(statisticalDataDTO.getLineId());
vo.setPhase(statisticalDataDTO.getPhaseType()); vo.setPhase(statisticalDataDTO.getPhaseType());
vo.setTime(statisticalDataDTO.getTime().atZone(ZoneId.systemDefault()).toLocalDateTime()); vo.setTime(statisticalDataDTO.getTime());
vo.setStatMethod(statisticalDataDTO.getValueType()); vo.setStatMethod(statisticalDataDTO.getValueType());
vo.setStatisticalData(BigDecimal.valueOf(statisticalDataDTO.getValue()).setScale(4, RoundingMode.UP).doubleValue()); vo.setStatisticalData(BigDecimal.valueOf(statisticalDataDTO.getValue()).setScale(4, RoundingMode.UP).doubleValue());
vo.setStatisticalIndex(temp.getDataId()); vo.setStatisticalIndex(temp.getDataId());

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

@@ -80,7 +80,7 @@ public class StableDataServiceImpl implements StableDataService {
ThdDataVO thdDataVO = new ThdDataVO(); ThdDataVO thdDataVO = new ThdDataVO();
BeanUtils.copyProperties(temp,thdDataVO); BeanUtils.copyProperties(temp,thdDataVO);
thdDataVO.setStatisticalName(statisticalName); thdDataVO.setStatisticalName(statisticalName);
thdDataVO.setTime(temp.getTime().atZone(ZoneId.systemDefault()).toLocalDateTime()); thdDataVO.setTime(temp.getTime());
String position = csLinePOList.stream().filter(csLinePO -> Objects.equals(csLinePO.getLineId(), thdDataVO.getLineId())).collect(Collectors.toList()).get(0).getPosition(); String position = csLinePOList.stream().filter(csLinePO -> Objects.equals(csLinePO.getLineId(), thdDataVO.getLineId())).collect(Collectors.toList()).get(0).getPosition();
thdDataVO.setPosition(position); thdDataVO.setPosition(position);
Double statisticalValue = 0.00; Double statisticalValue = 0.00;
@@ -106,7 +106,7 @@ public class StableDataServiceImpl implements StableDataService {
ThdDataVO thdDataVO = new ThdDataVO(); ThdDataVO thdDataVO = new ThdDataVO();
BeanUtils.copyProperties(temp,thdDataVO); BeanUtils.copyProperties(temp,thdDataVO);
thdDataVO.setStatisticalName(thdDataQueryParm.getStatisticalName()); thdDataVO.setStatisticalName(thdDataQueryParm.getStatisticalName());
thdDataVO.setTime(temp.getTime().atZone(ZoneId.systemDefault()).toLocalDateTime()); thdDataVO.setTime(temp.getTime());
String position = csLinePOList.stream().filter(csLinePO -> Objects.equals(csLinePO.getLineId(), thdDataVO.getLineId())).collect(Collectors.toList()).get(0).getPosition(); String position = csLinePOList.stream().filter(csLinePO -> Objects.equals(csLinePO.getLineId(), thdDataVO.getLineId())).collect(Collectors.toList()).get(0).getPosition();
thdDataVO.setPosition(position); thdDataVO.setPosition(position);
Double statisticalValue = 0.00; Double statisticalValue = 0.00;
@@ -133,7 +133,7 @@ public class StableDataServiceImpl implements StableDataService {
ThdDataVO thdDataVO = new ThdDataVO(); ThdDataVO thdDataVO = new ThdDataVO();
BeanUtils.copyProperties(temp,thdDataVO); BeanUtils.copyProperties(temp,thdDataVO);
thdDataVO.setStatisticalName(statisticalName); thdDataVO.setStatisticalName(statisticalName);
thdDataVO.setTime(temp.getTime().atZone(ZoneId.systemDefault()).toLocalDateTime()); thdDataVO.setTime(temp.getTime());
String position = csLinePOList.stream().filter(csLinePO -> Objects.equals(csLinePO.getLineId(), thdDataVO.getLineId())).collect(Collectors.toList()).get(0).getPosition(); String position = csLinePOList.stream().filter(csLinePO -> Objects.equals(csLinePO.getLineId(), thdDataVO.getLineId())).collect(Collectors.toList()).get(0).getPosition();
thdDataVO.setPosition(position); thdDataVO.setPosition(position);
Double statisticalValue = 0.00; Double statisticalValue = 0.00;
@@ -158,7 +158,7 @@ public class StableDataServiceImpl implements StableDataService {
ThdDataVO thdDataVO = new ThdDataVO(); ThdDataVO thdDataVO = new ThdDataVO();
BeanUtils.copyProperties(temp,thdDataVO); BeanUtils.copyProperties(temp,thdDataVO);
thdDataVO.setStatisticalName(thdDataQueryParm.getStatisticalName()); thdDataVO.setStatisticalName(thdDataQueryParm.getStatisticalName());
thdDataVO.setTime(temp.getTime().atZone(ZoneId.systemDefault()).toLocalDateTime()); thdDataVO.setTime(temp.getTime());
String position = csLinePOList.stream().filter(csLinePO -> Objects.equals(csLinePO.getLineId(), thdDataVO.getLineId())).collect(Collectors.toList()).get(0).getPosition(); String position = csLinePOList.stream().filter(csLinePO -> Objects.equals(csLinePO.getLineId(), thdDataVO.getLineId())).collect(Collectors.toList()).get(0).getPosition();
thdDataVO.setPosition(position); thdDataVO.setPosition(position);
Double statisticalValue = 0.00; Double statisticalValue = 0.00;
@@ -214,7 +214,7 @@ public class StableDataServiceImpl implements StableDataService {
vo.setPhase(phaseReflection(temp.getPhaseType())); vo.setPhase(phaseReflection(temp.getPhaseType()));
String position = finalCsLinePOList.stream().filter(csLinePO -> Objects.equals(csLinePO.getLineId(), vo.getLineId())).collect(Collectors.toList()).get(0).getPosition(); String position = finalCsLinePOList.stream().filter(csLinePO -> Objects.equals(csLinePO.getLineId(), vo.getLineId())).collect(Collectors.toList()).get(0).getPosition();
vo.setPosition(position); vo.setPosition(position);
vo.setTime(temp.getTime().atZone(ZoneId.systemDefault()).toLocalDateTime()); vo.setTime(temp.getTime());
vo.setStatMethod(temp.getValueType()); vo.setStatMethod(temp.getValueType());
vo.setStatisticalData(Double.valueOf(df.format(temp.getValue()))); vo.setStatisticalData(Double.valueOf(df.format(temp.getValue())));
vo.setStatisticalIndex(data.getId()); vo.setStatisticalIndex(data.getId());
@@ -265,7 +265,7 @@ public class StableDataServiceImpl implements StableDataService {
vo.setPhase(temp.getPhaseType()); vo.setPhase(temp.getPhaseType());
String position = csLinePOList.stream().filter(csLinePO -> Objects.equals(csLinePO.getLineId(), vo.getLineId())).collect(Collectors.toList()).get(0).getPosition(); String position = csLinePOList.stream().filter(csLinePO -> Objects.equals(csLinePO.getLineId(), vo.getLineId())).collect(Collectors.toList()).get(0).getPosition();
vo.setPosition(position); vo.setPosition(position);
vo.setTime(temp.getTime().atZone(ZoneId.systemDefault()).toLocalDateTime()); vo.setTime(temp.getTime());
vo.setStatMethod(temp.getValueType()); vo.setStatMethod(temp.getValueType());
vo.setStatisticalData(Double.valueOf(df.format(temp.getValue()))); vo.setStatisticalData(Double.valueOf(df.format(temp.getValue())));
vo.setStatisticalIndex(epdPqd.getId()); vo.setStatisticalIndex(epdPqd.getId());
@@ -325,7 +325,7 @@ public class StableDataServiceImpl implements StableDataService {
vo.setLineName(lineName); vo.setLineName(lineName);
vo.setPosition(position); vo.setPosition(position);
vo.setTime(temp.getTime().atZone(ZoneId.systemDefault()).toLocalDateTime()); vo.setTime(temp.getTime());
vo.setStatMethod(temp.getValueType()); vo.setStatMethod(temp.getValueType());
vo.setStatisticalData(Double.valueOf(df.format(temp.getValue()))); vo.setStatisticalData(Double.valueOf(df.format(temp.getValue())));
vo.setStatisticalIndex(epdPqd.getId()); vo.setStatisticalIndex(epdPqd.getId());