Merge remote-tracking branch 'origin/master'

 Bin/lib/client/flatlaf-2.3.jar

Binary files differ

 Bin/lib/client/icegridgui.jar

Binary files differ

 Bin/lib/client/jgoodies-common-1.8.1.jar

Binary files differ

 Bin/lib/client/jgoodies-looks-2.5.3.jar

Binary files differ

 Bin/lib/client/jgraph.jar

Binary files differ

 Bin/lib/client/jgraphx-3.1.0.0.jar

Binary files differ

 Bin/lib/client/nativeskin.jar

Binary files differ

 Bin/lib/client/pinyin4j-2.5.0.jar

Binary files differ

 Bin/lib/client/plt-client.jar

Binary files differ

 Bin/lib/client/plt-clientbase.jar

Binary files differ

 Bin/lib/client/poi-3.9-20121203.jar

Binary files differ

 Bin/lib/client/poi-ooxml-3.9-20121203.jar

Binary files differ

 Bin/lib/client/poi-ooxml-schemas-3.9-20121203.jar

Binary files differ

 Bin/lib/client/poi-scratchpad-3.9-20121203.jar

Binary files differ

 Bin/lib/client/protege35.jar

Binary files differ

 Bin/lib/client/skinlf.jar

Binary files differ

 Bin/lib/client/swingx-1.6.1.jar

Binary files differ

 Bin/lib/client/swixml.jar

Binary files differ

 Bin/lib/client/uitheme-1.3.1.jar

Binary files differ

 Bin/lib/common/commons-lang3-3.1.jar

Binary files differ

 Bin/lib/common/dom4j-1.6.1.jar

Binary files differ

 Bin/lib/common/fastjson-1.2.83.jar

Binary files differ

 Bin/lib/common/freemarker.jar

Binary files differ

 Bin/lib/common/icegridgui.jar

Binary files differ

 Bin/lib/common/junit-4.8.jar

Binary files differ

 Bin/lib/common/log4j-api-2.12.4.jar

Binary files differ

 Bin/lib/common/log4j-core-2.12.4.jar

Binary files differ

 Bin/lib/common/mail.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/CacheService.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/lib/thrid/IKAnalyzer2012FF_u1.jar

Binary files differ

 Bin/lib/thrid/XmlSchema-1.1.jar

Binary files differ

 Bin/lib/thrid/activation.jar

Binary files differ

 Bin/lib/thrid/antlr-2.7.6.jar

Binary files differ

 Bin/lib/thrid/avalon-framework-4.1.5.jar

Binary files differ

 Bin/lib/thrid/axis-ant.jar

Binary files differ

 Bin/lib/thrid/axis.jar

Binary files differ

 Bin/lib/thrid/bsf-2.3.0.jar

Binary files differ

 Bin/lib/thrid/bsh.jar

Binary files differ

 Bin/lib/thrid/c3p0-0.9.1.jar

Binary files differ

 Bin/lib/thrid/commons-codec-1.3.jar

Binary files differ

 Bin/lib/thrid/commons-collections-3.1.jar

Binary files differ

 Bin/lib/thrid/commons-dbcp-1.1.jar

Binary files differ

 Bin/lib/thrid/commons-discovery-0.2.jar

Binary files differ

 Bin/lib/thrid/commons-fileupload-1.2.2.jar

Binary files differ

 Bin/lib/thrid/commons-httpclient-3.0.jar

Binary files differ

 Bin/lib/thrid/commons-io-2.0.1.jar

Binary files differ

 Bin/lib/thrid/commons-logging-1.0.4.jar

Binary files differ

 Bin/lib/thrid/commons-net-1.4.1.jar

Binary files differ

 Bin/lib/thrid/commons-pool2-2.6.2.jar

Binary files differ

 Bin/lib/thrid/geronimo-stax-api_1.0_spec-1.0.jar

Binary files differ

 Bin/lib/thrid/guava-20.0.jar

Binary files differ

 Bin/lib/thrid/hibernate-jpa-2.0-api-1.0.1.Final.jar

Binary files differ

 Bin/lib/thrid/hibernate3.jar

Binary files differ

 Bin/lib/thrid/inforbroker-core-5.1.0.jar

Binary files differ

 Bin/lib/thrid/javassist-3.12.0.GA.jar

Binary files differ

 Bin/lib/thrid/jaxen-1.1-beta-9.jar

Binary files differ

 Bin/lib/thrid/jaxrpc.jar

Binary files differ

 Bin/lib/thrid/jbpm-4.3.2.jar

