From 9d003325865fe5adb195a0225be1893eb3d03606 Mon Sep 17 00:00:00 2001
From: wangting <675591594@qq.com>
Date: 星期一, 08 四月 2024 16:27:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/WebBtmIOServiceImpl.java | 23 +++++++++++++----------
1 files changed, 13 insertions(+), 10 deletions(-)
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 c9a6f4a..4a67660 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
@@ -8,8 +8,6 @@
import com.vci.starter.web.constant.FrameWorkLcStatusConstant;
import com.vci.starter.web.enumpck.VciFieldTypeEnum;
import com.vci.starter.web.exception.VciBaseException;
-import com.vci.starter.web.pagemodel.DataGrid;
-import com.vci.starter.web.pagemodel.PageHelper;
import com.vci.starter.web.util.BeanUtil;
import com.vci.starter.web.util.LocalFileUtil;
import com.vci.starter.web.util.VciBaseUtil;
@@ -20,10 +18,10 @@
import com.vci.web.pageModel.*;
import com.vci.web.properties.OsDDLExportWordFieldProperties;
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.tomcat.jni.Local;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -33,8 +31,8 @@
import plm.corba.attribpool.AttribItem;
import plm.corba.btm.BTMServiceOperations;
import plm.corba.btm.BtmItem;
-import plm.corba.enumManager.EnumChild;
-import plm.corba.enumManager.EnumItem;
+import com.vci.corba.omd.etm.EnumChild;
+import com.vci.corba.omd.etm.EnumItem;
import plm.corba.lifecycle.Bound;
import plm.corba.lifecycle.LifeCyle;
import plm.corba.lifecycle.TransitionVO;
@@ -487,11 +485,12 @@
private void importEnums(Collection<OsEnumDTO> enumDTOList) throws VciBaseException{
Set<String> existEnumIdList = enumService.selectAllEnumMap().keySet();
Map<String, OsEnumVO> allEnumMap = enumService.selectAllEnumMap();
- List< EnumItem> unExistEnumList = new ArrayList<EnumItem>();
+ List<EnumItem> unExistEnumList = new ArrayList<EnumItem>();
List<EnumItem> editEnumList = new ArrayList<EnumItem>();
String userId = WebUtil.getCurrentUserId();
String now = VciDateUtil.getNowString(VciDateUtil.DateTimeFormat);
+ Long nowLong = System.currentTimeMillis();
for(OsEnumDTO enumDTO : enumDTOList){
String enumId = enumDTO.getId().toLowerCase().trim();
if(!existEnumIdList.contains(enumId)){
@@ -499,9 +498,11 @@
enumItem.oid = "";
enumItem.ts = now;
enumItem.creator = userId;
- enumItem.createTime = now;
+ // enumItem.createTime = now;
+ enumItem.createTime = nowLong;
enumItem.modifier = userId;
- enumItem.modifyTime = now;
+ // enumItem.modifyTime = now;
+ enumItem.modifyTime = nowLong;
enumItem.name = enumDTO.getId();
enumItem.label = enumDTO.getName();
enumItem.type = "int".equalsIgnoreCase(enumDTO.getEnumValueDataType())?"Integer":"String";
@@ -527,10 +528,12 @@
EnumItem enumItem = new EnumItem();
OsEnumVO enumVO = allEnumMap.get(enumId);
enumItem.oid = enumVO.getOid();
- enumItem.createTime = VciDateUtil.date2Str(enumVO.getCreateTime(),VciDateUtil.DateTimeFormat);
+ // enumItem.createTime = VciDateUtil.date2Str(enumVO.getCreateTime(),VciDateUtil.DateTimeFormat);
+ enumItem.createTime = Func.toLong(enumVO.getCreateTime());
enumItem.creator = enumVO.getCreator();
enumItem.modifier = userId;
- enumItem.modifyTime = now;
+ // enumItem.modifyTime = now;
+ enumItem.modifyTime = nowLong;
enumItem.name = enumVO.getId();
enumItem.ts = VciDateUtil.date2Str(enumVO.getTs(),VciDateUtil.DateTimeMillFormat);
enumItem.label = enumDTO.getName();
--
Gitblit v1.9.3