From 75bdbdce8d62b9940d1410e914787c78d1908c17 Mon Sep 17 00:00:00 2001
From: czt <czt18638530771@163.com>
Date: 星期三, 26 十一月 2025 10:43:44 +0800
Subject: [PATCH] 相关业务表提交2

---
 fzzy-igdss-core/src/main/java/com/fzzy/igds/constant/GrainFrequence.java |   28 +
 fzzy-igdss-core/src/main/java/com/fzzy/igds/constant/Constant.java       |   36 ++
 fzzy-igdss-core/src/main/java/com/fzzy/igds/domain/GrainKey.java         |   24 +
 fzzy-igdss-core/src/main/java/com/fzzy/igds/domain/DeviceSer.java        |  130 ++++++++
 fzzy-igdss-core/src/main/java/com/fzzy/igds/domain/DeviceSerKey.java     |   23 +
 fzzy-igdss-core/src/main/java/com/fzzy/igds/constant/ControlModel.java   |   28 +
 fzzy-igdss-core/src/main/java/com/fzzy/igds/domain/Quantity.java         |   82 +++++
 fzzy-igdss-core/src/main/java/com/fzzy/igds/constant/DeviceSerType.java  |   39 ++
 fzzy-igdss-core/src/main/java/com/fzzy/igds/domain/Grain.java            |  117 +++++++
 fzzy-igdss-core/src/main/java/com/fzzy/igds/constant/DeviceIotType.java  |   36 ++
 fzzy-igdss-core/src/main/java/com/fzzy/igds/domain/DepotConf.java        |  122 +++++++
 fzzy-igdss-core/src/main/java/com/fzzy/igds/domain/DeviceIot.java        |   73 ++++
 fzzy-igdss-core/src/main/java/com/fzzy/igds/domain/QuantityKey.java      |   25 +
 fzzy-igdss-core/src/main/java/com/fzzy/igds/domain/QuantityConf.java     |  156 +++++++++
 14 files changed, 919 insertions(+), 0 deletions(-)

diff --git a/fzzy-igdss-core/src/main/java/com/fzzy/igds/constant/Constant.java b/fzzy-igdss-core/src/main/java/com/fzzy/igds/constant/Constant.java
index 7f90ef4..468cafc 100644
--- a/fzzy-igdss-core/src/main/java/com/fzzy/igds/constant/Constant.java
+++ b/fzzy-igdss-core/src/main/java/com/fzzy/igds/constant/Constant.java
@@ -22,4 +22,40 @@
     // 瀛楀吀-鍑哄叆搴撴祦绋�
     public static final String TRIGGER_PARENT_PROCESS_STATUS = "PROCESS_STATUS_";
 
+    //绛掍粨閿ュ舰-鏃犻獙璇�
+    public static final String CABLE_CONE_0 = "0";
+    //绛掍粨閿ュ舰-涓婇敟褰�
+    public static final String CABLE_CONE_1 = "1";
+    //绛掍粨閿ュ舰-涓嬮敟褰�
+    public static final String CABLE_CONE_2 = "2";
+
+    /**
+     * 绮儏鐢电紗璧峰鏂逛綅(榛樿鍙宠竟)
+     */
+    public static final String GRAIN_START_ORIENTATION_RIGHT = "right"; //鍙宠竟
+    public static final String GRAIN_START_ORIENTATION_RIGHT_UP = "right-up"; //鍙充笂
+    public static final String GRAIN_START_ORIENTATION_LEFT = "left";  //宸﹁竟
+    public static final String GRAIN_START_ORIENTATION_LEFT_UP = "left-up";  //宸︿笂
+
+    /**
+     * 绮儏鐢电紗甯冪嚎鏂瑰悜(榛樿绾靛悜)
+     */
+    public static final String GRAIN_START_DIRECTION_PORTRAIT = "portrait";  //绾靛悜
+    public static final String GRAIN_START_DIRECTION_TRANSVERSE = "transverse";  //妯悜
+
+    /**
+     * 绮儏鐢电紗璧峰鐐逛綅(榛樿椤堕儴)
+     */
+    public static final String GRAIN_START_POINT_TOP = "top";    //椤堕儴
+    public static final String GRAIN_START_POINT_BELOW = "below";  //搴曢儴
+
+    /**
+     * 琛屽眰杞崲(榛樿涓嶈浆鎹�)
+     */
+    public static final String GRAIN_CONVERT_DEFAULT = "default";    //榛樿
+    public static final String GRAIN_CONVERT_CLOCKWISE = "clockwise";    //椤烘椂閽�
+    public static final String GRAIN_CONVERT_ANTICLOCKWISE = "anticlockwise";  //閫嗘椂閽�
+
+    public static final String NETWORK_01 = "01";// 鏈夌嚎妯″紡
+    public static final String NETWORK_02 = "02";// 鏃犵嚎妯″紡
 }
