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 | 42 ++++++++++++++++++++++--------------------
1 files changed, 22 insertions(+), 20 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..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;
@@ -8,8 +9,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 +19,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 +32,7 @@
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.EnumItem;
import plm.corba.lifecycle.Bound;
import plm.corba.lifecycle.LifeCyle;
import plm.corba.lifecycle.TransitionVO;
@@ -128,7 +126,6 @@
*/
@Autowired
private OsDDLExportWordFieldProperties wordFieldProperties;
-
/**
* 瀵煎叆涓氬姟绫诲瀷鍜岄摼鎺ョ被鍨嬶紝鍖呭惈灞炴�э紝鏋氫妇锛岀姸鎬侊紝鐢熷懡鍛ㄦ湡锛岀増鏈鍒欑瓑鍏ㄥ鍐呭
@@ -487,70 +484,75 @@
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);
+ Long nowLong = System.currentTimeMillis();
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;
- 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";
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);
+ // 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();
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