From 567096dae7f467d04883f11b17f667b6cef5f536 Mon Sep 17 00:00:00 2001
From: baoshiwei <baoshiwei@shlanbao.cn>
Date: 星期五, 28 十一月 2025 10:35:18 +0800
Subject: [PATCH] feat(dry): 新增干燥配方上传功能
---
jeecg-module-dry/jeecg-module-dry-api/src/main/java/org/jeecg/modules/dry/entity/DryHerbFormula.java | 70 +++++++++++++++++++++++++++++------
1 files changed, 58 insertions(+), 12 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
index 9f63439..b0483e9 100755
--- 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
@@ -8,6 +8,8 @@
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import com.fasterxml.jackson.annotation.JsonFormat;
+import org.jeecg.modules.dry.Bo.HerbFormulaBo;
+import org.jeecg.modules.dry.vo.HerbFormulaVo;
import org.jeecg.modules.dry.vo.RealTimeDataVo;
import org.springframework.format.annotation.DateTimeFormat;
import org.jeecgframework.poi.excel.annotation.Excel;
@@ -36,20 +38,24 @@
@ApiModelProperty(value = "id")
private String id;
/**閰嶆柟缂栧彿*/
- @Excel(name = "閰嶆柟缂栧彿", width = 15)
+
@ApiModelProperty(value = "閰嶆柟缂栧彿")
private String code;
/**鑽潗id*/
- @Excel(name = "鑽潗id", width = 15, dictTable = "dry_herb_info", dicText = "name", dicCode = "id")
+ @Excel(name = "鑽潗", width = 15, dictTable = "dry_herb_info", dicText = "name", dicCode = "id")
@Dict(dictTable = "dry_herb_info", dicText = "name", dicCode = "id")
- @ApiModelProperty(value = "鑽潗id")
+ @ApiModelProperty(value = "鑽潗")
private String herbId;
/**閰嶆柟鍚嶇О*/
@Excel(name = "閰嶆柟鍚嶇О", width = 15)
@ApiModelProperty(value = "閰嶆柟鍚嶇О")
private String name;
- /**鑽潗鎷奸煶*/
- @Excel(name = "鑽潗鎷奸煶", width = 15)
+ /**缂╁啓*/
+ @Excel(name = "缂╁啓", width = 15)
+ @ApiModelProperty(value = "缂╁啓")
+ private String abbr;
+ /**鑽潗鎷奸煶*/
+
@ApiModelProperty(value = "鑽潗鎷奸煶")
private String pinyin;
/**璁惧绫诲瀷*/
@@ -57,10 +63,22 @@
@Dict(dictTable = "dry_eqp_type", dicText = "name", dicCode = "id")
@ApiModelProperty(value = "璁惧绫诲瀷")
private String eqpType;
+ /**鐗圭鐗╂枡*/
+ @Excel(name = "鐗圭鐗╂枡", width = 15)
+ @ApiModelProperty(value = "鐗圭鐗╂枡")
+ private String special;
+ /**杞昏川鐗╂枡*/
+ @Excel(name = "杞昏川鐗╂枡", width = 15)
+ @ApiModelProperty(value = "杞昏川鐗╂枡")
+ private String light;
/**閰嶆柟鍒嗙被*/
- @Excel(name = "閰嶆柟鍒嗙被", width = 15)
+// @Excel(name = "閰嶆柟鍒嗙被", width = 15)
@ApiModelProperty(value = "閰嶆柟鍒嗙被")
private String category;
+ /**鍒濆鍚按鐜�*/
+ @Excel(name = "鍒濆鍚按鐜�", width = 15)
+ @ApiModelProperty(value = "鍒濆鍚按鐜�")
+ private Double initial;
/**鐩爣鍚按鐜�*/
@Excel(name = "鐩爣鍚按鐜�", width = 15)
@ApiModelProperty(value = "鐩爣鍚按鐜�")
@@ -82,23 +100,27 @@
@ApiModelProperty(value = "鍒濆椋庢満棰戠巼")
private Integer fanSpeed;
/**鐜娓╁害*/
- @Excel(name = "鐜娓╁害", width = 15)
+
@ApiModelProperty(value = "鐜娓╁害")
private Double envTemp;
/**鐜婀垮害*/
- @Excel(name = "鐜婀垮害", width = 15)
+
@ApiModelProperty(value = "鐜婀垮害")
private Double envHum;
+ /**缈绘枡绛栫暐*/
+ @Excel(name = "缈绘枡绛栫暐", width = 15)
+ @ApiModelProperty(value = "缈绘枡绛栫暐")
+ private String strategy;
/**鑽℃枡寤舵椂ms*/
- @Excel(name = "鑽℃枡寤舵椂ms", width = 15)
+
@ApiModelProperty(value = "鑽℃枡寤舵椂ms")
private Integer delay;
/**缈绘枡娆℃暟*/
- @Excel(name = "缈绘枡娆℃暟", width = 15)
+
@ApiModelProperty(value = "缈绘枡娆℃暟")
private Integer turn;
/**鍚按鐜囪ˉ鍋�*/
- @Excel(name = "鍚按鐜囪ˉ鍋�", width = 15)
+// @Excel(name = "鍚按鐜囪ˉ鍋�", width = 15)
@ApiModelProperty(value = "鍚按鐜囪ˉ鍋�")
private Double moisOffset;
@@ -106,8 +128,14 @@
@Excel(name = "鍐烽鏃堕暱", width = 15)
@ApiModelProperty(value = "鍐烽鏃堕暱")
private Integer coolingDuration;
+
+
+ /**鏄惁鍚敤*/
+ @Excel(name = "鏄惁鍚敤", width = 15)
+ @ApiModelProperty(value = "鏄惁鍚敤")
+ private String enabled;
+
/**绉熸埛id*/
- @Excel(name = "绉熸埛id", width = 15)
@ApiModelProperty(value = "绉熸埛id")
private Integer tenantId;
/**鍒涘缓浜�*/
@@ -141,4 +169,22 @@
this.et = realTimeDataVo.getTime1();
this.tenantId = realTimeDataVo.getTenantid();
}
+
+ public DryHerbFormula(HerbFormulaBo formulaBo) {
+ this.eqpType = formulaBo.getEqpType();
+ this.name = formulaBo.getName();
+ this.abbr = formulaBo.getAbbr();
+ this.special = formulaBo.getSpecial();
+ this.light = formulaBo.getLight();
+ this.initial = formulaBo.getInitial();
+ this.target = formulaBo.getTarget();
+ this.feed = formulaBo.getFeed();
+ this.et = formulaBo.getEt();
+ this.windTemp = formulaBo.getWindTemp();
+ this.fanSpeed = formulaBo.getFanSpeed();
+ this.strategy = formulaBo.getStrategy();
+ this.coolingDuration = formulaBo.getCoolingDuration();
+ this.enabled = formulaBo.getEnabled();
+
+ }
}
--
Gitblit v1.9.3