diff --git a/fzzy-igdss-core/src/main/java/com/fzzy/igds/constant/ControlModel.java b/fzzy-igdss-core/src/main/java/com/fzzy/igds/constant/ControlModel.java
new file mode 100644
index 0000000..475c440
--- /dev/null
+++ b/fzzy-igdss-core/src/main/java/com/fzzy/igds/constant/ControlModel.java
@@ -0,0 +1,28 @@
+package com.fzzy.igds.constant;
+
+/**
+ * @Description 鎺у埗鏌滄搷浣滄ā寮�
+ * @Author CZT
+ * @Date 2025/11/26 09:25
+ */
+public enum ControlModel {
+
+	MODEL_01("01", "鏈湴妯″紡"), MODEL_02("02", "杩滅▼妯″紡");
+
+	private String code;
+	private String msg;
+
+	ControlModel(String code, String msg) {
+		this.code = code;
+		this.msg = msg;
+	}
+
+	public String getCode() {
+		return code;
+	}
+
+	public String getMsg() {
+		return msg;
+	}
+
+}
diff --git a/fzzy-igdss-core/src/main/java/com/fzzy/igds/constant/DeviceIotType.java b/fzzy-igdss-core/src/main/java/com/fzzy/igds/constant/DeviceIotType.java
new file mode 100644
index 0000000..4a67d46
--- /dev/null
+++ b/fzzy-igdss-core/src/main/java/com/fzzy/igds/constant/DeviceIotType.java
@@ -0,0 +1,36 @@
+package com.fzzy.igds.constant;
+
+/**
+ * @Description 鐗╄仈缃慖OT璁惧绫诲瀷鏋氫妇绫�
+ * @Author CZT
+ * @Date 2025/11/26 10:25
+ */
+public enum DeviceIotType {
+
+    TYPE_01("01", "01-娓╂箍搴�"),
+
+    TYPE_02("02", "02-娑蹭綅璁�");
+
+    private String code;
+    private String msg;
+
+    DeviceIotType(String code, String msg) {
+        this.code = code;
+        this.msg = msg;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public String getMsg() {
+        return msg;
+    }
+
+	public static String getMsg(String code) {
+		if(null == code) return null;
+		if(DeviceIotType.TYPE_01.getCode().equals(code)) return DeviceIotType.TYPE_01.getMsg();
+		if(DeviceIotType.TYPE_02.getCode().equals(code)) return DeviceIotType.TYPE_02.getMsg();
+		return "鍏朵粬";
+	}
+}
diff --git a/fzzy-igdss-core/src/main/java/com/fzzy/igds/constant/DeviceSerType.java b/fzzy-igdss-core/src/main/java/com/fzzy/igds/constant/DeviceSerType.java
new file mode 100644
index 0000000..6a04baa
--- /dev/null
+++ b/fzzy-igdss-core/src/main/java/com/fzzy/igds/constant/DeviceSerType.java
@@ -0,0 +1,39 @@
+package com.fzzy.igds.constant;
+
+/**
+ * @Description 鍒嗘満绫诲瀷
+ * @Author CZT
+ * @Date 2025/11/26 09:25
+ */
+public enum DeviceSerType {
+
+    TYPE_01("01", "01-缁煎悎鎺у埗鏌�"),
+    TYPE_02("02", "02-鐙珛绮儏鍒嗘満"),
+    TYPE_03("03", "02-鐙珛閫氶鍒嗘満"),
+    TYPE_99("99", "99-鐙珛缁堢");
+
+    private String code;
+    private String msg;
+
+    DeviceSerType(String code, String msg) {
+        this.code = code;
+        this.msg = msg;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public String getMsg() {
+        return msg;
+    }
+
+    public static String getMsg(String code) {
+        if (null == code) return null;
+
+        if (DeviceSerType.TYPE_01.getCode().equals(code)) return DeviceSerType.TYPE_01.getMsg();
+        if (DeviceSerType.TYPE_02.getCode().equals(code)) return DeviceSerType.TYPE_02.getMsg();
+
+        return DeviceSerType.TYPE_99.getMsg();
+    }
+}
diff --git a/fzzy-igdss-core/src/main/java/com/fzzy/igds/constant/GrainFrequence.java b/fzzy-igdss-core/src/main/java/com/fzzy/igds/constant/GrainFrequence.java
new file mode 100644
index 0000000..2e15da3
--- /dev/null
+++ b/fzzy-igdss-core/src/main/java/com/fzzy/igds/constant/GrainFrequence.java
@@ -0,0 +1,28 @@
+package com.fzzy.igds.constant;
+
+/**
+ * @Description 绮儏淇濆瓨棰戞
+ * @Author CZT
+ * @Date 2025/11/25 14:29
+ */
+public enum GrainFrequence {
+
+	FREQ_01("01", "涓�鏃ュ娆�"), FREQ_02("02", "涓�鏃ヤ竴娆�"), FREQ_03("03", "涓�鏃ヤ袱娆�");
+
+	private String code;
+	private String msg;
+
+	GrainFrequence(String code, String msg) {
+		this.code = code;
+		this.msg = msg;
+	}
+
+	public String getCode() {
+		return code;
+	}
+
+	public String getMsg() {
+		return msg;
+	}
+
+}
diff --git a/fzzy-igdss-core/src/main/java/com/fzzy/igds/domain/DepotConf.java b/fzzy-igdss-core/src/main/java/com/fzzy/igds/domain/DepotConf.java
new file mode 100644
index 0000000..2671061
--- /dev/null
+++ b/fzzy-igdss-core/src/main/java/com/fzzy/igds/domain/DepotConf.java
@@ -0,0 +1,122 @@
+package com.fzzy.igds.domain;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fzzy.igds.constant.Constant;
+import com.fzzy.igds.constant.GrainFrequence;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import javax.persistence.*;
+import java.io.Serializable;
+
+/**
+ * @Description 浠撳簱閰嶇疆
+ * @Author CZT
+ * @Date 2025/11/26 10:15
+ */
+@Data
+@Entity
+@Table(name = "d_depot_conf")
+@TableName("d_depot_conf")
+@EqualsAndHashCode(callSuper = false)
+public class DepotConf extends BizBaseEntity implements Serializable {
+
+    /**
+     *
+     */
+    private static final long serialVersionUID = 1L;
+
+    @Id
+    @Column(name = "depot_id", columnDefinition = "varchar(40) COMMENT '鎵�灞炰粨搴�'")
+    @TableField("depot_id")
+    private String depotId;
+
+    @Column(name = "dept_id", columnDefinition = "varchar(40) COMMENT '鎵�灞炲簱鍖�'")
+    @TableField("dept_id")
+    private String deptId;
+
+    @Column(name = "grain_ser", columnDefinition = "varchar(40) COMMENT '绮儏鍒嗘満'")
+    @TableField("grain_ser")
+    private String grainSer;
+
+    @Column(name = "th_ser", columnDefinition = "varchar(40) COMMENT '娓╂箍搴﹀垎鏈�'")
+    @TableField("th_ser")
+    private String thSer;
+
+    @Column(name = "grain_freq", columnDefinition = "varchar(2) COMMENT '绮儏淇濆瓨棰戠巼'")
+    @TableField("grain_freq")
+    private String grainFreq = GrainFrequence.FREQ_01.getCode();
+
+    @Column(name = "th_conf", columnDefinition = "varchar(5) COMMENT '浠撴俯浠撴箍閫氶亾'")
+    @TableField("th_conf")
+    private String thConf = "1";
+
+    @Column(name = "cable_rule", columnDefinition = "varchar(20) COMMENT '甯冪嚎瑙勫垯'")
+    @TableField("cable_rule")
+    private String cableRule;
+
+    @Column(name = "cable_cir", columnDefinition = "varchar(20) COMMENT '绛掍粨灞傝鍒�'")
+    @TableField("cable_cir")
+    private String cableCir;
+
+    @Column(name = "cable_cone", columnDefinition = "varchar(20) COMMENT '绛掍粨閿ュ舰(0=鏃犲垽鏂紝1=涓婇敟褰紝2=涓嬮敟褰�)'")
+    @TableField("cable_cone")
+    private String cableCone = Constant.CABLE_CONE_0;
+
+    @Column(name = "cable_start", columnDefinition = "int(5) COMMENT '鐢电紗寮�濮嬪垪'")
+    @TableField("cable_start")
+    private int cableStart;
+
+    @Column(name = "cable_end", columnDefinition = "int(5) COMMENT '鐢电紗鎴嚦鍒�'")
+    @TableField("cable_end")
+    private int cableEnd;
+
+    @Column(name = "start_orientation", columnDefinition = "varchar(40) COMMENT '鐢电紗璧峰鏂逛綅(榛樿鍙宠竟:鍙宠竟銆佸彸涓娿�佸乏杈广�佸乏涓�)'")
+    @TableField("start_orientation")
+    private String startOrientation = Constant.GRAIN_START_ORIENTATION_RIGHT;
+
+    @Column(name = "start_direction", columnDefinition = "varchar(40) COMMENT '鐢电紗璧峰鏂瑰悜(榛樿绾靛悜:绾靛悜銆佹í鍚�)'")
+    @TableField("start_direction")
+    private String startDirection = Constant.GRAIN_START_DIRECTION_PORTRAIT;
+
+    @Column(name = "start_point", columnDefinition = "varchar(40) COMMENT '鐢电紗璧峰鐐逛綅(榛樿椤堕儴:椤堕儴銆佸簳閮�)'")
+    @TableField("start_point")
+    private String startPoint = Constant.GRAIN_START_POINT_TOP;
+
+    @Column(name = "start_convert", columnDefinition = "varchar(40) COMMENT '榛樿涓嶈浆鎹�(榛樿銆侀『鏃堕拡銆侀�嗘椂閽�)'")
+    @TableField("start_convert")
+    private String startConvert = Constant.GRAIN_CONVERT_DEFAULT;
+
+    @Column(name = "temp_max", columnDefinition = "decimal(20,2) COMMENT '娓╁害涓婇檺'")
+    @TableField("temp_max")
+    private Double tempMax;
+
+    @Column(name = "temperature", columnDefinition = "decimal(20,2) COMMENT '娓╁樊闃堝��'")
+    @TableField("temperature")
+    private Double temperature;
+
+    @Column(name = "start_row", columnDefinition = "int(5) COMMENT '璧峰鏍瑰彿'")
+    @TableField("start_row")
+    private Integer startRow;
+
+    @Column(name = "grain_auto", columnDefinition = "varchar(40) COMMENT '绮儏鑷姩浼樺寲鍔熻兘'")
+    @TableField("grain_auto")
+    private String grainAuto = Constant.YN_N;
+
+    @Column(name = "only_cur_depot", columnDefinition = "varchar(40) COMMENT '鏄剧ず褰撳墠'")
+    @TableField("only_cur_depot")
+    private String onlyCurDepot = "Y";
+
+    @Column(name = "is_only_th", columnDefinition = "varchar(40) COMMENT '绮儏鏄惁娓╂箍搴�'")
+    @TableField("is_only_th")
+    private String isOnlyTH = Constant.YN_N;
+
+    // 浠撳簱鍚嶇О
+    @Transient
+    private String depotName;
+
+    //浠撳簱绫诲瀷
+    @Transient
+    private String depotType;
+
+}
diff --git a/fzzy-igdss-core/src/main/java/com/fzzy/igds/domain/DeviceIot.java b/fzzy-igdss-core/src/main/java/com/fzzy/igds/domain/DeviceIot.java
new file mode 100644
index 0000000..826f431
--- /dev/null
+++ b/fzzy-igdss-core/src/main/java/com/fzzy/igds/domain/DeviceIot.java
@@ -0,0 +1,73 @@
+package com.fzzy.igds.domain;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fzzy.igds.constant.DeviceIotType;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
+import java.io.Serializable;
+
+/**
+ * @Description 鐗╄仈缃慖OT璁惧
+ * @Author CZT
+ * @Date 2025/11/26 10:35
+ */
+@Data
+@Entity
+@Table(name = "d_device_iot")
+@TableName("d_device_iot")
+@EqualsAndHashCode(callSuper = false)
+public class DeviceIot extends BizBaseEntity implements Serializable {
+
+	/**
+	 *
+	 */
+	private static final long serialVersionUID = 1L;
+
+	public static String SORT_PROP = "id";
+
+	@Id
+	@Column(name = "id", columnDefinition = "varchar(40) COMMENT '涓婚敭ID'")
+	@TableField("id")
+	private String id;
+
+	@Column(name = "dept_id", columnDefinition = "varchar(40) COMMENT '鎵�灞炲簱鍖�'")
+	@TableField("dept_id")
+	private String deptId;
+
+	@Column(name = "depot_id", columnDefinition = "varchar(40) COMMENT '鎵�灞炰粨搴�'")
+	@TableField("depot_id")
+	private String depotId;
+
+	@Column(name = "ser_id", columnDefinition = "varchar(10) COMMENT '鎵�灞炲垎鏈�'")
+	@TableField("ser_id")
+	private String serId;
+
+	@Column(name = "pass_code", columnDefinition = "int(10) COMMENT '閫氶亾/鍦板潃'")
+	@TableField("pass_code")
+	private int passCode;
+
+	@Column(name = "name", columnDefinition = "varchar(40) COMMENT '鍒嗘満鍚嶇О'")
+	@TableField("name")
+	private String name;
+
+	@Column(name = "type", columnDefinition = "varchar(40) COMMENT '璁惧绫诲瀷'")
+	@TableField("type")
+	private String type = DeviceIotType.TYPE_01.getCode();
+
+	@Column(name = "remark", columnDefinition = "varchar(200) COMMENT '澶囨敞'")
+	@TableField("remark")
+	private String remark;
+
+	@Column(name = "pos_x", columnDefinition = "decimal(20,6) COMMENT 'X鍧愭爣'")
+	@TableField("pos_x")
+	private Double posX = 0.0;
+
+	@Column(name = "pos_y", columnDefinition = "decimal(20,6) COMMENT 'Y鍧愭爣'")
+	@TableField("pos_y")
+	private Double posY;
+}
\ No newline at end of file
diff --git a/fzzy-igdss-core/src/main/java/com/fzzy/igds/domain/DeviceSer.java b/fzzy-igdss-core/src/main/java/com/fzzy/igds/domain/DeviceSer.java
new file mode 100644
index 0000000..31b0e7b
--- /dev/null
+++ b/fzzy-igdss-core/src/main/java/com/fzzy/igds/domain/DeviceSer.java
@@ -0,0 +1,130 @@
+package com.fzzy.igds.domain;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fzzy.igds.constant.Constant;
+import com.fzzy.igds.constant.ControlModel;
+import com.fzzy.igds.constant.DeviceSerType;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import javax.persistence.*;
+import java.io.Serializable;
+
+/**
+ * @Description 閰嶇疆鍒嗘満鏈嶅姟
+ * @Author CZT
+ * @Date 2025/11/26 10:25
+ */
+@Data
+@Entity
+@Table(name = "d_device_ser")
+@TableName("d_device_ser")
+@EqualsAndHashCode(callSuper = false)
+@IdClass(DeviceSerKey.class)
+public class DeviceSer extends BizBaseEntity implements Serializable {
+
+	/**
+	 *
+	 */
+	private static final long serialVersionUID = 1L;
+
+	@Id
+	@Column(name = "id", columnDefinition = "varchar(40) COMMENT '绔欏彿/鍦板潃'")
+	@TableField("id")
+	private String id;
+
+	@Id
+	@Column(name = "dept_id", columnDefinition = "varchar(40) COMMENT '鎵�灞炲簱鍖�'")
+	@TableField("dept_id")
+	private String deptId;
+
+	@Column(name = "sn", columnDefinition = "varchar(40) COMMENT '搴忓垪鍙�'")
+	@TableField("sn")
+	private String sn;
+
+	@Column(name = "name", columnDefinition = "varchar(40) COMMENT '鍚嶇О'")
+	@TableField("name")
+	private String name;
+
+	@Column(name = "ip", columnDefinition = "varchar(40) COMMENT '鍒嗘満IP'")
+	@TableField("ip")
+	private String ip;
+
+	@Column(name = "port", columnDefinition = "int(5) COMMENT '鍒嗘満绔彛'")
+	@TableField("port")
+	private Integer port;
+
+	@Column(name = "type", columnDefinition = "varchar(40) COMMENT '鍒嗘満绫诲瀷'")
+	@TableField("type")
+	private String type = DeviceSerType.TYPE_01.getCode();
+
+	@Column(name = "status", columnDefinition = "varchar(2) COMMENT '鏄惁鍦ㄧ嚎(Y琛ㄧず鍦ㄧ嚎锛孨琛ㄧず鏂紑)'")
+	@TableField("status")
+	private String status = Constant.YN_N;
+
+	@Column(name = "control_model", columnDefinition = "varchar(10) COMMENT '鎿嶄綔妯″紡(杩滅▼鎴栬�呮湰鍦�)'")
+	@TableField("control_model")
+	private String controlModel = ControlModel.MODEL_01.getCode();
+
+	@Column(name = "network_type", columnDefinition = "varchar(10) COMMENT '缃戠粶妯″紡'")
+	@TableField("network_type")
+	private String networkType = Constant.NETWORK_01;
+
+	@Column(name = "protocol", columnDefinition = "varchar(40) COMMENT '鍒嗘満鍗忚'")
+	@TableField("protocol")
+	private String protocol;
+
+	@Column(name = "is_more_depot", columnDefinition = "varchar(40) COMMENT '鏄惁澶氫粨骞跺彂(Y-鏄紝N-鍚�,榛樿鍚�)'")
+	@TableField("is_more_depot")
+	private String isMoreDepot = Constant.YN_N;
+
+	@Column(name = "producer", columnDefinition = "varchar(40) COMMENT '鍘傚晢淇℃伅'")
+	@TableField("producer")
+	private String producer;
+
+	@Column(name = "remark", columnDefinition = "varchar(200) COMMENT '澶囨敞'")
+	@TableField("remark")
+	private String remark;
+
+	@Column(name = "order_num", columnDefinition = "int(5) COMMENT '鏄剧ず椤哄簭'")
+	@TableField("order_num")
+	private Integer orderNum = 1;
+
+	//-------------------------------鎵╁睍瀛楁--------------------//
+	@Column(name = "contact_phone", columnDefinition = "varchar(11) COMMENT '鍘傚晢鑱旂郴鐢佃瘽'")
+	@TableField("contact_phone")
+	private String contactPhone;
+
+	@Column(name = "power_model", columnDefinition = "varchar(2) COMMENT '渚涚數鏂瑰紡'")
+	@TableField("power_model")
+	private String powerModel = Constant.NETWORK_01;
+
+	@Column(name = "cable_start", columnDefinition = "int(2) COMMENT '寮�濮嬪垪'")
+	@TableField("cable_start")
+	private int cableStart = 1;
+
+	@Column(name = "cable_z", columnDefinition = "int(2) COMMENT '灞傞厤缃�'")
+	@TableField("cable_z")
+	private int cableZ = 0;
+
+	@Column(name = "cable_y", columnDefinition = "int(2) COMMENT '琛岄厤缃�'")
+	@TableField("cable_y")
+	private int cableY = 0;
+
+	@Column(name = "cable_x", columnDefinition = "int(2) COMMENT '鍒楅厤缃�'")
+	@TableField("cable_x")
+	private int cableX = 0;
+
+	@Column(name = "cable_type", columnDefinition = "varchar(40) COMMENT '鐢电紗绫诲瀷'")
+	@TableField("cable_type")
+	private String cableType;
+
+	@Column(name = "cable_format", columnDefinition = "varchar(40) COMMENT '鐢电紗鍒跺紡'")
+	@TableField("cable_format")
+	private String cableFormat;
+
+	@Column(name = "org_id", columnDefinition = "varchar(40) COMMENT '缁勭粐缂栧彿'")
+	@TableField("org_id")
+	private String orgId;
+
+}
\ No newline at end of file
diff --git a/fzzy-igdss-core/src/main/java/com/fzzy/igds/domain/DeviceSerKey.java b/fzzy-igdss-core/src/main/java/com/fzzy/igds/domain/DeviceSerKey.java
new file mode 100644
index 0000000..ba47ef5
--- /dev/null
+++ b/fzzy-igdss-core/src/main/java/com/fzzy/igds/domain/DeviceSerKey.java
@@ -0,0 +1,23 @@
+package com.fzzy.igds.domain;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import java.io.Serializable;
+
+/**
+ * @Description 鍒嗘満涓婚敭
+ * @Author CZT
+ * @Date 2025/11/26 10:18
+ */
+@Data
+@AllArgsConstructor
+public class DeviceSerKey implements Serializable {
+
+        private String id;
+
+        private String deptId;
+
+    public DeviceSerKey(){
+            super();
+        }
+    }
\ No newline at end of file
diff --git a/fzzy-igdss-core/src/main/java/com/fzzy/igds/domain/Grain.java b/fzzy-igdss-core/src/main/java/com/fzzy/igds/domain/Grain.java
new file mode 100644
index 0000000..0b49e78
--- /dev/null
+++ b/fzzy-igdss-core/src/main/java/com/fzzy/igds/domain/Grain.java
@@ -0,0 +1,117 @@
+package com.fzzy.igds.domain;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fzzy.igds.constant.Constant;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import javax.persistence.*;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @Description 绮儏鏁版嵁-涓昏〃
+ * @Author CZT
+ * @Date 2025/11/26 09:12
+ */
+@Data
+@Entity
+@Table(name = "d_grain")
+@TableName("d_grain")
+@IdClass(GrainKey.class)
+@EqualsAndHashCode(callSuper = false)
+public class Grain extends BizBaseEntity implements Serializable {
+
+    /**
+     *
+     */
+    private static final long serialVersionUID = 1L;
+
+    public static String SORT_PROP = "batchId";
+
+    @Id
+    @Column(name = "batch_id", columnDefinition = "varchar(40) COMMENT '鎵规缂栧彿'")
+    @TableField("batch_id")
+    private String batchId;
+
+    @Id
+    @Column(name = "dept_id", columnDefinition = "varchar(40) COMMENT '鎵�灞炲簱鍖�'")
+    @TableField("dept_id")
+    private String deptId;
+
+    @Id
+    @Column(name = "depot_id", columnDefinition = "varchar(40) COMMENT '鎵�灞炰粨搴�'")
+    @TableField("depot_id")
+    private String depotId;
+
+    @Column(name = "temp_min", columnDefinition = "decimal(20,2) COMMENT '鏈�浣庣伯娓�'")
+    @TableField("temp_min")
+    private Double tempMin = 0.0;
+
+    @Column(name = "temp_max", columnDefinition = "decimal(20,2) COMMENT '鏈�楂樼伯娓�'")
+    @TableField("temp_max")
+    private Double tempMax = 0.0;
+
+    @Column(name = "temp_ave", columnDefinition = "decimal(20,2) COMMENT '骞冲潎绮俯'")
+    @TableField("temp_ave")
+    private Double tempAve = 0.0;
+
+    @Column(name = "humidity_in", columnDefinition = "decimal(20,2) COMMENT '浠撳唴婀垮害'")
+    @TableField("humidity_in")
+    private Double humidityIn;
+
+    @Column(name = "temp_in", columnDefinition = "decimal(20,2) COMMENT '浠撳唴娓╁害'")
+    @TableField("temp_in")
+    private Double tempIn;
+
+    @Column(name = "humidity_out", columnDefinition = "decimal(20,2) COMMENT '浠撳婀垮害'")
+    @TableField("humidity_out")
+    private Double humidityOut;
+
+    @Column(name = "temp_out", columnDefinition = "decimal(20,2) COMMENT '浠撳娓╁害'")
+    @TableField("temp_out")
+    private Double tempOut;
+
+    @Column(name = "cable", columnDefinition = "varchar(20) COMMENT '灞傝鍒�(鐢ㄩ�楀彿闅斿紑鐨勯厤缃俊鎭�,灞�-琛�-鍒�)'")
+    @TableField("cable")
+    private String cable;
+
+    @Column(name = "cable_cir", columnDefinition = "varchar(20) COMMENT '绛掍粨灞傞厤缃�(鐢�-闅斿紑鐨勯厤缃俊鎭�)'")
+    @TableField("cable_cir")
+    private String cableCir;
+
+    @Column(name = "oil_height", columnDefinition = "varchar(20) COMMENT '娌归潰楂樺害(鐢�-闅斿紑鐨勪袱涓�硷紝娌归潰楂樺害-寤虹瓚楂樺害)'")
+    @TableField("oil_height")
+    private String oilHeight;
+
+    @Column(name = "weather", columnDefinition = "varchar(20) COMMENT '澶╂皵'")
+    @TableField("weather")
+    private String weather = "";
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @Column(name = "receive_date", columnDefinition = "datetime COMMENT '鎺ユ敹鏃堕棿'")
+    @TableField("receive_date")
+    private Date receiveDate;
+
+    @Column(name = "check_user", columnDefinition = "varchar(20) COMMENT '妫�娴嬩汉'")
+    @TableField("check_user")
+    private String checkUser;
+
+    @Column(name = "remark", columnDefinition = "varchar(100) COMMENT '澶囨敞璇存槑'")
+    @TableField("remark")
+    private String remark;
+
+    @Column(name = "points", columnDefinition = "longtext(2000) COMMENT '閲囬泦鐐逛俊鎭�'")
+    @TableField("points")
+    private String points;
+
+    @Column(name = "push_tag", columnDefinition = "varchar(2) COMMENT '鎺ㄩ�佹爣璁�'")
+    @TableField("push_tag")
+    private String pushTag = Constant.YN_N;
+
+    @Column(name = "batch_tag", columnDefinition = "varchar(2) COMMENT '鐢熸垚鏂瑰紡(01-璁惧閲囬泦锛�02-鎵嬪姩琛ュ綍)'")
+    @TableField("batch_tag")
+    private String batchTag = "01";
+
+}
diff --git a/fzzy-igdss-core/src/main/java/com/fzzy/igds/domain/GrainKey.java b/fzzy-igdss-core/src/main/java/com/fzzy/igds/domain/GrainKey.java
new file mode 100644
index 0000000..2edc7c9
--- /dev/null
+++ b/fzzy-igdss-core/src/main/java/com/fzzy/igds/domain/GrainKey.java
@@ -0,0 +1,24 @@
+package com.fzzy.igds.domain;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import java.io.Serializable;
+
+/**
+ * @Description 绮儏涓婚敭
+ * @Author CZT
+ * @Date 2025/11/26 09:11
+ */
+@Data
+@AllArgsConstructor
+public class GrainKey implements Serializable {
+    private String batchId;
+
+    private String companyId;
+
+    private String depotId;
+
+    public GrainKey() {
+        super();
+    }
+}
\ No newline at end of file
diff --git a/fzzy-igdss-core/src/main/java/com/fzzy/igds/domain/Quantity.java b/fzzy-igdss-core/src/main/java/com/fzzy/igds/domain/Quantity.java
new file mode 100644
index 0000000..90c2f30
--- /dev/null
+++ b/fzzy-igdss-core/src/main/java/com/fzzy/igds/domain/Quantity.java
@@ -0,0 +1,82 @@
+package com.fzzy.igds.domain;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import javax.persistence.*;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @Description 鏁伴噺妫�娴�
+ * @Author CZT
+ * @Date 2025/11/26 09:48
+ */
+@Data
+@Entity
+@Table(name = "d_quantity")
+@TableName("d_quantity")
+@IdClass(QuantityKey.class)
+@EqualsAndHashCode(callSuper = false)
+public class Quantity extends BizBaseEntity implements Serializable {
+
+    /**
+     *
+     */
+    private static final long serialVersionUID = 1L;
+
+    public static String SORT_PROP = "receiveDate";
+
+    @Id
+    @Column(name = "batch_id", columnDefinition = "varchar(40) COMMENT '鎵规缂栧彿'")
+    @TableField("batch_id")
+    private String batchId;
+
+    @Id
+    @Column(name = "dept_id", columnDefinition = "varchar(40) COMMENT '鎵�灞炲簱鍖�'")
+    @TableField("dept_id")
+    private String deptId;
+
+    @Id
+    @Column(name = "depot_id", columnDefinition = "varchar(40) COMMENT '鎵�灞炰粨搴�'")
+    @TableField("depot_id")
+    private String depotId;
+
+    @Column(name = "diameter", columnDefinition = "decimal(20,2) COMMENT '绛掍粨鐩村緞(鍗曚綅锛氱背)'")
+    @TableField("diameter")
+    private Double diameter = 0.0;
+
+    @Column(name = "height", columnDefinition = "decimal(20,2) COMMENT '妫�娴嬮珮搴�(鍗曚綅锛氱背)'")
+    @TableField("height")
+    private Double height = 0.0;
+
+    @Column(name = "bulk", columnDefinition = "decimal(20,2) COMMENT '浣撶Н(鍗曚綅锛氱珛鏂圭背)'")
+    @TableField("bulk")
+    private Double bulk = 0.00;
+
+    @Column(name = "weight", columnDefinition = "decimal(20,2) COMMENT '閲嶉噺(鍗曚綅锛欿G)'")
+    @TableField("weight")
+    private Double weight = 0.00;
+
+    @Column(name = "points", columnDefinition = "longtext(2000) COMMENT '閲囬泦鐐逛俊鎭�'")
+    @TableField("points")
+    private String points;
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @Column(name = "receive_date", columnDefinition = "datetime COMMENT '妫�娴嬫椂闂�'")
+    @TableField("receive_date")
+    private Date receiveDate;
+
+    @Column(name = "check_user", columnDefinition = "varchar(20) COMMENT '妫�娴嬩汉'")
+    @TableField("check_user")
+    private String checkUser;
+
+    @Column(name = "remark", columnDefinition = "varchar(100) COMMENT '澶囨敞璇存槑'")
+    @TableField("remark")
+    private String remark;
+
+    @Transient
+    private Depot depotData;
+}
diff --git a/fzzy-igdss-core/src/main/java/com/fzzy/igds/domain/QuantityConf.java b/fzzy-igdss-core/src/main/java/com/fzzy/igds/domain/QuantityConf.java
new file mode 100644
index 0000000..b2225c6
--- /dev/null
+++ b/fzzy-igdss-core/src/main/java/com/fzzy/igds/domain/QuantityConf.java
@@ -0,0 +1,156 @@
+package com.fzzy.igds.domain;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import javax.persistence.*;
+import java.io.Serializable;
+
+/**
+ * @Description 璐ㄩ噺宸℃閰嶇疆
+ * @Author CZT
+ * @Date 2025/11/26 09:25
+ */
+@Data
+@Entity
+@Table(name = "d_quantity")
+@TableName("d_quantity")
+@EqualsAndHashCode(callSuper = false)
+public class QuantityConf extends BizBaseEntity implements Serializable {
+
+    /**
+     *
+     */
+    private static final long serialVersionUID = 1L;
+
+    @Id
+    @Column(name = "depot_id", columnDefinition = "varchar(40) COMMENT '鎵�灞炰粨搴�'")
+    @TableField("depot_id")
+    private String depotId;
+
+    @Column(name = "dept_id", columnDefinition = "varchar(40) COMMENT '鎵�灞炲簱鍖�'")
+    @TableField("dept_id")
+    private String deptId;
+
+    //璁惧淇℃伅
+    @Column(name = "name", columnDefinition = "varchar(40) COMMENT '璁惧鍚嶇О'")
+    @TableField("name")
+    private String name;
+
+    @Column(name = "sn", columnDefinition = "varchar(40) COMMENT '璁惧SN'")
+    @TableField("sn")
+    private String sn;
+
+    @Column(name = "ip", columnDefinition = "varchar(40) COMMENT '閫氳IP'")
+    @TableField("ip")
+    private String ip;
+
+    @Column(name = "port", columnDefinition = "int(5) COMMENT '閫氳绔彛'")
+    @TableField("port")
+    private Integer port;
+
+    @Column(name = "status", columnDefinition = "varchar(40) COMMENT '鏄惁鍦ㄧ嚎'")
+    @TableField("status")
+    private String status;
+
+    @Column(name = "protocol", columnDefinition = "varchar(40) COMMENT '鍒嗘満鍗忚'")
+    @TableField("protocol")
+    private String protocol;
+
+    @Column(name = "login_id", columnDefinition = "varchar(40) COMMENT '甯愬彿'")
+    @TableField("login_id")
+    private String loginId;
+
+    @Column(name = "pwd", columnDefinition = "varchar(40) COMMENT '瀵嗙爜'")
+    @TableField("pwd")
+    private String pwd;
+
+    //鏁伴噺妫�娴嬮厤缃�
+    @Column(name = "length1", columnDefinition = "decimal(20,2) COMMENT '璺濈1(鎺㈠ご鍒扮涓�闈㈠鐨勮窛绂伙紝鍗曚綅绫筹紝鍙兘鏈夊皬鏁扮偣銆�)'")
+    @TableField("length1")
+    private Double length1 = 0.0;
+
+    @Column(name = "length2", columnDefinition = "decimal(20,2) COMMENT '璺濈2(鎺㈠ご鍒扮浜岄潰澧欑殑璺濈锛屽崟浣嶇背锛屽彲鑳芥湁灏忔暟鐐广��)'")
+    @TableField("length2")
+    private Double length2 = 0.0;
+
+    @Column(name = "length3", columnDefinition = "decimal(20,2) COMMENT '璺濈3(鎺㈠ご鍒扮涓夐潰澧欑殑璺濈锛屽崟浣嶇背锛屽彲鑳芥湁灏忔暟鐐广��)'")
+    @TableField("length3")
+    private Double length3 = 0.0;
+
+    @Column(name = "length4", columnDefinition = "decimal(20,2) COMMENT '璺濈4(鎺㈠ご鍒扮鍥涢潰澧欑殑璺濈锛屽崟浣嶇背锛屽彲鑳芥湁灏忔暟鐐广��)'")
+    @TableField("length4")
+    private Double length4 = 0.0;
+
+    @Column(name = "width", columnDefinition = "decimal(20,2) COMMENT '浠撴埧瀹�(鍗曚綅绫筹紝鍙兘鏈夊皬鏁扮偣銆�)'")
+    @TableField("width")
+    private Double width = 0.0;
+
+    @Column(name = "length", columnDefinition = "decimal(20,2) COMMENT '浠撴埧闀�(鍗曚綅绫筹紝鍙兘鏈夊皬鏁扮偣銆�)'")
+    @TableField("length")
+    private Double length = 0.0;
+
+    @Column(name = "height", columnDefinition = "decimal(20,2) COMMENT '鎺㈠ご楂�(鎺㈠ご鍒板湴闈㈤珮搴�,鍗曚綅绫筹紝鍙兘鏈夊皬鏁扮偣銆�)'")
+    @TableField("height")
+    private Double height = 0.0;
+
+    @Column(name = "line_height", columnDefinition = "decimal(20,2) COMMENT '鍫嗙伯绾块珮(鍫嗙伯绾垮埌鍦伴潰楂樺害,鍗曚綅绫筹紝鍙兘鏈夊皬鏁扮偣銆�)'")
+    @TableField("line_height")
+    private Double lineHeight = 0.0;
+
+    @Column(name = "yt_ip", columnDefinition = "varchar(20) COMMENT '鐩戞帶ip(铚�姹夌殑灏嗚澶噄p閰嶇疆鍦ㄨ繖閲�)'")
+    @TableField("yt_ip")
+    private String ytIp;
+
+    @Column(name = "camera_sn", columnDefinition = "varchar(40) COMMENT '鐩戞帶SN'")
+    @TableField("camera_sn")
+    private String cameraSn;
+
+    @Column(name = "port_ctrl", columnDefinition = "int(5) COMMENT '鎺у埗绔彛'")
+    @TableField("port_ctrl")
+    private Integer portCtrl = 554;
+
+    @Column(name = "port_web", columnDefinition = "int(5) COMMENT 'WEB绔彛'")
+    @TableField("port_web")
+    private Integer portWeb = 80;
+
+    @Column(name = "chan_num", columnDefinition = "int(5) COMMENT '閫氶亾鍙�'")
+    @TableField("chan_num")
+    private Integer chanNum = 1;
+
+    @Column(name = "play_type", columnDefinition = "varchar(40) COMMENT '鎾斁鏂瑰紡'")
+    @TableField("play_type")
+    private String playType;
+
+    @Column(name = "snap_type", columnDefinition = "varchar(40) COMMENT '鎶撴媿鏂瑰紡'")
+    @TableField("snap_type")
+    private String snapType;
+
+    @Column(name = "url_in", columnDefinition = "varchar(100) COMMENT '鍐呯綉鐩存挱鍦板潃'")
+    @TableField("url_in")
+    private String urlIn;
+
+    @Column(name = "url_out", columnDefinition = "varchar(100) COMMENT '澶栫綉鐩存挱鍦板潃'")
+    @TableField("url_out")
+    private String urlOut;
+
+    @Column(name = "media_addr", columnDefinition = "varchar(100) COMMENT 'RTSP鍦板潃'")
+    @TableField("media_addr")
+    private String mediaAddr;
+
+    @Column(name = "order_num", columnDefinition = "int(5) COMMENT '鏄剧ず椤哄簭'")
+    @TableField("order_num")
+    private Integer orderNum = 1;
+
+    //鍏朵粬淇℃伅
+    @Column(name = "remark", columnDefinition = "varchar(100) COMMENT '澶囨敞璇存槑'")
+    @TableField("remark")
+    private String remark;
+
+    @Transient
+    private String playAddr;//瑙嗛鎾斁鍦板潃锛屾牴鎹笉鍚岀殑鎾斁鏂瑰紡鐢熸垚涓嶅悓鐨勬挱鏀惧湴鍧�
+
+    @Transient
+    private String msg;
+}
diff --git a/fzzy-igdss-core/src/main/java/com/fzzy/igds/domain/QuantityKey.java b/fzzy-igdss-core/src/main/java/com/fzzy/igds/domain/QuantityKey.java
new file mode 100644
index 0000000..19307f4
--- /dev/null
+++ b/fzzy-igdss-core/src/main/java/com/fzzy/igds/domain/QuantityKey.java
@@ -0,0 +1,25 @@
+package com.fzzy.igds.domain;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import java.io.Serializable;
+
+/**
+ * @Description 鏁伴噺妫�娴嬫暟鎹富閿�
+ * @Author CZT
+ * @Date 2025/11/26 09:42
+ */
+@Data
+@AllArgsConstructor
+public class QuantityKey implements Serializable {
+
+    private String batchId;
+
+    private String deptId;
+
+    private String depotId;
+
+    public QuantityKey() {
+        super();
+    }
+}
\ No newline at end of file

--
Gitblit v1.9.3