diff --git a/src/main/java/org/springnewfiber/dataadapter/xf/entity/DiverterWellData.java b/src/main/java/org/springnewfiber/dataadapter/xf/entity/DiverterWellData.java index 3760217..74702d0 100644 --- a/src/main/java/org/springnewfiber/dataadapter/xf/entity/DiverterWellData.java +++ b/src/main/java/org/springnewfiber/dataadapter/xf/entity/DiverterWellData.java @@ -3,6 +3,8 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.Date; + /** * @program: newfiber-data-adapter * @description: @@ -18,7 +20,7 @@ @ApiModelProperty(value = "分流井编号") private String dvwnum; @ApiModelProperty(value = "时间") - private String tm; + private Date tm; @ApiModelProperty(value = "井内液位m") private String jnyw; @ApiModelProperty(value = "井外液位m") diff --git a/src/main/java/org/springnewfiber/dataadapter/xf/entity/DiverterWellData.java b/src/main/java/org/springnewfiber/dataadapter/xf/entity/DiverterWellData.java index 3760217..74702d0 100644 --- a/src/main/java/org/springnewfiber/dataadapter/xf/entity/DiverterWellData.java +++ b/src/main/java/org/springnewfiber/dataadapter/xf/entity/DiverterWellData.java @@ -3,6 +3,8 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.Date; + /** * @program: newfiber-data-adapter * @description: @@ -18,7 +20,7 @@ @ApiModelProperty(value = "分流井编号") private String dvwnum; @ApiModelProperty(value = "时间") - private String tm; + private Date tm; @ApiModelProperty(value = "井内液位m") private String jnyw; @ApiModelProperty(value = "井外液位m") diff --git a/src/main/java/org/springnewfiber/dataadapter/xf/entity/DiverterWellDataDto.java b/src/main/java/org/springnewfiber/dataadapter/xf/entity/DiverterWellDataDto.java index 98788dd..757faa0 100644 --- a/src/main/java/org/springnewfiber/dataadapter/xf/entity/DiverterWellDataDto.java +++ b/src/main/java/org/springnewfiber/dataadapter/xf/entity/DiverterWellDataDto.java @@ -100,7 +100,6 @@ public static DiverterWellDataDto dataToDto(DiverterWellData data) { DiverterWellDataDto dto = new DiverterWellDataDto(); BeanUtil.copyProperties(data, dto); - dto.setTm(DateUtil.parse(data.getTm(), "yyyy/MM/dd HH:mm:ss")); dto.setStnm(data.getLknm()); dto.setStcd(data.getDvwid()); return dto; diff --git a/src/main/java/org/springnewfiber/dataadapter/xf/entity/DiverterWellData.java b/src/main/java/org/springnewfiber/dataadapter/xf/entity/DiverterWellData.java index 3760217..74702d0 100644 --- a/src/main/java/org/springnewfiber/dataadapter/xf/entity/DiverterWellData.java +++ b/src/main/java/org/springnewfiber/dataadapter/xf/entity/DiverterWellData.java @@ -3,6 +3,8 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.Date; + /** * @program: newfiber-data-adapter * @description: @@ -18,7 +20,7 @@ @ApiModelProperty(value = "分流井编号") private String dvwnum; @ApiModelProperty(value = "时间") - private String tm; + private Date tm; @ApiModelProperty(value = "井内液位m") private String jnyw; @ApiModelProperty(value = "井外液位m") diff --git a/src/main/java/org/springnewfiber/dataadapter/xf/entity/DiverterWellDataDto.java b/src/main/java/org/springnewfiber/dataadapter/xf/entity/DiverterWellDataDto.java index 98788dd..757faa0 100644 --- a/src/main/java/org/springnewfiber/dataadapter/xf/entity/DiverterWellDataDto.java +++ b/src/main/java/org/springnewfiber/dataadapter/xf/entity/DiverterWellDataDto.java @@ -100,7 +100,6 @@ public static DiverterWellDataDto dataToDto(DiverterWellData data) { DiverterWellDataDto dto = new DiverterWellDataDto(); BeanUtil.copyProperties(data, dto); - dto.setTm(DateUtil.parse(data.getTm(), "yyyy/MM/dd HH:mm:ss")); dto.setStnm(data.getLknm()); dto.setStcd(data.getDvwid()); return dto; diff --git a/src/main/java/org/springnewfiber/dataadapter/xf/entity/SurgeTankData.java b/src/main/java/org/springnewfiber/dataadapter/xf/entity/SurgeTankData.java index 6725fc4..019f4c0 100644 --- a/src/main/java/org/springnewfiber/dataadapter/xf/entity/SurgeTankData.java +++ b/src/main/java/org/springnewfiber/dataadapter/xf/entity/SurgeTankData.java @@ -3,6 +3,8 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.Date; + /** * @program: newfiber-data-adapter * @description: 调蓄池监测数据 @@ -18,7 +20,7 @@ @ApiModelProperty(value = "调蓄池编号") private String stgnum; @ApiModelProperty(value = "时间") - private String tm; + private Date tm; @ApiModelProperty(value = "调蓄池液位m") private String txcyw; @ApiModelProperty(value = "泵坑液位m") diff --git a/src/main/java/org/springnewfiber/dataadapter/xf/entity/DiverterWellData.java b/src/main/java/org/springnewfiber/dataadapter/xf/entity/DiverterWellData.java index 3760217..74702d0 100644 --- a/src/main/java/org/springnewfiber/dataadapter/xf/entity/DiverterWellData.java +++ b/src/main/java/org/springnewfiber/dataadapter/xf/entity/DiverterWellData.java @@ -3,6 +3,8 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.Date; + /** * @program: newfiber-data-adapter * @description: @@ -18,7 +20,7 @@ @ApiModelProperty(value = "分流井编号") private String dvwnum; @ApiModelProperty(value = "时间") - private String tm; + private Date tm; @ApiModelProperty(value = "井内液位m") private String jnyw; @ApiModelProperty(value = "井外液位m") diff --git a/src/main/java/org/springnewfiber/dataadapter/xf/entity/DiverterWellDataDto.java b/src/main/java/org/springnewfiber/dataadapter/xf/entity/DiverterWellDataDto.java index 98788dd..757faa0 100644 --- a/src/main/java/org/springnewfiber/dataadapter/xf/entity/DiverterWellDataDto.java +++ b/src/main/java/org/springnewfiber/dataadapter/xf/entity/DiverterWellDataDto.java @@ -100,7 +100,6 @@ public static DiverterWellDataDto dataToDto(DiverterWellData data) { DiverterWellDataDto dto = new DiverterWellDataDto(); BeanUtil.copyProperties(data, dto); - dto.setTm(DateUtil.parse(data.getTm(), "yyyy/MM/dd HH:mm:ss")); dto.setStnm(data.getLknm()); dto.setStcd(data.getDvwid()); return dto; diff --git a/src/main/java/org/springnewfiber/dataadapter/xf/entity/SurgeTankData.java b/src/main/java/org/springnewfiber/dataadapter/xf/entity/SurgeTankData.java index 6725fc4..019f4c0 100644 --- a/src/main/java/org/springnewfiber/dataadapter/xf/entity/SurgeTankData.java +++ b/src/main/java/org/springnewfiber/dataadapter/xf/entity/SurgeTankData.java @@ -3,6 +3,8 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.Date; + /** * @program: newfiber-data-adapter * @description: 调蓄池监测数据 @@ -18,7 +20,7 @@ @ApiModelProperty(value = "调蓄池编号") private String stgnum; @ApiModelProperty(value = "时间") - private String tm; + private Date tm; @ApiModelProperty(value = "调蓄池液位m") private String txcyw; @ApiModelProperty(value = "泵坑液位m") diff --git a/src/main/java/org/springnewfiber/dataadapter/xf/entity/SurgeTankDataDto.java b/src/main/java/org/springnewfiber/dataadapter/xf/entity/SurgeTankDataDto.java index 7d0a828..6db6801 100644 --- a/src/main/java/org/springnewfiber/dataadapter/xf/entity/SurgeTankDataDto.java +++ b/src/main/java/org/springnewfiber/dataadapter/xf/entity/SurgeTankDataDto.java @@ -180,7 +180,7 @@ public static SurgeTankDataDto dataToDto(SurgeTankData data) { SurgeTankDataDto dto = new SurgeTankDataDto(); BeanUtil.copyProperties(data, dto); - dto.setTm(DateUtil.parse(data.getTm(), "yyyy/MM/dd HH:mm:ss")); +// dto.setTm(DateUtil.parse(data.getTm(), "yyyy/MM/dd HH:mm:ss")); dto.setStnm(data.getLknm()); dto.setStcd(data.getStrgid()); return dto;