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-permission/src/main/java/com/vci/web/service/impl/WebBoServiceImpl.java | 29 +
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/uidataservice/UIDataCommonServiceI.java | 2
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/dto/BdHomeConfigDTO.java | 58 ++
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/WebIconServiceImpl.java | 5
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/WebDataRightController.java | 4
Source/plt-web/plt-web-parent/plt-web-permission/src/main/java/com/vci/web/controller/WebProcessCommandController.java | 2
Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/DeleteLinkDataDTO.java | 2
Source/plt-web/plt-web-parent/plt-web-base/src/main/java/com/vci/starter/web/dto/BaseLinkModelDTOList.java | 2
Source/plt-web/plt-web-parent/plt-web-permission/src/main/java/com/vci/web/service/HomeConfigServiceI.java | 55 ++
Source/plt-web/plt-web-parent/plt-web-base/src/main/java/com/vci/starter/web/dto/BaseLinkModelDTO.java | 2
Source/plt-web/plt-web-parent/plt-web-permission/src/main/java/com/vci/web/service/impl/SmRoleQueryServiceImpl.java | 2
Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/constant/BtmIdConstant.java | 5
Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/model/BdHomeConfigDO.java | 124 +++++
Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/FormLinkDataDTO.java | 2
Source/plt-web/plt-web-parent/plt-web-permission/src/main/java/com/vci/web/controller/HomeConfigCtroller.java | 128 +++++
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/uidataservice/impl/UIDataCommonServiceImpl.java | 5
Source/plt-web/plt-web-parent/plt-web-permission/src/main/java/com/vci/web/dao/impl/HomeConfigDaoImpl.java | 218 +++++++++
Source/plt-web/plt-web-parent/plt-web-permission/src/main/java/com/vci/web/service/WebBoServiceI.java | 4
Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/BdHomeConfigVO.java | 58 ++
Source/plt-web/plt-web-parent/plt-web-base/src/main/java/com/vci/starter/web/pagemodel/BaseModelVO.java | 261 ++++------
Source/plt-web/DOC/数据表SQL.sql | 65 ++
Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/DeleteDataDTO.java | 2
Source/plt-web/plt-web-parent/plt-web-base/src/main/java/com/vci/starter/web/dto/BaseModelDTO.java | 2
Source/plt-web/plt-web-parent/plt-web-permission/src/main/java/com/vci/web/dao/HomeConfigDaoI.java | 123 +++++
Source/plt-web/plt-web-parent/plt-web-permission/src/main/java/com/vci/web/service/impl/HomeConfigServiceImpl.java | 160 ++++++
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/SmFunctionQueryServicePlatformImpl.java | 2
Source/plt-web/plt-web-parent/plt-web-base/src/main/java/com/vci/starter/web/dto/BaseModelDTOList.java | 2
Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/FormDataDTO.java | 4
29 files changed, 1,160 insertions(+), 170 deletions(-)
diff --git "a/Source/plt-web/DOC/\346\225\260\346\215\256\350\241\250SQL.sql" "b/Source/plt-web/DOC/\346\225\260\346\215\256\350\241\250SQL.sql"
new file mode 100644
index 0000000..eac8e53
--- /dev/null
+++ "b/Source/plt-web/DOC/\346\225\260\346\215\256\350\241\250SQL.sql"
@@ -0,0 +1,65 @@
+-- 鍥炬爣搴撹〃
+-- Create table
+create table PLICON
+(
+ oid VARCHAR2(64) not null,
+ name VARCHAR2(128),
+ content CLOB,
+ type VARCHAR2(20),
+ groups VARCHAR2(500)
+)
+ tablespace MPM550_TEST
+ pctfree 10
+ initrans 1
+ maxtrans 255
+ storage
+ (
+ initial 64K
+ next 1M
+ minextents 1
+ maxextents unlimited
+ );
+-- Add comments to the columns
+comment on column PLICON.name
+ is '鍥炬爣鍚嶇О';
+comment on column PLICON.content
+ is '鍥炬爣svg鍐呭';
+comment on column PLICON.type
+ is '鍥炬爣绫诲瀷銆俿vg锛宲ng绛�';
+comment on column PLICON.groups
+ is '鍥炬爣鍒嗙粍銆傚涓敤閫楀彿鍒嗗壊銆�';
+-- Create/Recreate indexes
+create index PK_ICON_NAME on PLICON (NAME);
+-- Create/Recreate primary, unique and foreign key constraints
+alter table PLICON
+ add constraint PK_ICON primary key (OID);
+
+
+--鐢ㄦ埛閰嶇疆琛�
+-- Create table
+create table PLUSERCONFIG
+(
+ oid VARCHAR2(64) not null,
+ name VARCHAR2(64),
+ type VARCHAR2(64),
+ content CLOB,
+ userid VARCHAR2(20),
+ username VARCHAR2(64)
+);
+-- Add comments to the columns
+comment on column PLUSERCONFIG.name
+ is '閰嶇疆鍚嶇О';
+comment on column PLUSERCONFIG.type
+ is '鐢ㄦ埛閰嶇疆绫诲瀷锛歨ome:棣栭〉閰嶇疆,search:鍏ㄥ眬鎼滅储';
+comment on column PLUSERCONFIG.content
+ is '鐢ㄦ埛閰嶇疆鍐呭銆俲son鏍煎紡';
+comment on column PLUSERCONFIG.userid
+ is '鐢ㄦ埛璐﹀彿';
+comment on column PLUSERCONFIG.username
+ is '鐢ㄦ埛鍚嶇О';
+-- Create/Recreate indexes
+create index PK_USERCONFIG_NAME on PLUSERCONFIG (NAME);
+create index PK_USERCONFIG_NAME_TYPE on PLUSERCONFIG (TYPE, NAME);
+create index PK_USERCONFIG_TYPE on PLUSERCONFIG (TYPE);
+-- Create/Recreate primary, unique and foreign key constraints
+alter table PLUSERCONFIG add constraint PK_USERCONFIG primary key (OID);
diff --git a/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/constant/BtmIdConstant.java b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/constant/BtmIdConstant.java
index 8a691ab..434cf36 100644
--- a/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/constant/BtmIdConstant.java
+++ b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/constant/BtmIdConstant.java
@@ -40,4 +40,9 @@
* 鍙緭鍙�夊唴瀹�
*/
public static final String BD_SELECT_INPUT = "bdselectinput" ;
+
+ /**
+ * 棣栭〉閰嶇疆
+ */
+ public static final String BD_HOME_CONFIG = "homeconfig";
}
diff --git a/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/AuditTaskDTO.java b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/AuditTaskDTO.java
index bb87d04..f040062 100644
--- a/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/AuditTaskDTO.java
+++ b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/AuditTaskDTO.java
@@ -1,6 +1,6 @@
package com.vci.dto;
-import com.vci.dto.BaseModelDTO;
+import com.vci.starter.web.dto.BaseModelDTO;
import java.util.Date;
diff --git a/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/BdHomeConfigDTO.java b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/BdHomeConfigDTO.java
new file mode 100644
index 0000000..565da1e
--- /dev/null
+++ b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/BdHomeConfigDTO.java
@@ -0,0 +1,58 @@
+package com.vci.dto;
+
+import com.vci.starter.web.dto.BaseModelDTO;
+import lombok.Data;
+
+/**
+ * @Description 棣栭〉閰嶇疆浼犺緭瀵硅薄
+ * @Author dangsn
+ * @Date 2024/12/24 15:42
+ */
+@Data
+public class BdHomeConfigDTO extends BaseModelDTO {
+
+ /**
+ * 搴忓垪鍖�
+ */
+ private static final long serialVersionUID = -111533233671413754L;
+
+ /**
+ * 缁勪欢
+ */
+ private String module;
+
+ /**
+ * 鏍囬
+ */
+ private String title;
+
+ /**
+ * 鍥炬爣
+ */
+ private String icon;
+
+ /**
+ * 鍒楁暟
+ */
+ private Integer num;
+
+ /**
+ * 鍗犳瘮
+ */
+ private Double ratio;
+
+ /**
+ * 鎺掑簭鍙�
+ */
+ private Integer orderNum;
+
+ /**
+ * 浜哄憳璐﹀彿
+ */
+ private String userId;
+
+ /**
+ * 浜哄憳濮撳悕
+ */
+ private String userName;
+}
diff --git a/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/DeleteDataDTO.java b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/DeleteDataDTO.java
index c0a7b6e..f002f85 100644
--- a/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/DeleteDataDTO.java
+++ b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/DeleteDataDTO.java
@@ -1,5 +1,7 @@
package com.vci.dto;
+import com.vci.starter.web.dto.BaseModelDTO;
+
import java.util.List;
/**
diff --git a/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/DeleteLinkDataDTO.java b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/DeleteLinkDataDTO.java
index 9c2bce1..b9c5fc5 100644
--- a/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/DeleteLinkDataDTO.java
+++ b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/DeleteLinkDataDTO.java
@@ -1,5 +1,7 @@
package com.vci.dto;
+import com.vci.starter.web.dto.BaseLinkModelDTO;
+
import java.util.List;
/**
diff --git a/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/FormDataDTO.java b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/FormDataDTO.java
index da64e67..1ee9059 100644
--- a/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/FormDataDTO.java
+++ b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/FormDataDTO.java
@@ -1,11 +1,13 @@
package com.vci.dto;
+import com.vci.starter.web.dto.BaseModelDTO;
+
/**
* 琛ㄥ崟鏂板鍜屼慨鏀规暟鎹�
* @author weidy
* @date 2021/2/16
*/
-public class FormDataDTO extends BaseModelDTO{
+public class FormDataDTO extends BaseModelDTO {
/**
* 琛ㄥ崟瀹氫箟
diff --git a/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/FormLinkDataDTO.java b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/FormLinkDataDTO.java
index 0c8ef87..ad686ba 100644
--- a/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/FormLinkDataDTO.java
+++ b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/FormLinkDataDTO.java
@@ -1,6 +1,8 @@
package com.vci.dto;
+import com.vci.starter.web.dto.BaseLinkModelDTO;
+
/**
* 閾炬帴绫诲瀷鐨勮〃鍗曢噷娣诲姞鎴栬�呬慨鏀�
* @author weidy
diff --git a/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/model/BdHomeConfigDO.java b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/model/BdHomeConfigDO.java
new file mode 100644
index 0000000..1e01589
--- /dev/null
+++ b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/model/BdHomeConfigDO.java
@@ -0,0 +1,124 @@
+package com.vci.model;
+
+import com.vci.constant.BtmIdConstant;
+import com.vci.starter.web.annotation.VciBtmType;
+import com.vci.starter.web.constant.FrameWorkLcStatusConstant;
+import com.vci.starter.web.model.BaseModel;
+
+/**
+ * @Description 棣栭〉閰嶇疆鍔熻兘
+ * @Author dangsn
+ * @Date 2024/12/24 15:05
+ */
+@VciBtmType(name = BtmIdConstant.BD_HOME_CONFIG,text = "棣栭〉閰嶇疆鍔熻兘",lifeCycle = FrameWorkLcStatusConstant.EMTYPE_LIFE_CYCLE)
+public class BdHomeConfigDO extends BaseModel {
+
+ /**
+ * 搴忓垪鍖�
+ */
+ private static final long serialVersionUID = -6291865953564163287L;
+
+ /**
+ * 缁勪欢
+ */
+ private String module;
+
+ /**
+ * 鏍囬
+ */
+ private String title;
+
+ /**
+ * 鍥炬爣
+ */
+ private String icon;
+
+ /**
+ * 鍒楁暟
+ */
+ private Integer num;
+
+ /**
+ * 鍗犳瘮
+ */
+ private Double ratio;
+
+ /**
+ * 鎺掑簭鍙�
+ */
+ private Integer orderNum;
+
+ /**
+ * 浜哄憳璐﹀彿
+ */
+ private String userId;
+
+ /**
+ * 浜哄憳濮撳悕
+ */
+ private String userName;
+
+ public String getModule() {
+ return module;
+ }
+
+ public void setModule(String module) {
+ this.module = module;
+ }
+
+ public String getTitle() {
+ return title;
+ }
+
+ public void setTitle(String title) {
+ this.title = title;
+ }
+
+ public String getIcon() {
+ return icon;
+ }
+
+ public void setIcon(String icon) {
+ this.icon = icon;
+ }
+
+ public Integer getNum() {
+ return num;
+ }
+
+ public void setNum(Integer num) {
+ this.num = num;
+ }
+
+ public Double getRatio() {
+ return ratio;
+ }
+
+ public void setRatio(Double ratio) {
+ this.ratio = ratio;
+ }
+
+ public Integer getOrderNum() {
+ return orderNum;
+ }
+
+ public void setOrderNum(Integer orderNum) {
+ this.orderNum = orderNum;
+ }
+
+ public String getUserId() {
+ return userId;
+ }
+
+ public void setUserId(String userId) {
+ this.userId = userId;
+ }
+
+ public String getUserName() {
+ return userName;
+ }
+
+ public void setUserName(String userName) {
+ this.userName = userName;
+ }
+}
diff --git a/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/BdHomeConfigVO.java b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/BdHomeConfigVO.java
new file mode 100644
index 0000000..74a10c3
--- /dev/null
+++ b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/BdHomeConfigVO.java
@@ -0,0 +1,58 @@
+package com.vci.pagemodel;
+
+import com.vci.starter.web.pagemodel.BaseModelVO;
+import lombok.Data;
+
+/**
+ * @Description 棣栭〉閰嶇疆鏄剧ず瀵硅薄
+ * @Author dangsn
+ * @Date 2024/12/24 15:33
+ */
+@Data
+public class BdHomeConfigVO extends BaseModelVO {
+
+ /**
+ * 搴忓垪鍖�
+ */
+ private static final long serialVersionUID = 2433044100730800252L;
+
+ /**
+ * 缁勪欢
+ */
+ private String module;
+
+ /**
+ * 鏍囬
+ */
+ private String title;
+
+ /**
+ * 鍥炬爣
+ */
+ private String icon;
+
+ /**
+ * 鍒楁暟
+ */
+ private Integer num;
+
+ /**
+ * 鍗犳瘮
+ */
+ private Double ratio;
+
+ /**
+ * 鎺掑簭鍙�
+ */
+ private Integer orderNum;
+
+ /**
+ * 浜哄憳璐﹀彿
+ */
+ private String userId;
+
+ /**
+ * 浜哄憳濮撳悕
+ */
+ private String userName;
+}
diff --git a/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/BaseLinkModelDTO.java b/Source/plt-web/plt-web-parent/plt-web-base/src/main/java/com/vci/starter/web/dto/BaseLinkModelDTO.java
similarity index 99%
rename from Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/BaseLinkModelDTO.java
rename to Source/plt-web/plt-web-parent/plt-web-base/src/main/java/com/vci/starter/web/dto/BaseLinkModelDTO.java
index e5d1c98..a4080f0 100644
--- a/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/BaseLinkModelDTO.java
+++ b/Source/plt-web/plt-web-parent/plt-web-base/src/main/java/com/vci/starter/web/dto/BaseLinkModelDTO.java
@@ -1,4 +1,4 @@
-package com.vci.dto;
+package com.vci.starter.web.dto;
import com.alibaba.fastjson.annotation.JSONField;
diff --git a/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/BaseLinkModelDTOList.java b/Source/plt-web/plt-web-parent/plt-web-base/src/main/java/com/vci/starter/web/dto/BaseLinkModelDTOList.java
similarity index 95%
rename from Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/BaseLinkModelDTOList.java
rename to Source/plt-web/plt-web-parent/plt-web-base/src/main/java/com/vci/starter/web/dto/BaseLinkModelDTOList.java
index 6c5e21c..0a9f62e 100644
--- a/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/BaseLinkModelDTOList.java
+++ b/Source/plt-web/plt-web-parent/plt-web-base/src/main/java/com/vci/starter/web/dto/BaseLinkModelDTOList.java
@@ -1,4 +1,4 @@
-package com.vci.dto;
+package com.vci.starter.web.dto;
import com.vci.starter.web.model.BaseLinkModel;
diff --git a/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/BaseModelDTO.java b/Source/plt-web/plt-web-parent/plt-web-base/src/main/java/com/vci/starter/web/dto/BaseModelDTO.java
similarity index 98%
rename from Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/BaseModelDTO.java
rename to Source/plt-web/plt-web-parent/plt-web-base/src/main/java/com/vci/starter/web/dto/BaseModelDTO.java
index a99584c..2f18947 100644
--- a/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/BaseModelDTO.java
+++ b/Source/plt-web/plt-web-parent/plt-web-base/src/main/java/com/vci/starter/web/dto/BaseModelDTO.java
@@ -1,4 +1,4 @@
-package com.vci.dto;
+package com.vci.starter.web.dto;
import com.vci.starter.web.model.BaseModel;
diff --git a/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/BaseModelDTOList.java b/Source/plt-web/plt-web-parent/plt-web-base/src/main/java/com/vci/starter/web/dto/BaseModelDTOList.java
similarity index 95%
rename from Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/BaseModelDTOList.java
rename to Source/plt-web/plt-web-parent/plt-web-base/src/main/java/com/vci/starter/web/dto/BaseModelDTOList.java
index 90baa7a..4f2b0e8 100644
--- a/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/BaseModelDTOList.java
+++ b/Source/plt-web/plt-web-parent/plt-web-base/src/main/java/com/vci/starter/web/dto/BaseModelDTOList.java
@@ -1,4 +1,4 @@
-package com.vci.dto;
+package com.vci.starter.web.dto;
import java.util.List;
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 +
- '}';
}
}
diff --git a/Source/plt-web/plt-web-parent/plt-web-permission/src/main/java/com/vci/web/controller/HomeConfigCtroller.java b/Source/plt-web/plt-web-parent/plt-web-permission/src/main/java/com/vci/web/controller/HomeConfigCtroller.java
new file mode 100644
index 0000000..1fa220e
--- /dev/null
+++ b/Source/plt-web/plt-web-parent/plt-web-permission/src/main/java/com/vci/web/controller/HomeConfigCtroller.java
@@ -0,0 +1,128 @@
+package com.vci.web.controller;
+
+import com.vci.dto.BdHomeConfigDTO;
+import com.vci.pagemodel.BdHomeConfigVO;
+import com.vci.starter.web.annotation.log.VciBusinessLog;
+import com.vci.starter.web.pagemodel.BaseQueryObject;
+import com.vci.starter.web.pagemodel.BaseResult;
+import com.vci.starter.web.pagemodel.DataGrid;
+import com.vci.web.service.HomeConfigServiceI;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * @Description 棣栭〉閰嶇疆鎺у埗鍣�
+ * @Author dangsn
+ * @Date 2024/12/24 15:44
+ */
+@RestController
+@RequestMapping("/homeConfigController")
+public class HomeConfigCtroller {
+
+ /**
+ * 鏃ュ織
+ */
+ private Logger logger = LoggerFactory.getLogger(getClass());
+
+ /**
+ * 棣栭〉閰嶇疆鏈嶅姟
+ */
+ @Resource
+ private HomeConfigServiceI homeConfigServiceI;
+
+ /**
+ * 鏂板棣栭〉閰嶇疆
+ * @param homeConfigDTO
+ * @return
+ */
+ @VciBusinessLog(operateName = "鏂板棣栭〉閰嶇疆", description = "鏂板棣栭〉閰嶇疆")
+ @PostMapping("/addData")
+ public BaseResult addData(@RequestBody BdHomeConfigDTO homeConfigDTO){
+ try {
+ homeConfigServiceI.addData(homeConfigDTO);
+ return BaseResult.success();
+ } catch (Exception e) {
+ logger.error("鏂板棣栭〉閰嶇疆澶辫触锛�", e);
+ return BaseResult.error("鏂板棣栭〉閰嶇疆澶辫触锛�"+e.getMessage());
+ }
+ }
+
+ /**
+ * 淇敼棣栭〉閰嶇疆
+ * @param homeConfigDTO
+ * @return
+ */
+ @VciBusinessLog(operateName = "淇敼棣栭〉閰嶇疆", description = "淇敼棣栭〉閰嶇疆")
+ @PutMapping("/editData")
+ public BaseResult editData(@RequestBody BdHomeConfigDTO homeConfigDTO){
+ try {
+ homeConfigServiceI.editData(homeConfigDTO);
+ return BaseResult.success();
+ } catch (Exception e) {
+ logger.error("淇敼棣栭〉閰嶇疆澶辫触锛�", e);
+ return BaseResult.error("淇敼棣栭〉閰嶇疆澶辫触锛�"+e.getMessage());
+ }
+ }
+
+ /**
+ * 淇敼棣栭〉閰嶇疆
+ * @param homeConfigDTO
+ * @return
+ */
+ @VciBusinessLog(operateName = "鍒犻櫎棣栭〉閰嶇疆", description = "鍒犻櫎棣栭〉閰嶇疆")
+ @DeleteMapping("/delData")
+ public BaseResult delData(@RequestBody BdHomeConfigDTO homeConfigDTO){
+ try {
+ homeConfigServiceI.delData(homeConfigDTO);
+ return BaseResult.success();
+ } catch (Exception e) {
+ logger.error("鍒犻櫎棣栭〉閰嶇疆澶辫触锛�", e);
+ return BaseResult.error("鍒犻櫎棣栭〉閰嶇疆澶辫触锛�"+e.getMessage());
+ }
+ }
+
+ /**
+ * 鏍规嵁OID鑾峰彇棣栭〉閰嶇疆
+ * @param oid 棣栭〉閰嶇疆OID
+ * @return 棣栭〉閰嶇疆
+ */
+ @VciBusinessLog(operateName = "鑾峰彇棣栭〉閰嶇疆", description = "鏍规嵁OID鑾峰彇棣栭〉閰嶇疆")
+ @GetMapping("/getDataByOid")
+ public BaseResult<BdHomeConfigVO> getDataByOid(String oid){
+ try {
+ BdHomeConfigVO homeConfigVO = homeConfigServiceI.getDataByOid(oid);
+ return BaseResult.success(homeConfigVO);
+ } catch (Exception e) {
+ logger.error("鑾峰彇棣栭〉閰嶇疆澶辫触锛�", e);
+ return BaseResult.error("鑾峰彇棣栭〉閰嶇疆澶辫触锛�"+e.getMessage());
+ }
+ }
+
+ /**
+ * 鍒嗛〉鑾峰彇棣栭〉閰嶇疆
+ * @param baseQueryObject 鏌ヨ瀵硅薄
+ * @return 棣栭〉閰嶇疆
+ */
+ @VciBusinessLog(operateName = "鑾峰彇棣栭〉閰嶇疆", description = "鍒嗛〉鑾峰彇棣栭〉閰嶇疆")
+ @GetMapping("/gridData")
+ public DataGrid<BdHomeConfigVO> gridData(BaseQueryObject baseQueryObject){
+ return homeConfigServiceI.gridData(baseQueryObject);
+ }
+
+ /**
+ * 鑾峰彇鎵�鏈夐椤甸厤缃�
+ * @return 棣栭〉閰嶇疆
+ */
+ @VciBusinessLog(operateName = "鑾峰彇棣栭〉閰嶇疆", description = "鑾峰彇鎵�鏈夐椤甸厤缃�")
+ @GetMapping("/getAllData")
+ public BaseResult<BdHomeConfigVO> getAllData(){
+ BaseResult baseResult = BaseResult.success();
+ List<BdHomeConfigVO> voList = homeConfigServiceI.getAllData();
+ baseResult.setData(voList);
+ return baseResult;
+ }
+}
diff --git a/Source/plt-web/plt-web-parent/plt-web-permission/src/main/java/com/vci/web/controller/WebProcessCommandController.java b/Source/plt-web/plt-web-parent/plt-web-permission/src/main/java/com/vci/web/controller/WebProcessCommandController.java
index 7df22dd..cec29d1 100644
--- a/Source/plt-web/plt-web-parent/plt-web-permission/src/main/java/com/vci/web/controller/WebProcessCommandController.java
+++ b/Source/plt-web/plt-web-parent/plt-web-permission/src/main/java/com/vci/web/controller/WebProcessCommandController.java
@@ -5,7 +5,7 @@
import com.vci.starter.web.annotation.log.VciBusinessLog;
import com.vci.starter.web.pagemodel.BaseResult;
import com.vci.starter.web.pagemodel.DataGrid;
-import com.vci.dto.BaseModelDTO;
+import com.vci.starter.web.dto.BaseModelDTO;
import com.vci.dto.ProcessNodeUseDTO;
import com.vci.dto.ProcessStartConfigDTO;
import com.vci.web.service.WebProcessCommandServiceI;
diff --git a/Source/plt-web/plt-web-parent/plt-web-permission/src/main/java/com/vci/web/dao/HomeConfigDaoI.java b/Source/plt-web/plt-web-parent/plt-web-permission/src/main/java/com/vci/web/dao/HomeConfigDaoI.java
new file mode 100644
index 0000000..d94ca1d
--- /dev/null
+++ b/Source/plt-web/plt-web-parent/plt-web-permission/src/main/java/com/vci/web/dao/HomeConfigDaoI.java
@@ -0,0 +1,123 @@
+package com.vci.web.dao;
+
+import com.vci.model.BdHomeConfigDO;
+import com.vci.pagemodel.BatchCBO;
+import com.vci.starter.web.pagemodel.PageHelper;
+import com.vci.starter.web.wrapper.VciQueryWrapperForDO;
+
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @Description 棣栭〉閰嶇疆鏁版嵁鎺ュ彛
+ * @Author dangsn
+ * @Date 2024/12/24 15:46
+ */
+public interface HomeConfigDaoI {
+ /**
+ * 娣诲姞鏁版嵁
+ * @param record 鏁版嵁瀵硅薄
+ * @return 鎵ц缁撴灉
+ */
+ BatchCBO insert(BdHomeConfigDO record);
+
+ /**
+ * 鎵归噺娣诲姞鏁版嵁
+ * @param records 鏁版嵁瀵硅薄闆嗗悎
+ * @return 鎵ц缁撴灉鏁�
+ */
+ BatchCBO batchInsert(List<BdHomeConfigDO> records);
+
+ /**
+ * 鏇存柊瀵硅薄
+ * @param record 鏁版嵁瀵硅薄
+ * @return 鎵ц缁撴灉
+ */
+ BatchCBO update(BdHomeConfigDO record);
+
+ /**
+ * 鎵归噺鏇存柊
+ * @param records 鏁版嵁瀵硅薄闆嗗悎
+ * @return 鎵ц缁撴灉琛屾暟
+ */
+ BatchCBO batchUpdate(List<BdHomeConfigDO> records);
+
+ /**
+ * 浣跨敤涓婚敭鍒犻櫎
+ * @param oid 鏁版嵁涓婚敭
+ * @return 鎵ц缁撴灉
+ */
+ BatchCBO deleteByPrimaryKey(String oid);
+
+ /**
+ * 浣跨敤涓婚敭鍒犻櫎
+ * @param oidCollection 鏁版嵁涓婚敭闆嗗悎
+ * @return 鎵ц缁撴灉
+ */
+ BatchCBO deleteByPrimaryKeys(Collection<String> oidCollection);
+
+ /**
+ * 鍒犻櫎涓氬姟閫氱煡
+ * @param record 涓氬姟閫氱煡瀵硅薄
+ * @return 鎵ц缁撴灉
+ */
+ BatchCBO delete(BdHomeConfigDO record);
+
+ /**
+ * 鎵归噺鍒犻櫎鏁版嵁
+ * @param recordList 鏁版嵁闆嗗悎
+ */
+ BatchCBO batchDelete(List<BdHomeConfigDO> recordList);
+
+ /**
+ * 鏍规嵁涓婚敭鏌ヨ
+ * @param oid 鏁版嵁涓婚敭
+ * @return 鏁版嵁瀵硅薄
+ */
+ BdHomeConfigDO selectByPrimaryKey(String oid);
+
+ /**
+ * 鏍规嵁涓婚敭鎵归噺鑾峰彇瀵硅薄
+ * @param oids 涓婚敭锛屽寘鍚崟寮曞彿,浣嗘槸涓嶈兘瓒呰繃1000
+ * @return 鏁版嵁瀵硅薄鍒楄〃
+ */
+ List<BdHomeConfigDO> selectByPrimaryKeys(String oids);
+
+ /**
+ * 鏍规嵁涓婚敭鎵归噺鏌ヨ瀵硅薄
+ * @param oids 瀵硅薄涓婚敭,浣跨敤閫楀彿鍒嗛殧锛屼絾鏄笉鑳借秴杩�1000
+ * @return 涓氬姟瀵硅薄
+ */
+ List<BdHomeConfigDO> selectByPrimaryKeyCollection(Collection<String> oids);
+
+ /**
+ * 鏍规嵁鏌ヨ鏉′欢鏌ヨ鏁版嵁
+ * @param conditionMap 鏌ヨ鏉′欢锛�
+ * @param pageHelper 鍖呮嫭鍒嗛〉锛屾帓搴�
+ * @return 鏁版嵁瀵硅薄鍒楄〃
+ */
+ List<BdHomeConfigDO> selectByCondition(Map<String,String> conditionMap, PageHelper pageHelper);
+
+ /**
+ * 鏍规嵁鏌ヨ鏉′欢鏉ユ煡璇㈡�绘暟
+ * @param conditionMap 鏌ヨ鏉′欢
+ * @return 鎬绘暟
+ */
+ Long countByCondition(Map<String,String> conditionMap);
+
+ /**
+ * 浣跨敤鏌ヨ灏佽鍣ㄦ潵鏌ヨ
+ * @param queryWrapper 鏌ヨ灏佽鍣�
+ * @return 鏁版嵁瀵硅薄鍒楄〃
+ */
+ List<BdHomeConfigDO> selectByWrapper(VciQueryWrapperForDO queryWrapper);
+
+ /**
+ * 鏍规嵁鏌ヨ灏佽鍣ㄦ潵鏌ヨ鎬绘暟
+ * @param queryWrapper 鏌ヨ灏佽鍣�
+ * @return 鎬绘暟
+ */
+ Long countByWrapper(VciQueryWrapperForDO queryWrapper);
+
+}
diff --git a/Source/plt-web/plt-web-parent/plt-web-permission/src/main/java/com/vci/web/dao/impl/HomeConfigDaoImpl.java b/Source/plt-web/plt-web-parent/plt-web-permission/src/main/java/com/vci/web/dao/impl/HomeConfigDaoImpl.java
new file mode 100644
index 0000000..876909c
--- /dev/null
+++ b/Source/plt-web/plt-web-parent/plt-web-permission/src/main/java/com/vci/web/dao/impl/HomeConfigDaoImpl.java
@@ -0,0 +1,218 @@
+package com.vci.web.dao.impl;
+
+import com.vci.constant.FrameWorkBusLangCodeConstant;
+import com.vci.model.BdHomeConfigDO;
+import com.vci.pagemodel.BatchCBO;
+import com.vci.starter.web.exception.VciBaseException;
+import com.vci.starter.web.pagemodel.PageHelper;
+import com.vci.starter.web.util.VciBaseUtil;
+import com.vci.starter.web.wrapper.VciQueryWrapperForDO;
+import com.vci.web.dao.HomeConfigDaoI;
+import com.vci.web.service.WebBoServiceI;
+import com.vci.web.util.WebUtil;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Repository;
+import org.springframework.util.CollectionUtils;
+
+import javax.annotation.Resource;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @Description 棣栭〉閰嶇疆鏁版嵁鏈嶅姟
+ * @Author dangsn
+ * @Date 2024/12/24 15:47
+ */
+@Repository
+public class HomeConfigDaoImpl implements HomeConfigDaoI {
+ /**
+ * 涓氬姟绫诲瀷鎿嶄綔鐨勬湇鍔�
+ */
+ @Resource
+ private WebBoServiceI boService;
+
+ /**
+ * 娣诲姞鏁版嵁
+ *
+ * @param record 鏁版嵁瀵硅薄
+ * @return 鎵ц缁撴灉
+ */
+ @Override
+ public BatchCBO insert(BdHomeConfigDO record) {
+ VciBaseUtil.alertNotNull(record,"瑕佹坊鍔犵殑鏁版嵁");
+ return boService.addSave(record);
+ }
+
+ /**
+ * 鎵归噺娣诲姞鏁版嵁
+ *
+ * @param records 鏁版嵁瀵硅薄闆嗗悎
+ * @return 鎵ц缁撴灉鏁�
+ */
+ @Override
+ public BatchCBO batchInsert(List<BdHomeConfigDO> records) {
+ VciBaseUtil.alertNotNull(records,"瑕佹坊鍔犵殑鏁版嵁");
+ return boService.batchAddSave(records);
+ }
+
+ /**
+ * 鏇存柊瀵硅薄
+ *
+ * @param record 浜у搧璋堜环璁″垝鏁版嵁瀵硅薄
+ * @return 鎵ц缁撴灉
+ */
+ @Override
+ public BatchCBO update(BdHomeConfigDO record) {
+ VciBaseUtil.alertNotNull(record,"瑕佷慨鏀圭殑瀵硅薄",record.getOid(),"鏁版嵁涓婚敭");
+ return boService.editSave(record);
+ }
+
+ /**
+ * 鎵归噺鏇存柊
+ *
+ * @param records 鏁版嵁瀵硅薄闆嗗悎
+ * @return 鎵ц缁撴灉琛屾暟
+ */
+ @Override
+ public BatchCBO batchUpdate(List<BdHomeConfigDO> records) {
+ VciBaseUtil.alertNotNull(records,"瑕佷慨鏀圭殑瀵硅薄");
+ return boService.batchEditSave(records);
+ }
+
+ /**
+ * 浣跨敤涓婚敭鍒犻櫎
+ *
+ * @param oid 鏁版嵁涓婚敭
+ * @return 鎵ц缁撴灉
+ */
+ @Override
+ public BatchCBO deleteByPrimaryKey(String oid) {
+ WebUtil.alertNotNull(oid, "鏁版嵁涓婚敭");
+ BdHomeConfigDO record = selectByPrimaryKey(oid);
+ return boService.delete(record);
+ }
+
+ /**
+ * 浣跨敤涓婚敭鍒犻櫎
+ *
+ * @param oidCollection 鏁版嵁涓婚敭闆嗗悎
+ * @return 鎵ц缁撴灉
+ */
+ @Override
+ public BatchCBO deleteByPrimaryKeys(Collection<String> oidCollection) {
+ WebUtil.alertNotNull(oidCollection, "鏁版嵁涓婚敭闆嗗悎");
+ List<BdHomeConfigDO> homeConfigDOList = selectByPrimaryKeyCollection(oidCollection);
+ return boService.batchDelete(homeConfigDOList);
+ }
+
+ /**
+ * 鍒犻櫎涓氬姟閫氱煡
+ *
+ * @param record 涓氬姟閫氱煡瀵硅薄
+ * @return 鎵ц缁撴灉
+ */
+ @Override
+ public BatchCBO delete(BdHomeConfigDO record) {
+ return boService.delete(record);
+ }
+
+ /**
+ * 鎵归噺鍒犻櫎鏁版嵁
+ *
+ * @param recordList 鏁版嵁闆嗗悎
+ */
+ @Override
+ public BatchCBO batchDelete(List<BdHomeConfigDO> recordList) {
+ BatchCBO batchCBO = new BatchCBO();
+ if(!CollectionUtils.isEmpty(recordList)){
+ batchCBO.copyFromOther(boService.batchDelete(recordList));
+ }
+ return batchCBO;
+ }
+
+ /**
+ * 鏍规嵁涓婚敭鏌ヨ
+ *
+ * @param oid 鏁版嵁涓婚敭
+ * @return 鏁版嵁瀵硅薄
+ */
+ @Override
+ public BdHomeConfigDO selectByPrimaryKey(String oid) {
+ VciBaseUtil.alertNotNull(oid,"鏁版嵁涓婚敭");
+ BdHomeConfigDO record = boService.selectByOid(oid, BdHomeConfigDO.class);
+ if(record == null || StringUtils.isBlank(record.getOid())){
+ throw new VciBaseException(FrameWorkBusLangCodeConstant.DATA_OID_NOT_EXIST);
+ }
+ return record;
+ }
+
+ /**
+ * 鏍规嵁涓婚敭鎵归噺鑾峰彇瀵硅薄
+ *
+ * @param oids 涓婚敭锛屽寘鍚崟寮曞彿,浣嗘槸涓嶈兘瓒呰繃1000
+ * @return 鏁版嵁瀵硅薄鍒楄〃
+ */
+ @Override
+ public List<BdHomeConfigDO> selectByPrimaryKeys(String oids) {
+ VciBaseUtil.alertNotNull(oids,"鏁版嵁涓婚敭闆嗗悎");
+ return boService.selectByOidCollection(VciBaseUtil.str2List(oids), BdHomeConfigDO.class);
+ }
+
+ /**
+ * 鏍规嵁涓婚敭鎵归噺鏌ヨ瀵硅薄
+ *
+ * @param oids 瀵硅薄涓婚敭,浣跨敤閫楀彿鍒嗛殧锛屼絾鏄笉鑳借秴杩�1000
+ * @return 涓氬姟瀵硅薄
+ */
+ @Override
+ public List<BdHomeConfigDO> selectByPrimaryKeyCollection(Collection<String> oids) {
+ VciBaseUtil.alertNotNull(oids,"鏁版嵁涓婚敭闆嗗悎");
+ return boService.selectByOidCollection(oids, BdHomeConfigDO.class);
+ }
+
+ /**
+ * 鏍规嵁鏌ヨ鏉′欢鏌ヨ鏁版嵁
+ *
+ * @param conditionMap 鏌ヨ鏉′欢锛�
+ * @param pageHelper 鍖呮嫭鍒嗛〉锛屾帓搴�
+ * @return 鏁版嵁瀵硅薄鍒楄〃
+ */
+ @Override
+ public List<BdHomeConfigDO> selectByCondition(Map<String, String> conditionMap, PageHelper pageHelper) {
+ return boService.queryObject(BdHomeConfigDO.class,conditionMap,pageHelper);
+ }
+
+ /**
+ * 鏍规嵁鏌ヨ鏉′欢鏉ユ煡璇㈡�绘暟
+ *
+ * @param conditionMap 鏌ヨ鏉′欢
+ * @return 鎬绘暟
+ */
+ @Override
+ public Long countByCondition(Map<String, String> conditionMap) {
+ return VciBaseUtil.getLong(String.valueOf(boService.queryCount(BdHomeConfigDO.class,conditionMap)));
+ }
+
+ /**
+ * 浣跨敤鏌ヨ灏佽鍣ㄦ潵鏌ヨ
+ *
+ * @param queryWrapper 鏌ヨ灏佽鍣�
+ * @return 鏁版嵁瀵硅薄鍒楄〃
+ */
+ @Override
+ public List<BdHomeConfigDO> selectByWrapper(VciQueryWrapperForDO queryWrapper) {
+ return boService.selectByQueryWrapper(queryWrapper,BdHomeConfigDO.class);
+ }
+
+ /**
+ * 鏍规嵁鏌ヨ灏佽鍣ㄦ潵鏌ヨ鎬绘暟
+ *
+ * @param queryWrapper 鏌ヨ灏佽鍣�
+ * @return 鎬绘暟
+ */
+ @Override
+ public Long countByWrapper(VciQueryWrapperForDO queryWrapper) {
+ return VciBaseUtil.getLong(String.valueOf(boService.countByQueryWrapper(queryWrapper,BdHomeConfigDO.class)));
+ }
+}
diff --git a/Source/plt-web/plt-web-parent/plt-web-permission/src/main/java/com/vci/web/service/HomeConfigServiceI.java b/Source/plt-web/plt-web-parent/plt-web-permission/src/main/java/com/vci/web/service/HomeConfigServiceI.java
new file mode 100644
index 0000000..025082b
--- /dev/null
+++ b/Source/plt-web/plt-web-parent/plt-web-permission/src/main/java/com/vci/web/service/HomeConfigServiceI.java
@@ -0,0 +1,55 @@
+package com.vci.web.service;
+
+import com.vci.dto.BdHomeConfigDTO;
+import com.vci.pagemodel.BdHomeConfigVO;
+import com.vci.starter.web.pagemodel.BaseQueryObject;
+import com.vci.starter.web.pagemodel.DataGrid;
+
+import java.util.List;
+
+/**
+ * @Description 棣栭〉閰嶇疆鎺ュ彛
+ * @Author dangsn
+ * @Date 2024/12/24 15:45
+ */
+public interface HomeConfigServiceI {
+
+ /**
+ * 鏂板棣栭〉閰嶇疆
+ * @param homeConfigDTO 棣栭〉閰嶇疆浼犺緭瀵硅薄
+ */
+ void addData(BdHomeConfigDTO homeConfigDTO);
+
+ /**
+ * 淇敼棣栭〉閰嶇疆
+ * @param homeConfigDTO 棣栭〉閰嶇疆浼犺緭瀵硅薄
+ */
+ void editData(BdHomeConfigDTO homeConfigDTO);
+
+ /**
+ * 鍒犻櫎棣栭〉閰嶇疆
+ * @param homeConfigDTO 棣栭〉閰嶇疆浼犺緭瀵硅薄
+ */
+ void delData(BdHomeConfigDTO homeConfigDTO);
+
+ /**
+ * 鏍规嵁OID鑾峰彇棣栭〉閰嶇疆
+ * @param oid 棣栭〉閰嶇疆OID
+ * @return 棣栭〉閰嶇疆
+ */
+ BdHomeConfigVO getDataByOid(String oid);
+
+ /**
+ * 鍒嗛〉鑾峰彇棣栭〉閰嶇疆
+ * @param baseQueryObject 鏌ヨ瀵硅薄
+ * @return 棣栭〉閰嶇疆
+ */
+ DataGrid<BdHomeConfigVO> gridData(BaseQueryObject baseQueryObject);
+
+ /**
+ * 鑾峰彇鎵�鏈夐椤甸厤缃�
+ * @return 棣栭〉閰嶇疆
+ */
+ List<BdHomeConfigVO> getAllData();
+
+}
diff --git a/Source/plt-web/plt-web-parent/plt-web-permission/src/main/java/com/vci/web/service/WebBoServiceI.java b/Source/plt-web/plt-web-parent/plt-web-permission/src/main/java/com/vci/web/service/WebBoServiceI.java
index af2b509..ad64908 100644
--- a/Source/plt-web/plt-web-parent/plt-web-permission/src/main/java/com/vci/web/service/WebBoServiceI.java
+++ b/Source/plt-web/plt-web-parent/plt-web-permission/src/main/java/com/vci/web/service/WebBoServiceI.java
@@ -639,6 +639,8 @@
|| "lastmodifytime".equalsIgnoreCase(attrName)
|| "createtime".equalsIgnoreCase(attrName)
|| "checkintime".equalsIgnoreCase(attrName)
- ||"checkouttime".equalsIgnoreCase(attrName));
+ ||"checkouttime".equalsIgnoreCase(attrName)
+ || "modifier".equalsIgnoreCase(attrName)
+ || "modifytime".equalsIgnoreCase(attrName));
}
}
diff --git a/Source/plt-web/plt-web-parent/plt-web-permission/src/main/java/com/vci/web/service/impl/HomeConfigServiceImpl.java b/Source/plt-web/plt-web-parent/plt-web-permission/src/main/java/com/vci/web/service/impl/HomeConfigServiceImpl.java
new file mode 100644
index 0000000..668dbcf
--- /dev/null
+++ b/Source/plt-web/plt-web-parent/plt-web-permission/src/main/java/com/vci/web/service/impl/HomeConfigServiceImpl.java
@@ -0,0 +1,160 @@
+package com.vci.web.service.impl;
+
+import com.vci.dto.BdHomeConfigDTO;
+import com.vci.model.BdHomeConfigDO;
+import com.vci.pagemodel.BdHomeConfigVO;
+import com.vci.starter.web.pagemodel.BaseQueryObject;
+import com.vci.starter.web.pagemodel.DataGrid;
+import com.vci.starter.web.pagemodel.PageHelper;
+import com.vci.starter.web.pagemodel.SessionInfo;
+import com.vci.starter.web.util.BeanUtilForVCI;
+import com.vci.starter.web.wrapper.VciQueryWrapperForDO;
+import com.vci.web.dao.HomeConfigDaoI;
+import com.vci.web.service.HomeConfigServiceI;
+import com.vci.web.util.WebUtil;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
+
+import javax.annotation.Resource;
+import java.util.*;
+
+/**
+ * @Description 棣栭〉閰嶇疆鏈嶅姟
+ * @Author dangsn
+ * @Date 2024/12/24 15:46
+ */
+@Service
+public class HomeConfigServiceImpl implements HomeConfigServiceI {
+
+ /**
+ * 鏃ュ織
+ */
+ private Logger logger = LoggerFactory.getLogger(getClass());
+
+ /**
+ * 棣栭〉閰嶇疆鏁版嵁鏈嶅姟
+ */
+ @Resource
+ private HomeConfigDaoI homeConfigDaoI;
+
+ /**
+ * 鏂板棣栭〉閰嶇疆
+ *
+ * @param homeConfigDTO 棣栭〉閰嶇疆浼犺緭瀵硅薄
+ */
+ @Override
+ public void addData(BdHomeConfigDTO homeConfigDTO) {
+ BdHomeConfigDO homeConfigDO = new BdHomeConfigDO();
+ BeanUtilForVCI.copyPropertiesIgnoreCase(homeConfigDTO, homeConfigDO);
+ homeConfigDO.setOid(WebUtil.getPk());
+ SessionInfo sessionInfo = WebUtil.getCurrentUserSessionInfo();
+ homeConfigDO.setUserId(sessionInfo.getUserId());
+ homeConfigDO.setUserName(sessionInfo.getUserName());
+ homeConfigDaoI.insert(homeConfigDO);
+ }
+
+ /**
+ * 淇敼棣栭〉閰嶇疆
+ *
+ * @param homeConfigDTO 棣栭〉閰嶇疆浼犺緭瀵硅薄
+ */
+ @Override
+ public void editData(BdHomeConfigDTO homeConfigDTO) {
+ WebUtil.alertNotNull(homeConfigDTO.getOid(), "鏁版嵁涓婚敭");
+ BdHomeConfigDO homeConfigDO = homeConfigDaoI.selectByPrimaryKey(homeConfigDTO.getOid());
+ homeConfigDO.setModule(homeConfigDTO.getModule());
+ homeConfigDO.setIcon(homeConfigDTO.getIcon());
+ homeConfigDO.setTitle(homeConfigDTO.getTitle());
+ homeConfigDO.setNum(homeConfigDTO.getNum());
+ homeConfigDO.setRatio(homeConfigDTO.getRatio());
+ homeConfigDO.setOrderNum(homeConfigDTO.getOrderNum());
+ homeConfigDaoI.update(homeConfigDO);
+ }
+
+ /**
+ * 鍒犻櫎棣栭〉閰嶇疆
+ *
+ * @param homeConfigDTO 棣栭〉閰嶇疆浼犺緭瀵硅薄
+ */
+ @Override
+ public void delData(BdHomeConfigDTO homeConfigDTO) {
+ WebUtil.alertNotNull(homeConfigDTO.getOid(), "鏁版嵁涓婚敭");
+ List<String> oidList = WebUtil.str2List(homeConfigDTO.getOid());
+ homeConfigDaoI.deleteByPrimaryKeys(oidList);
+ }
+
+ /**
+ * 鏍规嵁OID鑾峰彇棣栭〉閰嶇疆
+ *
+ * @param oid 棣栭〉閰嶇疆OID
+ * @return 棣栭〉閰嶇疆
+ */
+ @Override
+ public BdHomeConfigVO getDataByOid(String oid) {
+ WebUtil.alertNotNull(oid, "鏁版嵁涓婚敭");
+ BdHomeConfigDO homeConfigDO = homeConfigDaoI.selectByPrimaryKey(oid);
+
+
+ return null;
+ }
+
+ private List<BdHomeConfigVO> DOS2VOS(Collection<BdHomeConfigDO> doCollection){
+ List<BdHomeConfigVO> voList = new ArrayList<>();
+ if(!CollectionUtils.isEmpty(doCollection)){
+ doCollection.forEach(DO->{
+ voList.add(DO2VO(DO));
+ });
+ }
+ return voList;
+ }
+
+ private BdHomeConfigVO DO2VO(BdHomeConfigDO DO){
+ BdHomeConfigVO vo = new BdHomeConfigVO();
+ BeanUtilForVCI.copyPropertiesIgnoreCase(DO, vo);
+ return vo;
+ }
+
+ /**
+ * 鍒嗛〉鑾峰彇棣栭〉閰嶇疆
+ *
+ * @param baseQueryObject 鏌ヨ瀵硅薄
+ * @return 棣栭〉閰嶇疆
+ */
+ @Override
+ public DataGrid<BdHomeConfigVO> gridData(BaseQueryObject baseQueryObject) {
+ Map<String, String> conditionMap = baseQueryObject.getConditionMap();
+ PageHelper pageHelper = baseQueryObject.getPageHelper();
+ if(conditionMap == null){
+ conditionMap = new HashMap<>();
+ }
+ if(pageHelper == null){
+ pageHelper = new PageHelper();
+ }
+ VciQueryWrapperForDO wrapper = new VciQueryWrapperForDO(conditionMap, BdHomeConfigDO.class, pageHelper);
+ List<BdHomeConfigDO> doList = homeConfigDaoI.selectByWrapper(wrapper);
+
+ DataGrid<BdHomeConfigVO> dataGrid = new DataGrid<>();
+ dataGrid.setPage(pageHelper.getPage());
+ dataGrid.setLimit(pageHelper.getLimit());
+ dataGrid.setData(DOS2VOS(doList));
+
+ wrapper.clearPage();
+ dataGrid.setTotal(homeConfigDaoI.countByWrapper(wrapper));
+
+ return dataGrid;
+ }
+
+ /**
+ * 鑾峰彇鎵�鏈夐椤甸厤缃�
+ *
+ * @return 棣栭〉閰嶇疆
+ */
+ @Override
+ public List<BdHomeConfigVO> getAllData() {
+ VciQueryWrapperForDO wrapper = new VciQueryWrapperForDO(BdHomeConfigDO.class);
+ List<BdHomeConfigDO> doList = homeConfigDaoI.selectByWrapper(wrapper);
+ return DOS2VOS(doList);
+ }
+}
diff --git a/Source/plt-web/plt-web-parent/plt-web-permission/src/main/java/com/vci/web/service/impl/SmRoleQueryServiceImpl.java b/Source/plt-web/plt-web-parent/plt-web-permission/src/main/java/com/vci/web/service/impl/SmRoleQueryServiceImpl.java
index 11dca6e..3091cd7 100644
--- a/Source/plt-web/plt-web-parent/plt-web-permission/src/main/java/com/vci/web/service/impl/SmRoleQueryServiceImpl.java
+++ b/Source/plt-web/plt-web-parent/plt-web-permission/src/main/java/com/vci/web/service/impl/SmRoleQueryServiceImpl.java
@@ -855,7 +855,7 @@
roleVO.setCreator(roleForPlatform1.getPlcreateuser());
roleVO.setLastModifier(roleForPlatform1.getPlupdateuser());
roleVO.setLastModifyTime(new Date(roleForPlatform1.getPlupdatetime()));
- roleVO.setBtmname(FrameWorkBtmTypeConstant.SM_ROLE_BTM_TYPE);
+ roleVO.setBtmName(FrameWorkBtmTypeConstant.SM_ROLE_BTM_TYPE);
roleVO.setOwner(roleVO.getCreator());
roleVO.setTs(roleVO.getLastModifyTime());
return roleVO;
diff --git a/Source/plt-web/plt-web-parent/plt-web-permission/src/main/java/com/vci/web/service/impl/WebBoServiceImpl.java b/Source/plt-web/plt-web-parent/plt-web-permission/src/main/java/com/vci/web/service/impl/WebBoServiceImpl.java
index 614884d..15ecbdd 100644
--- a/Source/plt-web/plt-web-parent/plt-web-permission/src/main/java/com/vci/web/service/impl/WebBoServiceImpl.java
+++ b/Source/plt-web/plt-web-parent/plt-web-permission/src/main/java/com/vci/web/service/impl/WebBoServiceImpl.java
@@ -120,6 +120,23 @@
*/
public static final Map<String,String> BO_BASE_FIELD_MAP = new HashMap<>();
+ /**
+ * 鍙互淇敼鍊肩殑榛樿灞炴��
+ */
+ public static final List<String> EDIT_BASE_FIELD_LIST = new ArrayList<String>(){{
+ add("id");
+ add("name");
+ add("description");
+ add("lcstatus");
+ add("revisionvalue");
+ add("versionvalue");
+ add("copyfromversion");
+ add("lastr");
+ add("firstr");
+ add("lastv");
+ add("firstv");
+ }};
+
public WebBoServiceImpl(){
List<Field> fields = WebUtil.getAllFieldForObj(BusinessObject.class);
if(!CollectionUtils.isEmpty(fields)) {
@@ -1615,11 +1632,17 @@
if(isEdit && checkUnAttrUnEdit(attrName)){
//缂栬緫鐨勬椂鍊欙紝TS鍜孫ID涓嶈兘璁剧疆.鍥犱负骞冲彴閭ｆ帴鍙ｈ缃簡灏变細鎶ラ敊
}else {
- //闇�瑕佸垽鏂槸鍚﹂粯璁ょ殑灞炴�э紝濡傛灉鏄粯璁ゅ睘鎬э紝鍒欎娇鐢ㄥ璞＄殑璧嬪�肩殑鏂瑰紡
- if (WebUtil.isDefaultField(fieldName.toLowerCase()) && WebUtil.inArray(new String[]{"id", "name", "description","lcstatus","revisionvalue","versionvalue"}, fieldName.toLowerCase())) {
+ //闇�瑕佸垽鏂槸鍚﹂粯璁ょ殑灞炴�э紝濡傛灉鏄紝鍒欎娇鐢ㄥ璞＄殑璧嬪�肩殑鏂瑰紡
+ if (WebUtil.isDefaultField(fieldName.toLowerCase())) {
WebUtil.setValueToCboField(fieldName, cbo, value);
+ //鍒ゆ柇鏄惁涓哄彲浠ヤ慨鏀圭殑榛樿灞炴��
+ if(EDIT_BASE_FIELD_LIST.contains(fieldName.toLowerCase())){
+ //闇�瑕佹敞鎰忥紝榛樿灞炴�т腑锛岄儴鍒嗗睘鎬у悕绉帮紝鍜屾暟鎹簱涓殑瀛楁涓嶄竴鏍凤紝闇�瑕佽浆鎹�
+ ObjectTool.setBOAttributeValue(cbo, VciQueryWrapperForDO.BASE_MODEL_COMPATIBILITY_MAP.getOrDefault(fieldName.toLowerCase(),fieldName.toLowerCase()), value);
+ }
+ }else{
+ ObjectTool.setBOAttributeValue(cbo, attrName.toLowerCase(), value);
}
- ObjectTool.setBOAttributeValue(cbo, attrName.toLowerCase(), value);
}
}
}
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/WebDataRightController.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/WebDataRightController.java
index 1c3f5cc..c2667f4 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/WebDataRightController.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/WebDataRightController.java
@@ -5,8 +5,8 @@
import com.vci.starter.web.enumpck.UserSecretEnum;
import com.vci.starter.web.pagemodel.BaseResult;
import com.vci.starter.web.pagemodel.SessionInfo;
-import com.vci.dto.BaseModelDTO;
-import com.vci.dto.BaseModelDTOList;
+import com.vci.starter.web.dto.BaseModelDTO;
+import com.vci.starter.web.dto.BaseModelDTOList;
import com.vci.web.properties.WebProperties;
import com.vci.web.service.WebSecretServiceI;
import com.vci.web.util.WebUtil;
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/SmFunctionQueryServicePlatformImpl.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/SmFunctionQueryServicePlatformImpl.java
index 4545527..f241c1e 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/SmFunctionQueryServicePlatformImpl.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/SmFunctionQueryServicePlatformImpl.java
@@ -368,7 +368,7 @@
}
}
- functionVO.setBtmname("function");
+ functionVO.setBtmName("function");
//鑰佺殑鏁版嵁閲屽垱寤轰汉锛屾渶鍚庝慨鏀逛汉绛夐兘娌℃湁
return functionVO;
}
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/WebIconServiceImpl.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/WebIconServiceImpl.java
index 7e9ddda..c6d966d 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/WebIconServiceImpl.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/WebIconServiceImpl.java
@@ -71,6 +71,11 @@
JSONObject jsonObject = jsonArray.getJSONObject(i);
String iconContent = jsonObject.getString("svg");
String iconName = jsonObject.getString("name").toLowerCase();
+ if(iconContent.contains("<use href")){
+ iconContent = iconContent.replace("svg\"", "svg\" xmlns:xlink=\"http://www.w3.org/1999/xlink\"");
+ iconContent = iconContent.replace("<use href","<use xlink:href");
+ }
+
if(nameList.contains(iconName)){
PLIcon icon = iconMap.get(iconName);
icon.content = iconContent;
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/uidataservice/UIDataCommonServiceI.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/uidataservice/UIDataCommonServiceI.java
index 96a203d..2ef6b7d 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/uidataservice/UIDataCommonServiceI.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/uidataservice/UIDataCommonServiceI.java
@@ -8,6 +8,8 @@
import com.vci.dto.*;
import com.vci.pagemodel.OsBtmTypeVO;
import com.vci.pagemodel.ReferConfigVO;
+import com.vci.starter.web.dto.BaseLinkModelDTOList;
+import com.vci.starter.web.dto.BaseModelDTOList;
import com.vci.starter.web.enumpck.VciChangeDocumentTypeEnum;
import com.vci.starter.web.exception.VciBaseException;
import com.vci.starter.web.model.BaseModel;
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/uidataservice/impl/UIDataCommonServiceImpl.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/uidataservice/impl/UIDataCommonServiceImpl.java
index 33920a1..7a75659 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/uidataservice/impl/UIDataCommonServiceImpl.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/uidataservice/impl/UIDataCommonServiceImpl.java
@@ -27,6 +27,10 @@
import com.vci.starter.web.annotation.bus.VciChangeDataPlugin;
import com.vci.starter.web.constant.FrameWorkLcStatusConstant;
import com.vci.starter.web.constant.QueryOptionConstant;
+import com.vci.starter.web.dto.BaseLinkModelDTO;
+import com.vci.starter.web.dto.BaseLinkModelDTOList;
+import com.vci.starter.web.dto.BaseModelDTO;
+import com.vci.starter.web.dto.BaseModelDTOList;
import com.vci.starter.web.enumpck.VciChangeDocumentTypeEnum;
import com.vci.starter.web.exception.VciBaseException;
import com.vci.starter.web.model.BaseModel;
@@ -40,7 +44,6 @@
import com.vci.web.service.*;
import com.vci.web.service.impl.WebBoServiceImpl;
import com.vci.web.service.impl.WebLoServiceImpl;
-import com.vci.web.service.uidataservice.UIDataBaseServiceI;
import com.vci.web.service.uidataservice.UIDataCommonServiceI;
import com.vci.web.util.PlatformClientUtil;
import com.vci.web.util.WebUtil;
--
Gitblit v1.9.3