1、对象引用改动。

 Source/platformProject/vci-platform-web/src/main/java/com/vci/frameworkcore/compatibility/impl/OrgDeptQueryServiceImpl.java

@@ -23,7 +23,6 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
import plm.bs.bom.clientobject.ClientBusinessObject;

import java.util.*;
import java.util.stream.Collectors;

 Source/platformProject/vci-platform-web/src/main/java/com/vci/frameworkcore/compatibility/impl/SmFunctionQueryServicePlatformImpl.java

@@ -3,9 +3,7 @@
import com.alibaba.fastjson.JSONObject;
import com.vci.client.common.providers.ServiceProvider;
import com.vci.corba.common.PLException;
import com.vci.corba.common.VCIError;
import com.vci.corba.framework.data.FunctionInfo;
import com.vci.corba.portal.data.PLTabPage;
import com.vci.corba.portal.data.PLUILayout;
import com.vci.frameworkcore.compatibility.ISmFunctionQueryService;
import com.vci.frameworkcore.enumpck.ResourceControlTypeEnum;
@@ -30,7 +28,6 @@
import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
import plm.bs.bom.clientobject.ClientBusinessObject;

import java.util.*;
import java.util.stream.Collectors;

 Source/platformProject/vci-platform-web/src/main/java/com/vci/frameworkcore/compatibility/impl/SmRoleQueryServiceImpl.java

@@ -22,7 +22,6 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
import plm.bs.bom.clientobject.ClientBusinessObject;

import java.util.*;
import java.util.stream.Collectors;

 Source/platformProject/vci-platform-web/src/main/java/com/vci/frameworkcore/compatibility/impl/SmSessionForLoginImpl.java

@@ -1,6 +1,7 @@
package com.vci.frameworkcore.compatibility.impl;

import com.vci.corba.common.VCIError;
import com.vci.corba.common.PLException;
import com.vci.corba.omd.data.AttributeValue;
import com.vci.starter.web.annotation.log.VciUnLog;
import com.vci.starter.web.exception.VciBaseException;
import com.vci.starter.web.interceptor.VciSessionForLoginI;
@@ -18,7 +19,6 @@
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
import plm.bs.bom.common.AttributeValue;

import javax.servlet.http.HttpServletRequest;
import java.util.ArrayList;
@@ -88,7 +88,7 @@
        WebUtil.alertNotNull(userId,"用户名");
        try{
            platformClientUtil.getBOFactoryService().executeUpdateSql("delete from VCI_SESSIONINFO where userid ='" + userId.trim() + "'");
        }catch (VCIError e){
        }catch (PLException e){
            throw WebUtil.getVciBaseException(e);
        }
    }
@@ -110,7 +110,7 @@
            platformClientUtil.getBOFactoryService().executeUpdateSqlByParams("    insert into VCI_SESSIONINFO (USERID, TOKEN, JSONSTRING,lastRequestTime\n" +
                    "      )\n" +
                    " VALUES (?,?,?," + System.currentTimeMillis() + " )", attrs);
        }catch (VCIError e){
        }catch (PLException e){
            throw WebUtil.getVciBaseException(e);
        }
    }
@@ -143,7 +143,7 @@
        WebUtil.alertNotNull(userToken,"会话许可码");
        try{
            platformClientUtil.getBOFactoryService().executeUpdateSql("update VCI_SESSIONINFO set lastRequestTime = " + String.valueOf(System.currentTimeMillis()) + " where TOKEN ='" + userToken.trim() + "'");
        }catch (VCIError e){
        }catch (PLException e){
            throw WebUtil.getVciBaseException(e);
        }
    }
@@ -180,7 +180,7 @@
        WebUtil.alertNotNull(userToken,"用户许可");
        try{
            platformClientUtil.getBOFactoryService().executeUpdateSql("delete from VCI_SESSIONINFO where TOKEN ='" + userToken.trim() + "'");
        }catch (VCIError e){
        }catch (PLException e){
            throw WebUtil.getVciBaseException(e);
        }
    }
@@ -224,7 +224,7 @@
                WebUtil.switchCollectionForOracleIn(tokenList).stream().forEach(tokens -> {
                    try {
                        platformClientUtil.getBOFactoryService().executeUpdateSql("delete from VCI_SESSIONINFO where TOKEN in (" + WebUtil.toInSql(tokens.toArray(new String[0])) + ")");
                    } catch (VCIError e) {
                    } catch (PLException e) {
                        if (logger.isErrorEnabled()) {
                            logger.error("删除会话信息", e);
                        }

 Source/platformProject/vci-platform-web/src/main/java/com/vci/frameworkcore/compatibility/impl/SmUserQueryServiceImpl.java

@@ -1,12 +1,10 @@
package com.vci.frameworkcore.compatibility.impl;

import com.vci.client.common.providers.ServiceProvider;
import com.vci.corba.common.VCIError;
import com.vci.corba.omd.data.AttributeValue;
import com.vci.corba.common.PLException;
import com.vci.frameworkcore.compatibility.SmUserQueryServiceI;
import com.vci.frameworkcore.pagemodel.SmPasswordStrategyVO;
import com.vci.frameworkcore.pagemodel.SmUserVO;
import com.vci.rmip.allcommon.ThreeDES;
import com.vci.starter.web.enumpck.BooleanEnum;
import com.vci.starter.web.exception.VciBaseException;
import com.vci.starter.web.pagemodel.DataGrid;
@@ -27,7 +25,6 @@
import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
import plm.bs.bom.clientobject.ClientBusinessObject;

import java.util.*;
import java.util.stream.Collectors;
@@ -753,7 +750,7 @@
        String sql = "update pllogoninfo set plwrongnum = 0 where pluserid in (select pluid from pluser where plusername='" + userId + "')";
        try {
            platformClientUtil.getBOFactoryService().executeUpdateSql(sql);
        } catch (VCIError vciError) {
        } catch (PLException vciError) {
            throw WebUtil.getVciBaseException(vciError);
        }
    }
@@ -776,7 +773,7 @@
        String sql = "update pluser set plpassword = '" + encPassword + "' where pluid = '" + userOid.trim() + "'";
        try {
            platformClientUtil.getBOFactoryService().executeUpdateSql(sql);
        } catch (VCIError vciError) {
        } catch (PLException vciError) {
            throw WebUtil.getVciBaseException(vciError);
        }
    }
@@ -793,7 +790,7 @@
        String sql = "update pllogoninfo set plwrongnum = " + wrongCount +" where pluserid ='" + userOid + "'";
        try {
            platformClientUtil.getBOFactoryService().executeUpdateSql(sql);
        } catch (VCIError vciError) {
        } catch (PLException vciError) {
            throw WebUtil.getVciBaseException(vciError);
        }
    }
@@ -808,7 +805,7 @@
        String sql = "update pllogoninfo set pllogontime = sysdate where pluserid ='" + userOid + "'";
        try {
            platformClientUtil.getBOFactoryService().executeUpdateSql(sql);
        } catch (VCIError vciError) {
        } catch (PLException vciError) {
            throw WebUtil.getVciBaseException(vciError);
        }
    }

 Source/platformProject/vci-platform-web/src/main/java/com/vci/frameworkcore/controller/OrgDutyQueryController.java

@@ -4,7 +4,6 @@
import com.vci.frameworkcore.pagemodel.OrgDutyVO;
import com.vci.starter.web.exception.VciBaseException;
import com.vci.starter.web.pagemodel.*;
import com.vci.web.pageModel.*;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;

 Source/platformProject/vci-platform-web/src/main/java/com/vci/frameworkcore/controller/SmRoleQueryController.java

@@ -4,7 +4,6 @@
import com.vci.frameworkcore.pagemodel.SmRoleVO;
import com.vci.starter.web.exception.VciBaseException;
import com.vci.starter.web.pagemodel.*;
import com.vci.web.pageModel.*;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;

 Source/platformProject/vci-platform-web/src/main/java/com/vci/frameworkcore/controller/SmUserQueryController.java

@@ -4,10 +4,8 @@
import com.vci.frameworkcore.pagemodel.SmUserVO;
import com.vci.starter.web.exception.VciBaseException;
import com.vci.starter.web.pagemodel.*;
import com.vci.web.pageModel.*;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.ResponseBody;

 Source/platformProject/vci-platform-web/src/main/java/com/vci/frameworkcore/enumpck/DataObjectEnum.java

@@ -1,12 +1,12 @@
package com.vci.frameworkcore.enumpck;

