luhaojie/agricultural-monitoring-api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改流量计导出字段和灌溉控制器历史数据导出时间格式

Browse Source
This commit is contained in:
童丽然 2025-01-03 10:38:51 +08:00
parent c029bec220
commit 81793c325f
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
fastbee-service/fastbee-iot-service/src/main/java/com/fastbee/iot/domain/NgFlowDeviceData.java
View File

@ -27,8 +27,8 @@ private static final long serialVersionUID = 1L;
private Long id; private Long id;
/** shun'shi */ /** shun'shi */
@Excel(name = "shun'shi") @Excel(name = "瞬时流量")
@ApiModelProperty("shun'shi") @ApiModelProperty("瞬时流量")
private String inFlow; private String inFlow;
/** 累计流量 */ /** 累计流量 */
@ -59,8 +59,8 @@ private static final long serialVersionUID = 1L;
private Date saveTime; private Date saveTime;
/** ji'gou */ /** ji'gou */
@Excel(name = "ji'gou") @Excel(name = "机构",isExport = false)
@ApiModelProperty("ji'gou") @ApiModelProperty("机构")
private Long deptId; private Long deptId;
} }

10
fastbee-service/fastbee-rechargecard-service/src/main/java/com/fastbee/rechargecard/domain/NgWaterPumpUsageRecords.java
View File

@ -27,7 +27,7 @@ private static final long serialVersionUID = 1L;
/** 开泵时间 */ /** 开泵时间 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "开泵时间", width = 30, dateFormat = "yyyy-MM-dd") @Excel(name = "开泵时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
@ApiModelProperty("开泵时间") @ApiModelProperty("开泵时间")
private Date pumpStartTime; private Date pumpStartTime;
@ -58,14 +58,14 @@ private static final long serialVersionUID = 1L;
private String sumFlow; private String sumFlow;
/** 实时时间 */ /** 实时时间 */
@JsonFormat(pattern = "yyyy-MM-dd") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "实时时间", width = 30, dateFormat = "yyyy-MM-dd") @Excel(name = "实时时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
@ApiModelProperty("实时时间") @ApiModelProperty("实时时间")
private Date realTime; private Date realTime;
/** 保存时间 */ /** 保存时间 */
@JsonFormat(pattern = "yyyy-MM-dd") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "保存时间", width = 30, dateFormat = "yyyy-MM-dd") @Excel(name = "保存时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
@ApiModelProperty("保存时间") @ApiModelProperty("保存时间")
private Date saveTime; private Date saveTime;