From 438d8954dfb9d9f262d3e11594266a51e9f0dd5b Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期二, 09 四月 2024 10:03:27 +0800
Subject: [PATCH] Func中添加时间戳转Date方法parse(查询数据库取到的是时间戳)。
---
Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/WebBoServiceImpl.java | 20 +++++++++++---------
Source/platformProject/vci-platform-web/src/main/java/com/vci/web/util/Func.java | 11 +++++++++++
Source/platformProject/vci-platform-web/src/main/java/com/vci/web/util/DateUtil.java | 12 ++++++++++++
Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/WebBtmIOServiceImpl.java | 1 -
Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/OsBtmServiceImpl.java | 11 ++++++-----
Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/UIDataServiceImpl.java | 2 +-
6 files changed, 41 insertions(+), 16 deletions(-)
diff --git a/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/OsBtmServiceImpl.java b/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/OsBtmServiceImpl.java
index 4b37f1d..3099962 100644
--- a/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/OsBtmServiceImpl.java
+++ b/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();
}
diff --git a/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/UIDataServiceImpl.java b/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/UIDataServiceImpl.java
index 5e6e69a..7741d25 100644
--- a/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/UIDataServiceImpl.java
+++ b/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);
diff --git a/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/WebBoServiceImpl.java b/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/WebBoServiceImpl.java
index 55b4ed4..e38bdf8 100644
--- a/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/WebBoServiceImpl.java
+++ b/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);
//鍥犱负涔嬪墠骞冲彴鐨凾ool.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});
diff --git a/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/WebBtmIOServiceImpl.java b/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/WebBtmIOServiceImpl.java
index 4a67660..b54c65b 100644
--- a/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/WebBtmIOServiceImpl.java
+++ b/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/WebBtmIOServiceImpl.java
@@ -127,7 +127,6 @@
@Autowired
private OsDDLExportWordFieldProperties wordFieldProperties;
-
/**
* 瀵煎叆涓氬姟绫诲瀷鍜岄摼鎺ョ被鍨嬶紝鍖呭惈灞炴�э紝鏋氫妇锛岀姸鎬侊紝鐢熷懡鍛ㄦ湡锛岀増鏈鍒欑瓑鍏ㄥ鍐呭
*
diff --git a/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/util/DateUtil.java b/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/util/DateUtil.java
index 6b86fbe..605868d 100644
--- a/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/util/DateUtil.java
+++ b/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);
+ }
+ }
+
}
diff --git a/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/util/Func.java b/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/util/Func.java
index ffb3a4e..86007ae 100644
--- a/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/util/Func.java
+++ b/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/util/Func.java
@@ -1727,6 +1727,17 @@
}
/**
+ * 灏嗘椂闂存埑杞崲涓篋ate鏃堕棿
+ *
+ * @param dateLong 鏃堕棿鎴�
+ * @param format ConcurrentDateFormat
+ * @return 鏃堕棿
+ */
+ public static Date parse(Long dateLong, ConcurrentDateFormat format) {
+ return DateUtil.parseByLong(dateLong, format);
+ }
+
+ /**
* 鏃ユ湡鏃堕棿鏍煎紡鍖�
*
* @param temporal 鏃堕棿
--
Gitblit v1.9.3