From 8063eafc5e987696a1d6dea5955fa406508c7f72 Mon Sep 17 00:00:00 2001
From: wangting <675591594@qq.com>
Date: 星期一, 08 四月 2024 11:30:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Bin/lib/service/OQService.jar | 0
Bin/lib/service/VciServiceMain.jar | 0
Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/OsAttributeServiceI.java | 4 +-
Bin/lib/client/plt-clientbase.jar | 0
Bin/lib/service/FrameService.jar | 0
Bin/lib/common/plt-slice.jar | 0
Bin/lib/service/ServiceBase.jar | 0
Source/platformProject/vci-platform-web/src/main/java/com/vci/frameworkcore/compatibility/impl/SmFunctionQueryServicePlatformImpl.java | 38 +++++++++----------
Bin/lib/service/OMDService.jar | 0
Bin/lib/service/WFService.jar | 0
Source/platformProject/vci-platform-web/src/main/java/com/vci/web/controller/SmFunctionController.java | 2
Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/OsAttributeServiceImpl.java | 12 +++---
Bin/lib/service/WFPlugins.jar | 0
Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/UIEngineServiceImpl.java | 13 +++---
Bin/lib/service/UIService.jar | 0
Bin/lib/service/VolumeService.jar | 0
Bin/properties/hibernate.cfg.xml | 5 ++
Bin/lib/service/BOFService.jar | 0
Bin/lib/common/plt-common.jar | 0
Bin/lib/client/plt-client.jar | 0
20 files changed, 37 insertions(+), 37 deletions(-)
diff --git a/Bin/lib/client/plt-client.jar b/Bin/lib/client/plt-client.jar
index f088559..d4286a6 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 eae5bec..50330af 100644
--- a/Bin/lib/client/plt-clientbase.jar
+++ b/Bin/lib/client/plt-clientbase.jar
Binary files differ
diff --git a/Bin/lib/common/plt-common.jar b/Bin/lib/common/plt-common.jar
index 801e62c..4a83711 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 8a67790..96264cf 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 7d26e53..02856bd 100644
--- a/Bin/lib/service/BOFService.jar
+++ b/Bin/lib/service/BOFService.jar
Binary files differ
diff --git a/Bin/lib/service/FrameService.jar b/Bin/lib/service/FrameService.jar
index 75783a6..e8bf9a2 100644
--- a/Bin/lib/service/FrameService.jar
+++ b/Bin/lib/service/FrameService.jar
Binary files differ
diff --git a/Bin/lib/service/OMDService.jar b/Bin/lib/service/OMDService.jar
index 7d5355d..a4a1419 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 82a3e7a..64cc1fe 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 d72d5ed..9b3cc0d 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 1168791..3bdfbb9 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 4311374..e4bd80e 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 440eeb2..ab4afc4 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 1a87556..8042853 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 43c8e1a..25dbf09 100644
--- a/Bin/lib/service/WFService.jar
+++ b/Bin/lib/service/WFService.jar
Binary files differ
diff --git a/Bin/properties/hibernate.cfg.xml b/Bin/properties/hibernate.cfg.xml
index 4249aed..d61063d 100644
--- a/Bin/properties/hibernate.cfg.xml
+++ b/Bin/properties/hibernate.cfg.xml
@@ -9,8 +9,11 @@
<property name="connection.username">vcimes</property>
<property name="connection.password">vcimes</property>-->
- <property name="connection.url">jdbc:oracle:thin:@localhost:1521:orcl</property>
+ <!-- <property name="connection.url">jdbc:oracle:thin:@localhost:1521:orcl</property>
<property name="connection.username">mpm550new</property>
+ <property name="connection.password">vcitest</property> -->
+ <property name="connection.url">jdbc:oracle:thin:@192.168.0.66:1521:orcl</property>
+ <property name="connection.username">PLT2024</property>
<property name="connection.password">vcitest</property>
<!--<property name="connection.username">mpm112</property>
<property name="connection.password">vcitest</property>-->
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 eeb450e..6bf5598 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
@@ -263,13 +263,14 @@
if(StringUtils.isBlank(menu.resourceB) || !(menu.resourceB.length()>2 && "bs=".equals(menu.resourceB.substring(0,3)))){
continue;
}
- if(menu.resourceB.contains("type=") || menu.resourceB.contains("context=")){
- String[] split = menu.resourceB.split("\\?")[0].split("=");
- functionVO.setPath((split.length>1 && split[1].equals("test") ? "/custom-ui/" :"/base/UIContentViewer") + menu.resourceB.substring(3));
- }else{
- functionVO.setPath("/views/" + menu.id);
-// functionVO.setPath("/" + menu.resourceB + menu.aliasName);
- }
+ functionVO.setPath(menu.resourceB);
+// if(menu.resourceB.contains("type=") || menu.resourceB.contains("context=")){
+// String[] split = menu.resourceB.split("\\?")[0].split("=");
+// functionVO.setPath((split.length>1 && split[1].equals("test") ? "/custom-ui/" :"/base/UIContentViewer") + menu.resourceB.substring(3));
+// }else{
+// functionVO.setPath("/views/" + menu.id);
+//// functionVO.setPath("/" + menu.resourceB + menu.aliasName);
+// }
functionVO.setParentId(menu.parentId);
functionVO.setCode(menu.aliasName);
functionVO.setAlias(menu.aliasName);
@@ -301,13 +302,14 @@
if(StringUtils.isBlank(menu.resourceB) || !(menu.resourceB.length()>2 && "bs=".equals(menu.resourceB.substring(0,3)))){
continue;
}
- if(menu.resourceB.contains("type=") || menu.resourceB.contains("context=")){
- String[] split = menu.resourceB.split("\\?")[0].split("=");
- functionVO.setPath((split.length>1 && split[1].equals("test") ? "/custom-ui/" :"/base/UIContentViewer") + menu.resourceB.substring(3));
- }else{
- functionVO.setPath("/views/" + menu.id);
-// functionVO.setPath("/" + menu.resourceB + menu.aliasName);
- }
+ functionVO.setPath(menu.resourceB);
+// if(menu.resourceB.contains("type=") || menu.resourceB.contains("context=")){
+// String[] split = menu.resourceB.split("\\?")[0].split("=");
+// functionVO.setPath((split.length>1 && split[1].equals("test") ? "/custom-ui/" :"/base/UIContentViewer") + menu.resourceB.substring(3));
+// }else{
+// functionVO.setPath("/views/" + menu.id);
+//// functionVO.setPath("/" + menu.resourceB + menu.aliasName);
+// }
functionVO.setCode(menu.aliasName);
functionVO.setAlias(menu.aliasName);
functionVO.setParentId(menu.parentId);
@@ -335,13 +337,9 @@
if(resourceControlTypeEnum == null){
resourceControlTypeEnum = ResourceControlTypeEnum.BS;
}
-// PortalServicePrx uiService = ServiceProvider.getUIService();
-// FrameworkServicePrx frameService = ServiceProvider.getFrameService();
-// FunctionInfo[] menus = ServiceProvider.getFrameService().getModuleListByParentId("modelManagmentNode", true);
for (PLUILayout allPLUILayout : ServiceProvider.getUIService().getAllPLUILayouts()) {
- if("folder".equals(allPLUILayout.plRelatedType) && "cardtemplatemanager".equals(allPLUILayout.plCode)){
-// if("workflowinstance".equals(allPLUILayout.plRelatedType)){
-// System.out.printf("");
+ if(treeQueryObject.getConditionMap().getOrDefault("type","").equals(allPLUILayout.plRelatedType)
+ && treeQueryObject.getConditionMap().getOrDefault("context","").equals(allPLUILayout.plCode)){
return uiEngineServiceI.UIContentDO2VO(allPLUILayout,true);
}
}
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 e573d4e..8476255 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
@@ -48,7 +48,7 @@
*/
@VciUnCheckRight
@GetMapping("/getUIContentByBtmTypeAndId")
- public UIContentVO getUIContentByBtmTypeAndId(TreeQueryObject treeQueryObject) throws VCIError {
+ public UIContentVO getUIContentByBtmTypeAndId(@RequestBody TreeQueryObject treeQueryObject) throws VCIError {
return functionQueryService.getUIContentByBtmTypeAndId(treeQueryObject, ResourceControlTypeEnum.BS);
}
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 43e2176..28fd3d4 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
@@ -56,14 +56,14 @@
* @param attribItems 鏁版嵁瀵硅薄
* @return 鏄剧ず瀵硅薄
*/
- List<OsAttributeVO> attributeDO2VOs(Collection<AttribItem> attribItems);
+ List<OsAttributeVO> attributeDO2VOs(Collection<com.vci.corba.omd.atm.AttribItem> attribItems);
/**
* 灞炴�х殑鏁版嵁瀵硅薄杞崲涓烘樉绀哄璞�
* @param attribItem 鏁版嵁瀵硅薄
* @return 鏄剧ず瀵硅薄
*/
- OsAttributeVO attributeDO2VO(AttribItem attribItem);
+ OsAttributeVO attributeDO2VO(com.vci.corba.omd.atm.AttribItem attribItem);
/**
* 灞炴�х殑鏄剧ず瀵硅薄杞崲涓烘暟鎹璞�
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 7f1354a..fc0f144 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
@@ -115,8 +115,8 @@
AttribItemFilter abFilter = new AttribItemFilter();
//鍚庨潰涓や釜鍒嗛〉鏁帮紝瀹屽叏娌℃湁鐢�
try {
- return attributeDO2VOs(Arrays.stream(platformClientUtil.getAttributeService().getAttribItems(abFilter,1,1)).collect(Collectors.toList()));
-// return attributeDO2VOs(Arrays.stream(ServiceProvider.getOMDService().getAttributeService().getAttribItems(abFilter,1,1)).collect(Collectors.toList()));
+// 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) {
throw WebUtil.getVciBaseException(vciError);
}
@@ -141,7 +141,7 @@
* @return 鏄剧ず瀵硅薄
*/
@Override
- public List<OsAttributeVO> attributeDO2VOs(Collection<AttribItem> attribItems) {
+ public List<OsAttributeVO> attributeDO2VOs(Collection<com.vci.corba.omd.atm.AttribItem> attribItems) {
List<OsAttributeVO> vos = new ArrayList<>();
Optional.ofNullable(attribItems).orElseGet(()->new ArrayList<>()).stream().forEach(attribItem -> {
vos.add(attributeDO2VO(attribItem));
@@ -156,15 +156,15 @@
* @return 鏄剧ず瀵硅薄
*/
@Override
- public OsAttributeVO attributeDO2VO(AttribItem attribItem) {
+ public OsAttributeVO attributeDO2VO(com.vci.corba.omd.atm.AttribItem attribItem) {
OsAttributeVO attributeVO = new OsAttributeVO();
if(attribItem!=null){
attributeVO.setOid(attribItem.oid);
attributeVO.setId(attribItem.name);
attributeVO.setCreator(attribItem.creator);
try {
- attributeVO.setCreateTime(VciDateUtil.str2Date(attribItem.createTime,VciDateUtil.DateTimeFormat));
- attributeVO.setLastModifyTime(VciDateUtil.str2Date(attribItem.modifyTime,VciDateUtil.DateTimeFormat));
+ attributeVO.setCreateTime(VciDateUtil.str2Date(String.valueOf(attribItem.createTime),VciDateUtil.DateTimeFormat));
+ attributeVO.setLastModifyTime(VciDateUtil.str2Date(String.valueOf(attribItem.modifyTime),VciDateUtil.DateTimeFormat));
attributeVO.setTs(VciDateUtil.str2Date(attribItem.ts,VciDateUtil.DateTimeMillFormat));
}catch (Throwable e){
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 4bfe77d..ea1e16f 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
@@ -829,8 +829,8 @@
actionVO.setCreator(action.plCreateUser);
actionVO.setLastModifier(action.plModifyUser);
try {
- actionVO.setCreateTime(VciDateUtil.str2Date(String.valueOf(action.plCreateTime), VciDateUtil.DateTimeFormat));
- actionVO.setLastModifyTime(VciDateUtil.str2Date(String.valueOf(action.plCreateTime), VciDateUtil.DateTimeFormat));
+ actionVO.setCreateTime(new Date(action.plCreateTime));
+ actionVO.setLastModifyTime(new Date(action.plCreateTime));
}catch (Throwable e){
logger.error("杞崲鏃堕棿",e);
}
@@ -914,8 +914,8 @@
contentVO.setDescription(pageLayoutDefination.plDesc);
contentVO.setCreator(pageLayoutDefination.plCreateUser);
try {
- contentVO.setCreateTime(VciDateUtil.str2Date(String.valueOf(pageLayoutDefination.plCreateTime),VciDateUtil.DateTimeFormat));
- contentVO.setLastModifyTime(VciDateUtil.str2Date(String.valueOf(pageLayoutDefination.plModifyTime),VciDateUtil.DateTimeFormat));
+ contentVO.setCreateTime(new Date(pageLayoutDefination.plCreateTime));
+ contentVO.setLastModifyTime(new Date(pageLayoutDefination.plModifyTime));
} catch (Exception e) {
e.printStackTrace();
}
@@ -1136,8 +1136,8 @@
}
layoutVO.setCreator(page.plCreateUser);
try {
- layoutVO.setCreateTime(VciDateUtil.str2Date(String.valueOf(page.plCreateTime),VciDateUtil.DateTimeFormat));
- layoutVO.setLastModifyTime(VciDateUtil.str2Date(String.valueOf(page.plModifyTime),VciDateUtil.DateTimeFormat));
+ layoutVO.setCreateTime(new Date(page.plCreateTime));
+ layoutVO.setLastModifyTime(new Date(page.plModifyTime));
} catch (Exception e) {
e.printStackTrace();
}
@@ -1270,7 +1270,6 @@
}else{
try {
componentVO.setTableDefineVO(tableDO2VO(ServiceProvider.getUIService().getPortalVIByTypeNameAndVIName(btmType,componentDefineXO.getTemplateId()),true));
-// componentVO.setTableDefineVO(tableDO2VO(platformClientUtil.getPortalService().getPortalVIByTypeNameAndVIName(btmType,componentDefineXO.getTemplateId()),true));
} catch (VCIError vciError) {
throw WebUtil.getVciBaseException(vciError);
}
--
Gitblit v1.9.3