From 9cbbafbfed6cf1ac4e1801123f212642fadcc980 Mon Sep 17 00:00:00 2001
From: dangsn <dangsn@chicecm.com>
Date: 星期二, 03 十二月 2024 11:57:22 +0800
Subject: [PATCH] 提取业务系统使用的功能，独立出一个单独的模块
---
Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/ReferConfigVO.java | 6
Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/query/FileImageViewerQuery.java | 2
Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/enumpck/UI/RoleClassifyEnum.java | 2
Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/constant/IRightConstant.java | 24 ++++
Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/query/UIDataGridQuery.java | 8
Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/OsBtmTypeDTO.java | 13 ++
Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/AuditTaskDTO.java | 2
Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/enumpck/OsCodeProductTypeEnum.java | 2
Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/enumpck/OsCodeDateValueTypeEnum.java | 2
Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/enumpck/UserTypeEnum.java | 2
Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/model/PLDefination.java | 26 ++++
Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/provider/VciFileDocClassifyProvider.java | 2
Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/OsBtmTypeVO.java | 13 ++
Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/properties/VciFileTransProperties.java | 2
Source/plt-web/plt-web-parent/plt-starter/pom.xml | 28 ++--
Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/enumpck/UI/VciFileServiceOsTypeEnum.java | 2
Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/enumpck/UI/VciFileTransProtocolEnum.java | 2
Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/enumpck/UI/ItemTypeEnum.java | 10 +
Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/properties/TomcatConfig.java | 3
Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/lcstatuspck/FrameworkDataLCStatus.java | 2
Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/PLDefinationVO.java | 10 +
Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/query/UITreeRootQuery.java | 2
Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/lcstatuspck/FileObjectLCStatus.java | 3
Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/query/UIBaseQuery.java | 8
Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/enumpck/UI/ControlAttributeType.java | 10 +
Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/lcstatuspck/ReleaseDataLCStatus.java | 2
Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/enumpck/UI/RoleControlAreaEnum.java | 8
Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/provider/VciFileQueryProvider.java | 2
Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/provider/VciFileDownloadProvider.java | 2
Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/query/UIFormQuery.java | 7 -
Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/properties/OsConfig.java | 24 ++++
Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/enumpck/OsCodeGenJsPanelTypeEnum.java | 2
Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/query/UILinkTypeDataQuery.java | 8
Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/enumpck/OsCodeFillTypeEnum.java | 2
Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/OsDataAuthDTO.java | 30 +++++
Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/enumpck/UI/OrgTypeEnum.java | 2
Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/enumpck/OsCodeElementTypeEnum.java | 2
Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/po/OsBtmTypePO.java | 5
Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/provider/VciFileUploadProvider.java | 2
Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/query/UITreeQuery.java | 8
Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/UITreeDefineVO.java | 9
41 files changed, 222 insertions(+), 79 deletions(-)
diff --git a/Source/plt-web/plt-web-parent/plt-starter/pom.xml b/Source/plt-web/plt-web-parent/plt-starter/pom.xml
index 5c143e5..6885853 100644
--- a/Source/plt-web/plt-web-parent/plt-starter/pom.xml
+++ b/Source/plt-web/plt-web-parent/plt-starter/pom.xml
@@ -15,12 +15,24 @@
</properties>
<dependencies>
<!-- 鏂板钩鍙版墍闇�瑕佺殑鍖� -->
- <!--client-->
+ <!--骞冲彴client鍖�-->
<dependency>
- <groupId>com.vci.client</groupId>
+ <groupId>com.vci.plt</groupId>
<artifactId>plt-clientbase</artifactId>
<version>${plt.version}</version>
</dependency>
+ <!--骞冲彴common鍖�-->
+ <dependency>
+ <groupId>com.vci.plt</groupId>
+ <artifactId>plt-common</artifactId>
+ <version>${plt.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.vci.plt</groupId>
+ <artifactId>plt-slice</artifactId>
+ <version>${plt.version}</version>
+ </dependency>
+
<!--client鐨勪緷璧�-->
<dependency>
<groupId>com.formdev</groupId>
@@ -101,18 +113,6 @@
<groupId>com.uitheme</groupId>
<artifactId>uitheme</artifactId>
<version>1.3.1</version>
- </dependency>
-
- <!--common-->
- <dependency>
- <groupId>com.vci.common</groupId>
- <artifactId>plt-common</artifactId>
- <version>${plt.version}</version>
- </dependency>
- <dependency>
- <groupId>com.vci.corba</groupId>
- <artifactId>plt-slice</artifactId>
- <version>${plt.version}</version>
</dependency>
<!--common鐨勪緷璧�-->
<dependency>
diff --git a/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/constant/IRightConstant.java b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/constant/IRightConstant.java
new file mode 100644
index 0000000..cb56f9a
--- /dev/null
+++ b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/constant/IRightConstant.java
@@ -0,0 +1,24 @@
+package com.vci.constant;
+
+public class IRightConstant {
+ //鍏ㄩ儴鏈夋潈
+ public static final String RULETYPE_ALL_HAS = "0";
+ //鍏佽瑙勫垯
+ public static final String RULETYPE__HAS = "1";
+ //鍏ㄩ儴鏃犳潈
+ public static final String RULETYPE_ALL_NOTHAS = "2";
+ //鎷掔粷瑙勫垯
+ public static final String RULETYPE__NOTHAS = "3";
+ //鐢ㄦ埛
+ public static final String User = "user";
+ //鐢ㄦ埛缁�
+ public static final String UserGroup = "userGroup";
+ //瑙掕壊
+ public static final String Role = "role";
+
+ //鎿嶄綔
+ public static final String OPS="query,add,edit,remove,choose,choosedoc,cpdoc,pastedoc,imp,analyze,exp,rev,transfer,del,imp,ptop.add ,ptop.del,ptop.mody,lc.begin,lc.end";
+ // public static final String OPS_ORDINARY="query,add,edit,remove,choose,choosedoc,cpdoc,pastedoc,imp,analyze,exp,rev,transfer,del,imp";
+ public static final String OPS_ORDINARY="query";
+ public static final String OPS_RELATION_LIFECYCLE="ptop.add ,ptop.del,ptop.mody,lc.begin,lc.end";
+}
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/plugins/dto/AuditTaskDTO.java b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/AuditTaskDTO.java
similarity index 98%
rename from Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/plugins/dto/AuditTaskDTO.java
rename to Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/AuditTaskDTO.java
index 295977e..bb87d04 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/plugins/dto/AuditTaskDTO.java
+++ b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/AuditTaskDTO.java
@@ -1,4 +1,4 @@
-package com.vci.plugins.dto;
+package com.vci.dto;
import com.vci.dto.BaseModelDTO;
diff --git a/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/OsBtmTypeDTO.java b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/OsBtmTypeDTO.java
index 0e185a2..cd277ac 100644
--- a/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/OsBtmTypeDTO.java
+++ b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/OsBtmTypeDTO.java
@@ -155,6 +155,19 @@
*/
private Date lastModifyTime;
+ /**
+ * 鍥剧墖鍚嶇О
+ */
+ private String imageName;
+
+ public void setImageName(String imageName) {
+ this.imageName = imageName;
+ }
+
+ public String getImageName() {
+ return imageName;
+ }
+
public void setApNameArray(String apNameArray) {
this.apNameArray = apNameArray;
}
diff --git a/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/OsDataAuthDTO.java b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/OsDataAuthDTO.java
new file mode 100644
index 0000000..a32a568
--- /dev/null
+++ b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/OsDataAuthDTO.java
@@ -0,0 +1,30 @@
+package com.vci.dto;
+
+import lombok.Data;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 鏁版嵁鏉冮檺浼犺緭瀵硅薄
+ * @author yuxc
+ * @date 2024/11/26
+ */
+@Data
+public class OsDataAuthDTO implements java.io.Serializable {
+
+ /**
+ * 绂佹淇敼杩欎釜鍊�
+ */
+ private static final long serialVersionUID = 814342725285373312L;
+
+ // 璁剧疆Table鍒楀ご淇℃伅
+ List<String> tableHeader;
+
+ //鍒楄〃鏁版嵁
+ List<Map> rowList;
+
+ //action鐨刴ap
+ Map<String, String> actionMap;
+
+}
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/enumpck/OsCodeDateValueTypeEnum.java b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/enumpck/OsCodeDateValueTypeEnum.java
similarity index 98%
rename from Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/enumpck/OsCodeDateValueTypeEnum.java
rename to Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/enumpck/OsCodeDateValueTypeEnum.java
index 7003f87..3121c92 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/enumpck/OsCodeDateValueTypeEnum.java
+++ b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/enumpck/OsCodeDateValueTypeEnum.java
@@ -1,4 +1,4 @@
-package com.vci.web.enumpck;
+package com.vci.enumpck;
import com.vci.starter.web.annotation.VciEnum;
import com.vci.starter.web.enumpck.BaseEnum;
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/enumpck/OsCodeElementTypeEnum.java b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/enumpck/OsCodeElementTypeEnum.java
similarity index 98%
rename from Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/enumpck/OsCodeElementTypeEnum.java
rename to Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/enumpck/OsCodeElementTypeEnum.java
index 2e158a1..ed4e6ae 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/enumpck/OsCodeElementTypeEnum.java
+++ b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/enumpck/OsCodeElementTypeEnum.java
@@ -1,4 +1,4 @@
-package com.vci.web.enumpck;
+package com.vci.enumpck;
import com.vci.starter.web.annotation.VciEnum;
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/enumpck/OsCodeFillTypeEnum.java b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/enumpck/OsCodeFillTypeEnum.java
similarity index 98%
rename from Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/enumpck/OsCodeFillTypeEnum.java
rename to Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/enumpck/OsCodeFillTypeEnum.java
index 77a2b08..23ce7e8 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/enumpck/OsCodeFillTypeEnum.java
+++ b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/enumpck/OsCodeFillTypeEnum.java
@@ -1,4 +1,4 @@
-package com.vci.web.enumpck;
+package com.vci.enumpck;
import com.vci.starter.web.annotation.VciEnum;
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/enumpck/OsCodeGenJsPanelTypeEnum.java b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/enumpck/OsCodeGenJsPanelTypeEnum.java
similarity index 98%
rename from Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/enumpck/OsCodeGenJsPanelTypeEnum.java
rename to Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/enumpck/OsCodeGenJsPanelTypeEnum.java
index 17ad8f0..7ee71cf 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/enumpck/OsCodeGenJsPanelTypeEnum.java
+++ b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/enumpck/OsCodeGenJsPanelTypeEnum.java
@@ -1,4 +1,4 @@
-package com.vci.web.enumpck;
+package com.vci.enumpck;
import com.vci.starter.web.annotation.VciEnum;
import com.vci.starter.web.enumpck.BaseEnum;
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/enumpck/OsCodeProductTypeEnum.java b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/enumpck/OsCodeProductTypeEnum.java
similarity index 98%
rename from Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/enumpck/OsCodeProductTypeEnum.java
rename to Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/enumpck/OsCodeProductTypeEnum.java
index e1c272e..a440e08 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/enumpck/OsCodeProductTypeEnum.java
+++ b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/enumpck/OsCodeProductTypeEnum.java
@@ -1,4 +1,4 @@
-package com.vci.web.enumpck;
+package com.vci.enumpck;
import com.vci.starter.web.annotation.VciEnum;
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/enumpck/ControlAttributeType.java b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/enumpck/UI/ControlAttributeType.java
similarity index 78%
rename from Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/enumpck/ControlAttributeType.java
rename to Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/enumpck/UI/ControlAttributeType.java
index 7f86ad2..2732e95 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/enumpck/ControlAttributeType.java
+++ b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/enumpck/UI/ControlAttributeType.java
@@ -1,7 +1,11 @@
-package com.vci.web.enumpck;
+package com.vci.enumpck.UI;
+import com.vci.common.portal.enums.ControlType;
+
+/**
+ * 灞炴�х被鍨嬫灇涓�
+ */
public enum ControlAttributeType {
-
VTString,
VTInteger,
VTLong,
@@ -14,7 +18,7 @@
VTNote,
VTFilePath,
VTClob,
- canzhao;
+ VTRefer;
public static ControlType Parse(String value) {
for (ControlType ct : ControlType.values()) {
if (ct.name().equalsIgnoreCase(value)) {
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/enumpck/ItemTypeEnum.java b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/enumpck/UI/ItemTypeEnum.java
similarity index 96%
rename from Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/enumpck/ItemTypeEnum.java
rename to Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/enumpck/UI/ItemTypeEnum.java
index c7364b5..5ec5624 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/enumpck/ItemTypeEnum.java
+++ b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/enumpck/UI/ItemTypeEnum.java
@@ -1,12 +1,14 @@
-package com.vci.web.enumpck;
+package com.vci.enumpck.UI;
import com.vci.pagemodel.KeyValue;
import com.vci.starter.web.enumpck.BaseEnum;
-import com.vci.starter.web.enumpck.VciFieldTypeEnum;
import java.util.ArrayList;
import java.util.List;
+/**
+ * 杈撳叆妗嗙被鍨嬫灇涓�
+ */
public enum ItemTypeEnum implements BaseEnum {
TEXT("text","鍗曡鏂囨湰妗�"),
TEXTBTN("textbtn","鏂囨湰鎸夐挳妗�"),
@@ -166,7 +168,7 @@
}else if( ControlAttributeType.VTTime.equals(key)){//鏃堕棿
value = ItemTypeEnum.TIME.getValue();
}
- else if( ControlAttributeType.canzhao.equals(key)){//鍙傜収
+ else if( ControlAttributeType.VTRefer.equals(key)){//鍙傜収
value = ItemTypeEnum.TEXT.getValue();
}
else if( ControlAttributeType.VTBoolean.equals(key)){//boolean
@@ -211,7 +213,7 @@
}else if( ControlAttributeType.VTTime.equals(key)){//鏃堕棿
value = ItemTypeEnum.TIME.getValue();
}
- else if( ControlAttributeType.canzhao.equals(key)){//鍙傜収
+ else if( ControlAttributeType.VTRefer.equals(key)){//鍙傜収
value = ItemTypeEnum.TEXT.getValue();
}
else if( ControlAttributeType.VTBoolean.equals(key)){//boolean
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/enumpck/OrgTypeEnum.java b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/enumpck/UI/OrgTypeEnum.java
similarity index 97%
rename from Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/enumpck/OrgTypeEnum.java
rename to Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/enumpck/UI/OrgTypeEnum.java
index c1552b2..2748830 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/enumpck/OrgTypeEnum.java
+++ b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/enumpck/UI/OrgTypeEnum.java
@@ -1,4 +1,4 @@
-package com.vci.frameworkcore.enumpck;
+package com.vci.enumpck.UI;
import com.vci.starter.web.enumpck.BaseEnum;
/**
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/enumpck/RoleClassifyEnum.java b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/enumpck/UI/RoleClassifyEnum.java
similarity index 97%
rename from Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/enumpck/RoleClassifyEnum.java
rename to Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/enumpck/UI/RoleClassifyEnum.java
index 2696393..f75acf6 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/enumpck/RoleClassifyEnum.java
+++ b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/enumpck/UI/RoleClassifyEnum.java
@@ -1,4 +1,4 @@
-package com.vci.frameworkcore.enumpck;
+package com.vci.enumpck.UI;
import com.vci.starter.web.annotation.VciEnum;
import com.vci.starter.web.enumpck.BaseEnum;
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/enumpck/RoleControlAreaEnum.java b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/enumpck/UI/RoleControlAreaEnum.java
similarity index 88%
rename from Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/enumpck/RoleControlAreaEnum.java
rename to Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/enumpck/UI/RoleControlAreaEnum.java
index f09fc71..a38e7da 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/enumpck/RoleControlAreaEnum.java
+++ b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/enumpck/UI/RoleControlAreaEnum.java
@@ -1,7 +1,7 @@
-package com.vci.frameworkcore.enumpck;
+package com.vci.enumpck.UI;
-//import com.vci.frameworkcore.constant.FrameWorkEnumConstant;
-
+import com.vci.constant.FrameWorkEnumConstant;
+import com.vci.starter.web.annotation.VciEnum;
import com.vci.starter.web.enumpck.BaseEnum;
/**
@@ -9,7 +9,7 @@
* @author weidy
* @date 2019/9/25
*/
-//@VciEnum(name = FrameWorkEnumConstant.ROLE_CONTROL_AREA,text = "瑙掕壊鎺у埗鍖哄煙",description = "鐢佃剳绔疊S,CS,绉诲姩绔�,闆嗘垚,寰湇鍔�")
+@VciEnum(name = FrameWorkEnumConstant.ROLE_CONTROL_AREA,text = "瑙掕壊鎺у埗鍖哄煙",description = "鐢佃剳绔疊S,CS,绉诲姩绔�,闆嗘垚,寰湇鍔�")
public enum RoleControlAreaEnum implements BaseEnum {
/**
* 鐢佃剳绔疊/S
diff --git a/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/enumpck/VciFileServiceOsTypeEnum.java b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/enumpck/UI/VciFileServiceOsTypeEnum.java
similarity index 98%
rename from Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/enumpck/VciFileServiceOsTypeEnum.java
rename to Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/enumpck/UI/VciFileServiceOsTypeEnum.java
index d34c699..432370d 100644
--- a/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/enumpck/VciFileServiceOsTypeEnum.java
+++ b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/enumpck/UI/VciFileServiceOsTypeEnum.java
@@ -1,4 +1,4 @@
-package com.vci.enumpck;
+package com.vci.enumpck.UI;
import com.vci.starter.web.annotation.VciEnum;
import com.vci.starter.web.enumpck.BaseEnum;
diff --git a/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/enumpck/VciFileTransProtocolEnum.java b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/enumpck/UI/VciFileTransProtocolEnum.java
similarity index 98%
rename from Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/enumpck/VciFileTransProtocolEnum.java
rename to Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/enumpck/UI/VciFileTransProtocolEnum.java
index 8f7cdc9..5884ef4 100644
--- a/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/enumpck/VciFileTransProtocolEnum.java
+++ b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/enumpck/UI/VciFileTransProtocolEnum.java
@@ -1,4 +1,4 @@
-package com.vci.enumpck;
+package com.vci.enumpck.UI;
import com.vci.starter.web.annotation.VciEnum;
import com.vci.starter.web.enumpck.BaseEnum;
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/enumpck/UserTypeEnum.java b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/enumpck/UserTypeEnum.java
similarity index 98%
rename from Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/enumpck/UserTypeEnum.java
rename to Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/enumpck/UserTypeEnum.java
index b2e7c71..aff9d60 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/enumpck/UserTypeEnum.java
+++ b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/enumpck/UserTypeEnum.java
@@ -1,4 +1,4 @@
-package com.vci.web.enumpck;
+package com.vci.enumpck;
import com.vci.starter.web.annotation.VciEnum;
import com.vci.starter.web.enumpck.BaseEnum;
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/lifeCycle/FileObjectLCStatus.java b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/lcstatuspck/FileObjectLCStatus.java
similarity index 97%
rename from Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/lifeCycle/FileObjectLCStatus.java
rename to Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/lcstatuspck/FileObjectLCStatus.java
index 66a2787..d4b54a3 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/lifeCycle/FileObjectLCStatus.java
+++ b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/lcstatuspck/FileObjectLCStatus.java
@@ -1,8 +1,7 @@
-package com.vci.web.lifeCycle;
+package com.vci.lcstatuspck;
import com.vci.constant.FrameWorkDefaultValueConstant;
import com.vci.constant.VciFileLifeConstant;
-import com.vci.constant.FrameWorkDefaultValueConstant;
import com.vci.starter.web.annotation.Transient;
import com.vci.starter.web.annotation.VciLifeCycle;
import com.vci.starter.web.annotation.VciLifeCycleTrans;
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/lcstatuspck/FrameworkDataLCStatus.java b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/lcstatuspck/FrameworkDataLCStatus.java
similarity index 98%
rename from Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/lcstatuspck/FrameworkDataLCStatus.java
rename to Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/lcstatuspck/FrameworkDataLCStatus.java
index 6491230..444c9ae 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/lcstatuspck/FrameworkDataLCStatus.java
+++ b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/lcstatuspck/FrameworkDataLCStatus.java
@@ -1,4 +1,4 @@
-package com.vci.frameworkcore.lcstatuspck;
+package com.vci.lcstatuspck;
import com.vci.starter.web.annotation.VciLifeCycle;
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/lcstatuspck/ReleaseDataLCStatus.java b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/lcstatuspck/ReleaseDataLCStatus.java
similarity index 98%
rename from Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/lcstatuspck/ReleaseDataLCStatus.java
rename to Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/lcstatuspck/ReleaseDataLCStatus.java
index 5bfca87..bd73fc5 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/lcstatuspck/ReleaseDataLCStatus.java
+++ b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/lcstatuspck/ReleaseDataLCStatus.java
@@ -1,4 +1,4 @@
-package com.vci.frameworkcore.lcstatuspck;
+package com.vci.lcstatuspck;
import com.vci.starter.web.annotation.VciLifeCycle;
diff --git a/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/model/PLDefination.java b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/model/PLDefination.java
index 96dfcc4..3c7770c 100644
--- a/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/model/PLDefination.java
+++ b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/model/PLDefination.java
@@ -160,6 +160,16 @@
private String queryTemplateName = "";
/**
+ * cs绔娇鐢ㄧ殑鑷畾涔夋煡璇㈢被鍚嶆垨URL
+ */
+ private String csCustQueryCLsOrUrl = "";
+
+ /**
+ * bs绔娇鐢ㄧ殑鑷畾涔夋煡璇㈢被鍚嶆垨URL
+ */
+ private String bsCustQueryCLsOrUrl = "";
+
+ /**
* 瀛怳I鐨勪笟鍔＄被鍨�
*/
private String subUiObjType = "";
@@ -463,6 +473,22 @@
this.queryTemplateName = queryTemplateName;
}
+ public void setCsCustQueryCLsOrUrl(String csCustQueryCLsOrUrl) {
+ this.csCustQueryCLsOrUrl = csCustQueryCLsOrUrl;
+ }
+
+ public void setBsCustQueryCLsOrUrl(String bsCustQueryCLsOrUrl) {
+ this.bsCustQueryCLsOrUrl = bsCustQueryCLsOrUrl;
+ }
+
+ public String getCsCustQueryCLsOrUrl() {
+ return csCustQueryCLsOrUrl;
+ }
+
+ public String getBsCustQueryCLsOrUrl() {
+ return bsCustQueryCLsOrUrl;
+ }
+
/**
* @return the subUiBtName
*/
diff --git a/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/OsBtmTypeVO.java b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/OsBtmTypeVO.java
index 8ba5e9e..5e2154e 100644
--- a/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/OsBtmTypeVO.java
+++ b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/OsBtmTypeVO.java
@@ -183,6 +183,19 @@
private String[] apNameArray;
/**
+ * 鍥剧墖鍚嶇О
+ */
+ private String imageName;
+
+ public void setImageName(String imageName) {
+ this.imageName = imageName;
+ }
+
+ public String getImageName() {
+ return imageName;
+ }
+
+ /**
* 鍖呭惈灞炴��
*/
private List<OsBtmTypeAttributeVO> attributes;
diff --git a/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/PLDefinationVO.java b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/PLDefinationVO.java
index f20c2b4..97ba2d2 100644
--- a/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/PLDefinationVO.java
+++ b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/PLDefinationVO.java
@@ -179,6 +179,16 @@
private String queryTemplateName = "";
/**
+ * cs绔娇鐢ㄧ殑鑷畾涔夋煡璇㈢被鍚嶆垨URL
+ */
+ private String csCustQueryCLsOrUrl = "";
+
+ /**
+ * bs绔娇鐢ㄧ殑鑷畾涔夋煡璇㈢被鍚嶆垨URL
+ */
+ private String bsCustQueryCLsOrUrl = "";
+
+ /**
* 瀛怳I鐨勪笟鍔＄被鍨�
*/
private String subUIObjType = "";
diff --git a/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/ReferConfigVO.java b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/ReferConfigVO.java
index 490cef8..b3fd2c6 100644
--- a/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/ReferConfigVO.java
+++ b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/ReferConfigVO.java
@@ -92,7 +92,7 @@
/**
* 鏇挎崲鐨勬槧灏�
*/
- private Map<String,String> replaceMap = new HashMap<String, String>();
+ private Map<String,Object> replaceMap = new HashMap<>();
/**
* 鎺掑簭瀛楁
@@ -192,11 +192,11 @@
this.conditionMap = conditionMap;
}
- public Map<String, String> getReplaceMap() {
+ public Map<String, Object> getReplaceMap() {
return replaceMap;
}
- public void setReplaceMap(Map<String, String> replaceMap) {
+ public void setReplaceMap(Map<String, Object> replaceMap) {
this.replaceMap = replaceMap;
}
diff --git a/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/UITreeDefineVO.java b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/UITreeDefineVO.java
index f779f10..a4bbc1d 100644
--- a/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/UITreeDefineVO.java
+++ b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/UITreeDefineVO.java
@@ -22,9 +22,9 @@
private String loadType;
/**
- * 鏄惁鍙嶅悜
+ * 鏄惁鍙嶅悜,TODO:鏍戝畾涔変笂宸茬粡娌℃湁浣跨敤杩欎釜瀛楁浜�
*/
- private boolean orientation = false;
+ //private boolean orientation = false;
/**
* 鏄剧ず鍥炬爣
@@ -77,13 +77,13 @@
this.loadType = loadType;
}
- public boolean isOrientation() {
+ /*public boolean isOrientation() {
return orientation;
}
public void setOrientation(boolean orientation) {
this.orientation = orientation;
- }
+ }*/
public boolean isShowImage() {
return showImage;
@@ -146,7 +146,6 @@
return "UITreeDefineVO{" +
"btmType='" + btmType + '\'' +
", loadType='" + loadType + '\'' +
- ", orientation=" + orientation +
", showImage=" + showImage +
", rootContent='" + rootContent + '\'' +
", linkType='" + linkType + '\'' +
diff --git a/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/po/OsBtmTypePO.java b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/po/OsBtmTypePO.java
index 2d42882..2a18145 100644
--- a/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/po/OsBtmTypePO.java
+++ b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/po/OsBtmTypePO.java
@@ -88,6 +88,11 @@
private short verRuleName;
/**
+ * 鍥剧墖鍚嶇О
+ */
+ private String imageName;
+
+ /**
* btmItemsTo
*/
@ExcelColumn(value="鐢熷懡鍛ㄦ湡")
diff --git a/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/properties/OsConfig.java b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/properties/OsConfig.java
new file mode 100644
index 0000000..381c296
--- /dev/null
+++ b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/properties/OsConfig.java
@@ -0,0 +1,24 @@
+package com.vci.properties;
+
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.context.annotation.Configuration;
+
+/**
+ * @Description
+ * @Author dangsn
+ * @Date 2024/11/28 17:40
+ */
+@Configuration
+@ConfigurationProperties(prefix = "plt")
+public class OsConfig {
+
+ private boolean exportSecretGrade;
+
+ public boolean isExportSecretGrade() {
+ return exportSecretGrade;
+ }
+
+ public void setExportSecretGrade(boolean exportSecretGrade) {
+ this.exportSecretGrade = exportSecretGrade;
+ }
+}
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/config/TomcatConfig.java b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/properties/TomcatConfig.java
similarity index 89%
rename from Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/config/TomcatConfig.java
rename to Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/properties/TomcatConfig.java
index 1cfe9dc..60c83e2 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/config/TomcatConfig.java
+++ b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/properties/TomcatConfig.java
@@ -1,7 +1,6 @@
-package com.vci.web.config;
+package com.vci.properties;
import org.apache.catalina.connector.Connector;
-import org.springframework.boot.web.embedded.tomcat.TomcatConnectorCustomizer;
import org.springframework.boot.web.embedded.tomcat.TomcatServletWebServerFactory;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
diff --git a/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/properties/VciFileTransProperties.java b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/properties/VciFileTransProperties.java
index 9710389..a1685ec 100644
--- a/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/properties/VciFileTransProperties.java
+++ b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/properties/VciFileTransProperties.java
@@ -1,6 +1,6 @@
package com.vci.properties;
-import com.vci.enumpck.VciFileTransProtocolEnum;
+import com.vci.enumpck.UI.VciFileTransProtocolEnum;
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.context.annotation.Configuration;
diff --git a/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/provider/VciFileDocClassifyProvider.java b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/provider/VciFileDocClassifyProvider.java
index 4e10948..703bc7b 100644
--- a/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/provider/VciFileDocClassifyProvider.java
+++ b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/provider/VciFileDocClassifyProvider.java
@@ -17,7 +17,7 @@
*/
@FeignClient(
name = "vciFileDocClassifyProvider",
- url = "${vciPlatform.fileServiceUrl:http://localhost:19000/fileService}",
+ url = "${feign.fileServiceUrl:http://localhost:19000/fileService}",
path = "vciFileDocClassifyController"
)
public interface VciFileDocClassifyProvider {
diff --git a/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/provider/VciFileDownloadProvider.java b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/provider/VciFileDownloadProvider.java
index 6f27976..506588f 100644
--- a/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/provider/VciFileDownloadProvider.java
+++ b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/provider/VciFileDownloadProvider.java
@@ -12,7 +12,7 @@
*/
@FeignClient(
name = "VciFileDownloadProvider",
- url = "${vciPlatform.fileServiceUrl:http://localhost:19000/fileService}",
+ url = "${feign.fileServiceUrl:http://localhost:19000/fileService}",
path = "vciFileDownloadController"
)
public interface VciFileDownloadProvider {
diff --git a/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/provider/VciFileQueryProvider.java b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/provider/VciFileQueryProvider.java
index 417c0b3..0f47e86 100644
--- a/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/provider/VciFileQueryProvider.java
+++ b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/provider/VciFileQueryProvider.java
@@ -13,7 +13,7 @@
*/
@FeignClient(
name = "vciFileQueryProvider",
- url = "${vciPlatform.fileServiceUrl:http://localhost:19000/fileService}",
+ url = "${feign.fileServiceUrl:http://localhost:19000/fileService}",
path = "vciFileQueryController"
)
public interface VciFileQueryProvider {
diff --git a/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/provider/VciFileUploadProvider.java b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/provider/VciFileUploadProvider.java
index fd05ff7..b60b41a 100644
--- a/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/provider/VciFileUploadProvider.java
+++ b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/provider/VciFileUploadProvider.java
@@ -20,7 +20,7 @@
*/
@FeignClient(
name = "vciFileUploadProvider",
- url = "${vciPlatform.fileServiceUrl:http://localhost:19000/fileService}",
+ url = "${feign.fileServiceUrl:http://localhost:19000/fileService}",
path = "vciFileUploadController"
)
public interface VciFileUploadProvider {
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/query/FileImageViewerQuery.java b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/query/FileImageViewerQuery.java
similarity index 97%
rename from Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/query/FileImageViewerQuery.java
rename to Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/query/FileImageViewerQuery.java
index 543c64e..b14d5d3 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/query/FileImageViewerQuery.java
+++ b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/query/FileImageViewerQuery.java
@@ -1,4 +1,4 @@
-package com.vci.web.query;
+package com.vci.query;
/**
* 鍥剧墖缁勪欢鐨勬煡璇㈠璞�
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/query/UIBaseQuery.java b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/query/UIBaseQuery.java
similarity index 80%
rename from Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/query/UIBaseQuery.java
rename to Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/query/UIBaseQuery.java
index 49ac8ce..7031f3a 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/query/UIBaseQuery.java
+++ b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/query/UIBaseQuery.java
@@ -1,4 +1,4 @@
-package com.vci.web.query;
+package com.vci.query;
import java.util.ArrayList;
import java.util.HashMap;
@@ -15,18 +15,18 @@
/**
* 鏉ユ簮鏁版嵁
*/
- private Map<String,String> sourceData = new HashMap<>();
+ private Map<String,Object> sourceData = new HashMap<>();
/**
* 閫夋嫨鏁版嵁
*/
private List<Map<String,String>> selectData = new ArrayList<>();
- public Map<String, String> getSourceData() {
+ public Map<String, Object> getSourceData() {
return sourceData;
}
- public void setSourceData(Map<String, String> sourceData) {
+ public void setSourceData(Map<String, Object> sourceData) {
this.sourceData = sourceData;
}
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/query/UIDataGridQuery.java b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/query/UIDataGridQuery.java
similarity index 92%
rename from Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/query/UIDataGridQuery.java
rename to Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/query/UIDataGridQuery.java
index 57fea20..b6a2dcd 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/query/UIDataGridQuery.java
+++ b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/query/UIDataGridQuery.java
@@ -1,4 +1,4 @@
-package com.vci.web.query;
+package com.vci.query;
import com.vci.starter.web.pagemodel.BaseQueryObject;
@@ -42,7 +42,7 @@
/**
* 鏉ユ簮鏁版嵁
*/
- private Map<String,String> sourceData = new HashMap<>();
+ private Map<String,Object> sourceData = new HashMap<>();
/**
* 閫夋嫨鏁版嵁
@@ -54,11 +54,11 @@
*/
private boolean treeTableFlag = false;
- public Map<String, String> getSourceData() {
+ public Map<String, Object> getSourceData() {
return sourceData;
}
- public void setSourceData(Map<String, String> sourceData) {
+ public void setSourceData(Map<String, Object> sourceData) {
this.sourceData = sourceData;
}
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/query/UIFormQuery.java b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/query/UIFormQuery.java
similarity index 91%
rename from Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/query/UIFormQuery.java
rename to Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/query/UIFormQuery.java
index 55dd009..c475c36 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/query/UIFormQuery.java
+++ b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/query/UIFormQuery.java
@@ -1,9 +1,4 @@
-package com.vci.web.query;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+package com.vci.query;
/**
* 琛ㄥ崟鐨勬煡璇�
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/query/UILinkTypeDataQuery.java b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/query/UILinkTypeDataQuery.java
similarity index 94%
rename from Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/query/UILinkTypeDataQuery.java
rename to Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/query/UILinkTypeDataQuery.java
index 7458727..90f53fc 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/query/UILinkTypeDataQuery.java
+++ b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/query/UILinkTypeDataQuery.java
@@ -1,4 +1,4 @@
-package com.vci.web.query;
+package com.vci.query;
import com.vci.starter.web.pagemodel.PageHelper;
@@ -61,7 +61,7 @@
/**
* 鏇挎崲鐨勫睘鎬т俊鎭�
*/
- private Map<String,String> replaceMap;
+ private Map<String,Object> replaceMap;
/**
* 鎸囧畾灞傜骇
@@ -148,11 +148,11 @@
this.linkType = linkType;
}
- public Map<String, String> getReplaceMap() {
+ public Map<String, Object> getReplaceMap() {
return replaceMap;
}
- public void setReplaceMap(Map<String, String> replaceMap) {
+ public void setReplaceMap(Map<String, Object> replaceMap) {
this.replaceMap = replaceMap;
}
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/query/UITreeQuery.java b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/query/UITreeQuery.java
similarity index 93%
rename from Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/query/UITreeQuery.java
rename to Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/query/UITreeQuery.java
index c4f6a3a..5012d80 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/query/UITreeQuery.java
+++ b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/query/UITreeQuery.java
@@ -1,4 +1,4 @@
-package com.vci.web.query;
+package com.vci.query;
import com.vci.starter.web.pagemodel.TreeQueryObject;
@@ -57,18 +57,18 @@
/**
* 鏉ユ簮鏁版嵁
*/
- private Map<String,String> sourceData = new HashMap<>();
+ private Map<String,Object> sourceData = new HashMap<>();
/**
* 閫夋嫨鏁版嵁
*/
private List<Map<String,String>> selectData = new ArrayList<>();
- public Map<String, String> getSourceData() {
+ public Map<String, Object> getSourceData() {
return sourceData;
}
- public void setSourceData(Map<String, String> sourceData) {
+ public void setSourceData(Map<String, Object> sourceData) {
this.sourceData = sourceData;
}
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/query/UITreeRootQuery.java b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/query/UITreeRootQuery.java
similarity index 98%
rename from Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/query/UITreeRootQuery.java
rename to Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/query/UITreeRootQuery.java
index 4538023..d47af43 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/query/UITreeRootQuery.java
+++ b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/query/UITreeRootQuery.java
@@ -1,4 +1,4 @@
-package com.vci.web.query;
+package com.vci.query;
/**
* 鏍戠殑鏍硅妭鐐�
--
Gitblit v1.9.3