From 339515558253d776769dc2e2560bbb4a0450c989 Mon Sep 17 00:00:00 2001
From: zhuguifei <zhuguifei@zhuguifeideiMac.local>
Date: 星期五, 29 十一月 2024 09:44:44 +0800
Subject: [PATCH] 将码云版本提交至gitlab -- 20241129
---
jeecg-module-dry/jeecg-module-dry-api/src/main/java/org/jeecg/modules/dry/vo/DryOrderTrendVo.java | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 52 insertions(+), 2 deletions(-)
diff --git a/jeecg-module-dry/jeecg-module-dry-api/src/main/java/org/jeecg/modules/dry/vo/DryOrderTrendVo.java b/jeecg-module-dry/jeecg-module-dry-api/src/main/java/org/jeecg/modules/dry/vo/DryOrderTrendVo.java
old mode 100644
new mode 100755
index 1c4e4a9..1e26181
--- a/jeecg-module-dry/jeecg-module-dry-api/src/main/java/org/jeecg/modules/dry/vo/DryOrderTrendVo.java
+++ b/jeecg-module-dry/jeecg-module-dry-api/src/main/java/org/jeecg/modules/dry/vo/DryOrderTrendVo.java
@@ -5,6 +5,7 @@
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import lombok.NoArgsConstructor;
import lombok.ToString;
import org.jeecgframework.poi.excel.annotation.Excel;
import org.springframework.format.annotation.DateTimeFormat;
@@ -13,6 +14,7 @@
@Data
@ToString
+@NoArgsConstructor
public class DryOrderTrendVo {
/**id*/
@@ -25,8 +27,30 @@
@ApiModelProperty(value = "鍚按鐜�", example = "33")
private Double moisture;
/**娓╁害*/
- @ApiModelProperty(value = "娓╁害", example = "70")
- private Double temp;
+ @ApiModelProperty(value = "椋庢満娓╁害", example = "70")
+ private Double fanTemp;
+ /**椋庣娓╁害*/
+ @ApiModelProperty(value = "椋庣娓╁害")
+ private Double bellowsTemp;
+
+ /**鎬绘椂闂�*/
+ @ApiModelProperty(value = "鎬绘椂闂�")
+ private Integer totalTime;
+ /**骞茬嚗鏃堕棿s*/
+ @ApiModelProperty(value = "骞茬嚗鏃堕棿s")
+ private Integer dryTime;
+ /**缈绘枡娆℃暟*/
+ @ApiModelProperty(value = "缈绘枡娆℃暟")
+ private Integer turn;
+ /**椋庢満棰戠巼*/
+ @ApiModelProperty(value = "椋庢満棰戠巼")
+ private Double fanFrequency;
+ /**瀹炴椂閲嶉噺*/
+ @ApiModelProperty(value = "瀹炴椂閲嶉噺")
+ private Double weight;
+ /**鐑1/鍐烽0*/
+ @ApiModelProperty(value = "鐑1/鍐烽0")
+ private Integer wind;
/**鏃堕棿*/
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
@@ -35,4 +59,30 @@
/**绉熸埛id*/
@ApiModelProperty(value = "绉熸埛id", example = "1000")
private Integer tenantId;
+
+
+ /**钂告苯娑堣��*/
+ @ApiModelProperty(value = "钂告苯娑堣��")
+ private Double steam;
+
+ /**鐢佃兘娑堣��*/
+ @ApiModelProperty(value = "鐢佃兘娑堣��")
+ private Double watt;
+
+
+ public DryOrderTrendVo(RealTimeDataVo realTimeDataVo) {
+ this.fanFrequency = realTimeDataVo.getFanfrq();
+ this.weight = realTimeDataVo.getWeight3();
+ this.moisture = realTimeDataVo.getMoisture2();
+ this.fanTemp = realTimeDataVo.getTemp1();
+ this.bellowsTemp = realTimeDataVo.getTemp2();
+ this.dryTime = realTimeDataVo.getTime2();
+ this.wind = realTimeDataVo.getWind()?1:0;
+ this.turn = realTimeDataVo.getTurntime();
+ this.totalTime = realTimeDataVo.getTime3();
+ this.orderId = realTimeDataVo.getOrderId();
+ this.watt = realTimeDataVo.getWatt();
+ this.steam = realTimeDataVo.getSteam();
+ this.tim = new Date();
+ }
}
--
Gitblit v1.9.3