From cf105a689d2c3603b7546236993bbd30e90ec96a Mon Sep 17 00:00:00 2001
From: Ldc <ldc@vci.com>
Date: 星期一, 08 四月 2024 16:09:11 +0800
Subject: [PATCH] 1、处理时间类型不一致问题。
---
Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/UIEngineServiceImpl.java | 32 +++++++++++++++++---------------
Source/platformProject/vci-platform-web/src/main/java/com/vci/web/controller/WebUIController.java | 2 ++
2 files changed, 19 insertions(+), 15 deletions(-)
diff --git a/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/controller/WebUIController.java b/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/controller/WebUIController.java
index 04b1109..f6cbef8 100644
--- a/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/controller/WebUIController.java
+++ b/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/controller/WebUIController.java
@@ -1,5 +1,6 @@
package com.vci.web.controller;
+import com.vci.starter.web.annotation.controller.VciUnCheckRight;
import com.vci.starter.web.annotation.log.VciBusinessLog;
import com.vci.starter.web.pagemodel.BaseResult;
import com.vci.web.pageModel.UIContentVO;
@@ -41,6 +42,7 @@
* @return UI涓婁笅鏂�
*/
@GetMapping("/getUIContentByBtmTypeAndId")
+ @VciUnCheckRight
public UIContentVO getUIContentByBtmTypeAndId(String btmType,String id){
return uiService.getUIContentByBtmTypeAndId(btmType,id);
}
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 dfe9ef3..c7876ed 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
@@ -837,8 +837,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);
}
@@ -922,8 +922,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();
}
@@ -1144,8 +1144,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();
}
@@ -1223,7 +1223,7 @@
* @param pages 鏁版嵁瀵硅薄
* @return 鏄剧ず瀵硅薄
*/
- private List<UIComponentVO> uiComponentDO2VOs(Collection<PLPageDefination> pages, boolean queryDetail){
+ private List<UIComponentVO> uiComponentDO2VOs(Collection<com.vci.corba.portal.data.PLPageDefination> pages, boolean queryDetail){
List<UIComponentVO> componentVOS = new ArrayList<>();
pages.stream().forEach(page->{
componentVOS.add(uiComponentDO2VO(page,queryDetail));
@@ -1454,10 +1454,10 @@
* @return 鏄剧ず瀵硅薄
*/
@Override
- public UIButtonDefineVO buttonDO2VO(PLTabButton button) {
+ public UIButtonDefineVO buttonDO2VO(com.vci.corba.portal.data.PLTabButton button) {
UIButtonDefineVO buttonVO = new UIButtonDefineVO();
Map<String, UIActionVO> actionVOMap = self.selectAllActionMap();
- //Map<String, UIActionVO> actionVOMap = ServiceProvider.getUIService().getAllPLAction();
+// Map<String, UIActionVO> actionVOMap = ServiceProvider.getUIService().getAllPLAction();
if(button !=null){
buttonVO.setOid(button.plOId);
buttonVO.setPkComponent(button.plTableOId);
@@ -1553,22 +1553,24 @@
@Cacheable(value = VCI_OBJECT_SERVICE,key = "#p0.concat('${uicache}').concat(#p1)",unless = "#result == null || #p0 == null || #p1 ==null")
public UIContentVO getUIContentByBtmTypeAndId(String btmType, String id) {
WebUtil.alertNotNull(btmType,"涓氬姟绫诲瀷鎴栬�呴摼鎺ョ被鍨�",id,"UI涓婁笅鏂囩殑缂栧彿");
- PLPageLayoutDefination[] obj = null;
+ PLUILayout[] obj = null;
try {
- obj = platformClientUtil.getPortalService().getPLPageLayoutDefinationsByRelatedType(btmType);
+ obj = ServiceProvider.getUIService().getPLUILayoutsByRelatedType(btmType);
+// obj = platformClientUtil.getPortalService().getPLPageLayoutDefinationsByRelatedType(btmType);
+// obj = ServiceProvider.geT(btmType);
+
} catch (VCIError vciError) {
throw WebUtil.getVciBaseException(vciError);
}
- PLPageLayoutDefination context = null;
+ PLUILayout context = null;
for (int i = 0; i < obj.length; i++) {
if (obj[i].plCode.equals(id)) {
context = obj[i];
break;
}
}
- //return UIContentDO2VO(context,true);
- return UIContentDO2VO(null,true);
+ return UIContentDO2VO(context,true);
+// return UIContentDO2VO(null,true);
}
-
}
--
Gitblit v1.9.3