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/DryEquipment.java | 100 ++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 100 insertions(+), 0 deletions(-)
diff --git a/jeecg-module-dry/jeecg-module-dry-api/src/main/java/org/jeecg/modules/dry/entity/DryEquipment.java b/jeecg-module-dry/jeecg-module-dry-api/src/main/java/org/jeecg/modules/dry/entity/DryEquipment.java
new file mode 100644
index 0000000..1007d45
--- /dev/null
+++ b/jeecg-module-dry/jeecg-module-dry-api/src/main/java/org/jeecg/modules/dry/entity/DryEquipment.java
@@ -0,0 +1,100 @@
+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 lombok.ToString;
+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_equipment")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ToString
+@ApiModel(value="dry_equipment瀵硅薄", description="骞茬嚗鏈�")
+public class DryEquipment 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_eqp_type", dicText = "name", dicCode = "id")
+ @Dict(dictTable = "dry_eqp_type", dicText = "name", dicCode = "id")
+ @ApiModelProperty(value = "璁惧绫诲瀷")
+ private String type;
+ /**璁惧鎻忚堪*/
+ @Excel(name = "璁惧鎻忚堪", width = 15)
+ @ApiModelProperty(value = "璁惧鎻忚堪")
+ private String remark;
+ /**杞﹂棿id*/
+ @Excel(name = "杞﹂棿id", width = 15, dictTable = "dry_shop", dicText = "name", dicCode = "id")
+ @Dict(dictTable = "dry_shop", dicText = "name", dicCode = "id")
+ @ApiModelProperty(value = "杞﹂棿id")
+ private String shopId;
+ /**鍚敤鐘舵��*/
+ @Excel(name = "鍚敤鐘舵��", width = 15)
+ @ApiModelProperty(value = "鍚敤鐘舵��")
+ private String enable;
+ /**鍒涘缓浜�*/
+ @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;
+
+ /**璁惧IP*/
+ @Excel(name = "璁惧IP", width = 15)
+ @ApiModelProperty(value = "璁惧IP")
+ private String ip;
+
+ public DryEquipment() {
+ }
+ public DryEquipment(RealTimeDataVo realTimeDataVo) {
+ this.code = realTimeDataVo.getMachineid();
+ this.tenantId = realTimeDataVo.getTenantid();
+ }
+}
--
Gitblit v1.9.3