From 1bd4203a391832f1f1217e08753b4ed570db3f3d Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期三, 10 四月 2024 11:58:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/OsBtmServiceImpl.java | 11 ++++++-----
1 files changed, 6 insertions(+), 5 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();
}
--
Gitblit v1.9.3