From f07aca58c4e1d96c8e75c90b021b00c593bcffff Mon Sep 17 00:00:00 2001
From: yuxc <yuxc@vci-tech.com>
Date: 星期二, 28 五月 2024 11:36:17 +0800
Subject: [PATCH] 1、平台接口修改以及web端后台的修改。 2、对平台的更新jar包上传。
---
Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/WebBtmIOServiceImpl.java | 22 +++++++++++-----------
1 files changed, 11 insertions(+), 11 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 b54c65b..0b98e8e 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
@@ -1,6 +1,7 @@
package com.vci.web.service.impl;
import com.vci.corba.common.VCIError;
+import com.vci.corba.omd.etm.EnumType;
import com.vci.starter.poi.bo.WriteExcelData;
import com.vci.starter.poi.bo.WriteExcelOption;
import com.vci.starter.poi.util.ExcelUtil;
@@ -31,7 +32,6 @@
import plm.corba.attribpool.AttribItem;
import plm.corba.btm.BTMServiceOperations;
import plm.corba.btm.BtmItem;
-import com.vci.corba.omd.etm.EnumChild;
import com.vci.corba.omd.etm.EnumItem;
import plm.corba.lifecycle.Bound;
import plm.corba.lifecycle.LifeCyle;
@@ -484,8 +484,8 @@
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> editEnumList = new ArrayList<EnumItem>();
+ List<EnumType> unExistEnumList = new ArrayList<EnumType>();
+ List<EnumType> editEnumList = new ArrayList<EnumType>();
String userId = WebUtil.getCurrentUserId();
String now = VciDateUtil.getNowString(VciDateUtil.DateTimeFormat);
@@ -493,7 +493,7 @@
for(OsEnumDTO enumDTO : enumDTOList){
String enumId = enumDTO.getId().toLowerCase().trim();
if(!existEnumIdList.contains(enumId)){
- EnumItem enumItem = new EnumItem();
+ EnumType enumItem = new EnumType();
enumItem.oid = "";
enumItem.ts = now;
enumItem.creator = userId;
@@ -507,24 +507,24 @@
enumItem.type = "int".equalsIgnoreCase(enumDTO.getEnumValueDataType())?"Integer":"String";
enumItem.length = enumDTO.getLength();
- List<EnumChild> childList = new ArrayList<EnumChild>();
+ List<EnumItem> childList = new ArrayList<EnumItem>();
Map<String, String> itemMaps = enumDTO.getItemMaps();
if(CollectionUtils.isEmpty(itemMaps)){
throw new VciBaseException("鏋氫妇{0}娌℃湁閫夐」",new String[]{enumItem.name});
}
for(String key : itemMaps.keySet()){
String value = itemMaps.get(key);
- EnumChild enumChild = new EnumChild();
+ EnumItem enumChild = new EnumItem();
enumChild.name = value;
enumChild.value = key;
enumChild.description = "";
childList.add(enumChild);
}
- enumItem.children = childList.toArray(new EnumChild[0]);
+ enumItem.items = childList.toArray(new EnumItem[0]);
unExistEnumList.add(enumItem);
}else{
//淇敼鍐呭
- EnumItem enumItem = new EnumItem();
+ EnumType enumItem = new EnumType();
OsEnumVO enumVO = allEnumMap.get(enumId);
enumItem.oid = enumVO.getOid();
// enumItem.createTime = VciDateUtil.date2Str(enumVO.getCreateTime(),VciDateUtil.DateTimeFormat);
@@ -539,20 +539,20 @@
enumItem.type = "int".equalsIgnoreCase(enumDTO.getEnumValueDataType())?"Integer":"String";
enumItem.length = enumDTO.getLength();
- List<EnumChild> childList = new ArrayList<EnumChild>();
+ List<EnumItem> childList = new ArrayList<EnumItem>();
Map<String, String> itemMaps = enumDTO.getItemMaps();
if(CollectionUtils.isEmpty(itemMaps)){
throw new VciBaseException("鏋氫妇{0}娌℃湁閫夐」",new String[]{enumItem.name});
}
for(String key : itemMaps.keySet()){
String value = itemMaps.get(key);
- EnumChild enumChild = new EnumChild();
+ EnumItem enumChild = new EnumItem();
enumChild.name = value;
enumChild.value = key;
enumChild.description = "";
childList.add(enumChild);
}
- enumItem.children = childList.toArray(new EnumChild[0]);
+ enumItem.items = childList.toArray(new EnumItem[0]);
editEnumList.add(enumItem);
}
}
--
Gitblit v1.9.3