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,7 +2,9 @@ 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.frameworkcore.compatibility.SmUserQueryServiceI; import com.vci.mw.client.InvocationUtility; import com.vci.starter.web.annotation.Column; @@ -19,6 +21,7 @@ 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; @@ -140,7 +143,6 @@ }); } } /** * 初始化业务类型 @@ -465,7 +467,6 @@ return checkDataExsitByColumn(btmName,columnName,Arrays.asList(columnValues.split(","))); } /** * 根据查询条件来查询业务类型下的数据 * @param btmType 业务类型的名称，会自动变成小写 @@ -639,8 +640,8 @@ } queryLcStatus(allCbos); } catch (VCIError e) { // logger.error(e.error_code,e); // throw WebUtil.getVciBaseException(e); // logger.error(e.error_code,e); // hrow WebUtil.getVciBaseException(e); } return allCbos; } @@ -942,14 +943,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 +965,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 +983,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 时间