import com.alibaba.fastjson.JSONObject;
import com.vci.client.common.objects.DeptObject;
import com.vci.client.common.objects.RoleObject;
import com.vci.client.common.objects.UserObject;
import com.vci.frameworkcore.pagemodel.OrgDepartmentVO;
import com.vci.frameworkcore.pagemodel.SmRoleVO;
import com.vci.frameworkcore.pagemodel.SmUserVO;
import com.vci.rmip.framework.client.systemConfig.object.DeptObject;
import com.vci.rmip.framework.client.systemConfig.object.RoleObject;
import com.vci.rmip.framework.client.systemConfig.object.UserObject;

import java.text.ParsePosition;
import java.text.SimpleDateFormat;
@@ -81,7 +81,7 @@
        smUserVO.setPkPasswordStrategy(null);//所属密码安全策略
        smUserVO.setPkPasswordStrategyName(null);//所属密码安全策略
        smUserVO.setLastLoginTime(null);//最后登录时间
        smUserVO.setLastModifyPasswordTime(ChangeStrToDate(userObject.getPwdUpdateTime()));//最后修改密码是几
        smUserVO.setLastModifyPasswordTime(new Date(userObject.getPwdUpdateTime()));//最后修改密码是几
        smUserVO.setPwdWrongCount(0);//密码错误次数
        smUserVO.setSex(null);//性别
        smUserVO.setSexText(null);//性别显示名称
@@ -91,9 +91,9 @@
        smUserVO.setPhoto(null);//头像
        //smUserVO.setSecretGrade(userObject.getSecretGrade());
        smUserVO.setCreator(userObject.getCreateUser());//创建者
        smUserVO.setCreateTime(ChangeStrToDate(userObject.getCreateTime()));//创建时间
        smUserVO.setCreateTime(ChangeStrToDate(String.valueOf(new Date(userObject.getCreateTime()))));//创建时间
        smUserVO.setLastModifier(userObject.getUpdateUser());//修改者
        smUserVO.setLastModifyTime(ChangeStrToDate(userObject.getUpdateTime()));//修改时间
        smUserVO.setLastModifyTime(new Date(userObject.getUpdateTime()));//修改时间
        return smUserVO;
    }
    public OrgDepartmentVO[] changeDeptObjectToOrgDepartmentVOs(DeptObject[] deptObjects){
@@ -115,13 +115,13 @@
        departmentVOs.setPkFatherDepartment(deptObject.getParentId());
        departmentVOs.setDescription(deptObject.getDescription());
        departmentVOs.setCreator(deptObject.getCreateUser());
        departmentVOs.setCreateTime(ChangeStrToDate(deptObject.getCreateTime()));
        departmentVOs.setCreateTime(new Date(deptObject.getCreateTime()));
        departmentVOs.setLastModifier(deptObject.getUpdateUser());
        departmentVOs.setLastModifyTime(ChangeStrToDate(deptObject.getUpdateTime()));
        departmentVOs.setLastModifyTime(new Date(deptObject.getUpdateTime()));
        departmentVOs.setLcStatus(deptObject.getStatus()+"");
        return departmentVOs;
    }
    public SmRoleVO[]    changeRoleObjectToSmRoleVOs(RoleObject[] objects){
    public <RoleObject> SmRoleVO[]    changeRoleObjectToSmRoleVOs(com.vci.client.common.objects.RoleObject[] objects){
        SmRoleVO[] smRoleVOs=new SmRoleVO[objects.length];
        
        for (int i=0;i<objects.length;i++) {
@@ -135,10 +135,10 @@
        smRoleVO.setName(object.getName());
        smRoleVO.setDescription(object.getDescription());
        smRoleVO.setCreator(object.getCreateUser());
        smRoleVO.setCreateTime(ChangeStrToDate(object.getCreateTime()));
        smRoleVO.setCreateTime(new Date(object.getCreateTime()));
        smRoleVO.setLastModifier(object.getUpdateUser());
        smRoleVO.setBtmname("plrole");
        smRoleVO.setLastModifyTime(ChangeStrToDate(object.getUpdateTime()));
        smRoleVO.setLastModifyTime(new Date(object.getUpdateTime()));
        return smRoleVO;
    }
    

 Source/platformProject/vci-platform-web/src/main/java/com/vci/plugins/controller/AuditTaskController.java

@@ -1,6 +1,9 @@
package com.vci.plugins.controller;

import com.vci.corba.common.VCIError;
import com.vci.client.bof.ClientBusinessObject;
import com.vci.client.bof.ClientBusinessObjectOperation;
import com.vci.corba.common.PLException;
import com.vci.corba.query.data.KV;
import com.vci.plugins.dto.AuditTaskDTO;
import com.vci.starter.web.pagemodel.BaseResult;
import com.vci.starter.web.util.VciBaseUtil;
@@ -13,9 +16,6 @@
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import plm.bs.bom.clientobject.ClientBusinessObject;
import plm.bs.bom.clientobject.ClientBusinessObjectOperation;
import plm.corba.qt.KV;

import java.util.ArrayList;
import java.util.Arrays;
@@ -71,12 +71,12 @@
                        cbo.setAttributeValue("departmentname","PLNAME".equals(kvs[index][0].key.toUpperCase(Locale.ROOT)) ? kvs[index][0].value : kvs[index][1].value);
                        createList.add(cbo);
                    }
                } catch (VCIError vciError) {
                } catch ( PLException vciError) {
                    vciError.printStackTrace();
                }
            });
            operation.batchSaveCreateBuinessObject(createList.toArray(new ClientBusinessObject[0]));
        } catch (VCIError vciError) {
        } catch ( PLException vciError) {
            vciError.printStackTrace();
            return BaseResult.fail("创建评审任务失败");
        }
@@ -112,7 +112,7 @@
            if (StringUtils.isNotBlank(attributeValue)) {
                cbo.setAttributeValue(attributeName, attributeValue);
            }
        } catch (VCIError vciError) {
        } catch (PLException vciError) {
            vciError.printStackTrace();
        }
    }

 Source/platformProject/vci-platform-web/src/main/java/com/vci/plugins/controller/Sql2TableController.java

@@ -1,8 +1,8 @@
package com.vci.plugins.controller;

import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.vci.corba.common.VCIError;
import com.vci.corba.common.PLException;
import com.vci.corba.query.data.KV;
import com.vci.starter.web.exception.VciBaseException;
import com.vci.starter.web.pagemodel.BaseResult;
import com.vci.web.util.PlatformClientUtil;
@@ -10,9 +10,6 @@
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import plm.bs.bom.clientobject.ClientBusinessObjectOperation;
import plm.corba.qt.KV;
import plm.corba.qt.QTServiceOperations;

import java.util.*;
import java.util.stream.Collectors;
@@ -48,7 +45,7 @@
        KV[][] keyValues = new KV[0][0];
        try {
            keyValues =  platformClientUtil.getQueryService().queryBySql(sql);
        } catch (VCIError vciError) {
        } catch ( PLException vciError) {
            vciError.printStackTrace();
            return BaseResult.fail("sql语句有问题，请检查后重试");
        }

 Source/platformProject/vci-platform-web/src/main/java/com/vci/web/controller/WebDataRightController.java

@@ -1,10 +1,14 @@
package com.vci.web.controller;

import com.vci.corba.common.VCIError;
import com.vci.starter.web.enumpck.DataBaseEnum;


import com.vci.client.bof.ClientBusinessObject;
import com.vci.client.uif.actions.client.DataRightUtil;
import com.vci.client.uif.engine.common.DefaultTableNode;
import com.vci.client.uif.engine.common.IDataNode;
import com.vci.corba.common.PLException;
import com.vci.starter.web.enumpck.DataSecretEnum;
import com.vci.starter.web.enumpck.UserSecretEnum;
import com.vci.starter.web.exception.VciBaseException;
import com.vci.starter.web.pagemodel.BaseResult;
import com.vci.starter.web.pagemodel.SessionInfo;
import com.vci.web.dto.BaseModelDTO;
@@ -16,16 +20,10 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
import plm.bs.bom.clientobject.ClientBusinessObject;
import plm.bs.bom.clientobject.ClientLinkObject;
import plm.uif.actions.client.DataRightUtil;
import plm.uif.actions.client.RightCheckConstants;
import plm.uif.engine.common.DefaultTableNode;
import plm.uif.engine.common.IDataNode;


