diff --git a/influx-data/influx-source/src/main/java/com/njcn/influx/bo/po/OracleRmpEventDetailPO.java b/influx-data/influx-source/src/main/java/com/njcn/influx/bo/po/OracleRmpEventDetailPO.java index f56a27e..b5da466 100644 --- a/influx-data/influx-source/src/main/java/com/njcn/influx/bo/po/OracleRmpEventDetailPO.java +++ b/influx-data/influx-source/src/main/java/com/njcn/influx/bo/po/OracleRmpEventDetailPO.java @@ -4,8 +4,6 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import com.fasterxml.jackson.annotation.JsonFormat; -import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; @@ -38,6 +36,11 @@ public class OracleRmpEventDetailPO implements Serializable { @TableField(value = "LINEID") private String measurementPointId; + /** + * 统计指标类型 + */ + @TableField(value = "MS") + private Integer ms; /** * 统计指标类型 */ @@ -129,7 +132,7 @@ public class OracleRmpEventDetailPO implements Serializable { * 开始时间 */ @TableField(value = "TIMEID") - private Date startTime; + private LocalDateTime startTime; /** * 持续时间,单位秒 diff --git a/influx-data/influx-source/src/main/java/com/njcn/influx/bo/po/RmpEventDetailPO.java b/influx-data/influx-source/src/main/java/com/njcn/influx/bo/po/RmpEventDetailPO.java index 50b3787..bcbcb86 100644 --- a/influx-data/influx-source/src/main/java/com/njcn/influx/bo/po/RmpEventDetailPO.java +++ b/influx-data/influx-source/src/main/java/com/njcn/influx/bo/po/RmpEventDetailPO.java @@ -130,7 +130,7 @@ public class RmpEventDetailPO implements Serializable { * 开始时间 */ @TableField(value = "start_time") - private Date startTime; + private LocalDateTime startTime; /** * 持续时间,单位秒 diff --git a/influx-data/influx-source/src/main/java/com/njcn/influx/service/impl/OracleEventDetailToMysqlServiceImpl.java b/influx-data/influx-source/src/main/java/com/njcn/influx/service/impl/OracleEventDetailToMysqlServiceImpl.java index d912e9b..eab8728 100644 --- a/influx-data/influx-source/src/main/java/com/njcn/influx/service/impl/OracleEventDetailToMysqlServiceImpl.java +++ b/influx-data/influx-source/src/main/java/com/njcn/influx/service/impl/OracleEventDetailToMysqlServiceImpl.java @@ -14,6 +14,7 @@ import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import java.time.LocalDateTime; +import java.time.temporal.ChronoUnit; import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -82,7 +83,9 @@ public class OracleEventDetailToMysqlServiceImpl extends ServiceImpl