From 34abe3473f7e4deaac31a0ad38f855eeafbf9266 Mon Sep 17 00:00:00 2001
From: jiazx0107@163.com <jiazx0107@163.com>
Date: 星期一, 29 五月 2023 20:59:46 +0800
Subject: [PATCH] 出入库优化-登记1

---
 igds-core/src/main/java/com/ld/igds/models/InoutConf.java |  200 +++++++++++++++++++++++++------------------------
 1 files changed, 102 insertions(+), 98 deletions(-)

diff --git a/igds-core/src/main/java/com/ld/igds/models/InoutConf.java b/igds-core/src/main/java/com/ld/igds/models/InoutConf.java
index 4b802c3..c74a4d4 100644
--- a/igds-core/src/main/java/com/ld/igds/models/InoutConf.java
+++ b/igds-core/src/main/java/com/ld/igds/models/InoutConf.java
@@ -16,130 +16,134 @@
 @Table(name = "D_INOUT_CONF")
 public class InoutConf implements Serializable {
 
-	/**
-	 * 
-	 */
-	private static final long serialVersionUID = 1L;
+    /**
+     *
+     */
+    private static final long serialVersionUID = 1L;
 
-	@Id
-	@Column(name = "ID_", length = 40)
-	@PropertyDef(label = "涓婚敭")
-	private String id;
+    @Id
+    @Column(name = "ID_", length = 40)
+    @PropertyDef(label = "涓婚敭")
+    private String id;
 
-	@Column(name = "COMPANY_ID_", length = 10)
-	@PropertyDef(label = "缁勭粐缂栫爜")
-	private String companyId;
+    @Column(name = "COMPANY_ID_", length = 10)
+    @PropertyDef(label = "缁勭粐缂栫爜")
+    private String companyId;
 
-	@Column(name = "DEPT_ID_", length = 40)
-	@PropertyDef(label = "鎵�灞炲簱鍖�")
-	private String deptId;
+    @Column(name = "DEPT_ID_", length = 40)
+    @PropertyDef(label = "鎵�灞炲簱鍖�")
+    private String deptId;
 
-	@Column(name = "SORT_", length = 2)
-	@PropertyDef(label = "鍑哄叆搴撻厤濂楀簭鍙�")
-	private String sort = "1";
+    @Column(name = "SORT_", length = 2)
+    @PropertyDef(label = "鍑哄叆搴撻厤濂楀簭鍙�")
+    private String sort = "1";
 
-	@Column(name = "IN_ORDER_")
-	@PropertyDef(label = "璁惧椤哄簭")
-	private int inOrder = 1;
+    @Column(name = "IN_ORDER_")
+    @PropertyDef(label = "璁惧椤哄簭")
+    private int inOrder = 1;
 
-	@Column(name = "INTOU_PROGRESS_", length = 20)
-	@PropertyDef(label = "鎵�灞炴祦绋�")
-	private String inoutProgress;
+    @Column(name = "INTOU_PROGRESS_", length = 20)
+    @PropertyDef(label = "鎵�灞炴祦绋�")
+    private String inoutProgress;
 
-	@Column(name = "NAME_", length = 30)
-	@PropertyDef(label = "璁惧鍚嶇О")
-	private String name;
+    @Column(name = "NAME_", length = 30)
+    @PropertyDef(label = "璁惧鍚嶇О")
+    private String name;
 
-	@Column(name = "SN_", length = 46)
-	@PropertyDef(label = "璁惧搴忓垪鍙�")
-	private String sn;
+    @Column(name = "SN_", length = 46)
+    @PropertyDef(label = "璁惧搴忓垪鍙�")
+    private String sn;
 
-	@Column(name = "IP_", length = 20)
-	@PropertyDef(label = "鍒嗘満IP")
-	private String ip;
+    @Column(name = "IP_", length = 20)
+    @PropertyDef(label = "鍒嗘満IP")
+    private String ip;
 
-	@Column(name = "PORT_")
-	@PropertyDef(label = "鍒嗘満绔彛")
-	private Integer port;
+    @Column(name = "PORT_")
+    @PropertyDef(label = "鍒嗘満绔彛")
+    private Integer port;
 
-	@Column(name = "LOGIN_ID_", length = 20)
-	@PropertyDef(label = "甯愬彿")
-	private String loginId;
+    @Column(name = "LOGIN_ID_", length = 20)
+    @PropertyDef(label = "甯愬彿")
+    private String loginId;
 
-	@Column(name = "PWD_", length = 20)
-	@PropertyDef(label = "瀵嗙爜")
-	private String pwd;
+    @Column(name = "PWD_", length = 20)
+    @PropertyDef(label = "瀵嗙爜")
+    private String pwd;
 
-	@Column(name = "CHAN_NUM_")
-	@PropertyDef(label = "閫氶亾鍙�")
-	private int chanNum = 1;
+    @Column(name = "CHAN_NUM_")
+    @PropertyDef(label = "閫氶亾鍙�")
+    private int chanNum = 1;
 
-	@Column(name = "PORT_CTRL_")
-	@PropertyDef(label = "鎺у埗绔彛")
-	private Integer portCtrl;
+    @Column(name = "PORT_CTRL_")
+    @PropertyDef(label = "鎺у埗绔彛")
+    private Integer portCtrl;
 
 //	@Column(name = "PORT_WEB_")
 //	@PropertyDef(label = "WEB绔彛")
 //	private Integer portWeb;
 
-	@Column(name = "TYPE_", length = 10)
-	@PropertyDef(label = "璁惧绫诲瀷")
-	private String type;
+    @Column(name = "TYPE_", length = 10)
+    @PropertyDef(label = "璁惧绫诲瀷")
+    private String type;
 
-	@Column(name = "STATUS_", length = 10)
-	@PropertyDef(label = "鏄惁鍦ㄧ嚎")
-	private String status;
+    @Column(name = "STATUS_", length = 10)
+    @PropertyDef(label = "鏄惁鍦ㄧ嚎")
+    private String status;
 
-	@Column(name = "PROTOCOL_", length = 40)
-	@PropertyDef(label = "鍗忚", description = "涓嶅悓鍘傚晢鏈変笉鍚岀殑鍗忚")
-	private String protocol;
+    @Column(name = "PROTOCOL_", length = 40)
+    @PropertyDef(label = "鍗忚", description = "涓嶅悓鍘傚晢鏈変笉鍚岀殑鍗忚")
+    private String protocol;
 
-	@Column(name = "PLAY_TYPE_", length = 25)
-	@PropertyDef(label = "鎾斁鏂瑰紡")
-	private String playType;
+    @Column(name = "PLAY_TYPE_", length = 25)
+    @PropertyDef(label = "鎾斁鏂瑰紡")
+    private String playType;
 
-	@Column(name = "SNAP_TYPE_", length = 25)
-	@PropertyDef(label = "鎶撴媿鏂瑰紡")
-	private String snapType;
+    @Column(name = "SNAP_TYPE_", length = 25)
+    @PropertyDef(label = "鎶撴媿鏂瑰紡")
+    private String snapType;
 
-	@Column(name = "MEDIA_ADDR_", length = 100)
-	@PropertyDef(label = "鏈湴鎾斁鍦板潃")
-	private String mediaAddr;
+    @Column(name = "MEDIA_ADDR_", length = 100)
+    @PropertyDef(label = "鏈湴鎾斁鍦板潃")
+    private String mediaAddr;
 
-	@Column(name = "REMARK_", length = 100)
-	@PropertyDef(label = "澶囨敞")
-	private String remark;
+    @Column(name = "REMARK_", length = 100)
+    @PropertyDef(label = "澶囨敞")
+    private String remark;
 
-	@Transient
-	@PropertyDef(label = "寮傚父淇℃伅")
-	private String errorMsg;
+    @Transient
+    @PropertyDef(label = "寮傚父淇℃伅")
+    private String errorMsg;
 
-	public InoutConf() {
-		super();
-	}
+    public InoutConf() {
+        super();
+    }
 
-	public InoutConf(InoutConf conf) {
-		this.id = conf.getId();
-		this.companyId = conf.getCompanyId();
-		this.deptId = conf.getDeptId();
-		this.sort = conf.getSort();
-		this.inOrder = conf.getInOrder();
-		this.inoutProgress = conf.getInoutProgress();
-		this.name = conf.getName();
-		this.sn = conf.getSn();
-		this.ip = conf.getIp();
-		this.port = conf.getPort();
-		this.loginId = conf.getLoginId();
-		this.pwd = conf.getPwd();
-		this.chanNum = conf.getChanNum();
-		this.portCtrl = conf.getPortCtrl();
-		this.type = conf.getType();
-		this.status = conf.getStatus();
-		this.protocol = conf.getProtocol();
-		this.playType = conf.getPlayType();
-		this.snapType = conf.getSnapType();
-		this.mediaAddr = conf.getMediaAddr();
-		this.remark = conf.getRemark();
-		this.errorMsg = conf.getErrorMsg();
-	}
+    public InoutConf(InoutConf conf) {
+        this.id = conf.getId();
+        this.companyId = conf.getCompanyId();
+        this.deptId = conf.getDeptId();
+        this.sort = conf.getSort();
+        this.inOrder = conf.getInOrder();
+        this.inoutProgress = conf.getInoutProgress();
+        this.name = conf.getName();
+        this.sn = conf.getSn();
+        this.ip = conf.getIp();
+        this.port = conf.getPort();
+        this.loginId = conf.getLoginId();
+        this.pwd = conf.getPwd();
+        this.chanNum = conf.getChanNum();
+        this.portCtrl = conf.getPortCtrl();
+        this.type = conf.getType();
+        this.status = conf.getStatus();
+        this.protocol = conf.getProtocol();
+        this.playType = conf.getPlayType();
+        this.snapType = conf.getSnapType();
+        this.mediaAddr = conf.getMediaAddr();
+        this.remark = conf.getRemark();
+        this.errorMsg = conf.getErrorMsg();
+    }
+
+    public InoutConf(String sort) {
+        this.sort = sort;
+    }
 }

--
Gitblit v1.9.3