From 2f8555410f031e66ee91ee60f64d1cc9a34cc7d9 Mon Sep 17 00:00:00 2001
From: dangsn <dangsn@vci-tech.com>
Date: 星期三, 25 十二月 2024 17:44:38 +0800
Subject: [PATCH] 1、首页配置 2、调整BaseModelDTO的位置
---
Source/plt-web/plt-web-parent/plt-web-base/src/main/java/com/vci/starter/web/model/BaseModel.java | 332 ++++++++++++++++++++++++-------------------------------
1 files changed, 144 insertions(+), 188 deletions(-)
diff --git a/Source/plt-web/plt-web-parent/plt-web-base/src/main/java/com/vci/starter/web/model/BaseModel.java b/Source/plt-web/plt-web-parent/plt-web-base/src/main/java/com/vci/starter/web/model/BaseModel.java
index 1d350ad..b68afbd 100644
--- a/Source/plt-web/plt-web-parent/plt-web-base/src/main/java/com/vci/starter/web/model/BaseModel.java
+++ b/Source/plt-web/plt-web-parent/plt-web-base/src/main/java/com/vci/starter/web/model/BaseModel.java
@@ -18,198 +18,196 @@
*/
public class BaseModel implements java.io.Serializable{
-
/**
* 涓婚敭锛屽鏋滆嚜宸辩殑瀵硅薄锛屼笉鏄痮id浣滀负涓婚敭鐨勮瘽锛岄渶瑕佺敤id杩欎釜娉ㄨВ
*/
- @Column(nullable = false,length = 50)
+ @Column(nullable = false)
private String oid;
-
- /**
- * 浠ｅ彿锛涘彲浠ヨ缃睘鎬х殑鏄犲皠锛宯ame琛ㄧず鍦ㄥ钩鍙扮殑涓氬姟绫诲瀷涓殑灞炴�у悕绉帮紝蹇呴』涓哄皬鍐欙紱
- */
- @Column(length = 50)
- private String id;
-
- /**
- * 鍚嶇О锛涗篃鍙互涓嶈缃睘鎬ф槧灏勶紝榛樿鏄瓧娈靛悕鐨勫皬鍐�
- */
- @Column(length = 50)
- private String name;
-
- /**
- * 鎻忚堪
- */
- @Column(length = 250)
- private String description;
-
+
/**
* 鐗堟湰鐨勪富閿�
*/
- @Column(length = 50)
+ @Column()
private String revisionOid;
-
+
/**
* 瀵硅薄鐨勪富閿�
*/
- @Column(length = 50)
+ @Column()
private String nameOid;
-
+
/**
* 涓氬姟绫诲瀷鐨勫悕绉�
*/
- @Column(length = 30)
- private String btmname;
-
+ @Column()
+ private String btmName;
+
/**
- * 鏄惁鏈�鍚庣増鏈�
+ * 鏄惁鏈�鍚庣増鏈��1锛氭槸锛�0锛氬惁
*/
@Column(length=1)
private String lastR;
-
-
+
+
/**
- * 鏄惁鏈�鍒濈増鏈�
+ * 鏄惁鏈�鍒濈増鏈��1锛氭槸锛�0锛氬惁
*/
@Column(length=1)
private String firstR;
-
-
+
+
/**
- * 鏄惁鏈�鏂扮増娆�
+ * 鏄惁鏈�鏂扮増娆°��1锛氭槸锛�0锛氬惁
*/
@Column(length=1)
private String lastV;
-
-
+
+
/**
- * 鏄惁鏈�鏃╃増娆�
+ * 鏄惁鏈�鏃╃増娆°��1锛氭槸锛�0锛氬惁
*/
@Column(length=1)
private String firstV;
-
+
/**
* 鍒涘缓浜�
*/
- @Column(length = 50,nullable = false)
+ @Column(nullable = false)
private String creator;
-
+
/**
* 鍒涘缓鏃堕棿
*/
@Column(nullable = false)
@VciFieldType(VciFieldTypeEnum.VTDateTime)
private Date createTime;
-
+
/**
* 鏈�鍚庝慨鏀逛汉
*/
- @Column(length = 50,nullable = false)
+ @Column(nullable = false)
private String lastModifier;
-
+
/**
* 鏈�鍚庝慨鏀规椂闂达紝鏍煎紡鏄痽yyy-MM-dd HH:mm:ss.SSS
*/
@VciFieldType(VciFieldTypeEnum.VTDateTime)
private Date lastModifyTime;
-
+
/**
* 鐗堟湰瑙勫垯
*/
- @Column(length = 50)
+ @Column()
private String revisionRule;
+ /**
+ * 鐗堟瑙勫垯
+ */
+ @Column()
+ private String versionRule;
/**
* 鐗堟湰搴忓彿
*/
@VciFieldType(VciFieldTypeEnum.VTInteger)
private int revisionSeq;
-
+
/**
* 鐗堟湰鍊�
*/
- @Column(length = 50)
+ @Column()
private String revisionValue;
-
-
- /**
- * 鐗堟瑙勫垯
- */
- @Column(length = 50)
- private String versionRule;
/**
* 鐗堟鎺掑簭
*/
@VciFieldType(VciFieldTypeEnum.VTInteger)
private int versionSeq;
-
+
/**
* 鐗堟鍊�
*/
- @Column(length = 50)
+ @Column()
private String versionValue;
/**
* 鐢熷懡鍛ㄦ湡鐨勭紪鍙�
*/
- @Transient()
- private String lctid;
+ @Column()
+ private String lctId;
/**
* 鐢熷懡鍛ㄦ湡鍊�
*/
- @Column(length = 50)
+ @Column()
private String lcStatus;
+
+ /**
+ * 鏃堕棿鎴筹紝鏍煎紡鏄痽yyy-MM-dd HH:mm:ss.SSS
+ */
+ @JsonFormat(pattern = VciDateUtil.DateTimeMillFormat)
+ @VciFieldType(VciFieldTypeEnum.VTDateTime)
+ private Date ts;
+
+ /**
+ * 浠ｅ彿锛涘彲浠ヨ缃睘鎬х殑鏄犲皠锛宯ame琛ㄧず鍦ㄥ钩鍙扮殑涓氬姟绫诲瀷涓殑灞炴�у悕绉帮紝蹇呴』涓哄皬鍐欙紱
+ */
+ @Column()
+ private String id;
+
+ /**
+ * 鍚嶇О锛涗篃鍙互涓嶈缃睘鎬ф槧灏勶紝榛樿鏄瓧娈靛悕鐨勫皬鍐�
+ */
+ @Column()
+ private String name;
+
+ /**
+ * 鎻忚堪
+ */
+ @Column()
+ private String description;
+
+ /**
+ * 鎷ユ湁鑰咃紝涓庡垱寤鸿�呮湁鍖哄埆锛屽父鐢ㄤ簬鎺у埗鏁版嵁鏉冮檺
+ */
+ @Column(length = 50)
+ private String owner;
+
+ /**
+ * 绛惧叆浜�--绛惧叆鍜岀鍑烘暟鎹槸浜掓枼
+ */
+ @Column(length = 50)
+ private String checkInBy;
+
+ /**
+ * 绛惧叆鏃堕棿
+ */
+ @VciFieldType(VciFieldTypeEnum.VTDateTime)
+ private Date checkInTime;
+
+ /**
+ * 绛惧嚭浜�
+ */
+ @Column(length = 50)
+ private String checkOutBy;
+
+ /**
+ * 绛惧嚭鏃堕棿
+ */
+ @VciFieldType(VciFieldTypeEnum.VTDateTime)
+ private Date checkOutTime;
+
+ /**
+ * 浠庡摢涓増鏈嫹璐�
+ */
+ @Column(length = 50)
+ private String copyFromVersion;
/**
* 鐢熷懡鍛ㄦ湡鏄剧ず鏂囨湰
*/
@Transient(referColumn="lcStatus_text")
private String lcStatusText;
-
- /**
- * 鏃堕棿鎴筹紝鏍煎紡鏄痽yyy-MM-dd HH:mm:ss.SSS
- */
- @JsonFormat(pattern = VciDateUtil.DateTimeMillFormat)
- private Date ts;
-
- /**
- * 鎷ユ湁鑰咃紝涓庡垱寤鸿�呮湁鍖哄埆锛屽父鐢ㄤ簬鎺у埗鏁版嵁鏉冮檺
- */
- @Column(length = 50)
- private String owner;
-
- /**
- * 绛惧叆浜�--绛惧叆鍜岀鍑烘暟鎹槸浜掓枼
- */
- @Column(length = 50)
- private String checkInBy;
-
- /**
- * 绛惧叆鏃堕棿
- */
- @VciFieldType(VciFieldTypeEnum.VTDateTime)
- private Date checkInTime;
-
- /**
- * 绛惧嚭浜�
- */
- @Column(length = 50)
- private String checkOutBy;
-
- /**
- * 绛惧嚭鏃堕棿
- */
- @VciFieldType(VciFieldTypeEnum.VTDateTime)
- private Date checkOutTime;
-
- /**
- * 浠庡摢涓増鏈嫹璐�
- */
- @Column(length = 50)
- private String copyFromVersion;
/**
* 瀵嗙骇
@@ -237,30 +235,6 @@
this.oid = oid;
}
- public String getId() {
- return id;
- }
-
- public void setId(String id) {
- this.id = id;
- }
-
- public String getName() {
- return name;
- }
-
- public void setName(String name) {
- this.name = name;
- }
-
- public String getDescription() {
- return description;
- }
-
- public void setDescription(String description) {
- this.description = description;
- }
-
public String getRevisionOid() {
return revisionOid;
}
@@ -277,14 +251,13 @@
this.nameOid = nameOid;
}
- public String getBtmname() {
- return btmname;
+ public String getBtmName() {
+ return btmName;
}
- public void setBtmname(String btmname) {
- this.btmname = btmname;
+ public void setBtmName(String btmName) {
+ this.btmName = btmName;
}
-
public String getLastR() {
return lastR;
@@ -324,6 +297,14 @@
public void setCreator(String creator) {
this.creator = creator;
+ }
+
+ public Date getCreateTime() {
+ return createTime;
+ }
+
+ public void setCreateTime(Date createTime) {
+ this.createTime = createTime;
}
public String getLastModifier() {
@@ -390,6 +371,14 @@
this.versionValue = versionValue;
}
+ public String getLctId() {
+ return lctId;
+ }
+
+ public void setLctId(String lctId) {
+ this.lctId = lctId;
+ }
+
public String getLcStatus() {
return lcStatus;
}
@@ -404,6 +393,30 @@
public void setTs(Date ts) {
this.ts = ts;
+ }
+
+ public String getId() {
+ return id;
+ }
+
+ public void setId(String id) {
+ this.id = id;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public String getDescription() {
+ return description;
+ }
+
+ public void setDescription(String description) {
+ this.description = description;
}
public String getOwner() {
@@ -462,14 +475,6 @@
this.lcStatusText = lcStatusText;
}
- public Date getCreateTime() {
- return createTime;
- }
-
- public void setCreateTime(Date createTime) {
- this.createTime = createTime;
- }
-
public Integer getSecretGrade() {
return secretGrade;
}
@@ -486,60 +491,11 @@
this.secretGradeText = secretGradeText;
}
- public String getLctid() {
- return lctid;
- }
-
- public void setLctid(String lctid) {
- this.lctid = lctid;
- }
-
-
public Map<String, String> getData() {
return data;
}
public void setData(Map<String, String> data) {
this.data = data;
- }
-
- @Override
- public String toString() {
- return "BaseModel{" +
- "oid='" + oid + '\'' +
- ", id='" + id + '\'' +
- ", name='" + name + '\'' +
- ", description='" + description + '\'' +
- ", revisionOid='" + revisionOid + '\'' +
- ", nameOid='" + nameOid + '\'' +
- ", btmname='" + btmname + '\'' +
- ", lastR='" + lastR + '\'' +
- ", firstR='" + firstR + '\'' +
- ", lastV='" + lastV + '\'' +
- ", firstV='" + firstV + '\'' +
- ", creator='" + creator + '\'' +
- ", createTime=" + createTime +
- ", lastModifier='" + lastModifier + '\'' +
- ", lastModifyTime=" + lastModifyTime +
- ", revisionRule='" + revisionRule + '\'' +
- ", revisionSeq=" + revisionSeq +
- ", revisionValue='" + revisionValue + '\'' +
- ", versionRule='" + versionRule + '\'' +
- ", versionSeq=" + versionSeq +
- ", versionValue='" + versionValue + '\'' +
- ", lctid='" + lctid + '\'' +
- ", lcStatus='" + lcStatus + '\'' +
- ", lcStatusText='" + lcStatusText + '\'' +
- ", ts=" + ts +
- ", owner='" + owner + '\'' +
- ", checkInBy='" + checkInBy + '\'' +
- ", checkInTime=" + checkInTime +
- ", checkOutBy='" + checkOutBy + '\'' +
- ", checkOutTime=" + checkOutTime +
- ", copyFromVersion='" + copyFromVersion + '\'' +
- ", secretGrade=" + secretGrade +
- ", secretGradeText='" + secretGradeText + '\'' +
- ", data=" + data +
- '}';
}
}
--
Gitblit v1.9.3