From 88880cf067bf4d3aacdf9ba70353b731888cf9fe Mon Sep 17 00:00:00 2001
From: baoshiwei <baoshiwei@shlanbao.cn>
Date: 星期一, 27 三月 2023 10:57:30 +0800
Subject: [PATCH] 实时数据接口与移动端接口
---
jeecg-module-dry/jeecg-module-dry-api/src/main/java/org/jeecg/modules/dry/entity/DryHerb.java | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 52 insertions(+), 8 deletions(-)
diff --git a/jeecg-module-dry/jeecg-module-dry-api/src/main/java/org/jeecg/modules/dry/entity/DryHerb.java b/jeecg-module-dry/jeecg-module-dry-api/src/main/java/org/jeecg/modules/dry/entity/DryHerb.java
index 07452be..673734b 100644
--- a/jeecg-module-dry/jeecg-module-dry-api/src/main/java/org/jeecg/modules/dry/entity/DryHerb.java
+++ b/jeecg-module-dry/jeecg-module-dry-api/src/main/java/org/jeecg/modules/dry/entity/DryHerb.java
@@ -10,6 +10,7 @@
import com.baomidou.mybatisplus.annotation.TableLogic;
import lombok.Data;
import com.fasterxml.jackson.annotation.JsonFormat;
+import org.jeecg.modules.dry.vo.RealTimeDataVo;
import org.springframework.format.annotation.DateTimeFormat;
import org.jeecgframework.poi.excel.annotation.Excel;
import org.jeecg.common.aspect.annotation.Dict;
@@ -61,14 +62,14 @@
@Excel(name = "骞茬嚗鏂规硶", width = 15)
@ApiModelProperty(value = "骞茬嚗鏂规硶")
private String dryMethod;
- /**骞茬嚗鏃堕棿*/
- @Excel(name = "骞茬嚗鏃堕棿", width = 15)
- @ApiModelProperty(value = "骞茬嚗鏃堕棿")
- private Integer dryTime;
- /**骞茬嚗娓╁害*/
- @Excel(name = "骞茬嚗娓╁害", width = 15)
- @ApiModelProperty(value = "骞茬嚗娓╁害")
- private String dryTemp;
+// /**骞茬嚗鏃堕棿*/
+// @Excel(name = "骞茬嚗鏃堕棿", width = 15)
+// @ApiModelProperty(value = "骞茬嚗鏃堕棿")
+// private Integer dryTime;
+// /**骞茬嚗娓╁害*/
+// @Excel(name = "骞茬嚗娓╁害", width = 15)
+// @ApiModelProperty(value = "骞茬嚗娓╁害")
+// private String dryTemp;
/**娉ㄦ剰浜嬮」*/
@Excel(name = "娉ㄦ剰浜嬮」", width = 15)
@ApiModelProperty(value = "娉ㄦ剰浜嬮」")
@@ -105,4 +106,47 @@
@Excel(name = "鐩爣鍚按鐜�", width = 15)
@ApiModelProperty(value = "鐩爣鍚按鐜�")
private Double target;
+ /**鎶曟枡閲�*/
+ @Excel(name = "鎶曟枡閲�", width = 15)
+ @ApiModelProperty(value = "鎶曟枡閲�")
+ private Integer feed;
+ /**棰勮骞茬嚗鏃堕棿*/
+ @Excel(name = "棰勮骞茬嚗鏃堕棿", width = 15)
+ @ApiModelProperty(value = "棰勮骞茬嚗鏃堕棿")
+ private Integer et;
+ /**鐑娓╁害*/
+ @Excel(name = "鐑娓╁害", width = 15)
+ @ApiModelProperty(value = "鐑娓╁害")
+ private Double windTemp;
+ /**鐜娓╁害*/
+ @Excel(name = "鐜娓╁害", width = 15)
+ @ApiModelProperty(value = "鐜娓╁害")
+ private Double envTemp;
+ /**鐜婀垮害*/
+ @Excel(name = "鐜婀垮害", width = 15)
+ @ApiModelProperty(value = "鐜婀垮害")
+ private Double envHum;
+ /**鑽℃枡寤舵椂ms*/
+ @Excel(name = "鑽℃枡寤舵椂ms", width = 15)
+ @ApiModelProperty(value = "鑽℃枡寤舵椂ms")
+ private Integer delay;
+ /**缈绘枡娆℃暟*/
+ @Excel(name = "缈绘枡娆℃暟", width = 15)
+ @ApiModelProperty(value = "缈绘枡娆℃暟")
+ private Integer turn;
+
+ public DryHerb(){}
+ public DryHerb(RealTimeDataVo realTimeDataVo) {
+ this.code = realTimeDataVo.getIndex() + "";
+ this.delay = realTimeDataVo.getDelay();
+ this.name = realTimeDataVo.getName();
+ this.delay = realTimeDataVo.getDelay();
+ this.turn = realTimeDataVo.getTurntime();
+ this.feed = realTimeDataVo.getWeight1();
+ this.initial = realTimeDataVo.getMoisture1();
+ this.target = realTimeDataVo.getMoisture3();
+ this.windTemp = realTimeDataVo.getTemp3();
+ this.et = realTimeDataVo.getTime1();
+ this.tenantId = realTimeDataVo.getTenantid();
+ }
}
--
Gitblit v1.9.3