From c2fccb01b972176dc3da5a497b5e904025e9e98d Mon Sep 17 00:00:00 2001
From: bsw215583320 <baoshiwei121@163.com>
Date: 星期二, 16 四月 2024 15:06:51 +0800
Subject: [PATCH] Merge branch 'master' of http://210.22.126.130:1111/r/dry/herb
---
jeecg-module-dry/jeecg-module-dry-api/src/main/java/org/jeecg/modules/dry/entity/DryHerb.java | 152 ++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 152 insertions(+), 0 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
new file mode 100644
index 0000000..673734b
--- /dev/null
+++ b/jeecg-module-dry/jeecg-module-dry-api/src/main/java/org/jeecg/modules/dry/entity/DryHerb.java
@@ -0,0 +1,152 @@
+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;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * @Description: 鑽潗
+ * @Author: jeecg-boot
+ * @Date: 2023-03-08
+ * @Version: V1.0
+ */
+@Data
+@TableName("dry_herb")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="dry_herb瀵硅薄", description="鑽潗")
+public class DryHerb implements Serializable {
+ private static final long serialVersionUID = 1L;
+
+ /**id*/
+ @TableId(type = IdType.ASSIGN_ID)
+ @ApiModelProperty(value = "id")
+ private String id;
+ /**鑽潗缂栧彿*/
+ @Excel(name = "鑽潗缂栧彿", width = 15)
+ @ApiModelProperty(value = "鑽潗缂栧彿")
+ private String code;
+ /**鑽潗鍚嶇О*/
+ @Excel(name = "鑽潗鍚嶇О", width = 15)
+ @ApiModelProperty(value = "鑽潗鍚嶇О")
+ private String name;
+ /**鑽潗鍒嗙被*/
+ @Excel(name = "鑽潗鍒嗙被", width = 15, dictTable = "dry_herb_type", dicText = "name", dicCode = "id")
+ @Dict(dictTable = "dry_herb_type", dicText = "name", dicCode = "id")
+ @ApiModelProperty(value = "鑽潗鍒嗙被")
+ private String type;
+ /**鑽潗鍒悕*/
+ @Excel(name = "鑽潗鍒悕", width = 15)
+ @ApiModelProperty(value = "鑽潗鍒悕")
+ private String alias;
+ /**鑽敤閮ㄤ綅*/
+ @Excel(name = "鑽敤閮ㄤ綅", width = 15)
+ @ApiModelProperty(value = "鑽敤閮ㄤ綅")
+ private String parts;
+ /**骞茬嚗鏂规硶*/
+ @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 String notice;
+ /**鐗规�ф爣绛�*/
+ @Excel(name = "鐗规�ф爣绛�", width = 15)
+ @ApiModelProperty(value = "鐗规�ф爣绛�")
+ private String tag;
+ /**鍒涘缓浜�*/
+ @ApiModelProperty(value = "鍒涘缓浜�")
+ private String createBy;
+ /**鍒涘缓鏃ユ湡*/
+ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+ @DateTimeFormat(pattern="yyyy-MM-dd")
+ @ApiModelProperty(value = "鍒涘缓鏃ユ湡")
+ private Date createTime;
+ /**鏇存柊浜�*/
+ @ApiModelProperty(value = "鏇存柊浜�")
+ private String updateBy;
+ /**鏇存柊鏃ユ湡*/
+ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+ @DateTimeFormat(pattern="yyyy-MM-dd")
+ @ApiModelProperty(value = "鏇存柊鏃ユ湡")
+ private Date updateTime;
+ /**绉熸埛id*/
+ @Excel(name = "绉熸埛id", width = 15)
+ @ApiModelProperty(value = "绉熸埛id")
+ private Integer tenantId;
+ /**鍒濆鍚按鐜�*/
+ @Excel(name = "鍒濆鍚按鐜�", width = 15)
+ @ApiModelProperty(value = "鍒濆鍚按鐜�")
+ private Double initial;
+ /**鐩爣鍚按鐜�*/
+ @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