From f07aca58c4e1d96c8e75c90b021b00c593bcffff Mon Sep 17 00:00:00 2001
From: yuxc <yuxc@vci-tech.com>
Date: 星期二, 28 五月 2024 11:36:17 +0800
Subject: [PATCH] 1、平台接口修改以及web端后台的修改。 2、对平台的更新jar包上传。
---
Bin/lib/service/VciServiceMain.jar | 0
Bin/web/lib/plt-client-1.0.jar | 0
Source/platformProject/vci-platform-web/src/main/java/com/vci/web/util/WebUtil.java | 13 +
Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/OsStatusServiceImpl.java | 3
Source/platformProject/vci-platform-web/pom.xml | 5
Source/platformProject/vci-platform-web/src/main/java/com/vci/web/controller/StmFunctionController.java | 3
Source/platformProject/vci-platform-web/src/main/java/com/vci/web/controller/SmFunctionController.java | 5
Bin/web/lib/plt-clientbase-1.0.RELEASE.jar | 0
Bin/lib/service/UIService.jar | 0
Bin/properties/hibernate.cfg.xml | 56 ------
Bin/lib/common/ice-3.7.10.jar | 0
Bin/web/lib/plt-slice-1.0.RELEASE.jar | 0
Source/platformProject/vci-platform-web/src/main/java/com/vci/web/other/WorkFlowEndedNotice.java | 3
Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/WebLoServiceImpl.java | 5
Bin/properties/service.xml | 1
Bin/lib/service/OQService.jar | 0
Bin/lib/client/plt-clientbase.jar | 0
Bin/lib/common/plt-slice.jar | 0
Source/platformProject/vci-platform-web/src/main/java/com/vci/frameworkcore/compatibility/impl/SmFunctionQueryServicePlatformImpl.java | 8
Bin/web/lib/plt-common-1.0.RELEASE.jar | 0
Bin/lib/service/WFService.jar | 0
Bin/Redis-6.2.10/redis.conf | 2
Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/OsAttributeServiceImpl.java | 11
Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/OsLifeCycleServiceImpl.java | 7
Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/OsEnumServiceI.java | 9
Bin/lib/service/LogService.jar | 0
Bin/2-Startup_Server.bat | 0
Bin/lib/service/BOFService.jar | 0
Bin/lib/common/plt-common.jar | 0
Source/platformProject/vci-platform-web/src/main/java/com/vci/frameworkcore/compatibility/ISmFunctionQueryService.java | 5
Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/OsAttributeServiceI.java | 5
Bin/lib/service/CacheService.jar | 0
Bin/2-Startup_Server.sh | 0
Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/OsEnumServiceImpl.java | 33 +-
Bin/properties/iceClient.properties | 4
Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/OsBtmServiceI.java | 6
Bin/lib/service/WFPlugins.jar | 0
Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/UIEngineServiceImpl.java | 33 +-
Bin/lib/service/VolumeService.jar | 0
Bin/web/vci-platform-web.jar | 0
Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/UIDataServiceImpl.java | 66 ++++--
Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/WebBoServiceImpl.java | 45 ++--
Bin/lib/common/icebox-3.7.10.jar | 0
Source/platformProject/vci-platform-web/src/main/java/com/vci/web/controller/WebUIDataController.java | 1
Bin/lib/service/FrameService.jar | 0
Bin/properties/corba.properties | 157 -----------------
Bin/lib/service/ServiceBase.jar | 0
Bin/lib/service/OMDService.jar | 0
Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/WebBtmIOServiceImpl.java | 22 +-
Bin/00-startup.bat | 4
Bin/properties/redis.properties | 2
Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/OsBtmServiceImpl.java | 15
Bin/lib/client/plt-client.jar | 0
53 files changed, 187 insertions(+), 342 deletions(-)
diff --git a/Bin/00-startup.bat b/Bin/00-startup.bat
index bdcc272..9109ae6 100644
--- a/Bin/00-startup.bat
+++ b/Bin/00-startup.bat
@@ -1,5 +1,7 @@
start 1-Startup_Redis.bat
choice /t 3
-start 1-Startup_Server.bat
+start 2-Startup_Server.bat
+choice /t 3
+start 5-Startup_Web.bat
diff --git a/Bin/1-Startup_Server.bat b/Bin/2-Startup_Server.bat
similarity index 100%
rename from Bin/1-Startup_Server.bat
rename to Bin/2-Startup_Server.bat
diff --git a/Bin/1-Startup_Server.sh b/Bin/2-Startup_Server.sh
similarity index 100%
rename from Bin/1-Startup_Server.sh
rename to Bin/2-Startup_Server.sh
diff --git a/Bin/Redis-6.2.10/redis.conf b/Bin/Redis-6.2.10/redis.conf
index 6ded884..31c297f 100644
--- a/Bin/Redis-6.2.10/redis.conf
+++ b/Bin/Redis-6.2.10/redis.conf
@@ -900,7 +900,7 @@
# The requirepass is not compatable with aclfile option and the ACL LOAD
# command, these will cause requirepass to be ignored.
#
-# requirepass foobared
+requirepass foobared
# New users are initialized with restrictive permissions by default, via the
# equivalent of this ACL rule 'off resetkeys -@all'. Starting with Redis 6.2, it
diff --git a/Bin/lib/client/plt-client.jar b/Bin/lib/client/plt-client.jar
index d4286a6..a136600 100644
--- a/Bin/lib/client/plt-client.jar
+++ b/Bin/lib/client/plt-client.jar
Binary files differ
diff --git a/Bin/lib/client/plt-clientbase.jar b/Bin/lib/client/plt-clientbase.jar
index 50330af..88b1396 100644
--- a/Bin/lib/client/plt-clientbase.jar
+++ b/Bin/lib/client/plt-clientbase.jar
Binary files differ
diff --git a/Bin/lib/common/ice-3.7.10.jar b/Bin/lib/common/ice-3.7.10.jar
new file mode 100644
index 0000000..768c926
--- /dev/null
+++ b/Bin/lib/common/ice-3.7.10.jar
Binary files differ
diff --git a/Bin/lib/common/icebox-3.7.10.jar b/Bin/lib/common/icebox-3.7.10.jar
new file mode 100644
index 0000000..45e41b3
--- /dev/null
+++ b/Bin/lib/common/icebox-3.7.10.jar
Binary files differ
diff --git a/Bin/lib/common/plt-common.jar b/Bin/lib/common/plt-common.jar
index 4a83711..ec5d9d9 100644
--- a/Bin/lib/common/plt-common.jar
+++ b/Bin/lib/common/plt-common.jar
Binary files differ
diff --git a/Bin/lib/common/plt-slice.jar b/Bin/lib/common/plt-slice.jar
index 96264cf..e0d1317 100644
--- a/Bin/lib/common/plt-slice.jar
+++ b/Bin/lib/common/plt-slice.jar
Binary files differ
diff --git a/Bin/lib/service/BOFService.jar b/Bin/lib/service/BOFService.jar
index 02856bd..5055813 100644
--- a/Bin/lib/service/BOFService.jar
+++ b/Bin/lib/service/BOFService.jar
Binary files differ
diff --git a/Bin/lib/service/CacheService.jar b/Bin/lib/service/CacheService.jar
index 28856b3..7d76eae 100644
--- a/Bin/lib/service/CacheService.jar
+++ b/Bin/lib/service/CacheService.jar
Binary files differ
diff --git a/Bin/lib/service/FrameService.jar b/Bin/lib/service/FrameService.jar
index e8bf9a2..52ad00c 100644
--- a/Bin/lib/service/FrameService.jar
+++ b/Bin/lib/service/FrameService.jar
Binary files differ
diff --git a/Bin/lib/service/LogService.jar b/Bin/lib/service/LogService.jar
new file mode 100644
index 0000000..b640d7f
--- /dev/null
+++ b/Bin/lib/service/LogService.jar
Binary files differ
diff --git a/Bin/lib/service/OMDService.jar b/Bin/lib/service/OMDService.jar
index a4a1419..7d64090 100644
--- a/Bin/lib/service/OMDService.jar
+++ b/Bin/lib/service/OMDService.jar
Binary files differ
diff --git a/Bin/lib/service/OQService.jar b/Bin/lib/service/OQService.jar
index 64cc1fe..1fa8314 100644
--- a/Bin/lib/service/OQService.jar
+++ b/Bin/lib/service/OQService.jar
Binary files differ
diff --git a/Bin/lib/service/ServiceBase.jar b/Bin/lib/service/ServiceBase.jar
index 9b3cc0d..0e44d26 100644
--- a/Bin/lib/service/ServiceBase.jar
+++ b/Bin/lib/service/ServiceBase.jar
Binary files differ
diff --git a/Bin/lib/service/UIService.jar b/Bin/lib/service/UIService.jar
index 3bdfbb9..a6c2d4e 100644
--- a/Bin/lib/service/UIService.jar
+++ b/Bin/lib/service/UIService.jar
Binary files differ
diff --git a/Bin/lib/service/VciServiceMain.jar b/Bin/lib/service/VciServiceMain.jar
index e4bd80e..ae7ecff 100644
--- a/Bin/lib/service/VciServiceMain.jar
+++ b/Bin/lib/service/VciServiceMain.jar
Binary files differ
diff --git a/Bin/lib/service/VolumeService.jar b/Bin/lib/service/VolumeService.jar
index ab4afc4..fb5d5b1 100644
--- a/Bin/lib/service/VolumeService.jar
+++ b/Bin/lib/service/VolumeService.jar
Binary files differ
diff --git a/Bin/lib/service/WFPlugins.jar b/Bin/lib/service/WFPlugins.jar
index 8042853..d8e3a60 100644
--- a/Bin/lib/service/WFPlugins.jar
+++ b/Bin/lib/service/WFPlugins.jar
Binary files differ
diff --git a/Bin/lib/service/WFService.jar b/Bin/lib/service/WFService.jar
index 25dbf09..b6b7b34 100644
--- a/Bin/lib/service/WFService.jar
+++ b/Bin/lib/service/WFService.jar
Binary files differ
diff --git a/Bin/properties/corba.properties b/Bin/properties/corba.properties
index 601c439..164c098 100644
--- a/Bin/properties/corba.properties
+++ b/Bin/properties/corba.properties
@@ -1,10 +1,7 @@
-锘�#conf.properties version by Eclipse
+#corba.properties version by Eclipse
#Sat Oct 19 14:06:56 CST 2013
NameService=corbaloc\:\:localhost\:30000/NameService
InstanceIdentity=platform-
-
-## 脙漏脗聹脗聙脙篓脗娄脗聛脙楼脗聤脗聽脙篓脗陆脗陆脙搂脗職脗聞.jar脙娄脗聣脗聙脙楼脗聹脗篓脙篓脗路脗炉脙楼脗戮脗聞(脙陇脗录脗職脙漏脗聙脗聮脙楼脗陆脗聮脙楼脗颅脗聬脙娄脗聳脗聡脙陇脗禄脗露脙楼脗陇脗鹿脙漏脗聡脗聦脙搂脗職脗聞.jar脙炉脗录脗聣脙炉脗录脗聦脙楼脗娄脗聜 D:/xx/xx/xx
-jarPath=./libs
jacorb.net.socket_factory.port.min=29990
jacorb.net.socket_factory.port.max=29999
@@ -17,155 +14,3 @@
jacorb.log.default.verbosity=
-#脙娄脗聳脗聡脙陇脗禄脗露脙陇脗录脗聽脙篓脗戮脗聯脙楼脗聺脗聴脙楼脗陇脗搂脙楼脗掳脗聫
-blockLength=32
-
-########################################### 脙楼脗鹿脗鲁脙楼脗聫脗掳UIF 脙漏脗聹脗聙脙篓脗娄脗聛脙搂脗職脗聞脙漏脗聟脗聧脙搂脗陆脗庐 BEGIN ###########################################
-#脙陇脗潞脗潞脙楼脗聭脗聵脙陇脗驴脗隆脙娄脗聛脗炉脙楼脗聟脗楼脙娄脗聴脗露,脙娄脗聵脗炉脙楼脗聬脗娄脙漏脗聹脗聙脙篓脗娄脗聛脙楼脗炉脗聠脙搂脗潞脗搂脙楼脗颅脗聴脙娄脗庐脗碌
-exportSecretGrade=false
-
-# 脙楼脗聤脗聽脙楼脗炉脗聠脙楼脗炉脗聠脙漏脗聮脗楼
-encrypt.key=www.liming.portal.comwww.liming.portal.com
-# 脙搂脗聶脗禄脙楼脗陆脗聲脙搂脗陋脗聴脙楼脗聫脗拢脙炉脗录脗聦脙娄脗聵脗炉脙楼脗聬脗娄脙娄脗聵脗戮脙搂脗陇脗潞脙垄脗聙脗聵脙陇脗驴脗聺脙楼脗颅脗聵脙垄脗聙脗聶脙楼脗陇脗聧脙漏脗聙脗聣脙娄脗隆脗聠
-logon.saveBut=false
-# 脙搂脗鲁脗禄脙搂脗禄脗聼脙搂脗聰脗篓脙娄脗聢脗路脙搂脗聶脗禄脙楼脗陆脗聲脙篓脗露脗聟脙娄脗聴脗露脙娄脗聴脗露脙漏脗聴脗麓(脙楼脗聧脗聲脙陇脗陆脗聧脙楼脗聢脗聠脙楼脗聢脗聠脙漏脗聮脗聼脙炉脗录脗聣
-logon.loginovertime=1000
-# 脙陇脗赂脗禄脙娄脗隆脗聠脙娄脗聻脗露脙陇脗赂脗聤脙炉脗录脗聦脙娄脗聵脗炉脙楼脗聬脗娄脙娄脗聵脗戮脙搂脗陇脗潞脙漏脗隆脗露脙漏脗聝脗篓脙楼脗聸脗戮脙搂脗聣脗聡
-top.logon.image.show=false
-# 脙陇脗赂脗禄脙娄脗隆脗聠脙娄脗聻脗露脙陇脗赂脗聤脙炉脗录脗聦脙漏脗隆脗露脙漏脗聝脗篓脙楼脗聸脗戮脙搂脗聣脗聡脙楼脗聬脗聧脙搂脗搂脗掳脙炉脗录脗聢脙篓脗炉脗楼脙楼脗聸脗戮脙搂脗聣脗聡脙陇脗陆脗聧脙陇脗潞脗聨 com.vci.rmip.logon.client 脙楼脗聦脗聟脙陇脗赂脗聥脙炉脗录脗聣
-top.logon.image.name=title.jpg
-# 脙陇脗赂脗禄脙娄脗隆脗聠脙娄脗聻脗露脙陇脗赂脗聤脙炉脗录脗聦脙娄脗聵脗炉脙楼脗聬脗娄脙娄脗聵脗戮脙搂脗陇脗潞脙篓脗聫脗聹脙楼脗聧脗聲 true:脙娄脗聵脗戮脙搂脗陇脗潞 false:脙陇脗赂脗聧脙娄脗聵脗戮脙搂脗陇脗潞
-top.menuBar.show=true
-# 脙陇脗赂脗禄脙篓脗聫脗聹脙楼脗聧脗聲脙陇脗赂脗聥脙炉脗录脗聦脙娄脗聵脗炉脙楼脗聬脗娄脙娄脗聵脗戮脙搂脗陇脗潞脙垄脗聙脗聵脙漏脗聡脗聧脙娄脗聳脗掳脙搂脗聶脗禄脙楼脗陆脗聲脙垄脗聙脗聶 true:脙娄脗聵脗戮脙搂脗陇脗潞 false:脙陇脗赂脗聧脙娄脗聵脗戮脙搂脗陇脗潞
-top.menuBar.menuItem.relogin=true
-# 脙陇脗赂脗禄脙篓脗聫脗聹脙楼脗聧脗聲脙陇脗赂脗聥脙炉脗录脗聦脙娄脗聵脗炉脙楼脗聬脗娄脙娄脗聵脗戮脙搂脗陇脗潞脙垄脗聙脗聵脙陇脗驴脗庐脙娄脗聰脗鹿脙楼脗炉脗聠脙搂脗聽脗聛脙垄脗聙脗聶 true:脙娄脗聵脗戮脙搂脗陇脗潞 false:脙陇脗赂脗聧脙娄脗聵脗戮脙搂脗陇脗潞
-top.menuBar.menuItem.changePassword=true
-
-# 脙搂脗鲁脗禄脙搂脗禄脗聼脙楼脗聟脗鲁脙陇脗潞脗聨脙漏脗聟脗聧脙搂脗陆脗庐,脙陇脗驴脗庐脙娄脗聰脗鹿脙漏脗聟脗聧脙搂脗陆脗庐脙娄脗聵脗炉脙篓脗娄脗聛脙娄脗鲁脗篓脙娄脗聞脗聫脙陇脗赂脗颅脙娄脗聳脗聡脙楼脗颅脗聴脙搂脗卢脗娄脙搂脗職脗聞脙搂脗录脗聳脙搂脗聽脗聛脙陇脗陆脗驴脙搂脗聰脗篓utf-8
-system.about.title = 脙楼脗聟脗鲁脙陇脗潞脗聨
-# 脙娄脗聹脗聙脙陇脗陆脗鲁脙楼脗聸脗戮脙搂脗聣脗聡脙楼脗掳脗潞脙楼脗炉脗赂400*90脙炉脗录脗聦脙漏脗禄脗聵脙篓脗庐脗陇脙楼脗聙脗录脙陇脗赂脗潞about.png
-system.about.imageName=about.png
-# 脙陇脗潞脗搂脙楼脗聯脗聛脙楼脗聬脗聧脙搂脗搂脗掳
-system.about.softNameProduct= VCI Innovation 2017
-# 脙搂脗聣脗聢脙娄脗聺脗聝_脙陇脗赂脗颅脙娄脗聳脗聡
-system.about.softNameCopyrightC = 脙楼脗庐脗聫脙楼脗聧脗職脙篓脗驴脗聹脙篓脗戮脗戮脙楼脗聟脗卢脙楼脗聫脗赂 脙搂脗聣脗聢脙娄脗聺脗聝脙娄脗聣脗聙脙娄脗聹脗聣
-# 脙搂脗聣脗聢脙娄脗聺脗聝_脙篓脗聥脗卤脙娄脗聳脗聡
-system.about.softNameCopyrightE = Copyright(C) 2011-2017 Contributors. All rights reserved.
-# 脙漏脗隆脗鹿脙搂脗聸脗庐脙楼脗聬脗聧脙搂脗搂脗掳
-system.about.softName = 脙楼脗聦脗聴脙陇脗潞脗卢脙楼脗庐脗聫脙楼脗聧脗職脙篓脗驴脗聹脙篓脗戮脗戮脙搂脗搂脗聭脙娄脗聤脗聙脙娄脗聹脗聣脙漏脗聶脗聬脙楼脗聟脗卢脙楼脗聫脗赂 - 脙搂脗鲁脗禄脙搂脗禄脗聼脙楼脗录脗聙脙楼脗聫脗聭脙楼脗鹿脗鲁脙楼脗聫脗掳
-# 脙楼脗鹿脗鲁脙楼脗聫脗掳脙搂脗聣脗聢脙娄脗聹脗卢
-system.about.version = v2017.06.14
-# 脙楼脗聟脗卢脙楼脗聫脗赂脙搂脗陆脗聭脙楼脗聺脗聙
-system.about.visit = http://www.vci-tech.com
-
-
-# 脙搂脗庐脗隆脙搂脗聬脗聠脙楼脗聭脗聵脙搂脗聰脗篓脙娄脗聢脗路脙楼脗聬脗聧
-user.admin=admin
-# 脙篓脗露脗聟脙搂脗潞脗搂脙搂脗庐脗隆脙搂脗聬脗聠脙楼脗聭脗聵脙搂脗聰脗篓脙娄脗聢脗路脙楼脗聬脗聧
-user.developer=developer
-# 脙楼脗庐脗聣脙楼脗聟脗篓脙搂脗庐脗隆脙搂脗聬脗聠脙楼脗聭脗聵脙篓脗搂脗聮脙篓脗聣脗虏脙楼脗聬脗聧脙搂脗搂脗掳
-user.Sysadmin=\u5b89\u5168\u7ba1\u7406\u5458
-user.rooter=root
-
-# 脙娄脗聴脗楼脙楼脗驴脗聴脙娄脗篓脗隆脙楼脗聺脗聴脙炉脗录脗聦脙娄脗聵脗炉脙楼脗聬脗娄脙楼脗聬脗炉脙搂脗聰脗篓脙娄脗聼脗楼脙篓脗炉脗垄 on:脙楼脗聬脗炉脙搂脗聰脗篓 off:脙搂脗娄脗聛脙搂脗聰脗篓
-log.query.switch=off
-period=1
-# 脙娄脗聴脗楼脙楼脗驴脗聴脙娄脗篓脗隆脙楼脗聺脗聴脙炉脗录脗聦脙楼脗庐脗職脙娄脗聹脗聼脙楼脗聢脗聽脙漏脗聶脗陇脙娄脗聴脗楼脙楼脗驴脗聴脙娄脗聴脗露脙炉脗录脗聦脙娄脗聰脗炉脙娄脗聦脗聛脙搂脗職脗聞脙楼脗聫脗炉脙漏脗聙脗聣脙楼脗聙脗录脙炉脗录脗聢
-log.save.periods=\ufeff1\#\u4e00\u4e2a\u6708\:\:2\#\u4e24\u4e2a\u6708\:\:3\#\u4e09\u4e2a\u6708\:\:6\#\u534a\u5e74\:\:12\#\u4e00\u5e74\:\:18\#\u4e00\u5e74\u534a\:\:24\#\u4e24\u5e74
-# 脙娄脗聴脗楼脙楼脗驴脗聴脙娄脗篓脗隆脙楼脗聺脗聴脙炉脗录脗聦脙楼脗聢脗聠脙漏脗隆脗碌脙娄脗聼脗楼脙篓脗炉脗垄脙娄脗聴脗露脙炉脗录脗聦脙漏脗隆脗碌脙娄脗聲脗掳脙娄脗聧脗庐脙楼脗陇脗搂脙楼脗掳脗聫
-log.query.pagesize=30
-# 脙娄脗聴脗楼脙楼脗驴脗聴脙娄脗篓脗隆脙楼脗聺脗聴脙炉脗录脗聦脙娄脗聵脗炉脙楼脗聬脗娄脙楼脗聬脗炉脙搂脗聰脗篓脙楼脗庐脗職脙娄脗聴脗露脙楼脗聢脗聽脙漏脗聶脗陇脙娄脗聴脗楼脙楼脗驴脗聴 Y:脙楼脗聬脗炉脙搂脗聰脗篓 N:脙搂脗娄脗聛脙搂脗聰脗篓
-log.delete.auto=N
-# 脙娄脗聴脗楼脙楼脗驴脗聴脙娄脗篓脗隆脙楼脗聺脗聴脙炉脗录脗聦脙楼脗庐脗職脙娄脗聴脗露脙楼脗聢脗聽脙漏脗聶脗陇脙娄脗聴脗楼脙楼脗驴脗聴脙娄脗聴脗露脙炉脗录脗聦脙篓脗娄脗聛脙陇脗驴脗聺脙搂脗聲脗聶脙娄脗聹脗聙脙篓脗驴脗聭脙搂脗職脗聞脙楼脗陇脗漏脙娄脗聲脗掳
-log.autoDelete.rate=7
-# 脙娄脗聴脗楼脙楼脗驴脗聴脙楼脗聢脗聽脙漏脗聶脗陇脙娄脗聴脗露脙漏脗聴脗麓
-log.autoDelete.time=0\:\:0\:\:0
-
-########################################### 脙楼脗鹿脗鲁脙楼脗聫脗掳UIF 脙漏脗聹脗聙脙篓脗娄脗聛脙搂脗職脗聞脙漏脗聟脗聧脙搂脗陆脗庐 BEGIN ###########################################
-#脙娄脗聲脗掳脙娄脗聧脗庐脙娄脗聺脗聝脙漏脗聶脗聬脙娄脗聵脗炉脙楼脗聬脗娄脙搂脗聰脗聼脙娄脗聲脗聢 on:脙楼脗录脗聙脙楼脗聬脗炉 off脙炉脗录脗職脙楼脗聟脗鲁脙漏脗聴脗颅
-right.switch=off
-#脙楼脗聤脗聼脙篓脗聝脗陆脙娄脗篓脗隆脙楼脗聺脗聴脙娄脗聨脗聢脙娄脗聺脗聝脙漏脗陋脗聦脙篓脗炉脗聛脙娄脗聵脗炉脙楼脗聬脗娄脙篓脗庐脗掳 on脙炉脗录脗職脙楼脗录脗聙脙楼脗聬脗炉 off脙炉脗录脗職脙楼脗聟脗鲁脙漏脗聴脗颅
-function.right.swith=on
-#UI脙娄脗聨脗聢脙娄脗聺脗聝脙娄脗聵脗炉脙楼脗聬脗娄脙搂脗聰脗聼脙娄脗聲脗聢 on:脙楼脗录脗聙脙娄脗聢脗路 off脙炉脗录脗職脙楼脗聟脗鲁脙漏脗聴脗颅
-ui.right.swith=false
-# tablePanel 脙漏脗禄脗聵脙篓脗庐脗陇脙娄脗聰脗炉脙娄脗聦脗聛脙搂脗職脗聞pageSize脙楼脗聢脗聴脙篓脗隆脗篓
-tablePanel.pageSizeList=100,200,300,500,800,1000
-#脙楼脗聫脗聜脙搂脗聟脗搂脙娄脗聨脗搂脙陇脗禄脗露脙炉脗录脗聦脙楼脗聹脗篓脙漏脗聸脗聠脙娄脗聢脗聬脙娄脗聴脗露脙炉脗录脗聦脙楼脗聫脗炉脙篓脗聡脗陋脙楼脗庐脗職脙陇脗鹿脗聣脙楼脗聫脗聜脙搂脗聟脗搂脙娄脗聳脗鹿脙楼脗录脗聫脙炉脗录脗聦脙楼脗聙脗录脙陇脗赂脗潞脙搂脗卤脗禄
-engin.refObjectChoose =
-# 脙搂脗鲁脗禄脙搂脗禄脗聼脙陇脗驴脗隆脙娄脗聛脗炉脙娄脗聫脗聬脙搂脗陇脗潞脙娄脗隆脗聠脙娄脗聵脗戮脙搂脗陇脗潞脙娄脗聳脗鹿脙楼脗录脗聫 popup:脙楼脗录脗鹿脙楼脗聡脗潞脙娄脗隆脗聠 ;lowerRight:脙楼脗聫脗鲁脙陇脗赂脗聥脙篓脗搂脗聮脙拢脗聙脗聜 脙漏脗禄脗聵脙篓脗庐脗陇脙陇脗赂脗潞脙楼脗聫脗鲁脙陇脗赂脗聥脙篓脗搂脗聮
-PromptMessage.DisplayModes=popup
-# 脙楼脗娄脗聜脙娄脗聻脗聹脙楼脗聹脗篓脙楼脗聫脗鲁脙陇脗赂脗聥脙篓脗搂脗聮脙娄脗聵脗戮脙搂脗陇脗潞脙搂脗鲁脗禄脙搂脗禄脗聼脙娄脗露脗聢脙娄脗聛脗炉脙娄脗聴脗露脙炉脗录脗聦脙篓脗庐脗戮脙搂脗陆脗庐脙娄脗露脗聢脙娄脗聛脗炉脙搂脗陋脗聴脙楼脗聫脗拢脙搂脗職脗聞脙娄脗聵脗戮脙搂脗陇脗潞脙娄脗聴脗露脙漏脗聴脗麓脙炉脗录脗聦脙娄脗炉脗芦脙搂脗搂脗聮脙拢脗聙脗聜脙漏脗禄脗聵脙篓脗庐脗陇脙陇脗赂脗潞3000脙娄脗炉脗芦脙搂脗搂脗聮
-PromptMessage.DisplayTime=3000
-#脙楼脗聢脗聠脙搂脗卤脗禄脙娄脗聽脗聭脙楼脗炉脗录脙篓脗聢脗陋脙娄脗聴脗露脙炉脗录脗聦脙娄脗聰脗炉脙娄脗聦脗聛脙搂脗職脗聞脙陇脗潞脗聥脙陇脗禄脗露脙楼脗聬脗聧脙搂脗搂脗掳
-uidesign.eventKey=SelectionEvent,DBClickEvent,ClickEvent
-# 脙漏脗娄脗聳脙漏脗隆脗碌脙篓脗聡脗陋脙楼脗庐脗職脙陇脗鹿脗聣脙搂脗卤脗禄脙炉脗录脗聦脙楼脗聫脗炉脙陇脗禄脗楼脙娄脗聹脗聣脙楼脗陇脗職脙搂脗禄脗聞脙炉脗录脗聦脙娄脗炉脗聫脙搂脗禄脗聞脙陇脗鹿脗聥脙漏脗聴脗麓脙搂脗聰脗篓脙楼脗聢脗聠脙楼脗聫脗路;脙楼脗聢脗聠脙漏脗職脗聰脙炉脗录脗聦脙篓脗聡脗陋脙楼脗庐脗職脙陇脗鹿脗聣脙搂脗卤脗禄脙陇脗赂脗聨脙娄脗聽脗聡脙漏脗垄脗聵脙陇脗鹿脗聥脙漏脗聴脗麓脙搂脗聰脗篓脙漏脗聙脗聴脙楼脗聫脗路,脙楼脗聢脗聠脙漏脗職脗聰
-# 脙娄脗聽脗录脙楼脗录脗聫脙炉脗录脗職脙篓脗聡脗陋脙楼脗庐脗職脙陇脗鹿脗聣脙搂脗卤脗禄脙楼脗庐脗聦脙娄脗聲脗麓脙篓脗路脗炉脙楼脗戮脗聞1,脙娄脗聽脗聡脙漏脗垄脗聵1脙炉脗录脗聢UNOCIDE脙娄脗聽脗录脙楼脗录脗聫脙炉脗录脗聣,脙楼脗聸脗戮脙娄脗聽脗聡脙娄脗聳脗聡脙陇脗禄脗露脙楼脗庐脗聦脙娄脗聲脗麓脙篓脗路脗炉脙楼脗戮脗聞.;脙篓脗聡脗陋脙楼脗庐脗職脙陇脗鹿脗聣脙搂脗卤脗禄脙楼脗庐脗聦脙娄脗聲脗麓脙篓脗路脗炉脙楼脗戮脗聞2,脙娄脗聽脗聡脙漏脗垄脗聵2脙炉脗录脗聢UNOCIDE脙娄脗聽脗录脙楼脗录脗聫脙炉脗录脗聣,脙楼脗聸脗戮脙娄脗聽脗聡脙娄脗聳脗聡脙陇脗禄脗露脙楼脗庐脗聦脙娄脗聲脗麓脙篓脗路脗炉脙楼脗戮脗聞;
-# 脙搂脗陇脗潞脙陇脗戮脗聥脙炉脗录脗職plm617.engine.HomePageForTaskMessagePanel,\u6211\u7684\u6d88\u606f\u0096\u0087,
-#HomePageClasses=plm.uif.engine.client.UILayoutPanel?type=workitem&context=workItemHomePage,\u6211\u7684\u6d88\u606f\u0096\u0087,/com/vci/base/ui/image/email.png
-########################################### 脙楼脗鹿脗鲁脙楼脗聫脗掳UIF 脙漏脗聹脗聙脙篓脗娄脗聛脙搂脗職脗聞脙漏脗聟脗聧脙搂脗陆脗庐 END ###########################################
-
-
-########################################### 脙搂脗录脗聳脙搂脗聽脗聛脙楼脗聤脗聽脙漏脗聙脗聼脙搂脗職脗聞脙陇脗赂脗聯脙搂脗聰脗篓脙漏脗聟脗聧脙搂脗陆脗庐 BEGIN ###########################################
-Code.Accelerator.Rule.Keys=name;changeorder;btmName
-Code.Accelerator.Section.Keys=id;name;btmName
-Code.Accelerator.AttrMap=id=\u540d\u79f0;name=\u63cf\u8ff0;btmName=脙搂脗卤脗禄脙楼脗聻脗聥脙楼脗聬脗聧脙搂脗搂脗掳
-########################################### 脙搂脗录脗聳脙搂脗聽脗聛脙楼脗聤脗聽脙漏脗聙脗聼脙搂脗職脗聞脙陇脗赂脗聯脙搂脗聰脗篓脙漏脗聟脗聧脙搂脗陆脗庐 END ###########################################
-
-
-########################################### 脙楼脗路脗楼脙陇脗陆脗聹脙娄脗碌脗聛&脙娄脗碌脗聛脙搂脗篓脗聥脙楼脗录脗聲脙娄脗聯脗聨脙搂脗聸脗赂脙楼脗聟脗鲁脙漏脗聟脗聧脙搂脗陆脗庐 BEGIN ###########################################
-#脙楼脗路脗楼脙陇脗陆脗聹脙娄脗碌脗聛脙娄脗聫脗聮脙陇脗禄脗露脙炉脗录脗聦脙楼脗聟脗鲁脙篓脗聛脗聰脙楼脗鹿脗鲁脙楼脗聫脗掳workitem脙楼脗炉脗鹿脙篓脗卤脗隆脙搂脗職脗聞脙娄脗聯脗聧脙陇脗陆脗聹
-workflow.plmworkitem = com.vci.platform.workflow.plugins.PLMWorkItem
-workflow.AssignTask = com.vci.rmip.workflow.server.event.AssignTask
-#脙楼脗路脗楼脙陇脗陆脗聹脙娄脗碌脗聛脙篓脗庐脗戮脙搂脗陆脗庐脙陇脗禄脗禄脙楼脗聤脗隆脙楼脗聙脗聶脙漏脗聙脗聣脙陇脗潞脗潞
-jbpm4.engin.checkTaskUser = com.vci.rmip.workflow.server.ExImp.ExAssginImp
-#脙娄脗颅脗陇脙搂脗卤脗禄脙搂脗聰脗篓脙陇脗潞脗聨脙篓脗搂脗拢脙娄脗聻脗聬脙篓脗搂脗聮脙篓脗聣脗虏脙楼脗聮脗聦脙漏脗聝脗篓脙漏脗聴脗篓脙陇脗赂脗聥脙搂脗職脗聞脙搂脗聰脗篓脙娄脗聢脗路
-workflow.userService = com.vci.rmip.workflow.server.customInterfaceImpl.WorkFlowUserParserImpl
-#脙楼脗路脗楼脙陇脗陆脗聹脙娄脗碌脗聛脙娄脗聫脗聮脙陇脗禄脗露脙炉脗录脗聦脙楼脗聟脗鲁脙篓脗聛脗聰脙楼脗鹿脗鲁脙楼脗聫脗掳workitem脙楼脗炉脗鹿脙篓脗卤脗隆脙搂脗職脗聞脙娄脗聯脗聧脙陇脗陆脗聹
-workflow.plmworkitem = com.vci.platform.workflow.plugins.PLMWorkItem
-#脙娄脗聵脗炉脙楼脗聬脗娄脙楼脗聟脗路脙娄脗聹脗聣workflowinstance脙楼脗炉脗鹿脙篓脗卤脗隆 Y脙陇脗禄脗拢脙篓脗隆脗篓脙楼脗颅脗聵脙楼脗聹脗篓脙炉脗录脗聦N脙陇脗禄脗拢脙篓脗隆脗篓脙陇脗赂脗聧脙楼脗颅脗聵脙楼脗聹脗篓
-workflow.plmworkflowInstance.isExist=Y
-# 脙娄脗碌脗聛脙搂脗篓脗聥脙娄脗篓脗隆脙娄脗聺脗驴脙陇脗赂脗颅脙搂脗職脗聞脙陇脗禄脗禄脙楼脗聤脗隆脙篓脗聤脗聜脙搂脗聜脗鹿脙娄脗聰脗炉脙娄脗聦脗聛脙篓脗聡脗陋脙楼脗庐脗職脙陇脗鹿脗聣脙陇脗赂脗職脙楼脗聤脗隆脙楼脗聤脗聼脙篓脗聝脗陆脙娄脗聦脗聣脙漏脗聮脗庐脙搂脗職脗聞脙漏脗聟脗聧脙搂脗陆脗庐脙漏脗聙脗聣脙漏脗隆脗鹿
-workflow.business.function.class=plm.portal.NewNewUI.buttonmng.TaskBusinessFunctionButtonDialog
-
-#脙娄脗聵脗炉脙楼脗聬脗娄脙娄脗聵脗戮脙搂脗陇脗潞脙楼脗聢脗聠脙娄脗聺脗隆脙楼脗聫脗聭脙篓脗碌脗路脙娄脗碌脗聛脙搂脗篓脗聥脙娄脗聦脗聣脙漏脗聮脗庐脙炉脗录脗聦true:脙娄脗聵脗戮脙搂脗陇脗潞脙炉脗录脗聦false:脙陇脗赂脗聧脙娄脗聵脗戮脙搂脗陇脗潞
-workflow.workitem.launchFlag=false
-#脙娄脗聽脗鹿脙娄脗聧脗庐脙陇脗赂脗聥脙漏脗聺脗垄脙搂脗職脗聞脙楼脗卤脗聻脙娄脗聙脗搂脙楼脗聙脗录脙楼脗聢脗陇脙娄脗聳脗颅脙娄脗聵脗炉脙楼脗聬脗娄脙娄脗聵脗戮脙搂脗陇脗潞脙陇脗驴脗聺脙楼脗颅脗聵脙娄脗碌脗聛脙搂脗篓脗聥脙娄脗篓脗隆脙娄脗聺脗驴脙漏脗聙脗聣脙娄脗聥脗漏脙娄脗隆脗聠脙炉脗录脗聦true脙篓脗隆脗篓脙搂脗陇脗潞脙娄脗聵脗戮脙搂脗陇脗潞
-workflow.workitem.saveTempFlag=false
-#脙楼脗聫脗聭脙篓脗碌脗路脙娄脗碌脗聛脙搂脗篓脗聥脙娄脗碌脗聛脙搂脗篓脗聥脙陇脗禄脗禄脙楼脗聤脗隆脙楼脗聬脗聧脙搂脗搂脗掳脙娄脗聵脗炉脙楼脗聬脗娄脙楼脗驴脗聟脙楼脗隆脗芦脙楼脗聫脗聤脙楼脗聭脗陆脙楼脗聬脗聧脙楼脗陇脗聞脙搂脗聬脗聠脙篓脗搂脗聞脙楼脗聢脗聶
-workflow.workitem.workflowName=true
-#脙楼脗娄脗聜脙娄脗聻脗聹脙陇脗赂脗聧脙娄脗聵脗戮脙搂脗陇脗潞脙楼脗聢脗聠脙娄脗聺脗隆脙楼脗聫脗聭脙篓脗碌脗路脙娄脗聴脗露脙炉脗录脗聦脙娄脗聵脗炉脙楼脗聬脗娄脙楼脗掳脗聠脙漏脗聙脗聣脙楼脗庐脗職脙娄脗聲脗掳脙娄脗聧脗庐脙陇脗陆脗聹脙陇脗赂脗潞脙陇脗赂脗聙脙陇脗赂脗陋脙娄脗碌脗聛脙搂脗篓脗聥脙篓脗驴脗聸脙篓脗隆脗聦脙楼脗庐脗隆脙娄脗聣脗鹿 脙娄脗颅脗陇脙漏脗聟脗聧脙搂脗陆脗庐脙陇脗录脗聵脙楼脗聟脗聢脙搂脗潞脗搂脙楼脗聹脗篓脙娄脗聵脗戮脙搂脗陇脗潞脙楼脗聢脗聠脙娄脗聺脗隆脙楼脗聫脗聭脙篓脗碌脗路脙漏脗聙脗聣脙娄脗聥脗漏脙娄脗隆脗聠脙楼脗鹿脗露脙漏脗聙脗聣脙陇脗赂脗颅脙楼脗聢脗聠脙娄脗聺脗隆脙楼脗聫脗聭脙篓脗碌脗路脙娄脗碌脗聛脙搂脗篓脗聥脙陇脗鹿脗聥脙楼脗聬脗聨脙炉脗录脗聢脙楼脗聧脗鲁脙楼脗娄脗聜脙娄脗聻脗聹脙漏脗聙脗聣脙娄脗聥脗漏脙楼脗聢脗聠脙娄脗聺脗隆脙楼脗聫脗聭脙篓脗碌脗路脙炉脗录脗聦脙娄脗颅脗陇脙漏脗聟脗聧脙搂脗陆脗庐脙陇脗赂脗聧脙篓脗碌脗路脙陇脗陆脗聹脙搂脗聰脗篓脙炉脗录脗聣
-#脙炉脗录脗聢true脙炉脗录脗職脙楼脗掳脗聠脙漏脗聙脗聣脙楼脗庐脗職脙搂脗職脗聞脙娄脗聲脗掳脙娄脗聧脗庐脙楼脗聹脗篓脙陇脗赂脗聙脙陇脗赂脗陋脙娄脗碌脗聛脙搂脗篓脗聥脙陇脗赂脗颅脙篓脗驴脗聸脙篓脗隆脗聦脙楼脗庐脗隆脙娄脗聣脗鹿脙炉脗录脗聦false脙炉脗录脗職脙陇脗赂脗潞脙娄脗炉脗聫脙娄脗聺脗隆脙娄脗聲脗掳脙娄脗聧脗庐脙楼脗聬脗炉脙楼脗聤脗篓脙陇脗赂脗聙脙陇脗赂脗陋脙楼脗庐脗隆脙娄脗聣脗鹿脙娄脗碌脗聛脙搂脗篓脗聥脙炉脗录脗聣
-workflow.workitem.launchOneWorkflowFlag=true
-#脙娄脗聵脗炉脙楼脗聬脗娄脙篓脗聝脗陆脙娄脗聣脗鹿脙漏脗聡脗聫脙娄脗聣脗搂脙篓脗隆脗聦脙楼脗戮脗聟脙楼脗聤脗聻脙陇脗禄脗禄脙楼脗聤脗隆脙炉脗录脗聦脙漏脗聙脗聣脙陇脗赂脗颅脙楼脗陇脗職脙娄脗聺脗隆脙漏脗聙脗職脙搂脗聰脗篓脙楼脗戮脗聟脙楼脗聤脗聻脙陇脗禄脗禄脙楼脗聤脗隆脙娄脗聲脗掳脙娄脗聧脗庐脙炉脗录脗聦脙楼脗聢脗陇脙娄脗聳脗颅脙篓脗驴脗聶脙陇脗潞脗聸脙娄脗聲脗掳脙娄脗聧脗庐脙楼脗聹脗篓脙楼脗聬脗聦脙陇脗赂脗聙脙陇脗禄脗禄脙楼脗聤脗隆脙篓脗聤脗聜脙搂脗聜脗鹿脙炉脗录脗聦脙楼脗鹿脗露脙楼脗卤脗聻脙陇脗潞脗聨脙楼脗聬脗聦脙陇脗赂脗聙脙娄脗碌脗聛脙搂脗篓脗聥脙炉脗录脗聦脙楼脗掳脗卤脙楼脗聫脗炉脙陇脗禄脗楼脙娄脗聣脗鹿脙漏脗聡脗聫脙娄脗聣脗搂脙篓脗隆脗聦脙陇脗赂脗聥脙楼脗聨脗禄
-workflow.workitem.batchExeworkflowFlag=true
-
-##脙娄脗聽脗鹿脙娄脗聧脗庐脙陇脗赂脗聥脙漏脗聺脗垄脙搂脗職脗聞脙楼脗卤脗聻脙娄脗聙脗搂脙楼脗聙脗录脙楼脗聢脗陇脙娄脗聳脗颅脙娄脗聵脗炉脙楼脗聬脗娄脙陇脗赂脗聥脙陇脗赂脗聙脙娄脗颅脗楼脙篓脗麓脗拢脙陇脗禄脗禄脙陇脗潞脗潞脙娄脗聽脗聡脙篓脗炉脗聠脙炉脗录脗聢脙楼脗聫脗陋脙楼脗聢脗陇脙娄脗聳脗颅脙娄脗聵脗炉true脙炉脗录脗聦脙陇脗禄脗禄脙陇脗陆脗聲脙楼脗颅脗聴脙搂脗卢脗娄脙娄脗聢脗聳脙娄脗虏脗隆脙娄脗聹脗聣脙娄脗颅脗陇脙漏脗聟脗聧脙搂脗陆脗庐脙炉脗录脗聦脙楼脗聧脗鲁脙娄脗聦脗聣false脙楼脗陇脗聞脙搂脗聬脗聠脙炉脗录脗聣
-## 脙楼脗娄脗聜脙娄脗聻脗聹脙娄脗颅脗陇脙楼脗聙脗录脙陇脗赂脗潞脙炉脗录脗職true脙炉脗录脗職脙娄脗聣脗搂脙篓脗隆脗聦脙娄脗碌脗聛脙搂脗篓脗聥脙陇脗禄脗禄脙楼脗聤脗隆脙娄脗聴脗露脙炉脗录脗聦脙陇脗赂脗聧脙搂脗庐脗隆脙楼脗聫脗聭脙篓脗碌脗路脙娄脗聴脗露脙娄脗聵脗炉脙楼脗聬脗娄脙楼脗炉脗鹿脙娄脗炉脗聫脙陇脗赂脗陋脙篓脗聤脗聜脙搂脗聜脗鹿脙漏脗聝脗陆脙篓脗庐脗戮脙搂脗陆脗庐脙陇脗潞脗聠脙篓脗麓脗拢脙陇脗禄脗禄脙陇脗潞脗潞脙炉脗录脗聦脙楼脗陆脗聯脙楼脗聣脗聧脙娄脗聣脗搂脙篓脗隆脗聦脙搂脗陋脗聴脙楼脗聫脗拢脙楼脗搂脗聥脙搂脗禄脗聢脙漏脗聝脗陆脙娄脗聵脗戮脙搂脗陇脗潞脙楼脗聹脗篓脙漏脗聙脗聣脙娄脗聥脗漏脙陇脗赂脗聥脙陇脗赂脗聙脙篓脗聤脗聜脙搂脗聜脗鹿脙篓脗麓脗拢脙陇脗禄脗禄脙陇脗潞脗潞脙炉脗录脗聢脙陇脗禄脗聟脙娄脗聵脗炉脙篓脗路脗炉脙搂脗聰脗卤脙漏脗聙脗聣脙娄脗聥脗漏脙楼脗聬脗聦脙娄脗聞脗聫脙炉脗录脗聣
-## 脙楼脗聬脗娄脙楼脗聢脗聶脙炉脗录脗職false脙炉脗录脗職脙娄脗聣脗搂脙篓脗隆脗聦脙娄脗碌脗聛脙搂脗篓脗聥脙陇脗禄脗禄脙楼脗聤脗隆脙娄脗聴脗露脙炉脗录脗聦脙楼脗娄脗聜脙娄脗聻脗聹脙陇脗赂脗聥脙陇脗赂脗聙脙篓脗聤脗聜脙搂脗聜脗鹿脙搂脗職脗聞脙篓脗麓脗拢脙陇脗禄脗禄脙陇脗潞脗潞脙楼脗聹脗篓脙楼脗聫脗聭脙篓脗碌脗路脙娄脗聴脗露脙楼脗路脗虏脙搂脗禄脗聫脙娄脗聦脗聡脙楼脗庐脗職脙炉脗录脗聦脙楼脗聢脗聶脙陇脗赂脗聧脙娄脗聵脗戮脙搂脗陇脗潞脙陇脗赂脗聥脙陇脗赂脗聙脙篓脗聤脗聜脙搂脗聜脗鹿脙篓脗麓脗拢脙陇脗禄脗禄脙陇脗潞脗潞脙炉脗录脗聦脙楼脗聬脗娄脙楼脗聢脗聶脙娄脗聵脗戮脙搂脗陇脗潞脙陇脗赂脗聥脙陇脗赂脗聙脙娄脗颅脗楼脙篓脗麓脗拢脙陇脗禄脗禄脙陇脗潞脗潞脙炉脗录脗聦脙陇脗赂脗聰脙娄脗聹脗聣脙楼脗聤脗聽脙搂脗潞脗垄脙篓脗聣脗虏*脙娄脗聽脗聡脙篓脗炉脗聠脙炉脗录脗聦脙娄脗颅脗陇脙娄脗聴脗露脙陇脗赂脗潞脙楼脗驴脗聟脙漏脗隆脗禄脙楼脗隆脗芦脙楼脗聠脗聶脙炉脗录脗聢脙漏脗聙脗聣脙娄脗聥脗漏脙炉脗录脗聣
-workflow.workitem.showNextUserFlag=false
-########################################### 脙楼脗路脗楼脙陇脗陆脗聹脙娄脗碌脗聛&脙娄脗碌脗聛脙搂脗篓脗聥脙楼脗录脗聲脙娄脗聯脗聨脙搂脗聸脗赂脙楼脗聟脗鲁脙漏脗聟脗聧脙搂脗陆脗庐 END ###########################################
-
-
-########################################### CS脙搂脗鲁脗禄脙搂脗禄脗聼脙陇脗赂脗禄脙娄脗聻脗聞脙娄脗聻脗露脙娄脗聰脗炉脙娄脗聦脗聛脙搂脗職脗聞脙娄脗聣脗漏脙楼脗卤脗聲脙娄脗聹脗聧脙楼脗聤脗隆 BEGIN ###########################################
-# 脙搂脗聶脗禄脙楼脗陆脗聲脙娄脗聢脗聬脙楼脗聤脗聼脙楼脗聬脗聨脙陇脗陆脗驴脙搂脗聰脗篓脙楼脗聫脗聧脙楼脗掳脗聞脙娄脗聹脗潞脙楼脗聢脗露脙炉脗录脗聦脙篓脗聡脗陋脙楼脗聤脗篓脙娄脗聣脗搂脙篓脗隆脗聦脙篓脗炉脗楼脙搂脗卤脗禄脙陇脗赂脗颅脙搂脗職脗聞脙楼脗聟脗卢脙楼脗聟脗卤脙娄脗聨脗楼脙楼脗聫脗拢 showMessage() 脙炉脗录脗聢脙娄脗聴脗聽脙楼脗聫脗聜脙娄脗聲脗掳脙陇脗录脗聽脙漏脗聙脗聮脙炉脗录脗聣
-# 脙陇脗禄脗楼脙娄脗聰脗炉脙娄脗聦脗聛脙搂脗聶脗禄脙楼脗陆脗聲脙娄脗聢脗聬脙楼脗聤脗聼脙楼脗聬脗聨脙搂脗芦脗聥脙楼脗聧脗鲁脙娄脗聣脗搂脙篓脗隆脗聦脙搂脗聸脗赂脙楼脗聟脗鲁脙篓脗聡脗陋脙楼脗庐脗職脙陇脗鹿脗聣脙娄脗聣脗漏脙楼脗卤脗聲脙漏脗聙脗禄脙篓脗戮脗聭#
-#e.g:extendservice.0=xxx.xx.xx
-extendservicecount=0
-#extendservice.0=
-#extendservice.1=
-#extendservice.1=
-########################################### CS脙搂脗鲁脗禄脙搂脗禄脗聼脙陇脗赂脗禄脙娄脗聻脗聞脙娄脗聻脗露脙娄脗聰脗炉脙娄脗聦脗聛脙搂脗職脗聞脙娄脗聣脗漏脙楼脗卤脗聲脙娄脗聹脗聧脙楼脗聤脗隆 END ###########################################
-
-
-########################################### UI&脙楼脗聟脗聝脙娄脗聲脗掳脙娄脗聧脗庐脙炉脗录脗聢脙娄脗篓脗隆脙楼脗聻脗聥脙炉脗录脗聣脙搂脗录脗聯脙楼脗颅脗聵脙搂脗聸脗赂脙楼脗聟脗鲁脙搂脗職脗聞脙漏脗聟脗聧脙搂脗陆脗庐 BEGIN ###########################################
-#脙楼脗聬脗炉脙搂脗聰脗篓UI脙搂脗录脗聯脙楼脗颅脗聵脙楼脗聫脗聤脙搂脗录脗聯脙楼脗颅脗聵脙楼脗庐脗職脙娄脗聴脗露脙楼脗聢脗路脙娄脗聳脗掳脙娄脗聹脗聧脙楼脗聤脗隆
-UI.cache.enable=true
-#脙娄脗聵脗炉脙楼脗聬脗娄脙娄脗炉脗聫脙娄脗卢脗隆脙篓脗庐脗驴脙漏脗聴脗庐脙漏脗聝脗陆脙楼脗聢脗路脙娄脗聳脗掳脙娄脗聲脗掳脙娄脗聧脗庐脙楼脗潞脗聯脙炉脗录脗聦true脙陇脗禄脗拢脙搂脗聽脗聛脙楼脗聢脗路脙娄脗聳脗掳脙炉脗录脗聦脙楼脗聬脗娄脙楼脗聢脗聶脙陇脗赂脗聧脙楼脗聢脗路脙娄脗聳脗掳
-UI.cache.refreshEveryTime=true
-#脙楼脗庐脗職脙娄脗聴脗露脙楼脗聶脗篓脙炉脗录脗聦脙楼脗聹脗篓脙娄脗聹脗聧脙楼脗聤脗隆脙楼脗聬脗炉脙楼脗聤脗篓脙娄脗聴脗露脙楼脗录脗聙脙楼脗聬脗炉
-time_schedule_count=2
-#脙楼脗聤脗聽脙篓脗陆脗陆脙娄脗聲脗掳脙娄脗聧脗庐脙娄脗篓脗隆脙楼脗聻脗聥脙楼脗聢脗掳脙搂脗录脗聯脙楼脗颅脗聵
-time_schedule_0=com.vci.cache.server.util.DataModelCacheTimer
-#脙楼脗聤脗聽脙篓脗陆脗陆UI脙漏脗聟脗聧脙搂脗陆脗庐脙楼脗聢脗掳脙搂脗录脗聯脙楼脗颅脗聵
-time_schedule_1=plm.portal.tools.UICacheTimer
-########################################### UI&脙楼脗聟脗聝脙娄脗聲脗掳脙娄脗聧脗庐脙炉脗录脗聢脙娄脗篓脗隆脙楼脗聻脗聥脙炉脗录脗聣脙搂脗录脗聯脙楼脗颅脗聵脙搂脗聸脗赂脙楼脗聟脗鲁脙搂脗職脗聞脙漏脗聟脗聧脙搂脗陆脗庐 END ###########################################
diff --git a/Bin/properties/hibernate.cfg.xml b/Bin/properties/hibernate.cfg.xml
index a381442..ab6b058 100644
--- a/Bin/properties/hibernate.cfg.xml
+++ b/Bin/properties/hibernate.cfg.xml
@@ -11,6 +11,7 @@
<property name="connection.url">jdbc:oracle:thin:@192.168.0.66:1521:orcl</property>
<property name="connection.username">PLT2024</property>
+ <!-- <property name="connection.username">NMPM112</property> -->
<property name="connection.password">vcitest</property>
<!--<property name="connection.username">mpm112</property>
<property name="connection.password">vcitest</property>-->
@@ -32,60 +33,7 @@
<property name="hibernate.current_session_context_class">com.vci.server.mw.SessionContext4JBPM</property>
<property name="hibernate.connection.isolation">2</property>
- <!-- framework鏄犲皠鏂囦欢 -->
- <mapping resource="com/vci/server/framework/hbm/AppConfigCategory.hbm.xml"/>
- <mapping resource="com/vci/server/framework/hbm/AppConfigDetail.hbm.xml"/>
- <mapping resource="com/vci/server/framework/hbm/Combination.hbm.xml"/>
- <mapping resource="com/vci/server/framework/hbm/CombinationValue.hbm.xml"/>
- <mapping resource="com/vci/server/framework/hbm/Department.hbm.xml"/>
- <mapping resource="com/vci/server/framework/hbm/Role.hbm.xml"/>
- <mapping resource="com/vci/server/framework/hbm/User.hbm.xml"/>
- <mapping resource="com/vci/server/framework/hbm/Function.hbm.xml"/>
- <mapping resource="com/vci/server/framework/hbm/Operate.hbm.xml"/>
- <mapping resource="com/vci/server/framework/hbm/RoleRight.hbm.xml"/>
- <mapping resource="com/vci/server/framework/hbm/PasswordStrategy.hbm.xml"/>
- <mapping resource="com/vci/server/framework/hbm/UserLogon.hbm.xml"/>
- <mapping resource="com/vci/server/framework/hbm/SystemCfg.hbm.xml"/>
- <mapping resource="com/vci/server/framework/hbm/SpecialChar.hbm.xml"/>
- <mapping resource="com/vci/server/framework/hbm/SpecialCharClfy.hbm.xml"/>
- <mapping resource="com/vci/server/framework/hbm/Log.hbm.xml"/>
- <mapping resource="com/vci/server/framework/hbm/MachSecurity.hbm.xml"/>
- <mapping resource="com/vci/server/framework/hbm/Pvolume.hbm.xml"/>
-
- <!-- QT鏄犲皠鏂囦欢 -->
- <mapping resource="com/vci/server/omd/qt/hbm/QT.hbm.xml"/>
-
- <!-- portal_START-->
- <mapping resource="com/vci/server/portal/hbm/PLActionClsEntity.hbm.xml"/>
- <mapping resource="com/vci/server/portal/hbm/PLActionParamEntity.hbm.xml"/>
- <mapping resource="com/vci/server/portal/hbm/PLTypeActionEntity.hbm.xml"/>
- <mapping resource="com/vci/server/portal/hbm/PortalVIEntity.hbm.xml"/>
- <mapping resource="com/vci/server/portal/hbm/PLActionEntity.hbm.xml"/>
- <mapping resource="com/vci/server/portal/hbm/PLUILayoutEntity.hbm.xml"/>
- <mapping resource="com/vci/server/portal/hbm/PLTabPageEntity.hbm.xml"/>
- <mapping resource="com/vci/server/portal/hbm/PLTabButtonEntity.hbm.xml"/>
- <mapping resource="com/vci/server/portal/hbm/PLCommandParameterEntity.hbm.xml"/>
- <mapping resource="com/vci/server/portal/hbm/PLPageDefinationEntity.hbm.xml"/>
- <!-- portal_END-->
-
- <!-- workflow鏄犲皠鏂囦欢 -->
- <mapping resource="com/vci/server/workflow/server/hbm/ProcessCategory.hbm.xml"/>
- <mapping resource="com/vci/server/workflow/server/hbm/Plflowapproveopinion.hbm.xml"/>
- <mapping resource="com/vci/server/workflow/server/hbm/PLFlowObject.hbm.xml"/>
- <mapping resource="com/vci/server/workflow/server/hbm/NodeHide.hbm.xml"/>
- <mapping resource="com/vci/server/workflow/server/hbm/TaskDesc.hbm.xml"/>
- <mapping resource="com/vci/server/workflow/server/hbm/TaskRevoke.hbm.xml"/>
- <mapping resource="com/vci/server/workflow/server/hbm/TasksAssigned.hbm.xml"/>
- <mapping resource="com/vci/server/workflow/server/hbm/FlowApproveContent.hbm.xml"/>
- <mapping resource="jbpm.repository.hbm.xml"/>
- <mapping resource="jbpm.execution.hbm.xml"/>
- <mapping resource="jbpm.history.hbm.xml"/>
- <mapping resource="jbpm.task.hbm.xml"/>
- <mapping resource="jbpm.identity.hbm.xml"/>
-
- <mapping resource="com/vci/server/workflow/server/hbm/Plwfinstancetemplate.hbm.xml"/>
- <mapping resource="com/vci/server/workflow/server/hbm/Plwfpersonset.hbm.xml"/>
-
+
<!-- 鏆傛椂绂佺敤Hibernate鐨勪簨浠剁洃鍚�
<listener type="post-insert"
class="com.vci.base.server.persistence.history.HistoryListener" />
diff --git a/Bin/properties/iceClient.properties b/Bin/properties/iceClient.properties
index 5715f17..0dcf741 100644
--- a/Bin/properties/iceClient.properties
+++ b/Bin/properties/iceClient.properties
@@ -1,3 +1,3 @@
锘�#NameService=PLT
-Endpoints=default -h 127.0.0.1 -p 4601
-#Endpoints=VCI-PLT/Locator:default -h 172.16.0.127 -p 4061
\ No newline at end of file
+Endpoints=default -h localhost -p 4601
+#Endpoints=PLTGrid/Locator:default -h 172.16.0.85 -p 4061
\ No newline at end of file
diff --git a/Bin/properties/redis.properties b/Bin/properties/redis.properties
index 3a3beb2..f54ba9d 100644
--- a/Bin/properties/redis.properties
+++ b/Bin/properties/redis.properties
@@ -19,4 +19,4 @@
# \u5728borrow\u4e00\u4e2ajedis\u5b9e\u4f8b\u65f6\uff0c\u662f\u5426\u63d0\u524d\u8fdb\u884cvalidate\u64cd\u4f5c
redis.jedisPoolConfig.testOnBorrow=true
-
+redis.jedisPoolConfig.auth=foobared
diff --git a/Bin/properties/service.xml b/Bin/properties/service.xml
index 2fc834f..3112a78 100644
--- a/Bin/properties/service.xml
+++ b/Bin/properties/service.xml
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Services>
<ServiceTempl name="CacheService" entry="com.vci.server.cache.CacheServerImpl" description="缂撳瓨鏈嶅姟" />
+ <ServiceTempl name="LogService" entry="com.vci.server.log.LogServiceImpl" description="鏃ュ織鏈嶅姟" />
<ServiceTempl name="FrameService" entry="com.vci.server.framework.FrameworkServiceImpl" description="绯荤粺妗嗘灦鏈嶅姟" />
<ServiceTempl name="OMDService" entry="com.vci.server.omd.OMDServiceImpl" description="瀵硅薄妯″瀷瀹氫箟鏈嶅姟" />
<ServiceTempl name="BOFServer" entry="com.vci.server.bof.BOFactoryServiceImpl" description="瀵硅薄宸ュ巶鏈嶅姟" />
diff --git a/Bin/web/lib/plt-client-1.0.jar b/Bin/web/lib/plt-client-1.0.jar
index d4286a6..a136600 100644
--- a/Bin/web/lib/plt-client-1.0.jar
+++ b/Bin/web/lib/plt-client-1.0.jar
Binary files differ
diff --git a/Bin/web/lib/plt-clientbase-1.0.RELEASE.jar b/Bin/web/lib/plt-clientbase-1.0.RELEASE.jar
index eae5bec..88b1396 100644
--- a/Bin/web/lib/plt-clientbase-1.0.RELEASE.jar
+++ b/Bin/web/lib/plt-clientbase-1.0.RELEASE.jar
Binary files differ
diff --git a/Bin/web/lib/plt-common-1.0.RELEASE.jar b/Bin/web/lib/plt-common-1.0.RELEASE.jar
index 801e62c..ec5d9d9 100644
--- a/Bin/web/lib/plt-common-1.0.RELEASE.jar
+++ b/Bin/web/lib/plt-common-1.0.RELEASE.jar
Binary files differ
diff --git a/Bin/web/lib/plt-slice-1.0.RELEASE.jar b/Bin/web/lib/plt-slice-1.0.RELEASE.jar
index 8a67790..e0d1317 100644
--- a/Bin/web/lib/plt-slice-1.0.RELEASE.jar
+++ b/Bin/web/lib/plt-slice-1.0.RELEASE.jar
Binary files differ
diff --git a/Bin/web/vci-platform-web.jar b/Bin/web/vci-platform-web.jar
index 927255a..ec4ebdd 100644
--- a/Bin/web/vci-platform-web.jar
+++ b/Bin/web/vci-platform-web.jar
Binary files differ
diff --git a/Source/platformProject/vci-platform-web/pom.xml b/Source/platformProject/vci-platform-web/pom.xml
index b560086..bf18b06 100644
--- a/Source/platformProject/vci-platform-web/pom.xml
+++ b/Source/platformProject/vci-platform-web/pom.xml
@@ -18,6 +18,7 @@
<version>1.0-SNAPSHOT</version>
<type>pom</type>
</dependency>
+<!-- ddd-->
<dependency>
<groupId>com.vci.corba</groupId>
<artifactId>plt-slice</artifactId>
@@ -156,16 +157,19 @@
<artifactId>ddlTool-common</artifactId>
<version>${vciplt.version}</version>
</dependency>
+<!-- ddd-->
<dependency>
<groupId>com.vci.client</groupId>
<artifactId>plt-clientbase</artifactId>
<version>1.0.RELEASE</version>
</dependency>
+<!-- ddd-->
<dependency>
<groupId>com.zeroc</groupId>
<artifactId>icegridgui</artifactId>
<version>1.0.RELEASE</version>
</dependency>
+<!-- dd-->
<dependency>
<groupId>com.vci.common</groupId>
<artifactId>plt-common</artifactId>
@@ -176,6 +180,7 @@
<artifactId>vci-platform-starter</artifactId>
<version>2022.1-SNAPSHOT</version>
</dependency>
+<!-- ddd-->
<dependency>
<groupId>com.vci.client</groupId>
<artifactId>plt-client</artifactId>
diff --git a/Source/platformProject/vci-platform-web/src/main/java/com/vci/frameworkcore/compatibility/ISmFunctionQueryService.java b/Source/platformProject/vci-platform-web/src/main/java/com/vci/frameworkcore/compatibility/ISmFunctionQueryService.java
index 4596704..8582351 100644
--- a/Source/platformProject/vci-platform-web/src/main/java/com/vci/frameworkcore/compatibility/ISmFunctionQueryService.java
+++ b/Source/platformProject/vci-platform-web/src/main/java/com/vci/frameworkcore/compatibility/ISmFunctionQueryService.java
@@ -1,5 +1,6 @@
package com.vci.frameworkcore.compatibility;
+import com.vci.corba.common.PLException;
import com.vci.corba.common.VCIError;
import com.vci.frameworkcore.enumpck.ResourceControlTypeEnum;
import com.vci.frameworkcore.pagemodel.MenuVO;
@@ -49,7 +50,7 @@
* @param resourceControlTypeEnum 瑙掕壊鎺у埗鍖哄煙锛屼篃鏄姛鑳芥帶鍒剁殑鍖哄煙
* @return 鑿滃崟锛屽寘鍚笂涓嬬骇
*/
- List<MenuVO> treeCurrentUserMenu(TreeQueryObject treeQueryObject, ResourceControlTypeEnum resourceControlTypeEnum) throws VCIError;
+ List<MenuVO> treeCurrentUserMenu(TreeQueryObject treeQueryObject, ResourceControlTypeEnum resourceControlTypeEnum) throws PLException;
/**
* 鑾峰彇鎵�鏈夌殑鍔熻兘鑿滃崟
@@ -140,5 +141,5 @@
*/
DataGrid<SmFunctionVO> gridFunctionByRoleOids(Collection<String> roleOidCollection, Map<String, String> queryMap, PageHelper pageHelper, ResourceControlTypeEnum resourceControlTypeEnum);
- UIContentVO getUIContentByBtmTypeAndId(TreeQueryObject treeQueryObject, ResourceControlTypeEnum bs) throws VCIError;
+ UIContentVO getUIContentByBtmTypeAndId(TreeQueryObject treeQueryObject, ResourceControlTypeEnum bs) throws PLException;
}
diff --git a/Source/platformProject/vci-platform-web/src/main/java/com/vci/frameworkcore/compatibility/impl/SmFunctionQueryServicePlatformImpl.java b/Source/platformProject/vci-platform-web/src/main/java/com/vci/frameworkcore/compatibility/impl/SmFunctionQueryServicePlatformImpl.java
index fbd9f21..e53e4cf 100644
--- a/Source/platformProject/vci-platform-web/src/main/java/com/vci/frameworkcore/compatibility/impl/SmFunctionQueryServicePlatformImpl.java
+++ b/Source/platformProject/vci-platform-web/src/main/java/com/vci/frameworkcore/compatibility/impl/SmFunctionQueryServicePlatformImpl.java
@@ -2,6 +2,7 @@
import com.alibaba.fastjson.JSONObject;
import com.vci.client.common.providers.ServiceProvider;
+import com.vci.corba.common.PLException;
import com.vci.corba.common.VCIError;
import com.vci.corba.framework.data.FunctionInfo;
import com.vci.corba.portal.data.PLTabPage;
@@ -238,7 +239,7 @@
* @return 鑿滃崟锛屽寘鍚笂涓嬬骇
*/
@Override
- public List<MenuVO> treeCurrentUserMenu(TreeQueryObject treeQueryObject, ResourceControlTypeEnum resourceControlTypeEnum) throws VCIError {
+ public List<MenuVO> treeCurrentUserMenu(TreeQueryObject treeQueryObject, ResourceControlTypeEnum resourceControlTypeEnum) throws PLException {
SessionInfo sessionInfo = WebUtil.getCurrentUserSessionInfoNotException();
// if(sessionInfo == null || CollectionUtils.isEmpty(sessionInfo.getFunctionOids())){
// return new ArrayList<Tree>();
@@ -249,6 +250,7 @@
// PortalServicePrx uiService = ServiceProvider.getUIService();
// FrameworkServicePrx frameService = ServiceProvider.getFrameService();
FunctionInfo[] menus = ServiceProvider.getFrameService().getModuleListByParentId("modelManagmentNode", true);
+// FunctionInfo[] menus = ServiceProvider.getFrameService().("modelManagmentNode", true);
// PLAction[] allPLAction = uiService.getAllPLAction();
List<MenuVO> functionVOList = new ArrayList<>();
@@ -289,7 +291,7 @@
return functionVOList.stream().sorted(Comparator.comparing(s -> s.getSort())).collect(Collectors.toList());
}
- public List<MenuVO> findChildFunctionVO(String parentOid) throws VCIError {
+ public List<MenuVO> findChildFunctionVO(String parentOid) throws PLException {
FunctionInfo[] menus = ServiceProvider.getFrameService().getModuleListByParentId(parentOid, true);
List<MenuVO> functionVOList = new ArrayList<>();
for (FunctionInfo menu : menus) {
@@ -329,7 +331,7 @@
@Override
- public UIContentVO getUIContentByBtmTypeAndId(TreeQueryObject treeQueryObject, ResourceControlTypeEnum resourceControlTypeEnum) throws VCIError {
+ public UIContentVO getUIContentByBtmTypeAndId(TreeQueryObject treeQueryObject, ResourceControlTypeEnum resourceControlTypeEnum) throws PLException {
SessionInfo sessionInfo = WebUtil.getCurrentUserSessionInfoNotException();
// if(sessionInfo == null || CollectionUtils.isEmpty(sessionInfo.getFunctionOids())){
// return new ArrayList<Tree>();
diff --git a/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/controller/SmFunctionController.java b/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/controller/SmFunctionController.java
index 8476255..352f7ab 100644
--- a/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/controller/SmFunctionController.java
+++ b/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/controller/SmFunctionController.java
@@ -1,5 +1,6 @@
package com.vci.web.controller;
+import com.vci.corba.common.PLException;
import com.vci.corba.common.VCIError;
import com.vci.frameworkcore.compatibility.ISmFunctionQueryService;
import com.vci.frameworkcore.enumpck.ResourceControlTypeEnum;
@@ -37,7 +38,7 @@
*/
@VciUnCheckRight
@GetMapping("/treeMyMenu")
- public List<MenuVO> treeMyMenu(TreeQueryObject treeQueryObject) throws VCIError {
+ public List<MenuVO> treeMyMenu(TreeQueryObject treeQueryObject) throws PLException {
return functionQueryService.treeCurrentUserMenu(treeQueryObject, ResourceControlTypeEnum.BS);
}
@@ -48,7 +49,7 @@
*/
@VciUnCheckRight
@GetMapping("/getUIContentByBtmTypeAndId")
- public UIContentVO getUIContentByBtmTypeAndId(@RequestBody TreeQueryObject treeQueryObject) throws VCIError {
+ public UIContentVO getUIContentByBtmTypeAndId(@RequestBody TreeQueryObject treeQueryObject) throws PLException {
return functionQueryService.getUIContentByBtmTypeAndId(treeQueryObject, ResourceControlTypeEnum.BS);
}
diff --git a/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/controller/StmFunctionController.java b/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/controller/StmFunctionController.java
index d002ebd..37d18e6 100644
--- a/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/controller/StmFunctionController.java
+++ b/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/controller/StmFunctionController.java
@@ -1,5 +1,6 @@
package com.vci.web.controller;
+import com.vci.corba.common.PLException;
import com.vci.corba.common.VCIError;
import com.vci.frameworkcore.compatibility.ISmFunctionQueryService;
import com.vci.frameworkcore.enumpck.ResourceControlTypeEnum;
@@ -46,7 +47,7 @@
@VciUnCheckRight
@GetMapping("/getTreeMyMenu")
@ResponseBody
- public List<MenuVO> getTreeMyMenu(TreeQueryObject treeQueryObject) throws VCIError {
+ public List<MenuVO> getTreeMyMenu(TreeQueryObject treeQueryObject) throws PLException {
return functionQueryService.treeCurrentUserMenu(treeQueryObject, ResourceControlTypeEnum.BS);
}
}
diff --git a/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/controller/WebUIDataController.java b/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/controller/WebUIDataController.java
index d8b8a26..f910ad1 100644
--- a/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/controller/WebUIDataController.java
+++ b/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/controller/WebUIDataController.java
@@ -136,6 +136,7 @@
* @return 鎵ц鐨勭粨鏋�
*/
@DeleteMapping("/deleteData")
+ @VciUnCheckRight
@VciBusinessLog(operateName = "鍒犻櫎鏁版嵁",description = "${param.dataList.0.btmname}鐨�${param.dataList.${join}.oid}")
public BaseResult deleteData(@RequestBody DeleteDataDTO deleteDataDTO){
return uiDataService.batchDelete(deleteDataDTO);
diff --git a/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/other/WorkFlowEndedNotice.java b/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/other/WorkFlowEndedNotice.java
index 9937409..4f372ba 100644
--- a/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/other/WorkFlowEndedNotice.java
+++ b/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/other/WorkFlowEndedNotice.java
@@ -1,5 +1,6 @@
package com.vci.web.other;
+import com.vci.corba.common.PLException;
import com.vci.corba.common.VCIError;
import com.vci.starter.web.constant.QueryOptionConstant;
import com.vci.starter.web.util.VciBaseUtil;
@@ -73,7 +74,7 @@
operation.batchUpdateBuinessObject(allCodeList.toArray(new ClientBusinessObject[0]));
logger.info("缂栫爜鐢熷懡鍛ㄦ湡鎭㈠瀹屾垚");
}
- } catch (VCIError e) {
+ } catch (PLException | VCIError e) {
e.printStackTrace();
}
}
diff --git a/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/OsAttributeServiceI.java b/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/OsAttributeServiceI.java
index 28fd3d4..c978e1a 100644
--- a/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/OsAttributeServiceI.java
+++ b/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/OsAttributeServiceI.java
@@ -1,5 +1,6 @@
package com.vci.web.service;
+import com.vci.corba.omd.atm.AttributeDef;
import com.vci.starter.web.pagemodel.BaseQueryObject;
import com.vci.starter.web.pagemodel.DataGrid;
import com.vci.web.pageModel.OsAttributeVO;
@@ -56,14 +57,14 @@
* @param attribItems 鏁版嵁瀵硅薄
* @return 鏄剧ず瀵硅薄
*/
- List<OsAttributeVO> attributeDO2VOs(Collection<com.vci.corba.omd.atm.AttribItem> attribItems);
+ List<OsAttributeVO> attributeDO2VOs(Collection<AttributeDef> attribItems);
/**
* 灞炴�х殑鏁版嵁瀵硅薄杞崲涓烘樉绀哄璞�
* @param attribItem 鏁版嵁瀵硅薄
* @return 鏄剧ず瀵硅薄
*/
- OsAttributeVO attributeDO2VO(com.vci.corba.omd.atm.AttribItem attribItem);
+ OsAttributeVO attributeDO2VO(AttributeDef attribItem);
/**
* 灞炴�х殑鏄剧ず瀵硅薄杞崲涓烘暟鎹璞�
diff --git a/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/OsBtmServiceI.java b/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/OsBtmServiceI.java
index 3d19305..5639a9d 100644
--- a/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/OsBtmServiceI.java
+++ b/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/OsBtmServiceI.java
@@ -1,9 +1,9 @@
package com.vci.web.service;
+import com.vci.corba.omd.btm.BizType;
import com.vci.starter.web.pagemodel.DataGrid;
import com.vci.starter.web.pagemodel.PageHelper;
import com.vci.web.pageModel.*;
-import com.vci.corba.omd.btm.BtmItem;
import java.util.Collection;
import java.util.List;
import java.util.Map;
@@ -32,14 +32,14 @@
* @param btmItems 鏁版嵁瀵硅薄
* @return 鏄剧ず瀵硅薄
*/
- List<OsBtmTypeVO> btmDO2VOs(Collection<BtmItem> btmItems);
+ List<OsBtmTypeVO> btmDO2VOs(Collection<BizType> btmItems);
/**
* 鏁版嵁瀵硅薄杞崲涓烘樉绀哄璞�
* @param btmItem 鏁版嵁瀵硅薄
* @return 鏄剧ず瀵硅薄
*/
- OsBtmTypeVO btmDO2VO(BtmItem btmItem);
+ OsBtmTypeVO btmDO2VO(BizType btmItem);
/**
* 浣跨敤缂栧彿鑾峰彇涓氬姟绫诲瀷
diff --git a/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/OsEnumServiceI.java b/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/OsEnumServiceI.java
index 266bcbb..3643a8a 100644
--- a/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/OsEnumServiceI.java
+++ b/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/OsEnumServiceI.java
@@ -1,4 +1,5 @@
package com.vci.web.service;
+import com.vci.corba.omd.etm.EnumType;
import com.vci.starter.web.exception.VciBaseException;
import com.vci.starter.web.pagemodel.DataGrid;
import com.vci.starter.web.pagemodel.PageHelper;
@@ -69,14 +70,14 @@
* @param enumItems 鏋氫妇鐨勫璞�
* @return 鏄剧ず瀵硅薄
*/
- List<OsEnumVO> enumDO2VOs(Collection<EnumItem> enumItems);
+ List<OsEnumVO> enumDO2VOs(Collection<EnumType> enumItems);
/**
* 鏋氫妇鐨勬暟鎹璞¤浆鎹负鏄剧ず瀵硅薄
* @param enumItem 鏁版嵁瀵硅薄
* @return 鏄剧ず瀵硅薄
*/
- OsEnumVO enumDO2VO(EnumItem enumItem);
+ OsEnumVO enumDO2VO(EnumType enumItem);
/**
* 鏋氫妇鏄庣粏杞崲涓篕V
@@ -97,13 +98,13 @@
* 鎵归噺娣诲姞鍐呭
* @param enumItemList 鏋氫妇鐨勫唴瀹�
*/
- void batchAddEnum(List<EnumItem> enumItemList);
+ void batchAddEnum(List<EnumType> enumItemList);
/**
* 鎵归噺淇敼鍐呭
* @param enumItemList 鏋氫妇鐨勫唴瀹�
*/
- void batchEditEnum(List<EnumItem> enumItemList);
+ void batchEditEnum(List<EnumType> enumItemList);
/**
* 浣跨敤缂栧彿鑾峰彇鏋氫妇鐨勫悕绉�
diff --git a/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/OsAttributeServiceImpl.java b/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/OsAttributeServiceImpl.java
index fc0f144..3d39be0 100644
--- a/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/OsAttributeServiceImpl.java
+++ b/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/OsAttributeServiceImpl.java
@@ -1,7 +1,9 @@
package com.vci.web.service.impl;
import com.vci.client.common.providers.ServiceProvider;
+import com.vci.corba.common.PLException;
import com.vci.corba.common.VCIError;
+import com.vci.corba.omd.atm.AttributeDef;
import com.vci.starter.web.annotation.log.VciUnLog;
import com.vci.starter.web.enumpck.VciFieldTypeEnum;
import com.vci.starter.web.pagemodel.BaseQueryObject;
@@ -116,8 +118,9 @@
//鍚庨潰涓や釜鍒嗛〉鏁帮紝瀹屽叏娌℃湁鐢�
try {
// return attributeDO2VOs(Arrays.stream(platformClientUtil.getAttributeService().getAttribItems(abFilter,1,1)).collect(Collectors.toList()));
- return attributeDO2VOs(Arrays.stream(ServiceProvider.getOMDService().getAttributeService().getAttribItems(abFilter.name,1,1)).collect(Collectors.toList()));
- } catch (VCIError vciError) {
+// return attributeDO2VOs(Arrays.stream(ServiceProvider.getOMDService().getAttributeService().getAttribItems(abFilter.name,1,1)).collect(Collectors.toList()));
+ return attributeDO2VOs(Arrays.stream(ServiceProvider.getOMDService().getAttributeService().getAttributeDefs(abFilter.name,1,1)).collect(Collectors.toList()));
+ } catch (PLException vciError) {
throw WebUtil.getVciBaseException(vciError);
}
}
@@ -141,7 +144,7 @@
* @return 鏄剧ず瀵硅薄
*/
@Override
- public List<OsAttributeVO> attributeDO2VOs(Collection<com.vci.corba.omd.atm.AttribItem> attribItems) {
+ public List<OsAttributeVO> attributeDO2VOs(Collection<AttributeDef> attribItems) {
List<OsAttributeVO> vos = new ArrayList<>();
Optional.ofNullable(attribItems).orElseGet(()->new ArrayList<>()).stream().forEach(attribItem -> {
vos.add(attributeDO2VO(attribItem));
@@ -156,7 +159,7 @@
* @return 鏄剧ず瀵硅薄
*/
@Override
- public OsAttributeVO attributeDO2VO(com.vci.corba.omd.atm.AttribItem attribItem) {
+ public OsAttributeVO attributeDO2VO(AttributeDef attribItem) {
OsAttributeVO attributeVO = new OsAttributeVO();
if(attribItem!=null){
attributeVO.setOid(attribItem.oid);
diff --git a/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/OsBtmServiceImpl.java b/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/OsBtmServiceImpl.java
index 3099962..5896187 100644
--- a/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/OsBtmServiceImpl.java
+++ b/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/OsBtmServiceImpl.java
@@ -1,7 +1,8 @@
package com.vci.web.service.impl;
import com.vci.client.common.providers.ServiceProvider;
-import com.vci.corba.common.VCIError;
+import com.vci.corba.common.PLException;
+import com.vci.corba.omd.btm.BizType;
import com.vci.starter.web.annotation.log.VciUnLog;
import com.vci.starter.web.enumpck.BooleanEnum;
import com.vci.starter.web.exception.VciBaseException;
@@ -23,7 +24,6 @@
import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
-import com.vci.corba.omd.btm.BtmItem;
import java.util.*;
import java.util.stream.Collectors;
@@ -91,9 +91,10 @@
public List<OsBtmTypeVO> selectAllBtm() {
try {
// return btmDO2VOs(Arrays.stream(platformClientUtil.getBtmService().getAllBtmItem("")).collect(Collectors.toList()));
- return btmDO2VOs(Arrays.stream(ServiceProvider.getOMDService().getBTMService().getAllBtmItem("")).collect(Collectors.toList()));
- } catch (VCIError vciError) {
- throw WebUtil.getVciBaseException(vciError);
+// return btmDO2VOs(Arrays.stream(ServiceProvider.getOMDService().getBTMService().getAllBtmItem("")).collect(Collectors.toList()));
+ return btmDO2VOs(Arrays.stream(ServiceProvider.getOMDService().getBTMService().getBizTypes("")).collect(Collectors.toList()));
+ } catch (PLException e) {
+ throw new RuntimeException(e);
}
}
@@ -116,7 +117,7 @@
* @return 鏄剧ず瀵硅薄
*/
@Override
- public List<OsBtmTypeVO> btmDO2VOs(Collection<BtmItem> btmItems) {
+ public List<OsBtmTypeVO> btmDO2VOs(Collection<BizType> btmItems) {
List<OsBtmTypeVO> VOS = new ArrayList<>();
Optional.ofNullable(btmItems).orElseGet(()->new ArrayList<>()).stream().forEach(btmItem -> {
OsBtmTypeVO vo = btmDO2VO(btmItem);
@@ -132,7 +133,7 @@
* @return 鏄剧ず瀵硅薄
*/
@Override
- public OsBtmTypeVO btmDO2VO(BtmItem btmItem) {
+ public OsBtmTypeVO btmDO2VO(BizType btmItem) {
OsBtmTypeVO vo = new OsBtmTypeVO();
if(btmItem !=null){
vo.setOid(btmItem.oid);
diff --git a/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/OsEnumServiceImpl.java b/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/OsEnumServiceImpl.java
index 58170e8..500a13d 100644
--- a/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/OsEnumServiceImpl.java
+++ b/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/OsEnumServiceImpl.java
@@ -1,7 +1,9 @@
package com.vci.web.service.impl;
import com.vci.client.common.providers.ServiceProvider;
+import com.vci.corba.common.PLException;
import com.vci.corba.common.VCIError;
+import com.vci.corba.omd.etm.EnumType;
import com.vci.starter.web.annotation.log.VciUnLog;
import com.vci.starter.web.enumpck.UserSecretEnum;
import com.vci.starter.web.exception.VciBaseException;
@@ -13,7 +15,6 @@
import com.vci.web.constant.EnumIdConstant;
import com.vci.web.pageModel.*;
import com.vci.web.service.*;
-import com.vci.web.util.PlatformClientUtil;
import com.vci.web.util.WebUtil;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
@@ -25,8 +26,6 @@
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
import org.springframework.web.util.HtmlUtils;
-import plm.bs.bom.clientobject.ClientBusinessObject;
-import com.vci.corba.omd.etm.EnumChild;
import com.vci.corba.omd.etm.EnumItem;
import plm.corba.enumManager.EnumItemFilter;
@@ -211,9 +210,10 @@
EnumItemFilter filter = new EnumItemFilter("");
//鍚庨潰涓や釜鍙傛暟灞呯劧瀹屽叏娌℃湁浣滅敤
try {
- return enumDO2VOs(Arrays.stream(ServiceProvider.getOMDService().getEnumService().getEmItems("",1,1)).collect(Collectors.toList()));
+// return enumDO2VOs(Arrays.stream(ServiceProvider.getOMDService().getEnumService().getEmItems("",1,1)).collect(Collectors.toList()));
+ return enumDO2VOs(Arrays.stream(ServiceProvider.getOMDService().getEnumService().getEnumTypes("",1,1)).collect(Collectors.toList()));
//return enumDO2VOs(Arrays.stream(platformClientUtil.getEnumService().getEmItems(filter,1,1)).collect(Collectors.toList()));
- } catch (VCIError vciError) {
+ } catch (PLException vciError) {
throw WebUtil.getVciBaseException(vciError);
}
}
@@ -237,7 +237,7 @@
* @return 鏄剧ず瀵硅薄
*/
@Override
- public List<OsEnumVO> enumDO2VOs(Collection<EnumItem> enumItems) {
+ public List<OsEnumVO> enumDO2VOs(Collection<EnumType> enumItems) {
List<OsEnumVO> enumVOS = new ArrayList<>();
Optional.ofNullable(enumItems).orElseGet(()->new ArrayList<>()).stream().forEach(enumItem -> {
OsEnumVO enumVO = enumDO2VO(enumItem);
@@ -253,7 +253,7 @@
* @return 鏄剧ず瀵硅薄
*/
@Override
- public OsEnumVO enumDO2VO(EnumItem enumItem) {
+ public OsEnumVO enumDO2VO(EnumType enumItem) {
OsEnumVO enumVO = new OsEnumVO();
if(enumItem!=null){
enumVO.setOid(enumItem.oid);
@@ -281,10 +281,10 @@
}
List<OsEnumItemVO> itemVOS = new ArrayList<>();
Map<String,String> itemVOMap = new HashMap<>();
- if(enumItem.children!=null && enumItem.children.length > 0){
- for(int i = 0 ; i < enumItem.children.length ; i ++){
+ if(enumItem.items!=null && enumItem.items.length > 0){
+ for(int i = 0 ; i < enumItem.items.length ; i ++){
OsEnumItemVO enumItemVO = new OsEnumItemVO();
- EnumChild enumChild = enumItem.children[i];
+ EnumItem enumChild = enumItem.items[i];
enumItemVO.setId(enumChild.value);
enumItemVO.setName(enumChild.name);
enumItemVO.setDescription(enumChild.description);
@@ -360,12 +360,12 @@
* @param enumItemList 鏋氫妇鐨勫唴瀹�
*/
@Override
- public void batchAddEnum(List<EnumItem> enumItemList) {
+ public void batchAddEnum(List<EnumType> enumItemList) {
if(!CollectionUtils.isEmpty(enumItemList)){
enumItemList.stream().forEach(enumItem -> {
try {
- ServiceProvider.getOMDService().getEnumService().addEmItem(enumItem);
- } catch (VCIError e) {
+ ServiceProvider.getOMDService().getEnumService().addEnumType(enumItem);
+ } catch (PLException e) {
throw WebUtil.getVciBaseException(e);
}
});
@@ -378,12 +378,13 @@
* @param enumItemList 鏋氫妇鐨勫唴瀹�
*/
@Override
- public void batchEditEnum(List<EnumItem> enumItemList) {
+ public void batchEditEnum(List<EnumType> enumItemList) {
if(!CollectionUtils.isEmpty(enumItemList)){
enumItemList.stream().forEach(enumItem -> {
try {
- ServiceProvider.getOMDService().getEnumService().modifyEmItem(enumItem);
- } catch (VCIError e) {
+// ServiceProvider.getOMDService().getEnumService().modifyEmItem(enumItem);
+ ServiceProvider.getOMDService().getEnumService().modifyEnumType(enumItem);
+ } catch (PLException e) {
throw WebUtil.getVciBaseException(e);
}
});
diff --git a/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/OsLifeCycleServiceImpl.java b/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/OsLifeCycleServiceImpl.java
index 70752cc..a8f477d 100644
--- a/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/OsLifeCycleServiceImpl.java
+++ b/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/OsLifeCycleServiceImpl.java
@@ -1,6 +1,7 @@
package com.vci.web.service.impl;
import com.vci.client.common.providers.ServiceProvider;
+import com.vci.corba.common.PLException;
import com.vci.corba.common.VCIError;
import com.vci.corba.omd.lcm.LifeCycle;
import com.vci.starter.web.annotation.log.VciUnLog;
@@ -328,7 +329,7 @@
// LifeCyle[] lifeCyles = platformClientUtil.getLifeCycleService().getLifeCyles();
LifeCycle[] lifeCyles = ServiceProvider.getOMDService().getLifeCycleService().getLifeCycles();
return lifeCycleDO2VOs(Arrays.stream(lifeCyles).collect(Collectors.toList()));
- } catch (VCIError vciError) {
+ } catch (PLException vciError) {
if(logger.isErrorEnabled()){
// logger.error(vciError.error_code,vciError);
}
@@ -393,7 +394,7 @@
com.vci.corba.omd.lcm.TransitionVO transitionVO = lifeCycleLineVO2DO(lineVO);
// platformClientUtil.getBOFactoryService().transferBusinessObject(new BusinessObjectHolder(obj), transitionVO);
ServiceProvider.getBOFService().transferBusinessObject(obj, transitionVO);
- } catch (VCIError e) {
+ } catch (PLException e) {
throw WebUtil.getVciBaseException(e);
}
}else{
@@ -626,7 +627,7 @@
// bos, vos, releaseStatus);
ServiceProvider.getBOFService().batchTransferBusinessObjectAndRelease(
bos, vos, releaseStatus);
- } catch (VCIError e) {
+ } catch (PLException e) {
throw WebUtil.getVciBaseException(e);
}
}else{
diff --git a/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/OsStatusServiceImpl.java b/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/OsStatusServiceImpl.java
index 3605e62..272823d 100644
--- a/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/OsStatusServiceImpl.java
+++ b/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/OsStatusServiceImpl.java
@@ -1,6 +1,7 @@
package com.vci.web.service.impl;
import com.vci.client.common.providers.ServiceProvider;
+import com.vci.corba.common.PLException;
import com.vci.corba.common.VCIError;
import com.vci.corba.query.data.KV;
import com.vci.starter.web.annotation.log.VciUnLog;
@@ -136,7 +137,7 @@
try {
// return statusDO2VOs(Arrays.stream(platformClientUtil.getStatePoolService().getStatePools()).collect(Collectors.toList()));
return statusDO2VOs(Arrays.stream(ServiceProvider.getOMDService().getStateService().getStatePools()).collect(Collectors.toList()));
- } catch (VCIError vciError) {
+ } catch (PLException vciError) {
throw WebUtil.getVciBaseException(vciError);
}
}
diff --git a/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/UIDataServiceImpl.java b/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/UIDataServiceImpl.java
index cf07387..1407ee0 100644
--- a/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/UIDataServiceImpl.java
+++ b/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/UIDataServiceImpl.java
@@ -1,11 +1,13 @@
package com.vci.web.service.impl;
import com.vci.client.common.providers.ServiceProvider;
+import com.vci.corba.common.PLException;
import com.vci.corba.common.VCIError;
import com.vci.corba.omd.lcm.LifeCycle;
import com.vci.file.pagemodel.VciFileObjectVO;
import com.vci.frameworkcore.lcstatuspck.FrameworkDataLCStatus;
import com.vci.frameworkcore.lcstatuspck.ReleaseDataLCStatus;
+import com.vci.omd.constants.SystemAttribute;
import com.vci.starter.revision.bo.TreeWrapperOptions;
import com.vci.starter.web.annotation.bus.VciChangeDataAfter;
import com.vci.starter.web.annotation.bus.VciChangeDataBefore;
@@ -1070,11 +1072,12 @@
com.vci.client.bof.ClientBusinessObject afterCBO = null;
try {
// BusinessObject resultBO = platformClientUtil.getBOFactoryService().createBusinessObject(resultCbo.getObj().getBusinessObject(),false,false);
+// com.vci.corba.omd.data.BusinessObject resultBO = ServiceProvider.getBOFService().createBusinessObject(resultCbo.getObj().getBusinessObject(),false,false);
com.vci.corba.omd.data.BusinessObject resultBO = ServiceProvider.getBOFService().createBusinessObject(resultCbo.getObj().getBusinessObject(),false,false);
afterCBO = new com.vci.client.bof.ClientBusinessObject();
afterCBO.setBusinessObject(resultBO);
result.setObj(boService.cbo2Map(afterCBO));
- } catch (VCIError vciError) {
+ } catch (PLException vciError) {
throw WebUtil.getVciBaseException(vciError);
}
if(!CollectionUtils.isEmpty(formDataDTO.getReleaseFileOids())){
@@ -1089,7 +1092,7 @@
try {
// platformClientUtil.getBOFactoryService().deleteBusinessObject(afterCBO.getBusinessObject(),1);
ServiceProvider.getBOFService().deleteBusinessObject(afterCBO.getBusinessObject(),1);
- } catch (VCIError vciError) {
+ } catch (PLException vciError) {
throw WebUtil.getVciBaseException(vciError);
}
throw new VciBaseException(LangBaseUtil.getErrorMsg(e),new String[]{},e);
@@ -1135,7 +1138,7 @@
Map<String,String> baseDataMap = formDataDTO2MapLow(formDataDTO);
Map<String,String> allDataMapLow = new HashMap<>();
allDataMapLow.putAll(dataLow);
- allDataMapLow.putAll(baseDataMap);
+// allDataMapLow.putAll(baseDataMap);
//鍒ゆ柇蹇呰緭椤�
BaseResult result = checkRequired(formDefineVO,null,allDataMapLow);
if(!result.isSuccess()){
@@ -1353,7 +1356,7 @@
cbo.setBusinessObject(bo);
afterCBOs.add(cbo);
});
- } catch (VCIError vciError) {
+ } catch (PLException vciError) {
throw WebUtil.getVciBaseException(vciError);
}
if(!CollectionUtils.isEmpty(releasedFileOids)){
@@ -1409,7 +1412,7 @@
// platformClientUtil.getBOFactoryService().updateBusinessObject(new BusinessObjectHolder(resultCbo.getObj().getBusinessObject()));
ServiceProvider.getBOFService().updateBusinessObject(resultCbo.getObj().getBusinessObject());
result.setObj(boService.cbo2Map(resultCbo.getObj()));
- } catch (VCIError vciError) {
+ } catch (PLException vciError) {
throw WebUtil.getVciBaseException(vciError);
}
if(!CollectionUtils.isEmpty(formDataDTO.getReleaseFileOids())){
@@ -1457,7 +1460,7 @@
com.vci.client.bof.ClientBusinessObject afterCbo = new com.vci.client.bof.ClientBusinessObject();
afterCbo.setBusinessObject(bo);
result.setObj(boService.cbo2Map(afterCbo));
- } catch (VCIError vciError) {
+ } catch (PLException vciError) {
throw WebUtil.getVciBaseException(vciError);
}
if(!CollectionUtils.isEmpty(formDataDTO.getReleaseFileOids())){
@@ -1611,11 +1614,13 @@
}
VciBaseUtil.switchCollectionForOracleIn(finalCbo).stream().forEach(cbos->{
try {
- platformClientUtil.getBOFactoryService().batchDeleteBusinessObject(cbos.stream().map(s->s.getBusinessObject()).collect(Collectors.toList()).toArray(new BusinessObject[0]),1);
- } catch (VCIError vciError) {
+// platformClientUtil.getBOFactoryService().batchDeleteBusinessObject(cbos.stream().map(s->s.getBusinessObject()).collect(Collectors.toList()).toArray(new BusinessObject[0]),1);
+ ServiceProvider.getBOFService().batchDeleteBusinessObject(cbos.stream().map(s->s.getBusinessObject()).collect(Collectors.toList()).toArray(new com.vci.corba.omd.data.BusinessObject[0]),1);
+ } catch (PLException vciError) {
throw WebUtil.getVciBaseException(vciError);
}
});
+ System.out.println("zheshi shazi ");
return BaseResult.success();
}
@@ -1683,7 +1688,7 @@
try {
// fromCbo.setBusinessObject(platformClientUtil.getBOFactoryService().readBusinessObject(fromOid,fromBtmName));
fromCbo.setBusinessObject(ServiceProvider.getBOFService().readBusinessObject(fromOid,fromBtmName));
- } catch (VCIError vciError) {
+ } catch (PLException vciError) {
throw WebUtil.getVciBaseException(vciError);
}
String finalPrefix = prefix;
@@ -1721,7 +1726,7 @@
try {
// platformClientUtil.getBOFactoryService().createBusinessObjectWithLink(bosHolder,loHolder);
ServiceProvider.getBOFService().createBusinessObjectWithLink(bos,clo.getLinkObject());
- } catch (VCIError vciError) {
+ } catch (PLException vciError) {
throw WebUtil.getVciBaseException(vciError);
}
if(!CollectionUtils.isEmpty(formLinkDataDTO.getReleaseFileOids())){
@@ -1738,7 +1743,7 @@
// platformClientUtil.getBOFactoryService().deleteLinkObject(clo.getLinkObject());
ServiceProvider.getBOFService().deleteBusinessObject(toCbo.getBusinessObject(),1);
ServiceProvider.getBOFService().deleteLinkObject(clo.getLinkObject());
- } catch (VCIError vciError) {
+ } catch (PLException vciError) {
throw WebUtil.getVciBaseException(vciError);
}
throw new VciBaseException(LangBaseUtil.getErrorMsg(e),new String[]{},e);
@@ -1777,7 +1782,7 @@
com.vci.corba.omd.data.LinkObject linkObject = ServiceProvider.getBOFService().readLinkObjectById(formLinkDataDTO.getOid(), formLinkDataDTO.getLinkType());
clo = new com.vci.client.bof.ClientLinkObject();
clo.setLinkObject(linkObject);
- } catch (VCIError vciError) {
+ } catch (PLException vciError) {
throw WebUtil.getVciBaseException(vciError);
}
}else{
@@ -1939,11 +1944,12 @@
com.vci.client.bof.ClientBusinessObject cbo = new com.vci.client.bof.ClientBusinessObject();
String copyfromversion = baseDataMap.get("copyfromversion");
OsBtmTypeVO btmTypeVO = btmService.getBtmById(btmName);
+ List<String> attributeList = btmTypeVO.getAttributes().stream().map(attribute -> attribute.getId()).collect(Collectors.toList());
if(editFlag || newRevision || newVersion){
try {
// cbo.setBusinessObject(platformClientUtil.getBOFactoryService().readBusinessObject(editFlag?oid:copyfromversion,btmName));
cbo.setBusinessObject(ServiceProvider.getBOFService().readBusinessObject(editFlag?oid:copyfromversion,btmName));
- } catch (VCIError vciError) {
+ } catch (PLException vciError) {
throw new VciBaseException("浣跨敤涓婚敭鍦ㄧ郴缁熶腑娌℃湁鏌ヨ鍒版暟鎹�",new String[]{oid},vciError);
}
if(btmTypeVO.isRevisionFlag() && newRevision){
@@ -1975,7 +1981,7 @@
LifeCycle lifeCycleVO = null;
try {
lifeCycleVO = ServiceProvider.getOMDService().getLifeCycleService().getLifeCycle(btmTypeVO.getLifeCycleId());
- } catch (VCIError e) {
+ } catch (PLException e) {
throw new RuntimeException(e);
}
if(lifeCycleVO == null || StringUtils.isBlank(lifeCycleVO.oid)){
@@ -2001,7 +2007,7 @@
LifeCycle lifeCycleVO = null;
try {
lifeCycleVO = ServiceProvider.getOMDService().getLifeCycleService().getLifeCycle(btmTypeVO.getLifeCycleId());
- } catch (VCIError e) {
+ } catch (PLException e) {
throw new RuntimeException(e);
}
if(lifeCycleVO == null || StringUtils.isBlank(lifeCycleVO.oid)){
@@ -2068,7 +2074,15 @@
cbo.setIsFirstV(true);
}
}
+// Iterator<Map.Entry<String, String>> iterator = baseDataMap.entrySet().iterator();
+// while(iterator.hasNext()){
+// Map.Entry<String, String> next = iterator.next();
+// if(!attributeList.contains(next.getKey())){
+// iterator.remove();
+// }
+// }
setValueToCbo(dataLowMap,baseDataMap,cbo,editFlag);
+// cbo.setName(dataLowMap.get("name"));
return cbo;
}
@@ -2105,8 +2119,10 @@
//骞冲彴涓嶈兘浼犻�掕繖涓�
}else{
try {
- cbo.setAttributeValueWithNoCheck(key, value, !editFlag);
- } catch (VCIError vciError) {
+// if(!SystemAttribute.bosysAttList().contains(key)){
+ cbo.setAttributeValueWithNoCheck(key, value, !editFlag);
+// }
+ } catch (PLException vciError) {
throw new VciBaseException("{0}鐨勫�间笉绗﹀悎瑕佹眰锛屽綋鍓嶆槸{1}", new String[]{key, value}, vciError);
}
}
@@ -2118,16 +2134,20 @@
if(editFlag) {
//缂栬緫鐨勬椂鍊欏彲浠ラ兘璁剧疆
try {
- cbo.setAttributeValueWithNoCheck(key, value, !editFlag);
- } catch (VCIError vciError) {
+// if(!SystemAttribute.bosysAttList().contains(key)){
+ cbo.setAttributeValueWithNoCheck(key, value, !editFlag);
+// }
+ } catch (PLException vciError) {
throw new VciBaseException("{0}鐨勫�间笉绗﹀悎瑕佹眰锛屽綋鍓嶆槸{1}", new String[]{key, value}, vciError);
}
}else{
//鍙渶瑕佸鐞唅d,name,description锛屽瘑绾у嵆鍙紝鍏朵綑鐨勯兘宸茬粡琚缃簡
if(basicFields.contains(key) &&StringUtils.isNotBlank(value)){
try {
- cbo.setAttributeValueWithNoCheck(key, value, true);
- } catch (VCIError vciError) {
+// if(!SystemAttribute.bosysAttList().contains(key)){
+ cbo.setAttributeValueWithNoCheck(key, value, true);
+// }
+ } catch (PLException vciError) {
throw new VciBaseException("{0}鐨勫�间笉绗﹀悎瑕佹眰锛屽綋鍓嶆槸{1}", new String[]{key, value}, vciError);
}
}
@@ -2211,7 +2231,7 @@
try {
// platformClientUtil.getBOFactoryService().updateLinkObject(loHolder);
ServiceProvider.getBOFService().updateLinkObject(clo.getLinkObject());
- } catch (VCIError vciError) {
+ } catch (PLException vciError) {
throw WebUtil.getVciBaseException(vciError);
}
//淇濆瓨to绔垨鑰協rom绔�
@@ -2221,7 +2241,7 @@
try{
// platformClientUtil.getBOFactoryService().updateBusinessObject(boHolder);
ServiceProvider.getBOFService().updateBusinessObject(toCbo.getBusinessObject());
- } catch (VCIError vciError) {
+ } catch (PLException vciError) {
throw WebUtil.getVciBaseException(vciError);
}
if(!CollectionUtils.isEmpty(formLinkDataDTO.getReleaseFileOids())){
diff --git a/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/UIEngineServiceImpl.java b/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/UIEngineServiceImpl.java
index 36da87e..231a467 100644
--- a/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/UIEngineServiceImpl.java
+++ b/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/UIEngineServiceImpl.java
@@ -5,6 +5,7 @@
import com.thoughtworks.xstream.io.xml.XmlFriendlyNameCoder;
import com.thoughtworks.xstream.io.xml.XppDriver;
import com.vci.client.common.providers.ServiceProvider;
+import com.vci.corba.common.PLException;
import com.vci.corba.common.VCIError;
import com.vci.corba.portal.data.PLTabButton;
import com.vci.corba.portal.data.PLUILayout;
@@ -146,7 +147,7 @@
try {
portalVIS = ServiceProvider.getUIService().getAllPortalVI();
// portalVIS = platformClientUtil.getPortalService().getAllPortalVI();
- } catch (VCIError vciError) {
+ } catch (PLException vciError) {
throw WebUtil.getVciBaseException(vciError);
}
for(int i = 0 ; i < portalVIS.length ; i++){
@@ -170,7 +171,7 @@
PortalVI[] portalVIS = null;
try {
portalVIS = ServiceProvider.getUIService().getAllPortalVI();
- } catch (VCIError vciError) {
+ } catch (PLException vciError) {
throw WebUtil.getVciBaseException(vciError);
}
List<PortalVI> portalVIList = Arrays.stream(portalVIS).filter(portal -> 1 == portal.viType).collect(Collectors.toList());
@@ -421,7 +422,7 @@
PortalVI portalVI = null;
try {
portalVI = ServiceProvider.getUIService().getPortalVIByTypeNameAndVIName(btmId, id);
- } catch (VCIError vciError) {
+ } catch (PLException vciError) {
throw WebUtil.getVciBaseException(vciError);
}
return formDO2VO(portalVI);
@@ -464,7 +465,7 @@
PortalVI[] portalVIS = null;
try {
portalVIS = ServiceProvider.getUIService().getAllPortalVI();
- } catch (VCIError vciError) {
+ } catch (PLException vciError) {
throw WebUtil.getVciBaseException(vciError);
}
List<PortalVI> portalVIList = Arrays.stream(portalVIS).filter(portal -> 0 == portal.viType).collect(Collectors.toList());
@@ -540,7 +541,7 @@
}else{
try {
formDefineVO = formDO2VO(ServiceProvider.getUIService().getPortalVIById(formOid));
- } catch (VCIError vciError) {
+ } catch (PLException vciError) {
throw WebUtil.getVciBaseException(vciError);
}
}
@@ -741,7 +742,7 @@
PortalVI portalVI = null;
try {
portalVI = ServiceProvider.getUIService().getPortalVIByTypeNameAndVIName(btmId, id);
- } catch (VCIError vciError) {
+ } catch (PLException vciError) {
throw WebUtil.getVciBaseException(vciError);
}
return tableDO2VO(portalVI,true);
@@ -783,7 +784,7 @@
try {
// return actionDO2VOs(Arrays.stream(platformClientUtil.getPortalService().getAllPLAction()).collect(Collectors.toList()));
return actionDO2VOs(Arrays.stream(ServiceProvider.getUIService().getAllPLAction()).collect(Collectors.toList()));
- } catch (VCIError vciError) {
+ } catch (PLException vciError) {
throw WebUtil.getVciBaseException(vciError);
}
}
@@ -1033,7 +1034,7 @@
private List<UILayoutVO> listLayoutByContent(String pkContent){
try {
return UILayoutDO2VOs(Arrays.stream(ServiceProvider.getUIService().getPLTabPagesByPageDefinationOId(pkContent)).collect(Collectors.toList()),true);
- } catch (VCIError vciError) {
+ } catch (PLException vciError) {
throw WebUtil.getVciBaseException(vciError);
}
}
@@ -1158,7 +1159,7 @@
try {
layoutVO.setComponentVOs(uiComponentDO2VOs(Arrays.stream(ServiceProvider.getUIService().getPLPageDefinationsByPageContextOId(layoutVO.getOid())).collect(Collectors.toList()),true));
// layoutVO.setComponentVOs(uiComponentDO2VOs(Arrays.stream(platformClientUtil.getPortalService().getPLPageDefinationsByPageContextOId(layoutVO.getOid())).collect(Collectors.toList()),true));
- } catch (VCIError vciError) {
+ } catch (PLException vciError) {
throw WebUtil.getVciBaseException(vciError);
}
}
@@ -1205,7 +1206,7 @@
if(!QUERY_BY_CACHE){
try {
return uiComponentDO2VO(ServiceProvider.getUIService().getPLPageDefinationById(componentOid),true);
- } catch (VCIError vciError) {
+ } catch (PLException vciError) {
throw WebUtil.getVciBaseException(vciError);
}
}else{
@@ -1278,7 +1279,7 @@
try {
componentVO.setTableDefineVO(tableDO2VO(ServiceProvider.getUIService().getPortalVIByTypeNameAndVIName(btmType,componentDefineXO.getTemplateId()),true));
//componentVO.setTableDefineVO(tableDO2VO(platformClientUtil.getPortalService().getPortalVIByTypeNameAndVIName(btmType,componentDefineXO.getTemplateId()),true));
- } catch (VCIError vciError) {
+ } catch (PLException vciError) {
throw WebUtil.getVciBaseException(vciError);
}
}
@@ -1314,7 +1315,7 @@
}else{
try {
tableDefineVO = tableDO2VO(ServiceProvider.getUIService().getPortalVIByTypeNameAndVIName(btmType,componentDefineXO.getTemplateId()),true);
- } catch (VCIError vciError) {
+ } catch (PLException vciError) {
throw WebUtil.getVciBaseException(vciError);
}
}
@@ -1365,7 +1366,7 @@
}else{
try {
componentVO.setFormDefineVO(formDO2VO(ServiceProvider.getUIService().getPortalVIByTypeNameAndVIName(btmType,componentDefineXO.getTemplateId())));
- } catch (VCIError vciError) {
+ } catch (PLException vciError) {
throw WebUtil.getVciBaseException(vciError);
}
}
@@ -1429,7 +1430,7 @@
}else{
return buttonDefineVOS;
}
- } catch (VCIError vciError) {
+ } catch (PLException vciError) {
throw WebUtil.getVciBaseException(vciError);
}
}
@@ -1495,7 +1496,7 @@
params.put(parameter.plKey,parameter.plValue);
}
}
- } catch (VCIError vciError) {
+ } catch (PLException vciError) {
throw WebUtil.getVciBaseException(vciError);
}
buttonVO.setParamVOS(params);
@@ -1559,7 +1560,7 @@
// obj = platformClientUtil.getPortalService().getPLPageLayoutDefinationsByRelatedType(btmType);
// obj = ServiceProvider.geT(btmType);
- } catch (VCIError vciError) {
+ } catch (PLException vciError) {
throw WebUtil.getVciBaseException(vciError);
}
PLUILayout context = null;
diff --git a/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/WebBoServiceImpl.java b/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/WebBoServiceImpl.java
index 314c589..b75e0f4 100644
--- a/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/WebBoServiceImpl.java
+++ b/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/WebBoServiceImpl.java
@@ -3,6 +3,7 @@
import com.alibaba.fastjson.JSONObject;
import com.vci.base.common.utility.ObjectUtility;
import com.vci.client.common.providers.ServiceProvider;
+import com.vci.corba.common.PLException;
import com.vci.corba.common.VCIError;
import com.vci.corba.omd.qtm.QTInfo;
import com.vci.corba.query.ObjectQueryService;
@@ -226,7 +227,7 @@
Optional.ofNullable(btmTypeVO.getAttributes()).orElseGet(()->new ArrayList<>()).stream().forEach(attribute->{
try {
cbo.setAttributeValueWithNoCheck(attribute.getId(),attribute.getDefaultValue());
- } catch (VCIError vciError) {
+ } catch (PLException vciError) {
if(logger.isErrorEnabled()){
logger.error("璁剧疆灞炴�х殑鍊肩殑鏃跺�欏嚭鐜颁簡閿欒",vciError);
}
@@ -617,25 +618,19 @@
logger.error("娌℃湁鎵惧埌鏌ヨ鏈嶅姟");
throw new VciBaseException(msgCodePrefix+"qtServerNull", new String[]{});
}
- IntHolder count = new IntHolder();
+// IntHolder count = new IntHolder();
ObjectQueryService.FindBTMObjectsV3Result bos = null;
- String invo = JSONObject.toJSONString(InvocationUtility.getInvocation());
+// String invo = JSONObject.toJSONString(InvocationUtility.getInvocation());
try{
//bos = qtService.findBTMObjectsV3(invo,qt.getId(), Tool.qtTOXMl(qt).asXML(),count,refOpts.toArray(new BtmRefQueryOption[0]));
bos = qtService.findBTMObjectsV3(qt.getId(), Tool.qtTOXMl(qt).asXML(), refOpts.toArray(new BtmRefQueryOption[0]));
- }catch (VCIError e){
+ }catch (PLException e){
//bos = qtService.findBTMObjectsV4(invo,qt.getId(), Tool.qtTOXMl(qt).asXML(),count,refOpts.toArray(new BtmRefQueryOption[0]));
bos = qtService.findBTMObjectsV3(qt.getId(), Tool.qtTOXMl(qt).asXML(), refOpts.toArray(new BtmRefQueryOption[0]));
}
if (bos != null && bos.count > 0) {
for (com.vci.corba.omd.data.BusinessObject bo : bos.returnValue) {
com.vci.client.bof.ClientBusinessObject cbo = new com.vci.client.bof.ClientBusinessObject();
-// BusinessObject businessObject = new BusinessObject(bo.oid, bo.revisionid, bo.nameoid, bo.btName, bo.isLastR ? 1 : 0, bo.isFirstR ? 1 : 0,
-// bo.isLastV ? 1 : 0, bo.isFirstV ? 1 : 0, bo.creator, String.valueOf(bo.createTime), bo.modifier, String.valueOf(bo.modifyTime),
-// bo.revisionRule, bo.versionRule, bo.revisionSeq, bo.revisionValue, bo.versionSeq,
-// bo.versionValue, bo.lctId, bo.lcStatus, String.valueOf(bo.ts), bo.id, bo.name, bo.description,
-// bo.owner,null, null, null, null,
-// bo.fromVersion, copyToAttributeValue(bo.newAttrValList), copyToAttributeValue(bo.hisAttrValList));
cbo.setBusinessObject(bo);
queryEnumText(cbo,enumAttrName);
allCbos.add(cbo);
@@ -643,8 +638,7 @@
//鍥犱负淇敼浜嗘煡璇㈢殑鏂瑰紡锛屾墍浠ュ氨涓嶉渶瑕佸崟鐙煡璇㈠弬鐓�
}
queryLcStatus(allCbos);
- } catch (VCIError e) {
- //logger.error(e.error_code,e);
+ } catch (PLException e) {
throw WebUtil.getVciBaseException(e);
}
return allCbos;
@@ -997,10 +991,10 @@
}
});
}
- }catch(VCIError e){
+ }catch(PLException e){
//logger.error(e.error_code,e);
//throw WebUtil.getVciBaseException(e);
- } catch (DocumentException e) {
+ } catch (DocumentException | VCIError e) {
logger.error("鏌ヨ妯℃澘杞崲",e);
throw new VciBaseException(this.msgCodePrefix + "qtError", new Object[]{name});
}
@@ -1048,11 +1042,11 @@
try{
// count = platformClientUtil.getQueryService().findTotalCount();
count = Integer.parseInt(String.valueOf(ServiceProvider.getOQService().findTotalCount(qt.getId(), Tool.qtTOXMl(qt).asXML())));
- }catch (VCIError e) {
+ }catch (PLException e) {
try {
// count = platformClientUtil.getQueryService().findTotalCount(qt.getId(), Tool.qtTOXMl(qt).asXML());
count = Integer.parseInt(String.valueOf(ServiceProvider.getOQService().findTotalCount(qt.getId(), Tool.qtTOXMl(qt).asXML())));
- }catch (VCIError ee) {
+ }catch (PLException ee) {
// logger.error(ee.error_code,ee);
// throw WebUtil.getVciBaseException(ee);
}
@@ -1210,7 +1204,7 @@
dataList.add(data);
}
}
- } catch (VCIError e) {
+ } catch (PLException e) {
throw WebUtil.getVciBaseException(e);
}
return dataList;
@@ -1284,9 +1278,9 @@
sql = sql.replaceAll(" FROM "," from ");
}
- AttributeValue[] ava = null;
+ com.vci.corba.omd.data.AttributeValue[] ava = null;
if(conditionMap!=null&&!conditionMap.isEmpty()){
- ava = new AttributeValue[conditionMap.size()];
+ ava = new com.vci.corba.omd.data.AttributeValue[conditionMap.size()];
Iterator<String> it = conditionMap.keySet().iterator();
int i = 0 ;
while(it.hasNext()){
@@ -1295,15 +1289,16 @@
if(value == null){
value = "";
}
- AttributeValue av = new AttributeValue(key, value);
+ com.vci.corba.omd.data.AttributeValue av = new com.vci.corba.omd.data.AttributeValue(key, value);
ava[i] = av;
i++;
}
}else{
- ava = new AttributeValue[0];
+ ava = new com.vci.corba.omd.data.AttributeValue[0];
}
try {
- String[][] results =platformClientUtil.getBOFactoryService().getSqlQueryResult(sql, ava);
+// String[][] results =platformClientUtil.getBOFactoryService().getSqlQueryResult(sql, ava);
+ String[][] results =ServiceProvider.getBOFService().getSqlQueryResult(sql, ava);
if(results.length>0){
if(selectKeys==null) {
String selectSql = sql.substring(sql.toLowerCase(Locale.ROOT).indexOf("select") + 6, sql.toLowerCase(Locale.ROOT).indexOf(" from")).trim();
@@ -1340,7 +1335,7 @@
}else{
return new ArrayList<Map>();
}
- } catch (VCIError e) {
+ } catch (PLException e) {
// logger.error(e.error_code,e);
throw WebUtil.getVciBaseException(e);
}
@@ -1636,7 +1631,7 @@
} else {
cbo.setAttributeValueWithNoCheck(attrName.toLowerCase(), value);
}
- } catch (VCIError e) {
+ } catch (PLException e) {
throw WebUtil.getVciBaseException(e);
}
}
@@ -2345,7 +2340,7 @@
cboArray2Bo(batchCbos.getUpdateCboArray()),
cloArray2Lo(batchCbos.getUpdateCloArray()),
cboArray2Bo(batchCbos.getDeleteCboArray()), cloArray2Lo(batchCbos.getDeleteCloArray()));
- } catch (VCIError e) {
+ } catch (PLException e) {
throw WebUtil.getVciBaseException(e);
}
}
diff --git a/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/WebBtmIOServiceImpl.java b/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/WebBtmIOServiceImpl.java
index b54c65b..0b98e8e 100644
--- a/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/WebBtmIOServiceImpl.java
+++ b/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/WebBtmIOServiceImpl.java
@@ -1,6 +1,7 @@
package com.vci.web.service.impl;
import com.vci.corba.common.VCIError;
+import com.vci.corba.omd.etm.EnumType;
import com.vci.starter.poi.bo.WriteExcelData;
import com.vci.starter.poi.bo.WriteExcelOption;
import com.vci.starter.poi.util.ExcelUtil;
@@ -31,7 +32,6 @@
import plm.corba.attribpool.AttribItem;
import plm.corba.btm.BTMServiceOperations;
import plm.corba.btm.BtmItem;
-import com.vci.corba.omd.etm.EnumChild;
import com.vci.corba.omd.etm.EnumItem;
import plm.corba.lifecycle.Bound;
import plm.corba.lifecycle.LifeCyle;
@@ -484,8 +484,8 @@
private void importEnums(Collection<OsEnumDTO> enumDTOList) throws VciBaseException{
Set<String> existEnumIdList = enumService.selectAllEnumMap().keySet();
Map<String, OsEnumVO> allEnumMap = enumService.selectAllEnumMap();
- List<EnumItem> unExistEnumList = new ArrayList<EnumItem>();
- List<EnumItem> editEnumList = new ArrayList<EnumItem>();
+ List<EnumType> unExistEnumList = new ArrayList<EnumType>();
+ List<EnumType> editEnumList = new ArrayList<EnumType>();
String userId = WebUtil.getCurrentUserId();
String now = VciDateUtil.getNowString(VciDateUtil.DateTimeFormat);
@@ -493,7 +493,7 @@
for(OsEnumDTO enumDTO : enumDTOList){
String enumId = enumDTO.getId().toLowerCase().trim();
if(!existEnumIdList.contains(enumId)){
- EnumItem enumItem = new EnumItem();
+ EnumType enumItem = new EnumType();
enumItem.oid = "";
enumItem.ts = now;
enumItem.creator = userId;
@@ -507,24 +507,24 @@
enumItem.type = "int".equalsIgnoreCase(enumDTO.getEnumValueDataType())?"Integer":"String";
enumItem.length = enumDTO.getLength();
- List<EnumChild> childList = new ArrayList<EnumChild>();
+ List<EnumItem> childList = new ArrayList<EnumItem>();
Map<String, String> itemMaps = enumDTO.getItemMaps();
if(CollectionUtils.isEmpty(itemMaps)){
throw new VciBaseException("鏋氫妇{0}娌℃湁閫夐」",new String[]{enumItem.name});
}
for(String key : itemMaps.keySet()){
String value = itemMaps.get(key);
- EnumChild enumChild = new EnumChild();
+ EnumItem enumChild = new EnumItem();
enumChild.name = value;
enumChild.value = key;
enumChild.description = "";
childList.add(enumChild);
}
- enumItem.children = childList.toArray(new EnumChild[0]);
+ enumItem.items = childList.toArray(new EnumItem[0]);
unExistEnumList.add(enumItem);
}else{
//淇敼鍐呭
- EnumItem enumItem = new EnumItem();
+ EnumType enumItem = new EnumType();
OsEnumVO enumVO = allEnumMap.get(enumId);
enumItem.oid = enumVO.getOid();
// enumItem.createTime = VciDateUtil.date2Str(enumVO.getCreateTime(),VciDateUtil.DateTimeFormat);
@@ -539,20 +539,20 @@
enumItem.type = "int".equalsIgnoreCase(enumDTO.getEnumValueDataType())?"Integer":"String";
enumItem.length = enumDTO.getLength();
- List<EnumChild> childList = new ArrayList<EnumChild>();
+ List<EnumItem> childList = new ArrayList<EnumItem>();
Map<String, String> itemMaps = enumDTO.getItemMaps();
if(CollectionUtils.isEmpty(itemMaps)){
throw new VciBaseException("鏋氫妇{0}娌℃湁閫夐」",new String[]{enumItem.name});
}
for(String key : itemMaps.keySet()){
String value = itemMaps.get(key);
- EnumChild enumChild = new EnumChild();
+ EnumItem enumChild = new EnumItem();
enumChild.name = value;
enumChild.value = key;
enumChild.description = "";
childList.add(enumChild);
}
- enumItem.children = childList.toArray(new EnumChild[0]);
+ enumItem.items = childList.toArray(new EnumItem[0]);
editEnumList.add(enumItem);
}
}
diff --git a/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/WebLoServiceImpl.java b/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/WebLoServiceImpl.java
index 9868ece..2417af1 100644
--- a/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/WebLoServiceImpl.java
+++ b/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/WebLoServiceImpl.java
@@ -4,6 +4,7 @@
import com.alibaba.fastjson.serializer.SerializerFeature;
import com.vci.base.common.utility.ObjectUtility;
import com.vci.client.common.providers.ServiceProvider;
+import com.vci.corba.common.PLException;
import com.vci.corba.common.VCIError;
import com.vci.corba.query.ObjectQueryService;
import com.vci.starter.web.constant.QueryOptionConstant;
@@ -594,7 +595,7 @@
// com.vci.corba.query.data.BOAndLO[] bos = platformClientUtil.getQueryService().getBOAndLOS(qt.getId(), Tool.qtTOXMl(qt).asXML(),linkTypeDataQuery.getParentOid()==null?"":linkTypeDataQuery.getParentOid());
com.vci.corba.query.data.BOAndLO[] bos = ServiceProvider.getOQService().getBOAndLOS(qt.getId(), Tool.qtTOXMl(qt).asXML(),linkTypeDataQuery.getParentOid()==null?"":linkTypeDataQuery.getParentOid());
return Arrays.stream(bos).collect(Collectors.toList());
- } catch (VCIError e) {
+ } catch (PLException e) {
// logger.error(e.error_code,e);
throw WebUtil.getVciBaseException(e);
}
@@ -733,7 +734,7 @@
});
dataGrid.setData(data);
dataGrid.setTotal(total[0]);
- } catch (VCIError e) {
+ } catch (PLException e) {
// logger.error(e.error_code,e);
throw WebUtil.getVciBaseException(e);
}
diff --git a/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/util/WebUtil.java b/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/util/WebUtil.java
index 6b512d2..20cf192 100644
--- a/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/util/WebUtil.java
+++ b/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/util/WebUtil.java
@@ -3,6 +3,7 @@
import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson.serializer.SerializerFeature;
import com.vci.base.ui.exception.VCIException;
+import com.vci.corba.common.PLException;
import com.vci.corba.common.VCIError;
import com.vci.corba.framework.data.UserEntityInfo;
import com.vci.rmip.framework.client.systemConfig.object.UserEntityObject;
@@ -1367,7 +1368,7 @@
setValueToField(key, cbo, value);
}
cbo.setAttributeValueWithNoCheck(key.toLowerCase(), value);
- } catch (VCIError e) {
+ } catch (PLException e) {
throw WebUtil.getVciBaseException(e);
}
}
@@ -1519,6 +1520,16 @@
* @param e 寮傚父瀵硅薄
* @return base寮傚父瀵硅薄
*/
+ public static VciBaseException getVciBaseException(PLException e){
+ return new VciBaseException(e.code, new java.lang.String[]{e.getMessage()});
+// return null;
+ }
+
+ /**
+ * 杞崲寮傚父
+ * @param e 寮傚父瀵硅薄
+ * @return base寮傚父瀵硅薄
+ */
public static VciBaseException getVciBaseException(VCIException e){
String[] errorMsgs = new String[0];
if(e != null && e.getException_objArray() !=null ){
--
Gitblit v1.9.3