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/entity/DryHerbFormula.java | 57 ++++++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 48 insertions(+), 9 deletions(-)
diff --git a/jeecg-module-dry/jeecg-module-dry-api/src/main/java/org/jeecg/modules/dry/entity/DryHerbFormula.java b/jeecg-module-dry/jeecg-module-dry-api/src/main/java/org/jeecg/modules/dry/entity/DryHerbFormula.java
old mode 100644
new mode 100755
index 5c4c4aa..9f63439
--- a/jeecg-module-dry/jeecg-module-dry-api/src/main/java/org/jeecg/modules/dry/entity/DryHerbFormula.java
+++ b/jeecg-module-dry/jeecg-module-dry-api/src/main/java/org/jeecg/modules/dry/entity/DryHerbFormula.java
@@ -1,15 +1,14 @@
package org.jeecg.modules.dry.entity;
import java.io.Serializable;
-import java.io.UnsupportedEncodingException;
import java.util.Date;
-import java.math.BigDecimal;
+
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
-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;
@@ -36,20 +35,32 @@
@TableId(type = IdType.ASSIGN_ID)
@ApiModelProperty(value = "id")
private String id;
+ /**閰嶆柟缂栧彿*/
+ @Excel(name = "閰嶆柟缂栧彿", width = 15)
+ @ApiModelProperty(value = "閰嶆柟缂栧彿")
+ private String code;
/**鑽潗id*/
- @Excel(name = "鑽潗id", width = 15, dictTable = "dry_herb", dicText = "name", dicCode = "id")
- @Dict(dictTable = "dry_herb", dicText = "name", dicCode = "id")
+ @Excel(name = "鑽潗id", width = 15, dictTable = "dry_herb_info", dicText = "name", dicCode = "id")
+ @Dict(dictTable = "dry_herb_info", dicText = "name", dicCode = "id")
@ApiModelProperty(value = "鑽潗id")
private String herbId;
- /**鑽潗鍚嶇О*/
- @Excel(name = "鑽潗鍚嶇О", width = 15)
- @ApiModelProperty(value = "鑽潗鍚嶇О")
- private String herbName;
+ /**閰嶆柟鍚嶇О*/
+ @Excel(name = "閰嶆柟鍚嶇О", width = 15)
+ @ApiModelProperty(value = "閰嶆柟鍚嶇О")
+ private String name;
+ /**鑽潗鎷奸煶*/
+ @Excel(name = "鑽潗鎷奸煶", width = 15)
+ @ApiModelProperty(value = "鑽潗鎷奸煶")
+ private String pinyin;
/**璁惧绫诲瀷*/
@Excel(name = "璁惧绫诲瀷", width = 15, dictTable = "dry_eqp_type", dicText = "name", dicCode = "id")
@Dict(dictTable = "dry_eqp_type", dicText = "name", dicCode = "id")
@ApiModelProperty(value = "璁惧绫诲瀷")
private String eqpType;
+ /**閰嶆柟鍒嗙被*/
+ @Excel(name = "閰嶆柟鍒嗙被", width = 15)
+ @ApiModelProperty(value = "閰嶆柟鍒嗙被")
+ private String category;
/**鐩爣鍚按鐜�*/
@Excel(name = "鐩爣鍚按鐜�", width = 15)
@ApiModelProperty(value = "鐩爣鍚按鐜�")
@@ -66,6 +77,10 @@
@Excel(name = "鐑娓╁害", width = 15)
@ApiModelProperty(value = "鐑娓╁害")
private Double windTemp;
+ /**鍒濆椋庢満棰戠巼*/
+ @Excel(name = "鍒濆椋庢満棰戠巼", width = 15)
+ @ApiModelProperty(value = "鍒濆椋庢満棰戠巼")
+ private Integer fanSpeed;
/**鐜娓╁害*/
@Excel(name = "鐜娓╁害", width = 15)
@ApiModelProperty(value = "鐜娓╁害")
@@ -82,6 +97,15 @@
@Excel(name = "缈绘枡娆℃暟", width = 15)
@ApiModelProperty(value = "缈绘枡娆℃暟")
private Integer turn;
+ /**鍚按鐜囪ˉ鍋�*/
+ @Excel(name = "鍚按鐜囪ˉ鍋�", width = 15)
+ @ApiModelProperty(value = "鍚按鐜囪ˉ鍋�")
+ private Double moisOffset;
+
+ /**鍐烽鏃堕暱*/
+ @Excel(name = "鍐烽鏃堕暱", width = 15)
+ @ApiModelProperty(value = "鍐烽鏃堕暱")
+ private Integer coolingDuration;
/**绉熸埛id*/
@Excel(name = "绉熸埛id", width = 15)
@ApiModelProperty(value = "绉熸埛id")
@@ -102,4 +126,19 @@
@DateTimeFormat(pattern="yyyy-MM-dd")
@ApiModelProperty(value = "鏇存柊鏃堕棿")
private Date updateTime;
+
+
+ public DryHerbFormula(){}
+ public DryHerbFormula(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.target = realTimeDataVo.getMoisture3();
+ this.windTemp = realTimeDataVo.getTemp3();
+ this.et = realTimeDataVo.getTime1();
+ this.tenantId = realTimeDataVo.getTenantid();
+ }
}
--
Gitblit v1.9.3