From 3ec40889a5879265876842e53f0dabfe7e7a9bb9 Mon Sep 17 00:00:00 2001 From: zhangyue <82248909@qq.com> Date: Tue, 28 Jul 2026 17:50:43 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=20=E6=96=B0=E7=9B=91?= =?UTF-8?q?=E6=B5=8B=E9=A1=B9=E5=AD=97=E5=85=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jeecg/common/constant/enums/PollutionEnum.java | 9 +++++++++ .../org/jeecg/common/entity/SurvHisdataFlowmeter.java | 11 ++++++----- .../jeecg/common/entity/SurvTransdataFlowmeter.java | 9 +++++---- 3 files changed, 20 insertions(+), 9 deletions(-) diff --git a/zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/constant/enums/PollutionEnum.java b/zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/constant/enums/PollutionEnum.java index 3962399..8fab830 100644 --- a/zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/constant/enums/PollutionEnum.java +++ b/zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/constant/enums/PollutionEnum.java @@ -109,6 +109,15 @@ public enum PollutionEnum { dataStinkH2s("dataH2s","硫化氢","mg/m³","sys/icon/zhandian_icon_h2s.png","stink","#d05c9f", "sys/mobile/icon/shebei_icon_h2s.png", "sys/bs/icon/shebei_icon_h2s.png", "shebei_icon_h2s.png"), dataStinkTvoc("dataTvoc","总挥发性有机物","mg/m³","sys/icon/zhandian_icon_tvoc.png","stink","#f06464", "sys/mobile/icon/shebei_icon_tvoc.png", "sys/bs/icon/shebei_icon_tvoc.png", "shebei_icon_tvoc.png"), + //流量计 + dataMeterFlowTotal("sData1","累计流量","m³","sys/icon/shebei_icon_flowTotal.png","meter","#f47a75", "sys/mobile/icon/shebei_icon_flowTotal.png", "sys/bs/icon/shebei_icon_flowTotal.png", "shebei_icon_flowTotal.png"), + dataMeterFlowRate("sData2","瞬时流量","mg/m³","sys/icon/shebei_icon_flowRate.png","meter","#d05c7c", "sys/mobile/icon/shebei_icon_flowRate.png", "sys/bs/icon/shebei_icon_flowRate.png", "shebei_icon_flowRate.png"), + dataMeterOutage("sData3","空高值","mm","sys/icon/shebei_icon_outage.png","meter","#d05c9f", "sys/mobile/icon/shebei_icon_outage.png", "sys/bs/icon/shebei_icon_outage.png", "shebei_icon_outage.png"), + dataMeterLevel("sData4","液位值","mm","sys/icon/shebei_icon_level.png","meter","#f06464", "sys/mobile/icon/shebei_icon_level.png", "sys/bs/icon/shebei_icon_level.png", "shebei_icon_level.png"), + dataMeterVelocity("sData5","当前流速值","cm/s","sys/icon/shebei_icon_velocity.png","meter","#f06464", "sys/mobile/icon/shebei_icon_velocity.png", "sys/bs/icon/shebei_icon_velocity.png", "shebei_icon_velocity.png"), + + + //杀虫灯 dataPestLight("ct","杀虫次数","次","","9_pestlight","","","",""), diff --git a/zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/entity/SurvHisdataFlowmeter.java b/zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/entity/SurvHisdataFlowmeter.java index 2ce08f6..a424910 100644 --- a/zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/entity/SurvHisdataFlowmeter.java +++ b/zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/entity/SurvHisdataFlowmeter.java @@ -13,6 +13,7 @@ import org.jeecgframework.poi.excel.annotation.Excel; import org.springframework.format.annotation.DateTimeFormat; import java.io.Serializable; +import java.time.LocalDateTime; import java.util.Date; /** @@ -49,7 +50,7 @@ public class SurvHisdataFlowmeter implements Serializable { @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") @ApiModelProperty(value = "创建时间") - private Date createTime; + private LocalDateTime createTime; /**更新人*/ @Excel(name = "更新人", width = 15) @ApiModelProperty(value = "更新人") @@ -63,7 +64,7 @@ public class SurvHisdataFlowmeter implements Serializable { @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") @DateTimeFormat(pattern="yyyy-MM-dd") @ApiModelProperty(value = "更新时间") - private Date updatedTime; + private LocalDateTime updatedTime; /**数据1*/ @Excel(name = "数据1", width = 15) @ApiModelProperty(value = "数据1") @@ -89,7 +90,7 @@ public class SurvHisdataFlowmeter implements Serializable { @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") @ApiModelProperty(value = "数据更新时间") - private Date sDateTime; + private LocalDateTime dataDateTime; /**数据类型;realTime=实时，dayTime=日数据，month=月数据，year=年数据*/ @Excel(name = "数据类型;realTime=实时，dayTime=日数据，month=月数据，year=年数据", width = 15) @ApiModelProperty(value = "数据类型;realTime=实时，dayTime=日数据，month=月数据，year=年数据") @@ -101,7 +102,7 @@ public class SurvHisdataFlowmeter implements Serializable { /**设备ID*/ @Excel(name = "设备ID", width = 15) @ApiModelProperty(value = "设备ID") - private String deviceId; + private String deployId; /**站点编号*/ @Excel(name = "站点编号", width = 15) @ApiModelProperty(value = "站点编号") @@ -127,5 +128,5 @@ public class SurvHisdataFlowmeter implements Serializable { @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") @ApiModelProperty(value = "转储时间") - private Date transDate; + private LocalDateTime transDate; } diff --git a/zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/entity/SurvTransdataFlowmeter.java b/zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/entity/SurvTransdataFlowmeter.java index e4d3429..1415ba3 100644 --- a/zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/entity/SurvTransdataFlowmeter.java +++ b/zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/entity/SurvTransdataFlowmeter.java @@ -13,6 +13,7 @@ import org.jeecgframework.poi.excel.annotation.Excel; import org.springframework.format.annotation.DateTimeFormat; import java.io.Serializable; +import java.time.LocalDateTime; import java.util.Date; /** @@ -49,7 +50,7 @@ public class SurvTransdataFlowmeter implements Serializable { @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") @ApiModelProperty(value = "创建时间") - private Date createTime; + private LocalDateTime createTime; /**更新人*/ @Excel(name = "更新人", width = 15) @ApiModelProperty(value = "更新人") @@ -63,7 +64,7 @@ public class SurvTransdataFlowmeter implements Serializable { @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") @DateTimeFormat(pattern="yyyy-MM-dd") @ApiModelProperty(value = "更新时间") - private Date updatedTime; + private LocalDateTime updatedTime; /**数据1*/ @Excel(name = "数据1", width = 15) @ApiModelProperty(value = "数据1") @@ -89,7 +90,7 @@ public class SurvTransdataFlowmeter implements Serializable { @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") @ApiModelProperty(value = "数据更新时间") - private Date sDateTime; + private LocalDateTime dataDateTime; /**数据类型;realTime=实时，dayTime=日数据，month=月数据，year=年数据*/ @Excel(name = "数据类型;realTime=实时，dayTime=日数据，month=月数据，year=年数据", width = 15) @ApiModelProperty(value = "数据类型;realTime=实时，dayTime=日数据，month=月数据，year=年数据") @@ -101,7 +102,7 @@ public class SurvTransdataFlowmeter implements Serializable { /**设备ID*/ @Excel(name = "设备ID", width = 15) @ApiModelProperty(value = "设备ID") - private String deviceId; + private String deployId; /**站点编号*/ @Excel(name = "站点编号", width = 15) @ApiModelProperty(value = "站点编号")