import javax.servlet.http.HttpServletRequest;
import java.util.HashMap;
@@ -96,22 +94,22 @@
     * 回去选择的数据
     * @param boData 业务数据的信息
     * @return 选择的数据
     * @throws VCIError 缺少的时候会抛出异常
     * @throws PLException 缺少的时候会抛出异常
     */
    protected Object getSelectedObject(BaseModelDTO boData) throws VCIError{
    protected Object getSelectedObject(BaseModelDTO boData) throws PLException {
        IDataNode selectedObject = new DefaultTableNode();
        ClientBusinessObject cbo = new ClientBusinessObject();
        if(StringUtils.isBlank(boData.getOid())){
            throw new VCIError("没有获取到数据的主键",new String[0]);
            throw new PLException("没有获取到数据的主键",new String[0]);
        }
        if(StringUtils.isBlank(boData.getRevisionOid())){
            throw new VCIError("没有获取到数据的版本主键",new String[0]);
            throw new PLException("没有获取到数据的版本主键",new String[0]);
        }
        if(StringUtils.isBlank(boData.getNameOid())){
            throw new VCIError("没有获取到数据的项主键",new String[0]);
            throw new PLException("没有获取到数据的项主键",new String[0]);
        }
        if(StringUtils.isBlank(boData.getBtmname())){
            throw new VCIError("没有获取到数据的业务类型",new String[0]);
            throw new PLException("没有获取到数据的业务类型",new String[0]);
        }
        cbo.setOid(boData.getOid());
        cbo.setRevisionid(boData.getRevisionOid());

 Source/platformProject/vci-platform-web/src/main/java/com/vci/web/dao/WebProcessDaoI.java

@@ -1,16 +1,14 @@
package com.vci.web.dao;

import com.vci.corba.workflow.method.WorkflowService;
import com.vci.rmip.workflow.server.template.TasksAssigned;
import com.vci.client.bof.ClientLinkObject;
import com.vci.corba.workflow.WorkflowService;
import com.vci.corba.workflow.WorkflowServicePrx;
import com.vci.starter.web.exception.VciBaseException;
import com.vci.starter.web.pagemodel.DataGrid;
import com.vci.starter.web.pagemodel.PageHelper;
import com.vci.web.model.WFProcessClassifyDO;
import com.vci.web.model.WFProcessTemplateDO;
import com.vci.web.pageModel.*;
import plm.bs.bom.clientobject.ClientBusinessObject;
import plm.bs.bom.clientobject.ClientLinkObject;

import java.util.Collection;
import java.util.Date;
import java.util.List;
@@ -298,7 +296,7 @@
     * 获取平台的流程服务
     * @return
     */
     WorkflowService getWorkService() throws VciBaseException;
    WorkflowServicePrx getWorkService() throws VciBaseException;

    /**
     * 任务与数据关联的链接类型

 Source/platformProject/vci-platform-web/src/main/java/com/vci/web/dao/impl/WebProcessDaoImpl.java

@@ -1,13 +1,14 @@
package com.vci.web.dao.impl;

import com.vci.base.common.utility.ObjectUtility;
import com.vci.corba.common.VCIError;
import com.vci.corba.framework.data.UserEntityInfo;
import com.vci.client.bof.ClientLinkObject;
import com.vci.common.utility.ObjectUtility;
import com.vci.corba.common.PLException;
import com.vci.corba.common.data.UserEntityInfo;
import com.vci.corba.workflow.WorkflowService;
import com.vci.corba.workflow.WorkflowServicePrx;
import com.vci.corba.workflow.data.*;
import com.vci.corba.workflow.method.WorkflowService;
import com.vci.frameworkcore.compatibility.SmUserQueryServiceI;
import com.vci.frameworkcore.pagemodel.SmUserVO;
import com.vci.rmip.workflow.server.template.TasksAssigned;
import com.vci.starter.web.constant.QueryOptionConstant;
import com.vci.starter.web.exception.VciBaseException;
import com.vci.starter.web.pagemodel.DataGrid;
@@ -16,7 +17,6 @@
import com.vci.starter.web.util.BeanUtil;
import com.vci.starter.web.util.VciBaseUtil;
import com.vci.starter.web.util.VciDateUtil;
import com.vci.web.constant.WFVariablesKeyConstant;
import com.vci.web.dao.WebProcessDaoI;
import com.vci.web.model.ProcessInstance;
import com.vci.web.model.ProcessTask;
@@ -31,16 +31,11 @@
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Repository;
import org.springframework.util.CollectionUtils;
import plm.bs.bom.clientobject.ClientBusinessObject;
import plm.bs.bom.clientobject.ClientLinkObject;

import java.util.*;
import java.util.stream.Collectors;

import static com.vci.frameworkcore.constant.FrameWorkBusLangCodeConstant.DATA_OID_NOT_EXIST;

/**
@@ -82,7 +77,7 @@
    /**
     * 平台的流程服务
     */
    private WorkflowService workService = null;
    private WorkflowServicePrx workService = null;

    /**
     * 平台调用客户端
@@ -563,7 +558,7 @@
        WebUtil.alertNotNull(executionId,"流程执行主键",key,"参数Key");
        UserEntityInfo ueo = new UserEntityInfo();
        SessionInfo si = WebUtil.getCurrentUserSessionInfo();
        ueo.ip = si.getIp();
//        ueo..ip = si.getIp();
        ueo.modules = "流程";
        ueo.userName = si.getUserId();
//        while(StringUtils.countMatches(executionId,".")>1){
@@ -611,7 +606,7 @@
     * @throws VciBaseException
     */
    @Override
    public List<ClientLinkObject> getDataCloInTask(String taskOid,String executionid) throws VciBaseException {
    public List<ClientLinkObject> getDataCloInTask(String taskOid, String executionid) throws VciBaseException {
        Map<String,String> conditionMap = new HashMap<String, String>();
        if(StringUtils.isNotBlank(taskOid)) {
            conditionMap.put("f_oid", taskOid.trim());
@@ -813,14 +808,9 @@
    }

    @Override
    public WorkflowService getWorkService() throws VciBaseException{
    public WorkflowServicePrx getWorkService() throws VciBaseException{
        if(workService == null){
            try {
                this.workService = platformClientUtil.getLogonFactoryService().getWorkflowService();
            } catch (VCIError e) {
//                logger.error(e.error_code,e);
                throw WebUtil.getVciBaseException(e);
            }
            this.workService = platformClientUtil.getLogonFactoryService();
        }
        return workService;
    }

 Source/platformProject/vci-platform-web/src/main/java/com/vci/web/initTask/VciWebInitTaskComponent.java

@@ -1,16 +1,11 @@
package com.vci.web.initTask;

import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.vci.corba.common.VCIError;
import com.vci.frameworkcore.compatibility.ISmFunctionQueryService;
import com.vci.client.mw.ClientContextVariable;
import com.vci.client.mw.LaunchModeEnum;
import com.vci.corba.omd.data.AttributeValue;
import com.vci.frameworkcore.constant.FrameWorkBtmTypeConstant;
import com.vci.frameworkcore.properties.VciFramworkCompatibilityProperties;
import com.vci.mw.client.ClientContextVariable;
import com.vci.mw.client.InvocationUtility;
import com.vci.mw.client.LaunchModeEnum;
import com.vci.starter.corba.initializer.JacorbClientRequestInterceptor;
import com.vci.starter.corba.properties.JacorbClientMapProperties;
import com.vci.starter.web.annotation.config.VciConfigField;
import com.vci.starter.web.annotation.config.VciConfigModule;
import com.vci.starter.web.enumpck.DataSecretEnum;
@@ -25,7 +20,6 @@
import com.vci.web.pageModel.OsAttributeVO;
import com.vci.web.properties.WebProperties;
import com.vci.web.service.*;
import com.vci.web.service.impl.OsAttributeServiceImpl;
import com.vci.web.service.impl.UIEngineServiceImpl;
import com.vci.web.service.impl.WebContextInfoFetcher;
import com.vci.web.service.impl.WebInitServiceImpl;
@@ -41,15 +35,12 @@
import org.springframework.stereotype.Component;
import org.springframework.util.CollectionUtils;
import org.springframework.util.ResourceUtils;
import plm.bs.bom.common.AttributeValue;

import java.io.File;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.IOException;
import java.lang.reflect.Field;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.util.*;
import java.util.stream.Collectors;

@@ -133,11 +124,11 @@
    @Autowired
    private WebSecretServiceI secretService;

    /**
     * corba的客户端
     */
    @Autowired(required = false)
    private JacorbClientMapProperties jacorbClientMapProperties;
//    /**
//     * corba的客户端
//     */
//    @Autowired(required = false)
//    private JacorbClientMapProperties jacorbClientMapProperties;

    /**
     * 执行初始化
@@ -258,12 +249,12 @@
                properties.load(new FileInputStream(file));
                String url = properties.getProperty("NameService");
                String name = properties.getProperty("InstanceIdentity");
                if (StringUtils.isNotBlank(url)) {
                    jacorbClientMapProperties.setUrl(url);
                }
                if (StringUtils.isNotBlank(name)) {
                    jacorbClientMapProperties.setInstanceIdentity(name);
                }
//                if (StringUtils.isNotBlank(url)) {
//                    jacorbClientMapProperties.setUrl(url);
//                }
//                if (StringUtils.isNotBlank(name)) {
//                    jacorbClientMapProperties.setInstanceIdentity(name);
//                }
            }
        }catch (IOException e) {
            logger.error("读取平台的corb配置文件出现了错误",e);
@@ -288,8 +279,8 @@
    public void initSetting() {
        System.out.println("----初始化用于查询配置的用户----");
        ClientContextVariable.setClientLanuchMode(LaunchModeEnum.WebApp);
        InvocationUtility.registerIInvocationContext(contextInfoFetcher);
        JacorbClientRequestInterceptor.sessionContext = contextInfoFetcher;
//        InvocationUtility.registerIInvocationContext(contextInfoFetcher);
//        JacorbClientRequestInterceptor.sessionContext = contextInfoFetcher;
        System.out.println("----初始化用于查询配置的用户完成----");
        System.out.println("----开始扫描有VciConfigModule注解的类----");
        String[] namesForAnnotation = ApplicationContextProvider.getApplicationContext().getBeanNamesForAnnotation(VciConfigModule.class);

 Source/platformProject/vci-platform-web/src/main/java/com/vci/web/other/OsMapToObjFunction.java

@@ -1,9 +1,5 @@
package com.vci.web.other;

import plm.bs.bom.clientobject.ClientBusinessObject;

import java.util.Map;

/**
 * 对象服务中，map转成VO的对象
 * @author weidy

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

@@ -4,8 +4,6 @@
import com.vci.starter.web.pagemodel.BaseQueryObject;
import com.vci.starter.web.pagemodel.DataGrid;
import com.vci.web.pageModel.OsAttributeVO;
import com.vci.web.pageModel.OsUsedAttributeVO;
import plm.corba.attribpool.AttribItem;

import java.util.Collection;
import java.util.List;
@@ -91,13 +89,13 @@
     * 批量添加属性
     * @param attribItemList 属性的列表
     */
    void batchAddAttribute(List<AttribItem> attribItemList);
    void batchAddAttribute(List<AttributeDef> attribItemList);

    /**
     * 批量编辑属性
     * @param editAttrList 属性的列表
     */
    void batchEditAttribute(List<AttribItem> editAttrList);
    void batchEditAttribute(List<AttributeDef> editAttrList);

    /**
     * 属性列表

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

@@ -8,9 +8,6 @@
import com.vci.web.pageModel.OsLifeCycleLineVO;
import com.vci.web.pageModel.OsLifeCycleVO;
import com.vci.web.pageModel.OsStatusVO;
import plm.bs.bom.clientobject.ClientBusinessObject;
import plm.bs.bom.common.BusinessObject;
import plm.corba.lifecycle.LifeCyle;

import java.util.Collection;
import java.util.List;
@@ -89,7 +86,7 @@
     * @param lifeCycleVO 显示对象
     * @return 数据对象
     */
    LifeCyle lifeCycleVO2DO(OsLifeCycleVO lifeCycleVO);
    LifeCycle lifeCycleVO2DO(OsLifeCycleVO lifeCycleVO);

    /**
     * 查询所有生命周期状态
@@ -153,13 +150,13 @@
     * 批量添加生命周期
     * @param lifeCyleList 生命周期的内容
     */
    void batchAddLifeCycle(List<LifeCyle> lifeCyleList);
    void batchAddLifeCycle(List<LifeCycle> lifeCyleList);

    /**
     * 批量修改生命周期
     * @param lifeCycleList 生命周期的内容
     */
    void batchEditLifeCycle(List<LifeCyle> lifeCycleList);
    void batchEditLifeCycle(List<LifeCycle> lifeCycleList);

    /**
     * 状态在生命周期中使用的勤快

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

@@ -1,8 +1,7 @@
package com.vci.web.service;

import com.vci.corba.omd.vrm.VersionRule;
import com.vci.web.pageModel.OsRevisionRuleVO;
import plm.corba.versionRuleManager.VersionRule;

import java.util.Collection;
import java.util.List;
import java.util.Map;

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

@@ -1,11 +1,10 @@
package com.vci.web.service;

import com.vci.corba.omd.stm.StatePool;
import com.vci.starter.web.pagemodel.DataGrid;
import com.vci.starter.web.pagemodel.PageHelper;
import com.vci.web.dto.OsStatusDTO;
import com.vci.web.pageModel.OsLifeCycleVO;
import com.vci.web.pageModel.OsStatusVO;
import plm.corba.statePoolManager.StatePool;

import java.util.Collection;
import java.util.List;

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

@@ -1,18 +1,14 @@
package com.vci.web.service;

import com.vci.client.bof.ClientBusinessObject;
import com.vci.client.bof.ClientLinkObject;
import com.vci.client.bof.ClientLinkObjectOperation;
import com.vci.starter.web.exception.VciBaseException;
import com.vci.starter.web.pagemodel.DataGrid;
import com.vci.starter.web.pagemodel.PageHelper;
import com.vci.web.query.UILinkTypeDataQuery;
import plm.bs.bom.clientobject.ClientBusinessObject;
import plm.bs.bom.clientobject.ClientLinkObject;
import plm.bs.bom.clientobject.ClientLinkObjectOperation;
import plm.bs.bom.common.AttributeValue;
import plm.bs.bom.common.LinkObject;
import plm.corba.qt.BOAndLO;

import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
import java.util.Map;

@@ -156,7 +152,7 @@
     * @return
     * @throws VciBaseException
     */
     Map<String, com.vci.client.bof.ClientBusinessObject> queryLinkedCbo(List los,
     Map<String, ClientBusinessObject> queryLinkedCbo(List los,
                                                      boolean isDirection, List<String> queryColumn) throws VciBaseException;
    
     /**
@@ -165,7 +161,7 @@
     * @return map
     * @throws VciBaseException
     */
     List<Map> clos2Map(List<com.vci.client.bof.ClientLinkObject> clos) throws VciBaseException;
     List<Map> clos2Map(List<ClientLinkObject> clos) throws VciBaseException;
    
    /**
     * ClientLinkObject 转为HashMap
@@ -173,7 +169,7 @@
     * @return
     * @throws VciBaseException
     */
     Map clo2Map(com.vci.client.bof.ClientLinkObject clo) throws VciBaseException;
     Map clo2Map(ClientLinkObject clo) throws VciBaseException;
    
    /**
     * map转为ClientLinkObject

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

@@ -334,12 +334,12 @@
     * @param attribItemList 属性的列表
     */
    @Override
    public void batchAddAttribute(List<AttribItem> attribItemList) {
    public void batchAddAttribute(List<AttributeDef> attribItemList) {
        if(!CollectionUtils.isEmpty(attribItemList)){
            attribItemList.stream().forEach(attribItem -> {
                try {
                    platformClientUtil.getAttributeService().addAttribItem(attribItem);
                } catch (VCIError e) {
                    platformClientUtil.getAttributeService().addAttributeDef(attribItem);
                } catch (PLException e) {
                    throw WebUtil.getVciBaseException(e);
                }
            });
@@ -351,12 +351,12 @@
     * @param editAttrList 属性的列表
     */
    @Override
    public void batchEditAttribute(List<AttribItem> editAttrList) {
    public void batchEditAttribute(List<AttributeDef> editAttrList) {
        if(!CollectionUtils.isEmpty(editAttrList)){
            editAttrList.stream().forEach(attribItem -> {
                try {
                    platformClientUtil.getAttributeService().modifyAbItem(attribItem);
                } catch (VCIError e) {
                    platformClientUtil.getAttributeService().modifyAttributeDef(attribItem);
                } catch (PLException e) {
                    throw WebUtil.getVciBaseException(e);
                }
            });

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

@@ -2,44 +2,30 @@

import com.vci.client.common.providers.ServiceProvider;
import com.vci.corba.common.PLException;
import com.vci.corba.common.VCIError;
import com.vci.corba.omd.lcm.Bound;
import com.vci.corba.omd.lcm.LifeCycle;
import com.vci.starter.web.annotation.log.VciUnLog;
import com.vci.starter.web.exception.VciBaseException;
import com.vci.starter.web.pagemodel.BaseQueryObject;
import com.vci.starter.web.pagemodel.DataGrid;
import com.vci.starter.web.pagemodel.PageHelper;
import com.vci.starter.web.util.VciBaseUtil;
import com.vci.starter.web.util.VciDateUtil;
import com.vci.starter.web.wrapper.VciQueryWrapperForDO;
import com.vci.web.constant.CacheKeyConstant;
import com.vci.web.model.OsLifeCycleDO;
import com.vci.web.model.OsStatusDO;
import com.vci.web.pageModel.*;
import com.vci.web.service.OsLifeCycleServiceI;
import com.vci.web.service.OsLinkTypeServiceI;
import com.vci.web.service.OsStatusServiceI;
import com.vci.web.service.WebBoServiceI;
import com.vci.web.util.PlatformClientUtil;
import com.vci.web.util.WebUtil;
import org.apache.commons.lang3.StringUtils;
import org.apache.tools.ant.taskdefs.condition.Os;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.cache.annotation.CacheEvict;
import org.springframework.cache.annotation.CachePut;
import org.springframework.cache.annotation.Cacheable;
import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
import plm.bs.bom.clientobject.ClientBusinessObject;
import plm.bs.bom.common.BusinessObject;
import plm.bs.bom.common.BusinessObjectHolder;
import plm.corba.lifecycle.Bound;
import plm.corba.lifecycle.LifeCyle;
import plm.corba.lifecycle.TransitionVO;
import plm.corba.lifecycle.TransitionVOEvent;

import java.util.*;
import java.util.stream.Collectors;
@@ -276,16 +262,16 @@
     * @return 数据对象
     */
    @Override
    public LifeCyle lifeCycleVO2DO(OsLifeCycleVO lifeCycleVO){
        LifeCyle lifeCyle = new LifeCyle();
    public LifeCycle lifeCycleVO2DO(OsLifeCycleVO lifeCycleVO){
        LifeCycle lifeCyle = new LifeCycle();
        lifeCyle.name = lifeCycleVO.getId();
        lifeCyle.tag = lifeCycleVO.getName();
        lifeCyle.oid = lifeCycleVO.getOid();
        lifeCyle.creator = lifeCycleVO.getCreator();
        lifeCyle.description = lifeCycleVO.getDescription();
        lifeCyle.modifier = lifeCycleVO.getLastModifier();
        lifeCyle.modifyTime = VciDateUtil.date2Str(lifeCycleVO.getLastModifyTime(),VciDateUtil.DateTimeFormat);
        lifeCyle.createTime = VciDateUtil.date2Str(lifeCycleVO.getCreateTime(),VciDateUtil.DateTimeFormat);
        lifeCyle.modifyTime = lifeCycleVO.getLastModifyTime().getTime();
        lifeCyle.createTime = lifeCycleVO.getCreateTime().getTime();
        lifeCyle.startState =lifeCycleVO.getStartStatus();
        lifeCyle.ts = VciDateUtil.date2Str(lifeCycleVO.getTs(),VciDateUtil.DateTimeMillFormat);
        if(lifeCycleVO.getBounds() !=null && lifeCycleVO.getBounds().length>0) {
@@ -393,7 +379,7 @@
            try {
                com.vci.corba.omd.lcm.TransitionVO transitionVO = lifeCycleLineVO2DO(lineVO);
//                platformClientUtil.getBOFactoryService().transferBusinessObject(new BusinessObjectHolder(obj), transitionVO);
                ServiceProvider.getBOFService().transferBusinessObject(obj, transitionVO);
                ServiceProvider.getBOFService().transferBusinessObject(obj, transitionVO.destination);
            } catch (PLException e) {
                throw WebUtil.getVciBaseException(e);
            }
@@ -473,12 +459,12 @@
     * @param lifeCyleList 生命周期的内容
     */
    @Override
    public void batchAddLifeCycle(List<LifeCyle> lifeCyleList) {
    public void batchAddLifeCycle(List<LifeCycle> lifeCyleList) {
        if(!CollectionUtils.isEmpty(lifeCyleList)){
            lifeCyleList.stream().forEach(lifeCyle -> {
                try {
                    platformClientUtil.getLifeCycleService().addLifeCyle(lifeCyle);
                } catch (VCIError e) {
                    platformClientUtil.getLifeCycleService().addLifeCycle(lifeCyle);
                } catch (PLException e) {
                    throw WebUtil.getVciBaseException(e);
                }
            });
@@ -491,12 +477,12 @@
     * @param lifeCycleList 生命周期的内容
     */
    @Override
    public void batchEditLifeCycle(List<LifeCyle> lifeCycleList) {
    public void batchEditLifeCycle(List<LifeCycle> lifeCycleList) {
        if(!CollectionUtils.isEmpty(lifeCycleList)){
            lifeCycleList.stream().forEach(lifeCyle -> {
                try {
                    platformClientUtil.getLifeCycleService().modifyLifeCyle(lifeCyle);
                } catch (VCIError e) {
                    platformClientUtil.getLifeCycleService().modifyLifeCycle(lifeCyle);
                } catch (PLException e) {
                    throw WebUtil.getVciBaseException(e);
                }
            });

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

@@ -1,6 +1,7 @@
package com.vci.web.service.impl;

import com.vci.corba.common.VCIError;
import com.vci.corba.common.PLException;
import com.vci.corba.omd.vrm.VersionRule;
import com.vci.starter.web.annotation.log.VciUnLog;
import com.vci.starter.web.util.VciDateUtil;
import com.vci.web.constant.CacheKeyConstant;
@@ -13,7 +14,6 @@
import org.springframework.cache.annotation.CachePut;
import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service;
import plm.corba.versionRuleManager.VersionRule;

import java.util.*;
import java.util.stream.Collectors;
@@ -49,8 +49,8 @@
    public List<OsRevisionRuleVO> selectAllRevision() {
        try {
            return revisionRuleDO2VOs(Arrays.stream(platformClientUtil.getVersionService().getVersionRules()).collect(Collectors.toList()));
        } catch (VCIError vciError) {
            throw WebUtil.getVciBaseException(vciError);
        } catch (PLException e) {
            throw WebUtil.getVciBaseException(e);
        }
    }

@@ -96,8 +96,8 @@
            ruleVO.setCreator(versionRule.creator);
            ruleVO.setLastModifier(versionRule.modifier);
            try {
                ruleVO.setCreateTime(VciDateUtil.str2Date(versionRule.createTime,VciDateUtil.DateTimeFormat));
                ruleVO.setLastModifyTime(VciDateUtil.str2Date(versionRule.modifyTime,VciDateUtil.DateTimeFormat));
                ruleVO.setCreateTime(new Date(versionRule.createTime));
                ruleVO.setLastModifyTime(new Date(versionRule.modifyTime));
                ruleVO.setTs(VciDateUtil.str2Date(versionRule.ts,VciDateUtil.DateTimeFormat));
            } catch (Exception e) {
                e.printStackTrace();

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

@@ -2,8 +2,7 @@

import com.vci.client.common.providers.ServiceProvider;
import com.vci.corba.common.PLException;
import com.vci.corba.common.VCIError;
import com.vci.corba.query.data.KV;
import com.vci.corba.omd.stm.StatePool;
import com.vci.starter.web.annotation.log.VciUnLog;
import com.vci.starter.web.exception.VciBaseException;
import com.vci.starter.web.pagemodel.BaseQueryObject;
@@ -13,11 +12,8 @@
import com.vci.starter.web.util.LangBaseUtil;
import com.vci.starter.web.util.VciBaseUtil;
import com.vci.starter.web.util.VciDateUtil;
import com.vci.starter.web.wrapper.VciQueryWrapperForDO;
import com.vci.web.dto.OsStatusDTO;
import com.vci.web.model.OsLifeCycleDO;
import com.vci.web.model.OsStatusDO;
import com.vci.web.pageModel.OsLifeCycleVO;
import com.vci.web.pageModel.OsStatusVO;
import com.vci.web.service.OsLifeCycleServiceI;
import com.vci.web.service.OsStatusServiceI;
@@ -33,7 +29,6 @@
import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
import plm.corba.statePoolManager.StatePool;

import java.util.*;
import java.util.stream.Collectors;
@@ -187,8 +182,8 @@
            for(StatePool statePool : statePoolList) {
                try {
                    platformClientUtil.getStatePoolService().addStatePool(statePool);
                } catch (VCIError vciError) {
                    throw WebUtil.getVciBaseException(vciError);
                } catch (PLException e) {
                    throw WebUtil.getVciBaseException(e);
                }
            }
        }
@@ -204,8 +199,8 @@
            for(StatePool statePool : statePoolList) {
                try {
                    platformClientUtil.getStatePoolService().modifyStatePool(statePool);
                } catch (VCIError vciError) {
                    throw WebUtil.getVciBaseException(vciError);
                } catch (PLException e) {
                    throw WebUtil.getVciBaseException(e);
                }
            }
        }
@@ -290,7 +285,7 @@
        OsStatusVO statusVO = getObjectByOid(statusDTO.getOid());
        StatePool pool = statusDTO2DO(statusDTO);
        pool.creator = statusVO.getCreator();
        pool.createTime = VciDateUtil.date2Str(statusVO.getCreateTime(),VciDateUtil.DateTimeMillFormat);
        pool.createTime = statusVO.getCreateTime().getTime();
        List<StatePool> poolList = new ArrayList<>();
        poolList.add(pool);
        batchEditSave(poolList);
@@ -336,9 +331,9 @@
        String userId = VciBaseUtil.getCurrentUserId();
        String now = VciDateUtil.getNowString(VciDateUtil.DateTimeMillFormat);
        statePool.creator = userId;
        statePool.createTime = now;
        statePool.createTime = System.currentTimeMillis();
        statePool.modifier = userId;
        statePool.modifyTime = now;
        statePool.modifyTime = System.currentTimeMillis();
        statePool.ts = statusDTO.getTs()==null?now:VciDateUtil.date2Str(statusDTO.getTs(),VciDateUtil.DateTimeMillFormat);
        statePool.tag = statusDTO.getName();
        return statePool;
@@ -358,9 +353,9 @@
        String userId = VciBaseUtil.getCurrentUserId();
        String now = VciDateUtil.getNowString(VciDateUtil.DateTimeMillFormat);
        statePool.creator = statusVO.getCreator();
        statePool.createTime = VciDateUtil.date2Str(statusVO.getCreateTime(),VciDateUtil.DateTimeMillFormat);
        statePool.createTime = statusVO.getCreateTime().getTime();
        statePool.modifier = statusVO.getLastModifier();
        statePool.modifyTime = VciDateUtil.date2Str(statusVO.getLastModifyTime(),VciDateUtil.DateTimeMillFormat);;
        statePool.modifyTime = statusVO.getLastModifyTime().getTime();
        statePool.ts = statusVO.getTs()==null?now:VciDateUtil.date2Str(statusVO.getTs(),VciDateUtil.DateTimeMillFormat);
        statePool.tag = statusVO.getName();
        return statePool;

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

@@ -214,9 +214,11 @@
        vciFileObjectDO.setLastModifier("admin");
//        revisionModelUtil.wrapperForAdd(vciFileObjectDO);
        //随机路径
        String randomPath = VciBaseUtil.getPk();
//        String randomPath = VciBaseUtil.getPk();
        String randomPath = "rrt";
        //目标文件
        String targetFileName = vciFileObjectDO.getOid();
//        String targetFileName = vciFileObjectDO.getOid();
        String targetFileName = VciBaseUtil.getPk();

        String filePath = randomPath+File.separator+targetFileName;


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

@@ -5,6 +5,7 @@
import com.vci.common.qt.object.*;
import com.vci.common.utility.ObjectUtility;
import com.vci.corba.common.PLException;
import com.vci.corba.common.VCIError;
import com.vci.corba.omd.data.AttributeValue;
import com.vci.corba.omd.data.BusinessObject;
import com.vci.corba.omd.qtm.QTInfo;
@@ -1104,8 +1105,8 @@
            if(results!=null && results.length>0 && results[0] != null && results[0].length>0){
                return WebUtil.getInt(results[0][0]);
            }
        }catch (VCIError e){
            throw WebUtil.getVciBaseException(e);
        } catch (PLException e) {
            throw new RuntimeException(e);
        }
        return 0;
    }

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

@@ -1,7 +1,9 @@
package com.vci.web.service.impl;

import com.vci.corba.common.VCIError;
import com.vci.corba.omd.etm.EnumType;
import com.vci.corba.omd.lcm.Bound;
import com.vci.corba.omd.lcm.LifeCycle;
import com.vci.corba.omd.lcm.TransitionVO;
import com.vci.starter.poi.bo.WriteExcelData;
import com.vci.starter.poi.bo.WriteExcelOption;
import com.vci.starter.poi.util.ExcelUtil;
@@ -28,28 +30,12 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
import plm.bs.omd.linktype.common.LinkTypeProvider;
import plm.corba.attribpool.AttribItem;
import plm.corba.btm.BTMServiceOperations;
import plm.corba.btm.BtmItem;
import com.vci.corba.omd.etm.EnumItem;
import plm.corba.lifecycle.Bound;
import plm.corba.lifecycle.LifeCyle;
import plm.corba.lifecycle.TransitionVO;
import plm.corba.lifecycle.TransitionVOEvent;
import plm.corba.linkTypeManager.LinkType;
import plm.corba.statePoolManager.StatePool;
import plm.ddlTool.client.DDLToolClient;
import plm.vo.omd.btm.common.BtmProvider;
import plm.vo.omd.btm.resource.Tool;

import java.io.File;
import java.io.FileNotFoundException;
import java.util.*;
import java.util.concurrent.ConcurrentHashMap;
import java.util.stream.Collectors;

import static plm.vo.omd.attribpool.ui.VTDataTypePanel.*;


/**
@@ -257,21 +243,21 @@
            allLifeCycleLowMap.put(id.toLowerCase(Locale.ROOT),lifeCycleVO);
        });
        //不存在的生命周期对象
        List<LifeCyle> unExistLifeCycleList = new ArrayList<LifeCyle>();
        List<LifeCyle> editLifeCycleList = new ArrayList<LifeCyle>();
        List<LifeCycle> unExistLifeCycleList = new ArrayList<LifeCycle>();
        List<LifeCycle> editLifeCycleList = new ArrayList<LifeCycle>();
        String userId = WebUtil.getCurrentUserId();
        String now = VciDateUtil.getNowString(VciDateUtil.DateTimeFormat);
        //循环分析需要添加还是修改
        for(OsLifeCycleDTO lifeCycleDTO : lifeCycleDTOList){
            String lifeCycleId = lifeCycleDTO.getId().toLowerCase().trim();
            LifeCyle lifeCyle = null;
            LifeCycle lifeCyle = null;
            boolean edit = false;
            if(!existLifeCycleLowIds.contains(lifeCycleId)) {
                lifeCyle = new LifeCyle();
                lifeCyle = new LifeCycle();
                lifeCyle.oid = "";
                lifeCyle.id = "";
                lifeCyle.creator = userId;
                lifeCyle.createTime = now;
                lifeCyle.createTime = System.currentTimeMillis();
                lifeCyle.ts = now;
                lifeCyle.name = lifeCycleDTO.getId();
            }else {
@@ -282,7 +268,7 @@
            lifeCyle.description = lifeCycleDTO.getDescription() == null?"":lifeCycleDTO.getDescription();
            lifeCyle.startState = lifeCycleDTO.getStartStatus() == null?"":lifeCycleDTO.getStartStatus();
            lifeCyle.modifier = userId;
            lifeCyle.modifyTime = now;
            lifeCyle.modifyTime = System.currentTimeMillis();
            //找区域
            List<OsLifeCycleLineDTO> lineDTOList = lifeCycleDTO.getLineDTOList();
            if(CollectionUtils.isEmpty(lineDTOList)){

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

@@ -2,10 +2,13 @@

import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson.serializer.SerializerFeature;
import com.vci.base.common.utility.ObjectUtility;
import com.vci.client.bof.ClientBusinessObject;
import com.vci.client.bof.ClientLinkObject;
import com.vci.client.bof.ClientLinkObjectOperation;
import com.vci.client.common.providers.ServiceProvider;
import com.vci.common.qt.object.*;
import com.vci.corba.common.PLException;
import com.vci.corba.common.VCIError;
import com.vci.corba.omd.data.LinkObject;
import com.vci.corba.query.ObjectQueryService;
import com.vci.starter.web.constant.QueryOptionConstant;
import com.vci.starter.web.exception.VciBaseException;
@@ -21,23 +24,11 @@
import com.vci.web.util.WebUtil;
import org.apache.commons.lang3.StringUtils;
import org.omg.CORBA.IntHolder;
import org.omg.CORBA.PRIVATE_MEMBER;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
import plm.bs.bom.clientobject.BOFactoryClient;
import plm.bs.bom.clientobject.ClientBusinessObject;
import plm.bs.bom.clientobject.ClientLinkObject;
import plm.bs.bom.clientobject.ClientLinkObjectOperation;
import plm.bs.bom.common.AttributeValue;
import plm.bs.bom.common.BusinessObject;
import plm.bs.bom.common.LinkObject;
import plm.corba.qt.BOAndLO;
import plm.oq.objectQuery.common.*;

import java.lang.reflect.Field;
import java.util.*;
import java.util.stream.Collectors;

@@ -106,13 +97,13 @@

    @Override
    public List<ClientLinkObject> queryCLO(String linkType,
            Map<String, String> conditionMap) throws VciBaseException {
                                           Map<String, String> conditionMap) throws VciBaseException {
        return queryCLO(linkType, "", 1, conditionMap);
    }

    @Override
    public List<ClientBusinessObject> queryLinkCbo(String linkType,
            String toBtmname, Map<String, String> conditionMap)
                                                   String toBtmname, Map<String, String> conditionMap)
            throws VciBaseException {
        return queryLinkCbo(linkType, toBtmname, 1, conditionMap);
    }

 Source/platformProject/vci-platform-web/src/main/java/com/vci/web/util/PlatformClientUtil.java

@@ -1,34 +1,20 @@
package com.vci.web.util;

import com.vci.corba.logon.method.LogonFactory;
import com.vci.corba.logon.method.LogonFactoryHelper;
import com.vci.corba.volumn.method.VolumnFactory;
import com.vci.corba.volumn.method.VolumnFactoryHelper;
import com.vci.starter.corba.connector.JacorbClientConnector;
import com.vci.starter.web.exception.VciBaseException;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import com.vci.client.common.providers.ServiceProvider;
import com.vci.corba.bofactory.BOFactoryServicePrx;
import com.vci.corba.common.PLException;
import com.vci.corba.omd.atm.AttPoolServicePrx;
import com.vci.corba.omd.btm.BTMServicePrx;
import com.vci.corba.omd.etm.EnumServicePrx;
import com.vci.corba.omd.lcm.LifeCycleServicePrx;
import com.vci.corba.omd.ltm.LinkTypeServicePrx;
import com.vci.corba.omd.stm.StatePoolServicePrx;
import com.vci.corba.omd.vrm.VersionRuleServicePrx;
import com.vci.corba.portal.PortalServicePrx;
import com.vci.corba.query.ObjectQueryServicePrx;
import com.vci.corba.volume.VolumeServicePrx;
import com.vci.corba.workflow.WorkflowServicePrx;
import org.springframework.stereotype.Component;
import plm.bs.bom.common.BOFactoryService;
import plm.bs.bom.common.BOFactoryServiceHelper;
import plm.corba.attribpool.AttPoolServiceHelper;
import plm.corba.attribpool.AttPoolServiceOperations;
import plm.corba.btm.BTMServiceHelper;
import plm.corba.btm.BTMServiceOperations;
import plm.corba.enumManager.EnumServiceHelper;
import plm.corba.enumManager.EnumServiceOperations;
import plm.corba.lifecycle.LifeCyleServiceHelper;
import plm.corba.lifecycle.LifeCyleServiceOperations;
import plm.corba.linkTypeManager.LinkTypeServiceHelper;
import plm.corba.linkTypeManager.LinkTypeServiceOperations;
import plm.corba.portal.PortalServiceHelper;
import plm.corba.portal.PortalServiceOperations;
import plm.corba.qt.QTServiceHelper;
import plm.corba.qt.QTServiceOperations;
import plm.corba.statePoolManager.StatePoolServiceHelper;
import plm.corba.statePoolManager.StatePoolServiceOperations;
import plm.corba.versionRuleManager.VersionRuleServiceHelper;
import plm.corba.versionRuleManager.VersionRuleServiceOperations;

/**
 * 平台的客户端调用工具类
@@ -91,115 +77,110 @@
     */
    private static final String QUERY_SERVICE_NAME = "qtService";

    /**
    * corba的客户端调用
    */
    @Autowired
    private JacorbClientConnector jacorbClientConnector;

    /**
     * 获取业务类型工厂的服务
     * @return 服务的对象
     */
    public BOFactoryService getBOFactoryService(){
       return BOFactoryServiceHelper.narrow(jacorbClientConnector.getCorbaServiceObjectByServiceName(BO_FACTORY_SERVICE_NAME));
    }
    public BOFactoryServicePrx getBOFactoryService(){
        return ServiceProvider.getBOFService();
   }

    /**
     * 获取登录主服务
     * @return 服务的对象
     */
    public LogonFactory getLogonFactoryService(){
        return LogonFactoryHelper.narrow(jacorbClientConnector.getCorbaServiceObjectByServiceName(LOGON_FACTORY_SERVICE_NAME));
    }
    public WorkflowServicePrx getLogonFactoryService(){
        return ServiceProvider.getWFService();
  }

    /**
     * 获取状态池的服务
     * @return 服务的对象
     */
    public StatePoolServiceOperations getStatePoolService(){
        return StatePoolServiceHelper.narrow(jacorbClientConnector.getCorbaServiceObjectByServiceName(STATE_POOL_SERVICE_NAME));
    }
    public StatePoolServicePrx getStatePoolService() throws PLException {
        return ServiceProvider.getOMDService().getStateService();
   }

    /**
     * 获取生命周期的服务
     * @return 生命周期的服务对象
     */
    public LifeCyleServiceOperations getLifeCycleService(){
        return LifeCyleServiceHelper.narrow(jacorbClientConnector.getCorbaServiceObjectByServiceName(LIFE_CYCLE_SERVICE_NAME));
    }
    public LifeCycleServicePrx getLifeCycleService() throws PLException {
        return ServiceProvider.getOMDService().getLifeCycleService();
}

    /**
     * 获取枚举的服务
     * @return 枚举的服务对象
     */
    public EnumServiceOperations getEnumService(){
        return EnumServiceHelper.narrow(jacorbClientConnector.getCorbaServiceObjectByServiceName(ENUM_SERVICE_NAME));
    public EnumServicePrx getEnumService() throws PLException {
        return ServiceProvider.getOMDService().getEnumService();
//        return EnumServiceHelper.narrow(jacorbClientConnector.getCorbaServiceObjectByServiceName(ENUM_SERVICE_NAME));
    }

    /**
     * 获取版本规则的服务
     * @return 版本规则的服务
     */
    public VersionRuleServiceOperations getVersionService(){
        return VersionRuleServiceHelper.narrow(jacorbClientConnector.getCorbaServiceObjectByServiceName(VERSION_SERVICE_NAME));
    public VersionRuleServicePrx getVersionService() throws PLException {
        return ServiceProvider.getOMDService().getVerRuleService();
//        return VersionRuleServiceHelper.narrow(jacorbClientConnector.getCorbaServiceObjectByServiceName(VERSION_SERVICE_NAME));
    }

    /**
     * 属性服务
     * @return 服务的对象
     */
    public AttPoolServiceOperations getAttributeService(){
        return AttPoolServiceHelper.narrow(jacorbClientConnector.getCorbaServiceObjectByServiceName(ATTRIBUTE_SERVICE_NAME));
    public AttPoolServicePrx getAttributeService() throws PLException {
        return ServiceProvider.getOMDService().getAttributeService();
//        return AttPoolServiceHelper.narrow(jacorbClientConnector.getCorbaServiceObjectByServiceName(ATTRIBUTE_SERVICE_NAME));
    }

    /**
     * 获取业务类型
     * @return 服务的对象
     */
    public BTMServiceOperations getBtmService(){
        return BTMServiceHelper.narrow(jacorbClientConnector.getCorbaServiceObjectByServiceName(BTM_SERVICE_NAME));
    public BTMServicePrx getBtmService() throws PLException {
        return ServiceProvider.getOMDService().getBTMService();
//        return BTMServiceHelper.narrow(jacorbClientConnector.getCorbaServiceObjectByServiceName(BTM_SERVICE_NAME));
    }

    /**
     * 获取链接类型
     * @return 服务的对象
     */
    public LinkTypeServiceOperations getLinkTypeService(){
        return LinkTypeServiceHelper.narrow(jacorbClientConnector.getCorbaServiceObjectByServiceName(LINK_SERVICE_NAME));
    public LinkTypeServicePrx getLinkTypeService() throws PLException {
        return ServiceProvider.getOMDService().getLinkTypeService();
//        return LinkTypeServiceHelper.narrow(jacorbClientConnector.getCorbaServiceObjectByServiceName(LINK_SERVICE_NAME));
    }

    /**
     * 获取UI上下文服务
     * @return 服务的对象
     */
    public PortalServiceOperations getPortalService(){
        return PortalServiceHelper.narrow(jacorbClientConnector.getCorbaServiceObjectByServiceName(PORTAL_SERVICE_NAME));
    public PortalServicePrx getPortalService(){
        return ServiceProvider.getUIService();
//        return PortalServiceHelper.narrow(jacorbClientConnector.getCorbaServiceObjectByServiceName(PORTAL_SERVICE_NAME));
    }

    /**
     * 获取查询服务
     * @return 服务的对象
     */
    public QTServiceOperations getQueryService(){
        return QTServiceHelper.narrow(jacorbClientConnector.getCorbaServiceObjectByServiceName(QUERY_SERVICE_NAME));
    public ObjectQueryServicePrx getQueryService(){
        return ServiceProvider.getOQService();
//        return QTServiceHelper.narrow(jacorbClientConnector.getCorbaServiceObjectByServiceName(QUERY_SERVICE_NAME));
    }

    /**
     * 卷服务
     * @param serverUrl 命名服务
     * @param volumeName 卷的名称
     * @return 卷服务的的对象
     */
    public VolumnFactory getVolumeService(String serverUrl,String volumeName){
        if(StringUtils.isNotBlank(serverUrl)){
            if(StringUtils.countMatches(serverUrl,":") < 2){
                throw new VciBaseException("卷服务的配置错误，需要主机名:端口:服务前缀这种形式");
            }
            String[] split = serverUrl.split(":");
            serverUrl = "corbaloc::" + split[0] + ":" +split[1] + "/NameService:" +split[2];
        }
        return VolumnFactoryHelper.narrow(jacorbClientConnector.getCorbaServiceObjectByUrlAndServiceName(serverUrl,volumeName));
    public VolumeServicePrx getVolumeService(String volumeName){
        return ServiceProvider.getVolumeService(volumeName);
//        return VolumnFactoryHelper.narrow(jacorbClientConnector.getCorbaServiceObjectByUrlAndServiceName(serverUrl,volumeName));
    }

}

 Source/platformProject/vci-platform-web/src/main/java/com/vci/web/util/WebUtil.java

@@ -2,11 +2,15 @@

import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson.serializer.SerializerFeature;
import com.vci.base.ui.exception.VCIException;
import com.vci.client.bof.ClientBusinessObject;
import com.vci.client.bof.ClientLinkObject;
import com.vci.client.common.objects.UserEntityObject;
import com.vci.common.exception.VciException;
import com.vci.corba.common.PLException;
import com.vci.corba.common.VCIError;
import com.vci.corba.framework.data.UserEntityInfo;
import com.vci.rmip.framework.client.systemConfig.object.UserEntityObject;
import com.vci.corba.common.data.UserEntityInfo;
import com.vci.corba.omd.data.AttributeValue;
import com.vci.corba.omd.data.BusinessObject;
import com.vci.corba.omd.data.LinkObject;
import com.vci.starter.revision.bo.TreeWrapperOptions;
import com.vci.starter.web.annotation.*;
import com.vci.starter.web.constant.QueryOptionConstant;
@@ -19,7 +23,6 @@
import com.vci.starter.web.util.*;
import com.vci.starter.web.wrapper.VciQueryWrapperForDO;
import com.vci.web.pageModel.*;
import com.vci.web.properties.WebProperties;
import com.vci.web.service.impl.WebLoServiceImpl;
import net.sf.jsqlparser.parser.CCJSqlParserUtil;
import net.sf.jsqlparser.statement.select.PlainSelect;
@@ -27,14 +30,8 @@
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import org.springframework.util.CollectionUtils;
import plm.bs.bom.clientobject.ClientBusinessObject;
import plm.bs.bom.clientobject.ClientLinkObject;
import plm.bs.bom.common.AttributeValue;
import plm.bs.bom.common.BusinessObject;
import plm.bs.bom.common.LinkObject;

import javax.servlet.http.HttpServletRequest;
import java.beans.IntrospectionException;
@@ -81,16 +78,16 @@
            if (e == null) {
                return errContent;
            }
            if (e instanceof VCIError ) {
            if (e instanceof PLException ) {
//                String error_code = ((VCIError) e).error_code;
//                String[] error_message = ((VCIError) e).error_message;
//                return MessageUtils.get(error_code, error_message);
                return null;
            } else if(e instanceof VciBaseException || e.getClass().getSuperclass().equals(VciBaseException.class)){
                return LangBaseUtil.getErrorMsg(e);
            }else if (e instanceof VCIException){
                String error_code = ((VCIException) e).getException_code();
                Object[] error_message = ((VCIException) e).getException_objArray();
            }else if (e instanceof VciException){
                String error_code = ((VciException) e).getCode();
                Object[] error_message = ((VciException) e).getObjArray();
                return MessageUtils.get(error_code, error_message);
            }else if (e.getCause() != null
                    && !e.getCause().toString().equals("")) {
@@ -242,7 +239,7 @@
    public static UserEntityInfo getUserEntityInfo(String model){
        SessionInfo si = WebUtil.getCurrentUserSessionInfo();
        UserEntityInfo ueo = new UserEntityInfo();
        ueo.ip = si.getIp();
//        ueo.ip = si.getIp();
        ueo.modules = model;
        ueo.userName = si.getUserId();
        return ueo;
@@ -256,7 +253,7 @@
    public static UserEntityObject getUserEntityObject(String model) {
        UserEntityObject entityObject = new UserEntityObject();
        SessionInfo si = WebUtil.getCurrentUserSessionInfo();
        entityObject.setIp(si.getIp());
//        entityObject.setIp(si.getIp());
        entityObject.setModules(model);
        entityObject.setUserName(si.getUserId());
        return entityObject;
@@ -1321,7 +1318,7 @@
     * @param obj 对象
     * @param fieldAttrMap 属性map
     */
    public static void copyValueToObjectFromLos(LinkObject lo ,Object obj,Map<String,String> fieldAttrMap){
    public static void copyValueToObjectFromLos(LinkObject lo , Object obj, Map<String,String> fieldAttrMap){
        if(lo!=null && obj != null){
            //先把所有的字段映射找到
            if(fieldAttrMap == null){
@@ -1395,7 +1392,7 @@
                    }else {
                        clo.setAttributeValue(key.toLowerCase(), value);
                    }
                } catch (VCIError e) {
                } catch (PLException e) {
                    throw WebUtil.getVciBaseException(e);
                }
            }
@@ -1438,7 +1435,7 @@
                        setValueToField(fieldName, cbo, value);
                    }
                    cbo.setAttributeValue(attrName.toLowerCase(), value);
                } catch (VCIError e) {
                } catch (PLException e) {
                    throw WebUtil.getVciBaseException(e);
                }
            }
@@ -1510,10 +1507,10 @@
     * @param e 异常对象
     * @return base异常对象
     */
    public static VciBaseException getVciBaseException(VCIError e){
//        return new VciBaseException(e.error_code, e.error_message);
        return null;
    }
//    public static VciBaseException getVciBaseException(PLException e){
////        return new VciBaseException(e.error_code, e.error_message);
//        return null;
//    }

    /**
     * 转换异常
@@ -1530,15 +1527,15 @@
     * @param e 异常对象
     * @return base异常对象
     */
    public static VciBaseException getVciBaseException(VCIException e){
    public static VciBaseException getVciBaseException(VciException e){
        String[] errorMsgs = new String[0];
        if(e != null && e.getException_objArray() !=null ){
            errorMsgs = new String[e.getException_objArray().length];
        if(e != null && e.getObjArray() !=null ){
            errorMsgs = new String[e.getObjArray().length];
            for(int i = 0 ; i < errorMsgs.length ; i ++){
                errorMsgs[i] = e.getException_objArray()[i].toString();
                errorMsgs[i] = e.getObjArray()[i].toString();
            }
        }
        return new VciBaseException(e == null ?"com.vci.web.base.unknowerror":e.getException_code(), errorMsgs);
        return new VciBaseException(e == null ?"com.vci.web.base.unknowerror":e.getCode(), errorMsgs);
    }

    /**