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/OsEnumServiceI.java | 3
Source/ProjectWeb/src/views/base/UIContentViewerInDialog.vue | 1
Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/OsBtmServiceI.java | 4 -
Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/UIEngineServiceImpl.java | 36 ++++++------
Source/ProjectWeb/src/views/base/UIContentViewer.vue | 23 +++----
Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/WebBtmIOServiceImpl.java | 23 ++++---
Source/platformProject/vci-platform-web/src/main/java/com/vci/web/controller/WebUIController.java | 2
Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/OsBtmServiceImpl.java | 21 +++---
Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/OsEnumServiceImpl.java | 25 ++++----
9 files changed, 69 insertions(+), 69 deletions(-)
diff --git a/Source/ProjectWeb/src/views/base/UIContentViewer.vue b/Source/ProjectWeb/src/views/base/UIContentViewer.vue
index 62b9081..01f01db 100644
--- a/Source/ProjectWeb/src/views/base/UIContentViewer.vue
+++ b/Source/ProjectWeb/src/views/base/UIContentViewer.vue
@@ -1,6 +1,6 @@
<template>
<!--UI涓婁笅鏂囩殑灞曠ず鍣�-->
- <div style="height:calc(100% - 4px);min-width:1200px">
+ <div style="height:calc(100% - 4px);min-width:1200px" >
<el-header v-if="uiDefineVO.northAreas && uiDefineVO.northAreas.length>0">
<UIContentArea :key="'northArea-'+uiDefineVO.oid" :areasData="uiDefineVO.northAreas"
:dataStore="checkedData.northArea"
@@ -78,13 +78,9 @@
}
},
watch: {
- typeAContent:{
- handler(newV,oldV){
- if(oldV!=newV && !verifyNull(newV)){
- this.initUI();
- }
- },
- immediate: true,
+ $route(to, from) {
+ this.getTheParameters()
+ this.initUI();
}
},
computed: {
@@ -97,14 +93,17 @@
this.$message.error("閰嶇疆鐨勪俊鎭敊璇紝璇峰弬鑰僢s=缁勪欢name?type=xxx&context=yyy¶m=zzz杩欑褰㈠紡銆傚叾涓璽ype鏄笟鍔＄被鍨嬶紙鎴栭摼鎺ョ被鍨嬶級锛宑ontext鏄疷I涓婁笅鏂囩殑鍚嶇О");
return false;
}
- this.btmType = this.$route.query.type;
- this.content = this.$route.query.context || this.$route.query.content;
- this.sourceData = this.$route.query;
+ this.getTheParameters()
+ this.initUI();
},
methods: {
+ getTheParameters(){
+ this.btmType = this.$route.query.type;
+ this.content = this.$route.query.context || this.$route.query.content;
+ this.sourceData = this.$route.query;
+ },
initUI() {
getUIContent({btmType: this.btmType, id: this.content}).then(res => {
- console.log(res.data.obj)
this.uiDefineVO = res.data.obj;
this.initContent();
})
diff --git a/Source/ProjectWeb/src/views/base/UIContentViewerInDialog.vue b/Source/ProjectWeb/src/views/base/UIContentViewerInDialog.vue
index a021921..6199887 100644
--- a/Source/ProjectWeb/src/views/base/UIContentViewerInDialog.vue
+++ b/Source/ProjectWeb/src/views/base/UIContentViewerInDialog.vue
@@ -122,7 +122,6 @@
methods: {
initUI() {
getUIContent({btmType: this.btmType, id: this.content}).then(res => {
- console.log(res.data.obj)
this.uiDefineVO = res.data.obj;
this.initContent();
})
diff --git a/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/controller/WebUIController.java b/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/controller/WebUIController.java
index 04b1109..f6cbef8 100644
--- a/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/controller/WebUIController.java
+++ b/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/controller/WebUIController.java
@@ -1,5 +1,6 @@
package com.vci.web.controller;
+import com.vci.starter.web.annotation.controller.VciUnCheckRight;
import com.vci.starter.web.annotation.log.VciBusinessLog;
import com.vci.starter.web.pagemodel.BaseResult;
import com.vci.web.pageModel.UIContentVO;
@@ -41,6 +42,7 @@
* @return UI涓婁笅鏂�
*/
@GetMapping("/getUIContentByBtmTypeAndId")
+ @VciUnCheckRight
public UIContentVO getUIContentByBtmTypeAndId(String btmType,String id){
return uiService.getUIContentByBtmTypeAndId(btmType,id);
}
diff --git a/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/OsBtmServiceI.java b/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/OsBtmServiceI.java
index 4d6b558..3d19305 100644
--- a/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/OsBtmServiceI.java
+++ b/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/OsBtmServiceI.java
@@ -1,10 +1,9 @@
package com.vci.web.service;
-import com.vci.starter.web.pagemodel.BaseResult;
import com.vci.starter.web.pagemodel.DataGrid;
import com.vci.starter.web.pagemodel.PageHelper;
import com.vci.web.pageModel.*;
-import plm.corba.btm.BtmItem;
+import com.vci.corba.omd.btm.BtmItem;
import java.util.Collection;
import java.util.List;
import java.util.Map;
@@ -114,7 +113,6 @@
* @param btmId 涓氬姟绫诲瀷涓婚敭
*/
OsERVO createERDiagram(String btmId);
-
/**
* 鑾峰彇浣跨敤杩欎釜涓氬姟绫诲瀷鐨凟-R鍥�
diff --git a/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/OsEnumServiceI.java b/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/OsEnumServiceI.java
index 9a7c1f1..266bcbb 100644
--- a/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/OsEnumServiceI.java
+++ b/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/OsEnumServiceI.java
@@ -3,10 +3,9 @@
import com.vci.starter.web.pagemodel.DataGrid;
import com.vci.starter.web.pagemodel.PageHelper;
import com.vci.web.pageModel.KeyValue;
-import com.vci.web.pageModel.OsBtmTypeVO;
import com.vci.web.pageModel.OsEnumItemVO;
import com.vci.web.pageModel.OsEnumVO;
-import plm.corba.enumManager.EnumItem;
+import com.vci.corba.omd.etm.EnumItem;
import java.util.Collection;
import java.util.List;
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 a5f1944..4b37f1d 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
@@ -1,5 +1,6 @@
package com.vci.web.service.impl;
+import com.vci.client.common.providers.ServiceProvider;
import com.vci.corba.common.VCIError;
import com.vci.starter.web.annotation.log.VciUnLog;
import com.vci.starter.web.enumpck.BooleanEnum;
@@ -19,15 +20,13 @@
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.cache.annotation.CacheEvict;
-import org.springframework.cache.annotation.CachePut;
import org.springframework.cache.annotation.Cacheable;
import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
-import plm.corba.btm.BtmItem;
+import com.vci.corba.omd.btm.BtmItem;
import java.util.*;
-import java.util.function.Supplier;
import java.util.stream.Collectors;
import static com.vci.web.constant.CacheNameConstant.VCI_OBJECT_SERVICE;
@@ -48,8 +47,8 @@
/**
* 骞冲彴鐨勮皟鐢ㄥ伐鍏风被
*/
- @Autowired
- private PlatformClientUtil platformClientUtil;
+ //@Autowired
+ //private PlatformClientUtil platformClientUtil;
/**
* 灞炴�х殑鏈嶅姟
@@ -82,6 +81,7 @@
@Autowired(required = false)
@Lazy
private OsBtmServiceI self;
+
/**
* 鏌ヨ鎵�鏈夌殑涓氬姟绫诲瀷
*
@@ -91,7 +91,8 @@
@VciUnLog
public List<OsBtmTypeVO> selectAllBtm() {
try {
- return btmDO2VOs(Arrays.stream(platformClientUtil.getBtmService().getAllBtmItem("")).collect(Collectors.toList()));
+ // return btmDO2VOs(Arrays.stream(platformClientUtil.getBtmService().getAllBtmItem("")).collect(Collectors.toList()));
+ return btmDO2VOs(Arrays.stream(ServiceProvider.getOMDService().getBTMService().getAllBtmItem("")).collect(Collectors.toList()));
} catch (VCIError vciError) {
throw WebUtil.getVciBaseException(vciError);
}
@@ -139,15 +140,15 @@
vo.setCreator(btmItem.creator);
vo.setLastModifier(btmItem.modifier);
try {
- vo.setCreateTime(VciDateUtil.str2Date(btmItem.createTime,VciDateUtil.DateTimeFormat));
- vo.setLastModifyTime(VciDateUtil.str2Date(btmItem.modifyTime,VciDateUtil.DateTimeFormat));
- vo.setTs(VciDateUtil.str2Date(btmItem.ts,VciDateUtil.DateTimeMillFormat));
+ 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));
} catch (Exception e) {
e.printStackTrace();
}
vo.setDescription(btmItem.description);
vo.setId(btmItem.name);
- vo.setName(btmItem.label);
+ vo.setName(btmItem.label);
vo.setLifeCycleId(btmItem.lifeCycle);
vo.setAbstractFlag(btmItem.isAbstract);
vo.setImplClass(btmItem.implClass);
diff --git a/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/OsEnumServiceImpl.java b/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/OsEnumServiceImpl.java
index 093d3de..17970c2 100644
--- a/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/OsEnumServiceImpl.java
+++ b/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/OsEnumServiceImpl.java
@@ -1,8 +1,8 @@
package com.vci.web.service.impl;
+import com.vci.client.common.providers.ServiceProvider;
import com.vci.corba.common.VCIError;
import com.vci.starter.web.annotation.log.VciUnLog;
-import com.vci.starter.web.enumpck.DataSecretEnum;
import com.vci.starter.web.enumpck.UserSecretEnum;
import com.vci.starter.web.exception.VciBaseException;
import com.vci.starter.web.pagemodel.DataGrid;
@@ -20,15 +20,14 @@
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.cache.annotation.CacheEvict;
-import org.springframework.cache.annotation.CachePut;
import org.springframework.cache.annotation.Cacheable;
import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
import org.springframework.web.util.HtmlUtils;
import plm.bs.bom.clientobject.ClientBusinessObject;
-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.enumManager.EnumItemFilter;
import java.util.*;
@@ -48,8 +47,8 @@
/**
* 骞冲彴璋冪敤瀹㈡埛绔�
*/
- @Autowired
- private PlatformClientUtil platformClientUtil;
+ //@Autowired
+ //private PlatformClientUtil platformClientUtil;
/**
* 鐢熷懡鍛ㄦ湡
@@ -153,7 +152,6 @@
return "";
}
-
/**
* 鑾峰彇鏋氫妇鐨勮嫳鏂囧��
* @param enumCode 鏋氫妇鐨勭紪鍙凤紙鑻辨枃鍚嶇О锛�
@@ -213,7 +211,8 @@
EnumItemFilter filter = new EnumItemFilter("");
//鍚庨潰涓や釜鍙傛暟灞呯劧瀹屽叏娌℃湁浣滅敤
try {
- return enumDO2VOs(Arrays.stream(platformClientUtil.getEnumService().getEmItems(filter,1,1)).collect(Collectors.toList()));
+ return enumDO2VOs(Arrays.stream(ServiceProvider.getOMDService().getEnumService().getEmItems("",1,1)).collect(Collectors.toList()));
+ //return enumDO2VOs(Arrays.stream(platformClientUtil.getEnumService().getEmItems(filter,1,1)).collect(Collectors.toList()));
} catch (VCIError vciError) {
throw WebUtil.getVciBaseException(vciError);
}
@@ -263,15 +262,15 @@
enumVO.setId(enumItem.name);
enumVO.setName(enumItem.label);
enumVO.setEnumValueDataType(enumItem.type);
- enumVO.setLength(enumItem.length);
+ enumVO.setLength((int) enumItem.length);
try {
- enumVO.setLastModifyTime(VciDateUtil.str2Date(enumItem.createTime,VciDateUtil.DateTimeFormat));
+ enumVO.setLastModifyTime(VciDateUtil.str2Date(String.valueOf(enumItem.createTime),VciDateUtil.DateTimeFormat));
} catch (Exception e) {
e.printStackTrace();
}
try {
- enumVO.setCreateTime(VciDateUtil.str2Date(enumItem.createTime,VciDateUtil.DateTimeFormat));
+ enumVO.setCreateTime(VciDateUtil.str2Date(String.valueOf(enumItem.createTime),VciDateUtil.DateTimeFormat));
} catch (Exception e) {
e.printStackTrace();
}
@@ -365,7 +364,7 @@
if(!CollectionUtils.isEmpty(enumItemList)){
enumItemList.stream().forEach(enumItem -> {
try {
- platformClientUtil.getEnumService().addEmItem(enumItem);
+ ServiceProvider.getOMDService().getEnumService().addEmItem(enumItem);
} catch (VCIError e) {
throw WebUtil.getVciBaseException(e);
}
@@ -383,7 +382,7 @@
if(!CollectionUtils.isEmpty(enumItemList)){
enumItemList.stream().forEach(enumItem -> {
try {
- platformClientUtil.getEnumService().modifyEmItem(enumItem);
+ ServiceProvider.getOMDService().getEnumService().modifyEmItem(enumItem);
} catch (VCIError e) {
throw WebUtil.getVciBaseException(e);
}
diff --git a/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/UIEngineServiceImpl.java b/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/UIEngineServiceImpl.java
index a4f664c..c7876ed 100644
--- a/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/UIEngineServiceImpl.java
+++ b/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/UIEngineServiceImpl.java
@@ -25,6 +25,7 @@
import com.vci.web.service.OsBtmServiceI;
import com.vci.web.service.UIEngineServiceI;
import com.vci.web.service.WebBoServiceI;
+import com.vci.web.util.Func;
import com.vci.web.util.PlatformClientUtil;
import com.vci.web.util.WebUtil;
import com.vci.web.xmlmodel.UIComponentDefineXO;
@@ -508,9 +509,6 @@
@Override
@VciUnLog
public UITableDefineVO tableDO2VO(PortalVI portal, boolean queryDetail) {
- if(null != null){
-
- }
UITableDefineVO tableDefineVO = new UITableDefineVO();
tableDefineVO.setOid(portal.id);
tableDefineVO.setId(portal.viName);
@@ -839,8 +837,8 @@
actionVO.setCreator(action.plCreateUser);
actionVO.setLastModifier(action.plModifyUser);
try {
- actionVO.setCreateTime(VciDateUtil.str2Date(String.valueOf(action.plCreateTime), VciDateUtil.DateTimeFormat));
- actionVO.setLastModifyTime(VciDateUtil.str2Date(String.valueOf(action.plCreateTime), VciDateUtil.DateTimeFormat));
+ actionVO.setCreateTime(new Date(action.plCreateTime));
+ actionVO.setLastModifyTime(new Date(action.plCreateTime));
}catch (Throwable e){
logger.error("杞崲鏃堕棿",e);
}
@@ -924,8 +922,8 @@
contentVO.setDescription(pageLayoutDefination.plDesc);
contentVO.setCreator(pageLayoutDefination.plCreateUser);
try {
- contentVO.setCreateTime(VciDateUtil.str2Date(String.valueOf(pageLayoutDefination.plCreateTime),VciDateUtil.DateTimeFormat));
- contentVO.setLastModifyTime(VciDateUtil.str2Date(String.valueOf(pageLayoutDefination.plModifyTime),VciDateUtil.DateTimeFormat));
+ contentVO.setCreateTime(new Date(pageLayoutDefination.plCreateTime));
+ contentVO.setLastModifyTime(new Date(pageLayoutDefination.plModifyTime));
} catch (Exception e) {
e.printStackTrace();
}
@@ -1146,8 +1144,8 @@
}
layoutVO.setCreator(page.plCreateUser);
try {
- layoutVO.setCreateTime(VciDateUtil.str2Date(String.valueOf(page.plCreateTime),VciDateUtil.DateTimeFormat));
- layoutVO.setLastModifyTime(VciDateUtil.str2Date(String.valueOf(page.plModifyTime),VciDateUtil.DateTimeFormat));
+ layoutVO.setCreateTime(new Date(page.plCreateTime));
+ layoutVO.setLastModifyTime(new Date(page.plModifyTime));
} catch (Exception e) {
e.printStackTrace();
}
@@ -1225,7 +1223,7 @@
* @param pages 鏁版嵁瀵硅薄
* @return 鏄剧ず瀵硅薄
*/
- private List<UIComponentVO> uiComponentDO2VOs(Collection<PLPageDefination> pages, boolean queryDetail){
+ private List<UIComponentVO> uiComponentDO2VOs(Collection<com.vci.corba.portal.data.PLPageDefination> pages, boolean queryDetail){
List<UIComponentVO> componentVOS = new ArrayList<>();
pages.stream().forEach(page->{
componentVOS.add(uiComponentDO2VO(page,queryDetail));
@@ -1456,10 +1454,10 @@
* @return 鏄剧ず瀵硅薄
*/
@Override
- public UIButtonDefineVO buttonDO2VO(PLTabButton button) {
+ public UIButtonDefineVO buttonDO2VO(com.vci.corba.portal.data.PLTabButton button) {
UIButtonDefineVO buttonVO = new UIButtonDefineVO();
Map<String, UIActionVO> actionVOMap = self.selectAllActionMap();
- //Map<String, UIActionVO> actionVOMap = ServiceProvider.getUIService().getAllPLAction();
+// Map<String, UIActionVO> actionVOMap = ServiceProvider.getUIService().getAllPLAction();
if(button !=null){
buttonVO.setOid(button.plOId);
buttonVO.setPkComponent(button.plTableOId);
@@ -1555,22 +1553,24 @@
@Cacheable(value = VCI_OBJECT_SERVICE,key = "#p0.concat('${uicache}').concat(#p1)",unless = "#result == null || #p0 == null || #p1 ==null")
public UIContentVO getUIContentByBtmTypeAndId(String btmType, String id) {
WebUtil.alertNotNull(btmType,"涓氬姟绫诲瀷鎴栬�呴摼鎺ョ被鍨�",id,"UI涓婁笅鏂囩殑缂栧彿");
- PLPageLayoutDefination[] obj = null;
+ PLUILayout[] obj = null;
try {
- obj = platformClientUtil.getPortalService().getPLPageLayoutDefinationsByRelatedType(btmType);
+ obj = ServiceProvider.getUIService().getPLUILayoutsByRelatedType(btmType);
+// obj = platformClientUtil.getPortalService().getPLPageLayoutDefinationsByRelatedType(btmType);
+// obj = ServiceProvider.geT(btmType);
+
} catch (VCIError vciError) {
throw WebUtil.getVciBaseException(vciError);
}
- PLPageLayoutDefination context = null;
+ PLUILayout context = null;
for (int i = 0; i < obj.length; i++) {
if (obj[i].plCode.equals(id)) {
context = obj[i];
break;
}
}
- //return UIContentDO2VO(context,true);
- return UIContentDO2VO(null,true);
+ return UIContentDO2VO(context,true);
+// return UIContentDO2VO(null,true);
}
-
}
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