Merge remote-tracking branch 'origin/master'

# Conflicts:
#	Source/ProjectWeb/src/store/modules/user.js

 Bin/lib/client/plt-client.jar

Binary files differ

 Bin/lib/client/plt-clientbase.jar

Binary files differ

 Bin/lib/common/plt-common.jar

Binary files differ

 Bin/lib/common/plt-slice.jar

Binary files differ

 Bin/lib/service/BOFService.jar

Binary files differ

 Bin/lib/service/FrameService.jar

Binary files differ

 Bin/lib/service/OMDService.jar

Binary files differ

 Bin/lib/service/OQService.jar

Binary files differ

 Bin/lib/service/ServiceBase.jar

Binary files differ

 Bin/lib/service/UIService.jar

Binary files differ

 Bin/lib/service/VciServiceMain.jar

Binary files differ

 Bin/lib/service/VolumeService.jar

Binary files differ

 Bin/lib/service/WFPlugins.jar

Binary files differ

 Bin/lib/service/WFService.jar

Binary files differ

 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>-->

 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);
            }
        }

 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);
    }
    

 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);

    /**
     * 属性的显示对象转换为数据对象

 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){


 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);
                    }