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 | 115 ++++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 100 insertions(+), 15 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..b0483e9
--- 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,16 @@
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.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;
import org.jeecg.common.aspect.annotation.Dict;
@@ -36,20 +37,48 @@
@TableId(type = IdType.ASSIGN_ID)
@ApiModelProperty(value = "id")
private String id;
+ /**閰嶆柟缂栧彿*/
+
+ @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")
- @ApiModelProperty(value = "鑽潗id")
+ @Excel(name = "鑽潗", width = 15, dictTable = "dry_herb_info", dicText = "name", dicCode = "id")
+ @Dict(dictTable = "dry_herb_info", dicText = "name", dicCode = "id")
+ @ApiModelProperty(value = "鑽潗")
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 abbr;
+ /**鑽潗鎷奸煶*/
+
+ @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 special;
+ /**杞昏川鐗╂枡*/
+ @Excel(name = "杞昏川鐗╂枡", width = 15)
+ @ApiModelProperty(value = "杞昏川鐗╂枡")
+ private String light;
+ /**閰嶆柟鍒嗙被*/
+// @Excel(name = "閰嶆柟鍒嗙被", width = 15)
+ @ApiModelProperty(value = "閰嶆柟鍒嗙被")
+ private String category;
+ /**鍒濆鍚按鐜�*/
+ @Excel(name = "鍒濆鍚按鐜�", width = 15)
+ @ApiModelProperty(value = "鍒濆鍚按鐜�")
+ private Double initial;
/**鐩爣鍚按鐜�*/
@Excel(name = "鐩爣鍚按鐜�", width = 15)
@ApiModelProperty(value = "鐩爣鍚按鐜�")
@@ -66,24 +95,47 @@
@Excel(name = "鐑娓╁害", width = 15)
@ApiModelProperty(value = "鐑娓╁害")
private Double windTemp;
+ /**鍒濆椋庢満棰戠巼*/
+ @Excel(name = "鍒濆椋庢満棰戠巼", width = 15)
+ @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)
+ @ApiModelProperty(value = "鍚按鐜囪ˉ鍋�")
+ private Double moisOffset;
+
+ /**鍐烽鏃堕暱*/
+ @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;
/**鍒涘缓浜�*/
@@ -102,4 +154,37 @@
@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();
+ }
+
+ 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