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

@@ -25,6 +25,7 @@
import com.vci.web.service.OsBtmServiceI;
import com.vci.web.service.UIEngineServiceI;
import com.vci.web.service.WebBoServiceI;
import com.vci.web.util.Func;
import com.vci.web.util.PlatformClientUtil;
import com.vci.web.util.WebUtil;
import com.vci.web.xmlmodel.UIComponentDefineXO;
@@ -371,18 +372,18 @@
         if("radio".equalsIgnoreCase(itemVO.getType()) || "checkbox".equalsIgnoreCase(itemVO.getType())
               || "combox".equalsIgnoreCase(itemVO.getType())){
            //看看有没有单独设置
            if(StringUtils.isNotBlank(itemXO.getComboxKey())){
               itemVO.setComboxKey(itemXO.getComboxKey());
               if(StringUtils.isNotBlank(itemXO.getComboxItems())){
                  List<KeyValue> keyValues = new ArrayList<>();
                  VciBaseUtil.str2List(itemXO.getComboxItems()).stream().forEach(temmpKeyValue->{
                     KeyValue kv = new KeyValue();
                     kv.setKey(temmpKeyValue.split("=")[0]);
                     kv.setValue(temmpKeyValue.split("=")[1]);
                     keyValues.add(kv);
                  });
                  itemVO.setData(keyValues);
//            if(StringUtils.isNotBlank(itemXO.getComboxKey())){
//               itemVO.setComboxKey(itemXO.getComboxKey());
            if(StringUtils.isNotBlank(itemXO.getComboxItems())){
               List<KeyValue> keyValues = new ArrayList<>();
               for (String keyValue : itemXO.getComboxItems().split(";")) {
                  KeyValue kv = new KeyValue();
                  String[] split = keyValue.split("\\{");
                  kv.setKey(split[0]);
                  kv.setValue(split[1].substring(0,split[1].length()-1));
                  keyValues.add(kv);
               }
               itemVO.setData(keyValues);
            }else{
               String attr = itemVO.getField();
               if(itemVO.getField().toLowerCase().startsWith("t_oid.")
@@ -508,9 +509,6 @@
   @Override
   @VciUnLog
   public UITableDefineVO tableDO2VO(PortalVI portal, boolean queryDetail) {
      if(null != null){

      }
      UITableDefineVO tableDefineVO = new UITableDefineVO();
      tableDefineVO.setOid(portal.id);
      tableDefineVO.setId(portal.viName);
@@ -839,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);
         }
@@ -924,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();
         }
@@ -1146,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();
         }
@@ -1225,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));
@@ -1456,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);
@@ -1555,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);
   }

}