src/main/java/com/whyc/dto/InfoDto.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/whyc/factory/InfoFactory.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/whyc/pojo/db_station/PowerInf.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
src/main/java/com/whyc/dto/InfoDto.java
@@ -63,6 +63,9 @@ @ApiModelProperty(value = "电源类型:1:直流,2:通讯,3配网") private Integer powerType; @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "Asia/Shanghai") private Date powerInuseTime; @ApiModelProperty(value = "设备id") @@ -108,10 +111,10 @@ @ApiModelProperty(value = "型号") private String battModel; @TableField(fill = FieldFill.INSERT) @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "Asia/Shanghai") private Date createTime; @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "Asia/Shanghai") private Date inuseTime; @ApiModelProperty(value = "标识是否加入电池组1:添加,0不添加") private Integer addBinfFlag; src/main/java/com/whyc/factory/InfoFactory.java
@@ -13,7 +13,8 @@ .setPowerType(info.getPowerType()) .setPowerModel(info.getPowerModel()) .setProtocol(info.getProtocol()) .setPowerIp(info.getPowerIp()); .setPowerIp(info.getPowerIp()) .setPowerInuseTime(info.getPowerInuseTime()); if(info.getPowerId()!=null){ pinf.setPowerId(info.getPowerId()); } @@ -85,6 +86,9 @@ if(info.getDevName()!=null){ binf.setDevName(info.getDevName()); } if(info.getInuseTime()!=null){ binf.setInuseTime(info.getInuseTime()); } return binf; } } src/main/java/com/whyc/pojo/db_station/PowerInf.java
@@ -4,6 +4,7 @@ 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.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -11,6 +12,7 @@ import lombok.experimental.Accessors; import java.io.Serializable; import java.util.Date; /** * <p> @@ -60,6 +62,9 @@ @ApiModelProperty(value = "电源类型:1:直流,2:通讯,3配网") private Integer powerType; @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "Asia/Shanghai") private Date powerInuseTime; @TableField(exist = false) private StationInf sinf;