From 62424b385a7348c08e2def54e7d0854ce9d37243 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期一, 08 四月 2024 15:56:53 +0800
Subject: [PATCH] OsBtmServiceImpl和BtmItem类做的相关调整提交。

---
 Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/OsEnumServiceI.java           |    3 -
 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 |    4 -
 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/service/impl/OsBtmServiceImpl.java    |   21 +++++-----
 Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/OsEnumServiceImpl.java   |   25 ++++++------
 6 files changed, 39 insertions(+), 41 deletions(-)

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..dfe9ef3 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);
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