Binary files differ

 Bin/lib/thrid/jcalendar-1.3.3.jar

Binary files differ

 Bin/lib/thrid/jcommon-1.0.17.jar

Binary files differ

 Bin/lib/thrid/jdom-1.0.jar

Binary files differ

 Bin/lib/thrid/jdsl.jar

Binary files differ

 Bin/lib/thrid/jedis-2.9.0.jar

Binary files differ

 Bin/lib/thrid/jee-management-1.1.jar

Binary files differ

 Bin/lib/thrid/jfreechart-1.0.14.jar

Binary files differ

 Bin/lib/thrid/jms-1.1.jar

Binary files differ

 Bin/lib/thrid/jta-1.1.jar

Binary files differ

 Bin/lib/thrid/juel-engine.jar

Binary files differ

 Bin/lib/thrid/juel-impl.jar

Binary files differ

 Bin/lib/thrid/juel.jar

Binary files differ

 Bin/lib/thrid/livetribe-jsr223.jar

Binary files differ

 Bin/lib/thrid/logkit-1.2.jar

Binary files differ

 Bin/lib/thrid/ognl-2.6.11.jar

Binary files differ

 Bin/lib/thrid/ojdbc8.jar

Binary files differ

 Bin/lib/thrid/picocontainer-1.2.jar

Binary files differ

 Bin/lib/thrid/plugin.jar

Binary files differ

 Bin/lib/thrid/poi-3.9-20121203.jar

Binary files differ

 Bin/lib/thrid/poi-ooxml-3.9-20121203.jar

Binary files differ

 Bin/lib/thrid/poi-ooxml-schemas-3.9-20121203.jar

Binary files differ

 Bin/lib/thrid/poi-scratchpad-3.9-20121203.jar

Binary files differ

 Bin/lib/thrid/portalcustom.jar

Binary files differ

 Bin/lib/thrid/proxool-0.8.3.jar

Binary files differ

 Bin/lib/thrid/quartz-all-1.8.6.jar

Binary files differ

 Bin/lib/thrid/rsyntax.jar

Binary files differ

 Bin/lib/thrid/saaj.jar

Binary files differ

 Bin/lib/thrid/sapjco.jar

Binary files differ

 Bin/lib/thrid/slf4j-api-1.7.14.jar

Binary files differ

 Bin/lib/thrid/slf4j-jdk14-1.7.14.jar

Binary files differ

 Bin/lib/thrid/xml-apis.jar

Binary files differ

 Bin/lib/thrid/xmlbeans-2.3.0.jar

Binary files differ

 Bin/lib/thrid/xmlsec-1.3.0.jar

Binary files differ

 Bin/lib/thrid/xstream-1.3.1.jar

Binary files differ

 Source/ProjectWeb/src/actions/AddAction.js

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,4 @@
/**
 * æŒ‰é’®å¤„理 ä¸šåŠ¡ç±»åž‹æ–°å¢ž
 */
import BaseAction from './BaseAction';

 Source/ProjectWeb/src/actions/BaseAction.js

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,52 @@
import {validatenull} from "@/util/validate";
import {findArray} from "@/util/util";

/**
 * æŒ‰é’®çš„基础服务
 */

/**
 * æ›¿æ¢æ–‡æœ¬ä¸­çš„${xxx}
 * @param text æ–‡æœ¬
 * @param dataStore é€‰æ‹©çš„数据
 * @param sourceData æ¥æºæ•°æ®
 * @returns æ›¿æ¢åŽçš„值,字符串
 */
export const replaceFreeMarker = (text,dataStore,sourceData) => {
  //替换表达式
  if (!sourceData) {
    sourceData = {};
  }
  if (!dataStore) {
    dataStore = [];
  }
  let replaceData = dataStore.length > 0 ? dataStore[0] : {};
  if (text && text.indexOf("${") > -1 && text.indexOf("}")) {
    //js只能使用${xxx}这种的方式
    let reg = "root.${";
    while (text.indexOf(reg) > -1) {
      let temp = text.substring(0, text.indexOf(reg));
      let field = text.substring(text.indexOf(reg) + reg.length, text.indexOf("}"));
      let end = text.substring(text.indexOf("}") + 1);
      field = replaceData[field] || sourceData[field] || '';
      text = temp + field + end;
    }
    reg = "sourceData.${";
    while (text.indexOf(reg) > -1) {
      let temp = text.substring(0, text.indexOf(reg));
      let field = text.substring(text.indexOf(reg) + reg.length, text.indexOf("}"));
      let end = text.substring(text.indexOf("}") + 1);
      field = replaceData[field] || sourceData[field] || '';
      text = temp + field + end;
    }
    reg = "${";
    while (text.indexOf(reg) > -1) {
      let temp = text.substring(0, text.indexOf(reg));
      let field = text.substring(text.indexOf(reg) + reg.length, text.indexOf("}"));
      let end = text.substring(text.indexOf("}") + 1);
      field = replaceData[field] || sourceData[field] || '';
      text = temp + field + end;
    }
  }
  return text;
};

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

