Ldc
2024-04-08 afd3fd83eb0940b524cf0bda79965f52de86de37
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();
         }
@@ -1194,19 +1194,20 @@
      if(StringUtils.isBlank(componentOid)){
         return null;
      }
//      if(!QUERY_BY_CACHE){
//         try {
//            return uiComponentDO2VO(platformClientUtil.getPortalService().getPLPageDefinationById(componentOid),true);
//         } catch (VCIError vciError) {
//            throw WebUtil.getVciBaseException(vciError);
//         }
//      }else{
//         List<UIComponentVO> componentVOS = self.selectAllUIComponent();
//         List<UIComponentVO> componentVOList = Optional.ofNullable(componentVOS).orElseGet(() -> new ArrayList<>()).stream().filter(s -> s.getOid().equalsIgnoreCase(componentOid)).collect(Collectors.toList());
//         if(!CollectionUtils.isEmpty(componentVOList)){
//            return componentVOList.get(0);
//         }
//      }
      if(!QUERY_BY_CACHE){
         try {
            platformClientUtil.getPortalService().getPLPageDefinationById(componentOid);
            return uiComponentDO2VO(null,true);
         } catch (VCIError vciError) {
            throw WebUtil.getVciBaseException(vciError);
         }
      }else{
         List<UIComponentVO> componentVOS = self.selectAllUIComponent();
         List<UIComponentVO> componentVOList = Optional.ofNullable(componentVOS).orElseGet(() -> new ArrayList<>()).stream().filter(s -> s.getOid().equalsIgnoreCase(componentOid)).collect(Collectors.toList());
         if(!CollectionUtils.isEmpty(componentVOList)){
            return componentVOList.get(0);
         }
      }
      return null;
   }
@@ -1269,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);
               }