Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/UIEngineServiceImpl.java

@@ -6,6 +6,7 @@
import com.thoughtworks.xstream.io.xml.XppDriver;
import com.vci.client.common.providers.ServiceProvider;
import com.vci.corba.common.VCIError;
import com.vci.corba.portal.data.PLPageDefination;
import com.vci.corba.portal.data.PLUILayout;
import com.vci.starter.web.annotation.log.VciUnLog;
import com.vci.starter.web.exception.VciBaseException;
@@ -1194,19 +1195,21 @@
      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 {
            PLPageDefination plPageDefination = ServiceProvider.getUIService().getPLPageDefinationById(componentOid);
            // PLPageDefination plPageDefination = platformClientUtil.getPortalService().getPLPageDefinationById(componentOid);
            return uiComponentDO2VO(plPageDefination,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;
   }

@@ -1215,7 +1218,7 @@
    * @param pages 数据对象
    * @return 显示对象
    */
   private List<UIComponentVO> uiComponentDO2VOs(Collection<com.vci.corba.portal.data.PLPageDefination> pages, boolean queryDetail){
   private List<UIComponentVO> uiComponentDO2VOs(Collection<PLPageDefination> pages, boolean queryDetail){
      List<UIComponentVO> componentVOS = new ArrayList<>();
      pages.stream().forEach(page->{
         componentVOS.add(uiComponentDO2VO(page,queryDetail));
@@ -1229,7 +1232,7 @@
    * @return 显示对象
    */
   @VciUnLog
   private UIComponentVO uiComponentDO2VO(com.vci.corba.portal.data.PLPageDefination page, boolean queryDetail){
   private UIComponentVO uiComponentDO2VO(PLPageDefination page, boolean queryDetail){
      UIComponentVO componentVO = new UIComponentVO();
      if(page !=null){
         componentVO.setOid(page.plOId);
@@ -1269,7 +1272,7 @@
            }else{
               try {
                  componentVO.setTableDefineVO(tableDO2VO(ServiceProvider.getUIService().getPortalVIByTypeNameAndVIName(btmType,componentDefineXO.getTemplateId()),true));
//                  componentVO.setTableDefineVO(tableDO2VO(platformClientUtil.getPortalService().getPortalVIByTypeNameAndVIName(btmType,componentDefineXO.getTemplateId()),true));
                  //componentVO.setTableDefineVO(tableDO2VO(platformClientUtil.getPortalService().getPortalVIByTypeNameAndVIName(btmType,componentDefineXO.getTemplateId()),true));
               } catch (VCIError vciError) {
                  throw WebUtil.getVciBaseException(vciError);
               }
@@ -1426,8 +1429,6 @@
      }
   }



   /**
    * 按钮的数据对象转换为显示对象
    * @param buttons 按钮的数据对象
@@ -1563,5 +1564,6 @@
//      return UIContentDO2VO(context,true);
      return UIContentDO2VO(null,true);
   }

}