@@ -260,7 +260,7 @@
            MenuVO functionVO = new MenuVO();
            functionVO.setId(menu.id);
            functionVO.setSource(menu.image);
            if(StringUtils.isBlank(menu.resourceB) || !(menu.resourceB.length()>2 && "bs=".equals(menu.resourceB.substring(0,3)))){
            if(StringUtils.isBlank(menu.resourceB)){
                continue;
            }
            functionVO.setPath(menu.resourceB);
@@ -299,7 +299,7 @@
            MenuVO functionVO = new MenuVO();
            functionVO.setId(menu.id);
            functionVO.setSource(menu.image);
            if(StringUtils.isBlank(menu.resourceB) || !(menu.resourceB.length()>2 && "bs=".equals(menu.resourceB.substring(0,3)))){
            if(StringUtils.isBlank(menu.resourceB) ){
                continue;
            }
            functionVO.setPath(menu.resourceB);

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

@@ -13,8 +13,7 @@
import com.vci.web.constant.CacheKeyConstant;
import com.vci.web.pageModel.*;
import com.vci.web.service.*;
import com.vci.web.util.PlatformClientUtil;
import com.vci.web.util.WebUtil;
import com.vci.web.util.*;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -140,9 +139,11 @@
            vo.setCreator(btmItem.creator);
            vo.setLastModifier(btmItem.modifier);
            try {
                vo.setCreateTime(VciDateUtil.str2Date(String.valueOf(btmItem.createTime),VciDateUtil.DateTimeFormat));
                vo.setLastModifyTime(VciDateUtil.str2Date(String.valueOf(btmItem.modifyTime),VciDateUtil.DateTimeFormat));
                vo.setTs(VciDateUtil.str2Date(String.valueOf(btmItem.ts),VciDateUtil.DateTimeMillFormat));
                // btmItem.createTime拿到的是时间戳，但是这儿要的是例如2017-12-27 09:32:20.034这样的格式，所以不调用这个方法，改调用其他方法
                //vo.setCreateTime(VciDateUtil.str2Date(String.valueOf(btmItem.createTime),VciDateUtil.DateTimeFormat));
                vo.setCreateTime(Func.parse(btmItem.createTime, ConcurrentDateFormat.of(VciDateUtil.DateTimeFormat)));
                vo.setLastModifyTime( Func.parse(btmItem.modifyTime, ConcurrentDateFormat.of(VciDateUtil.DateTimeFormat)));
                vo.setTs(Func.parse(btmItem.ts, ConcurrentDateFormat.of(VciDateUtil.DateTimeFormat)));
            } catch (Exception e) {
                e.printStackTrace();
            }

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

@@ -327,6 +327,7 @@
     * æ ‘节点的分隔符不一样
     */
    private static final String TREE_NODE_ID_SEP = "@vcitreesep@";

    /**
     * èŽ·å–树形数据
     *
@@ -429,7 +430,6 @@
                if (StringUtils.isNotBlank(queryTemplate)) {
                    thisChildren = boService.queryCBOByScheme(queryTemplate, treeQuery.getConditionMap(), replaceMap, null, queryFieldList);
                } else {

                    thisChildren = boService.queryCBO(treeQuery.getParentBtmName(), treeQuery.getConditionMap(), null, queryFieldList);
                }
                return cbo2Trees(thisChildren, valueField, textField, parentFieldName, treeQuery.isShowCheckBox(), null);

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

@@ -2,12 +2,16 @@

import com.alibaba.fastjson.JSONObject;
import com.vci.base.common.utility.ObjectUtility;
import com.vci.client.common.providers.ServiceProvider;
import com.vci.corba.common.VCIError;
import com.vci.corba.omd.qtm.QTInfo;
import com.vci.corba.query.ObjectQueryService;
import com.vci.corba.query.ObjectQueryServicePrx;
import com.vci.frameworkcore.compatibility.SmUserQueryServiceI;
import com.vci.mw.client.InvocationUtility;
import com.vci.starter.web.annotation.Column;
import com.vci.starter.web.constant.QueryOptionConstant;
import com.vci.starter.web.constant.VciSystemVarConstants;
import com.vci.corba.query.data.BtmRefQueryOption;
import com.vci.starter.web.enumpck.BooleanEnum;
import com.vci.starter.web.exception.VciBaseException;
import com.vci.starter.web.pagemodel.DataGrid;
@@ -19,10 +23,11 @@
import com.vci.web.pageModel.*;
import com.vci.web.properties.WebProperties;
import com.vci.web.service.*;
import com.vci.web.util.Func;
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.apache.poi.ss.formula.functions.T;
import org.dom4j.DocumentException;
import org.dom4j.DocumentHelper;
import org.omg.CORBA.IntHolder;
@@ -34,10 +39,8 @@
import plm.bs.bom.clientobject.ClientBusinessObject;
import plm.bs.bom.clientobject.ClientLinkObject;
import plm.bs.bom.common.*;
import plm.corba.qt.BtmRefQueryOption;
import plm.corba.qt.KV;
import plm.corba.qt.QTServiceOperations;
import plm.corba.qt.QTWrapper;
import plm.oq.objectQuery.common.*;

import java.lang.reflect.Field;
@@ -140,7 +143,6 @@
            });
        }
    }


    /**
     * åˆå§‹åŒ–业务类型
@@ -465,7 +467,6 @@
        return checkDataExsitByColumn(btmName,columnName,Arrays.asList(columnValues.split(",")));
    }


    /**
     * æ ¹æ®æŸ¥è¯¢æ¡ä»¶æ¥æŸ¥è¯¢ä¸šåŠ¡ç±»åž‹ä¸‹çš„数据
     * @param btmType ä¸šåŠ¡ç±»åž‹çš„名称，会自动变成小写
@@ -567,7 +568,7 @@
            clauseList.add("*");
        }
        setRightValueToQueryTemplate(qt,conditionMap);//设置密级查询，和数据权限控制
        List<BtmRefQueryOption> refOpts = new ArrayList<BtmRefQueryOption>();
        List<com.vci.corba.query.data.BtmRefQueryOption> refOpts = new ArrayList<BtmRefQueryOption>();
        List<String> enumAttrName = new ArrayList<String>();
        List<String> thisQueryAttr = new ArrayList<String>();
        if(clauseList!=null && clauseList.size()>0){
@@ -614,24 +615,27 @@
        //设置分页信息和排序
        setPageAndOrderToQT(qt,ph);
        try {
            QTServiceOperations qtService = platformClientUtil.getQueryService();
            // QTServiceOperations qtService = platformClientUtil.getQueryService();
            ObjectQueryServicePrx qtService = ServiceProvider.getOQService();
            if(qtService == null){
                logger.error("没有找到查询服务");
                throw new VciBaseException(msgCodePrefix+"qtServerNull", new String[]{});
            }
            IntHolder count = new IntHolder();
            BusinessObject[] bos = null;
            ObjectQueryService.FindBTMObjectsV3Result bos = null;
            String invo = JSONObject.toJSONString(InvocationUtility.getInvocation());
            try{
                bos = qtService.findBTMObjectsV4(invo,qt.getId(), Tool.qtTOXMl(qt).asXML(),count,refOpts.toArray(new BtmRefQueryOption[0]));
                //bos = qtService.findBTMObjectsV3(invo,qt.getId(), Tool.qtTOXMl(qt).asXML(),count,refOpts.toArray(new BtmRefQueryOption[0]));
                bos = qtService.findBTMObjectsV3(qt.getId(), Tool.qtTOXMl(qt).asXML(), refOpts.toArray(new BtmRefQueryOption[0]));
            }catch (VCIError e){
                bos = qtService.findBTMObjectsV4(invo,qt.getId(), Tool.qtTOXMl(qt).asXML(),count,refOpts.toArray(new BtmRefQueryOption[0]));
                //bos = qtService.findBTMObjectsV4(invo,qt.getId(), Tool.qtTOXMl(qt).asXML(),count,refOpts.toArray(new BtmRefQueryOption[0]));
                bos = qtService.findBTMObjectsV3(qt.getId(), Tool.qtTOXMl(qt).asXML(), refOpts.toArray(new BtmRefQueryOption[0]));
            }

            if (bos != null && bos.length > 0) {
                for (BusinessObject bo : bos) {
            if (bos != null && bos.count > 0) {
                for (com.vci.corba.omd.data.BusinessObject bo : bos.returnValue) {
                    ClientBusinessObject cbo = new ClientBusinessObject();
                    cbo.setBusinessObject(bo);
                    BusinessObject businessObject = Func.copyProperties(bo, BusinessObject.class);
                    cbo.setBusinessObject(businessObject);
                    queryEnumText(cbo,enumAttrName);
                    allCbos.add(cbo);
                }
@@ -639,8 +643,8 @@
            }
            queryLcStatus(allCbos);
        } catch (VCIError e) {
//            logger.error(e.error_code,e);
//            throw WebUtil.getVciBaseException(e);
            //logger.error(e.error_code,e);
            throw WebUtil.getVciBaseException(e);
        }
        return allCbos;
    }
@@ -942,14 +946,15 @@
        QueryTemplate qt = null;
        try{
            VciBaseUtil.alertNotNull(name,"查询模板的名称");
            QTWrapper wrapper = platformClientUtil.getQueryService().getQT(name);
            // QTWrapper wrapper = platformClientUtil.getQueryService().getQT(name);
            QTInfo wrapper = ServiceProvider.getOMDService().getQTDService().getQT(name);
            qt = Tool.getQTByDoc(DocumentHelper.parseText(wrapper.qtText), name);
            //因为之前平台的Tool.replaceQTValues æ²¡æœ‰å¤„理 ${xxx}。， ä¸ºäº†å¿½ç•¥å¤§å°å†™ï¼Œæˆ‘们这里单独处理 weidy@2021-3-10
            //我们转换为小写
            Condition condition = qt.getCondition();
            Map<String,String> replaceLowMap = new HashMap<>();
            if(condition !=null && condition.getCIMap()!=null){
                Map<String, String> systemVarValueMap = VciSystemVarConstants.getSystemVarValueMap();
                // Map<String, String> systemVarValueMap = VciSystemVarConstants.getSystemVarValueMap();
                if(!CollectionUtils.isEmpty(replaceMap)){
                    replaceMap.forEach((key,value)->{
                        replaceLowMap.put(key.toLowerCase(),value);
@@ -963,7 +968,7 @@
                        if(StringUtils.isNotBlank(value)){
                            if(value.contains("#")){
                                //系统变量.支持一个
                                lInfo.getValue().setOrdinaryValue(systemVarValueMap.getOrDefault(value.toUpperCase(),""));
                                //lInfo.getValue().setOrdinaryValue(systemVarValueMap.getOrDefault(value.toUpperCase(),""));
                            }else if(value.contains("${")){
                                //有${xxxx}的方式
                                if(!CollectionUtils.isEmpty(replaceLowMap)) {
@@ -981,8 +986,8 @@
                });
            }
        }catch(VCIError e){
//            logger.error(e.error_code,e);
//            throw WebUtil.getVciBaseException(e);
            //logger.error(e.error_code,e);
            //throw WebUtil.getVciBaseException(e);
        } catch (DocumentException e) {
            logger.error("查询模板转换",e);
            throw new VciBaseException(this.msgCodePrefix + "qtError", new Object[]{name});

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

@@ -127,7 +127,6 @@
    @Autowired
    private OsDDLExportWordFieldProperties wordFieldProperties;


    /**
     * å¯¼å…¥ä¸šåŠ¡ç±»åž‹å’Œé“¾æŽ¥ç±»åž‹ï¼ŒåŒ…含属性，枚举，状态，生命周期，版本规则等全套内容
     *

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

@@ -631,4 +631,16 @@
        return NumberUtil.toInt(format(new Date(), "HH"));
    }

    /**
     * æ—¶é—´æˆ³è½¬æ¢ä¸ºDate
     * @return
     */
    public static Date parseByLong(Long dateLong, ConcurrentDateFormat format){
        try {
            return format.parse(format.format(new Date(dateLong)));
        } catch (ParseException e) {
            throw Exceptions.unchecked(e);
        }
    }

}

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

@@ -1727,6 +1727,17 @@
    }

    /**
     * å°†æ—¶é—´æˆ³è½¬æ¢ä¸ºDate时间
     *
     * @param dateLong æ—¶é—´æˆ³
     * @param format  ConcurrentDateFormat
     * @return æ—¶é—´
     */
    public static Date parse(Long dateLong, ConcurrentDateFormat format) {
        return DateUtil.parseByLong(dateLong, format);
    }

    /**
     * æ—¥æœŸæ—¶é—´æ ¼å¼åŒ–
     *
     * @param temporal æ—¶é—´