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/pagemodel/BaseModelVO.java | 261 +++++++++++++++++++++------------------------------
1 files changed, 107 insertions(+), 154 deletions(-)
diff --git a/Source/plt-web/plt-web-parent/plt-web-base/src/main/java/com/vci/starter/web/pagemodel/BaseModelVO.java b/Source/plt-web/plt-web-parent/plt-web-base/src/main/java/com/vci/starter/web/pagemodel/BaseModelVO.java
index 1b0f772..3a961de 100644
--- a/Source/plt-web/plt-web-parent/plt-web-base/src/main/java/com/vci/starter/web/pagemodel/BaseModelVO.java
+++ b/Source/plt-web/plt-web-parent/plt-web-base/src/main/java/com/vci/starter/web/pagemodel/BaseModelVO.java
@@ -1,7 +1,5 @@
package com.vci.starter.web.pagemodel;
-import com.vci.starter.web.annotation.Transient;
-
import java.util.Date;
import java.util.Map;
@@ -10,100 +8,73 @@
* @author weidy
*/
public class BaseModelVO implements java.io.Serializable{
-
-
/**
- * 涓婚敭
+ * 涓婚敭锛屽鏋滆嚜宸辩殑瀵硅薄锛屼笉鏄痮id浣滀负涓婚敭鐨勮瘽锛岄渶瑕佺敤id杩欎釜娉ㄨВ
*/
private String oid;
-
- /**
- * 浠ｅ彿
- */
- private String id;
-
- /**
- * 鍚嶇О
- */
- private String name;
-
- /**
- * 鎻忚堪
- */
- private String description;
-
+
/**
* 鐗堟湰鐨勪富閿�
*/
private String revisionOid;
-
+
/**
- * 鍚嶇О鐨勪富閿�
+ * 瀵硅薄鐨勪富閿�
*/
private String nameOid;
-
+
/**
* 涓氬姟绫诲瀷鐨勫悕绉�
*/
- private String btmname;
-
+ private String btmName;
+
/**
- * 鏄惁鏈�鍚庣増娆�
+ * 鏄惁鏈�鍚庣増鏈��1锛氭槸锛�0锛氬惁
*/
private String lastR;
-
-
+
+
/**
- * 鏄惁鏈�鍒濈増娆�
+ * 鏄惁鏈�鍒濈増鏈��1锛氭槸锛�0锛氬惁
*/
private String firstR;
+
/**
- * 鏄惁鏈�鏂扮増鏈�
+ * 鏄惁鏈�鏂扮増娆°��1锛氭槸锛�0锛氬惁
*/
private String lastV;
-
-
+
+
/**
- * 鏄惁鏈�鏃╃増鏈�
+ * 鏄惁鏈�鏃╃増娆°��1锛氭槸锛�0锛氬惁
*/
private String firstV;
-
+
/**
* 鍒涘缓浜�
*/
private String creator;
-
+
/**
* 鍒涘缓鏃堕棿
*/
private Date createTime;
-
+
/**
* 鏈�鍚庝慨鏀逛汉
*/
private String lastModifier;
-
+
/**
* 鏈�鍚庝慨鏀规椂闂达紝鏍煎紡鏄痽yyy-MM-dd HH:mm:ss.SSS
*/
private Date lastModifyTime;
-
+
/**
* 鐗堟湰瑙勫垯
*/
private String revisionRule;
-
- /**
- * 鐗堟湰搴忓彿
- */
- private int revisionSeq;
-
- /**
- * 鐗堟湰鍊�
- */
- private String revisionValue;
-
/**
* 鐗堟瑙勫垯
@@ -111,60 +82,89 @@
private String versionRule;
/**
+ * 鐗堟湰搴忓彿
+ */
+ private int revisionSeq;
+
+ /**
+ * 鐗堟湰鍊�
+ */
+ private String revisionValue;
+
+ /**
* 鐗堟鎺掑簭
*/
private int versionSeq;
-
+
/**
* 鐗堟鍊�
*/
private String versionValue;
-
+ /**
+ * 鐢熷懡鍛ㄦ湡鐨勭紪鍙�
+ */
+ private String lctId;
+
/**
* 鐢熷懡鍛ㄦ湡鍊�
*/
private String lcStatus;
-
- /**
- * 鐢熷懡鍛ㄦ湡鏄剧ず鏂囨湰
- */
- private String lcStatusText;
-
+
/**
* 鏃堕棿鎴筹紝鏍煎紡鏄痽yyy-MM-dd HH:mm:ss.SSS
*/
private Date ts;
-
+
+ /**
+ * 浠ｅ彿锛涘彲浠ヨ缃睘鎬х殑鏄犲皠锛宯ame琛ㄧず鍦ㄥ钩鍙扮殑涓氬姟绫诲瀷涓殑灞炴�у悕绉帮紝蹇呴』涓哄皬鍐欙紱
+ */
+ private String id;
+
+ /**
+ * 鍚嶇О锛涗篃鍙互涓嶈缃睘鎬ф槧灏勶紝榛樿鏄瓧娈靛悕鐨勫皬鍐�
+ */
+ private String name;
+
+ /**
+ * 鎻忚堪
+ */
+ private String description;
+
/**
* 鎷ユ湁鑰咃紝涓庡垱寤鸿�呮湁鍖哄埆锛屽父鐢ㄤ簬鎺у埗鏁版嵁鏉冮檺
*/
private String owner;
-
+
/**
* 绛惧叆浜�--绛惧叆鍜岀鍑烘暟鎹槸浜掓枼
*/
private String checkInBy;
-
+
/**
* 绛惧叆鏃堕棿
*/
private Date checkInTime;
-
+
/**
* 绛惧嚭浜�
*/
private String checkOutBy;
-
+
/**
* 绛惧嚭鏃堕棿
*/
private Date checkOutTime;
-
+
/**
* 浠庡摢涓増鏈嫹璐�
*/
private String copyFromVersion;
+
+ /**
+ * 鐢熷懡鍛ㄦ湡鏄剧ず鏂囨湰
+ */
+ private String lcStatusText;
/**
* 瀵嗙骇
@@ -177,14 +177,8 @@
private String secretGradeText;
/**
- * 鐢熷懡鍛ㄦ湡鐨勫悕绉�
- */
- private String lctid;
-
- /**
* 鎵╁睍鐨勫睘鎬�
*/
- @Transient
private Map<String,String> data;
public String getOid() {
@@ -193,30 +187,6 @@
public void setOid(String oid) {
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() {
@@ -235,12 +205,12 @@
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() {
@@ -281,6 +251,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() {
@@ -347,6 +325,13 @@
this.versionValue = versionValue;
}
+ public String getLctId() {
+ return lctId;
+ }
+
+ public void setLctId(String lctId) {
+ this.lctId = lctId;
+ }
public String getLcStatus() {
return lcStatus;
@@ -362,6 +347,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() {
@@ -420,14 +429,6 @@
this.lcStatusText = lcStatusText;
}
- public Date getCreateTime() {
- return createTime;
- }
-
- public void setCreateTime(Date createTime) {
- this.createTime = createTime;
- }
-
public Integer getSecretGrade() {
return secretGrade;
}
@@ -444,59 +445,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 "BaseModelVO{" +
- "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 + '\'' +
- ", lcStatus='" + lcStatus + '\'' +
- ", lcStatusText='" + lcStatusText + '\'' +
- ", ts=" + ts +
- ", owner='" + owner + '\'' +
- ", checkInBy='" + checkInBy + '\'' +
- ", checkInTime=" + checkInTime +
- ", checkOutBy='" + checkOutBy + '\'' +
- ", checkOutTime=" + checkOutTime +
- ", copyFromVersion='" + copyFromVersion + '\'' +
- ", secretGrade=" + secretGrade +
- ", secretGradeText='" + secretGradeText + '\'' +
- ", lctid='" + lctid + '\'' +
- ", data=" + data +
- '}';
}
}
--
Gitblit v1.9.3