From 5203081b68e3a8dc139d1807b2f8774e4a00a82a Mon Sep 17 00:00:00 2001
From: ludc <ludc@vci-tech.com>
Date: 星期四, 16 一月 2025 11:11:59 +0800
Subject: [PATCH] 退出登录接口增加清除session、jwttoken等缓存信息
---
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/WebBtmIOServiceImpl.java | 140 +++++++++++++++++++++++++++-------------------
1 files changed, 82 insertions(+), 58 deletions(-)
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/WebBtmIOServiceImpl.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/WebBtmIOServiceImpl.java
index 1d5153f..9586abf 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/WebBtmIOServiceImpl.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/WebBtmIOServiceImpl.java
@@ -1,8 +1,5 @@
package com.vci.web.service.impl;
-import com.vci.client.omd.linktype.util.Tool;
-import com.vci.client.omd.provider.BtmProvider;
-import com.vci.client.omd.provider.LinkTypeProvider;
import com.vci.corba.common.PLException;
import com.vci.corba.omd.atm.AttributeDef;
import com.vci.corba.omd.btm.BTMServicePrx;
@@ -15,6 +12,8 @@
import com.vci.corba.omd.lcm.TransitionVOEvent;
import com.vci.corba.omd.ltm.LinkType;
import com.vci.corba.omd.stm.StatePool;
+import com.vci.dto.*;
+import com.vci.pagemodel.*;
import com.vci.starter.poi.bo.WriteExcelData;
import com.vci.starter.poi.bo.WriteExcelOption;
import com.vci.starter.poi.util.ExcelUtil;
@@ -22,17 +21,15 @@
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.util.BeanUtil;
+import com.vci.starter.web.util.BeanUtilForVCI;
+import com.vci.starter.web.util.Lcm.Func;
import com.vci.starter.web.util.LocalFileUtil;
import com.vci.starter.web.util.VciBaseUtil;
import com.vci.starter.web.util.VciDateUtil;
import com.vci.starter.word.bo.WordMergeStartTableDataBO;
import com.vci.starter.word.util.WordUtil;
-import com.vci.web.dto.*;
-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;
@@ -48,7 +45,7 @@
import java.util.concurrent.ConcurrentHashMap;
import java.util.stream.Collectors;
-import static com.vci.client.omd.attribpool.ui.VTDataTypePanel.*;
+import static com.vci.omd.constants.AttributeConstants.*;
/**
@@ -204,7 +201,7 @@
* @param statusDTOList 瑕佸鍏ョ殑鐘舵�佺殑鏁版嵁浼犺緭瀵硅薄鍒楄〃
* @throws VciBaseException 鏌ヨ鎴栬�呮墽琛屽嚭閿欑殑鏃跺�欎細鎶涘嚭寮傚父
*/
- private void importStatus( Collection<OsStatusDTO> statusDTOList) throws VciBaseException{
+ private void importStatus( Collection<OsStatusDTO> statusDTOList) throws Exception {
//瑕佸鍏ョ殑鐘舵�佺殑鎵�鏈夎嫳鏂囧悕绉�
List<String> statusIdList = new ArrayList<String>();
Iterator<OsStatusDTO> iterator = statusDTOList.iterator();
@@ -246,7 +243,7 @@
* @param lifeCycleDTOList 瑕佸鍏ョ殑鐢熷懡鍛ㄦ湡鏁版嵁浼犺緭瀵硅薄鍒楄〃
* @throws VciBaseException 鏌ヨ鎴栬�呬繚瀛樺嚭閿欑殑鏃跺�欙紝浼氭姏鍑哄紓甯�
*/
- private void importLifeCycles(Collection<OsLifeCycleDTO> lifeCycleDTOList) throws VciBaseException{
+ private void importLifeCycles(Collection<OsLifeCycleDTO> lifeCycleDTOList) throws VciBaseException, PLException {
Set<String> existLifeCycleIds = lifeCycleService.selectAllLifeCycleMap().keySet();
//鐢熷懡鍛ㄦ湡鐨勫悕绉版病鏈夎浆涓哄皬鍐欙紝浣嗘槸骞冲彴鍙堝尯鍒嗗ぇ灏忓啓
List<String> existLifeCycleLowIds = existLifeCycleIds.stream().map(s->s.toLowerCase(Locale.ROOT)).collect(Collectors.toList());
@@ -259,7 +256,7 @@
List<LifeCycle> unExistLifeCycleList = new ArrayList<LifeCycle>();
List<LifeCycle> editLifeCycleList = new ArrayList<LifeCycle>();
String userId = WebUtil.getCurrentUserId();
- long now = VciDateUtil.getTime(VciDateUtil.getNow());
+ long now = VciDateUtil.getNowTime();
//寰幆鍒嗘瀽闇�瑕佹坊鍔犺繕鏄慨鏀�
for(OsLifeCycleDTO lifeCycleDTO : lifeCycleDTOList){
String lifeCycleId = lifeCycleDTO.getId().toLowerCase().trim();
@@ -274,10 +271,10 @@
lifeCyle.ts = VciDateUtil.getNowString(VciDateUtil.DateTimeMillFormat);
lifeCyle.name = lifeCycleDTO.getId();
}else {
- lifeCyle = lifeCycleService.lifeCycleVO2DO( allLifeCycleLowMap.get(lifeCycleId));
+ lifeCyle = lifeCycleService.lifeCycleVO2DO(allLifeCycleLowMap.get(lifeCycleId));
edit = true;
}
- lifeCyle.tag = lifeCycleDTO.getName();
+ lifeCyle.label = lifeCycleDTO.getName();
lifeCyle.description = lifeCycleDTO.getDescription() == null?"":lifeCycleDTO.getDescription();
lifeCyle.startState = lifeCycleDTO.getStartStatus() == null?"":lifeCycleDTO.getStartStatus();
lifeCyle.modifier = userId;
@@ -378,7 +375,7 @@
List<AttributeDef> unExistAttrList = new ArrayList<AttributeDef>();
List<AttributeDef> editAttrList = new ArrayList<AttributeDef>();
String userId = WebUtil.getCurrentUserId();
- long now = VciDateUtil.getTime(VciDateUtil.getNow());
+ long now = VciDateUtil.getNowTime();
//寰幆鍒嗘瀽闇�瑕佹坊鍔犺繕鏄慨鏀�
for (OsAttributeDTO attributeDTO : attributeDTOList) {
String attrId = attributeDTO.getId().toLowerCase().trim();
@@ -578,7 +575,7 @@
List<BizType> unExistBtmList = new ArrayList<BizType>();
List<BizType> editBtmList = new ArrayList<BizType>();
String userId = WebUtil.getCurrentUserId();
- long now = VciDateUtil.getTime(VciDateUtil.getNow());
+ long now = VciDateUtil.getNowTime();
for (OsBtmTypeDTO btmTypeDTO : btmTypeDTOList) {
String btmId = btmTypeDTO.getId().toLowerCase().trim();
@@ -630,21 +627,25 @@
btmService.addBizType(btmItem);
//鎵ц瀹屾垚浜嗛渶瑕佸垱寤鸿〃
//鑾峰彇鐨勬椂鍊欎笉涓�瀹氬埛鏂颁簡缂撳瓨锛岃繖鏍峰氨鑾峰彇涓嶅埌淇℃伅
- String btmTableName = BtmProvider.getInstance().getBTTableName(btmItem.name);
+ //OmdHelper
+ //todo 姝ゅ崰鏃犳硶寮曠敤锛屽悗缁細杩涜璋冩暣锛屽啀杩涜寮曠敤
+// String btmTableName = BtmProvider.getInstance().getBTTableName(btmItem.name);
+ String btmTableName = null;
String sql = "create Table " + btmTableName + "(" + "\n\tOID VARCHAR2(36) not null,\n\tREVISIONOID VARCHAR2(36),\n\tNAMEOID VARCHAR2(36),\n\tBtmName VARCHAR2(36),\n\tISLastR CHAR(1),\n\tISFirstR CHAR(1),\n\tISLastV CHAR(1),\n\tISFirstV CHAR(1),\n\tCreator VARCHAR2(36),\n\tCreateTime TIMESTAMP,\n\tLastModifier VARCHAR2(36),\n\tLastModifyTime TIMESTAMP,\n\tRevisionRule VARCHAR2(36),\n\tVersionRule VARCHAR2(36),\n\tRevisionSeq NUMBER,\n\tRevisionValue VARCHAR2(10),\n\tVersionSeq NUMBER,\n\tVersionValue VARCHAR2(10),\n\tLCTID VARCHAR2(36),\n\tLCStatus VARCHAR2(36),\n\tTS TIMESTAMP,\n\tID VARCHAR2(36),\n\tNAME VARCHAR2(128),\n\tDESCRIPTION VARCHAR2(255),\n\tOWNER VARCHAR2(36),\n\tCHECKINBY VARCHAR2(36),\n\tCHECKINTIME TIMESTAMP,\n\tCHECKOUTBY VARCHAR2(36),\n\tCHECKOUTTIME TIMESTAMP,\n\tCOPYFROMVERSION VARCHAR2(36),\n\t";
String[] apNameArray = btmItem.apNameArray;
if(apNameArray!=null && apNameArray.length>0){
for(String attrId : apNameArray){
OsAttributeVO attrVO = attributeMap.get(attrId.toLowerCase().trim());
if(attrVO!=null) {
- String abSql = Tool.getInstance().getAbSql(attrService.attributeVO2DO(attrVO));
- sql = sql + abSql;
+ //todo 姝ゅ崰鏃犳硶寮曠敤锛屽悗缁細杩涜璋冩暣锛屽啀杩涜寮曠敤
+// String abSql = Tool.getInstance().getAbSql(attrService.attributeVO2DO(attrVO));
+// sql = sql + abSql;
}else{
logger.info("涓氬姟绫诲瀷{}閲岀殑灞炴�}娌℃壘鍒�",btmTableName,attrId.toLowerCase().trim());
}
}
}
- String alterSql = BtmProvider.getInstance().getAddPKSql(btmItem.name);
+// String alterSql = BtmProvider.getInstance().getAddPKSql(btmItem.name);
sql = sql.substring(0, sql.lastIndexOf(","));
sql = sql + "\n)";
//TODO 鏆傛椂涓嶆竻妤氱敤浣曠鏂瑰紡鍒涘缓琛紝姝ゅ鍏堟敞閲婃帀
@@ -734,7 +735,7 @@
OsBtmTypeAttributeVO idAttrVO = new OsBtmTypeAttributeVO();
idAttrVO.setId("id");
idAttrVO.setName("缂栧彿");
- idAttrVO.setAttrDataType(VciFieldTypeEnum.VTString.name());
+ idAttrVO.setAttributeDataType(VciFieldTypeEnum.VTString.name());
idAttrVO.setAttributeLength(50);
idAttrVO.setNullableFlag(true);
attributes.add(idAttrVO);
@@ -742,7 +743,7 @@
OsBtmTypeAttributeVO nameAttrVO = new OsBtmTypeAttributeVO();
nameAttrVO.setId("name");
nameAttrVO.setName("鍚嶇О");
- nameAttrVO.setAttrDataType(VciFieldTypeEnum.VTString.name());
+ nameAttrVO.setAttributeDataType(VciFieldTypeEnum.VTString.name());
nameAttrVO.setAttributeLength(50);
nameAttrVO.setNullableFlag(true);
attributes.add(nameAttrVO);
@@ -750,7 +751,7 @@
OsBtmTypeAttributeVO descAttrVO = new OsBtmTypeAttributeVO();
descAttrVO.setId("description");
descAttrVO.setName("鎻忚堪");
- descAttrVO.setAttrDataType(VciFieldTypeEnum.VTString.name());
+ descAttrVO.setAttributeDataType(VciFieldTypeEnum.VTString.name());
descAttrVO.setAttributeLength(150);
descAttrVO.setNullableFlag(true);
attributes.add(descAttrVO);
@@ -761,7 +762,14 @@
attributes.stream().forEach( t -> {
int index = indexMap.get("index");
- Map<String,Object> columnData = attributeToWordMap(t,index);
+ Map<String,Object> columnData = null;
+ try {
+ columnData = attributeToWordMap(t,index);
+ } catch (PLException e) {
+ e.printStackTrace();
+ String exceptionMessage = "灏嗗睘鎬у璞℃嫹璐濆埌word鏁版嵁瀵硅薄涓椂鍑虹幇閿欒锛屽師鍥狅細"+VciBaseUtil.getExceptionMessage(e);
+ logger.error(exceptionMessage);
+ }
indexMap.put("index",index+1);
columnDataList.add(columnData);
});
@@ -793,7 +801,7 @@
List<OsBtmTypeAttributeVO> attributes = new ArrayList<>();
linkAttributes.stream().forEach(t -> {
OsBtmTypeAttributeVO attributeVO = new OsBtmTypeAttributeVO();
- BeanUtil.convert(t,attributeVO);
+ BeanUtilForVCI.convert(t,attributeVO);
attributeVO.setPkBtmType(t.getPkLinkType());
attributes.add(attributeVO);
});
@@ -803,7 +811,14 @@
indexMap.put("index",1);
attributes.stream().forEach( t -> {
int index = indexMap.get("index");
- Map<String,Object> columnData = attributeToWordMap(t,index);
+ Map<String,Object> columnData = null;
+ try {
+ columnData = attributeToWordMap(t,index);
+ } catch (PLException e) {
+ e.printStackTrace();
+ String exceptionMessage = "灏嗗睘鎬у璞℃嫹璐濆埌word鏁版嵁瀵硅薄涓椂鍑虹幇閿欒锛屽師鍥狅細"+VciBaseUtil.getExceptionMessage(e);
+ logger.error(exceptionMessage);
+ }
indexMap.put("index",index+1);
columnDataList.add(columnData);
});
@@ -850,7 +865,13 @@
if(!CollectionUtils.isEmpty(btmTypeVOList)) {
btmTypeVOList.stream().forEach(btmTypeVO -> {
String btmId = btmTypeVO.getId();
- List<OsBtmTypeAttributeVO> attributeVOS = btmService.listAttributeByBtmId(btmId);
+ List<OsBtmTypeAttributeVO> attributeVOS = null;
+ try {
+ attributeVOS = btmService.listAttributeByBtmId(btmId);
+ } catch (PLException e) {
+ e.printStackTrace();
+ throw new VciBaseException(VciBaseUtil.getExceptionMessage(e));
+ }
//鍏堟槸鍚嶇О
int rowIndex = index[0];
WriteExcelData idED = new WriteExcelData(rowIndex, 0, btmId);
@@ -893,7 +914,7 @@
//鐒跺悗灞炴�х殑涓枃鍚嶇О
rowDataList.add(new WriteExcelData(rowIndex, 3, attributeVO.getName()));
//灞炴�х殑绫诲瀷
- rowDataList.add(new WriteExcelData(rowIndex, 4, VciFieldTypeEnum.getTextByValue(attributeVO.getAttrDataType())));
+ rowDataList.add(new WriteExcelData(rowIndex, 4, VciFieldTypeEnum.getTextByValue(attributeVO.getAttributeDataType())));
//鏄惁鍙互涓虹┖
rowDataList.add(new WriteExcelData(rowIndex, 5, attributeVO.isNullableFlag() ? "鏄�" : "鍚�"));
//灞炴�ч暱搴�
@@ -913,7 +934,15 @@
if(!CollectionUtils.isEmpty(linkTypeVOList)){
linkTypeVOList.stream().forEach(linkTypeVO->{
String linkTypeId = linkTypeVO.getId();
- List<OsLinkTypeAttributeVO> attributeVOS = linkTypeService.listAttributeByLinkId(linkTypeId);
+ List<OsLinkTypeAttributeVO> attributeVOS = null;
+ try {
+ attributeVOS = linkTypeService.listAttributeByLinkId(linkTypeId);
+ } catch (PLException e) {
+ e.printStackTrace();
+ String errorLog = "鏌ヨ閾炬帴绫诲瀷鏃跺嚭鐜伴敊璇紝鍘熷洜锛�"+VciBaseUtil.getExceptionMessage(e);
+ logger.error(errorLog);
+ throw new VciBaseException(errorLog);
+ }
//鍏堟槸鍚嶇О
int rowIndex = index[0];
WriteExcelData idED = new WriteExcelData(rowIndex, 0, linkTypeId);
@@ -1056,14 +1085,14 @@
* @param index 绱㈠紩
* @return 鏁版嵁鏄犲皠,key 鏄痺ord閲岀殑鍩熷瓧娈碉紝value鏄搴旂殑鍊�
*/
- private Map<String,Object> attributeToWordMap(OsBtmTypeAttributeVO btmTypeAttributeVO,int index){
+ private Map<String,Object> attributeToWordMap(OsBtmTypeAttributeVO btmTypeAttributeVO,int index) throws PLException {
Map<String,Object> columnData = new HashMap<>();
if(StringUtils.isNotBlank(wordFieldProperties.getColumnIndex())) {
columnData.put(wordFieldProperties.getColumnIndex(), index);
}
columnData.put(wordFieldProperties.getColumnId(),btmTypeAttributeVO.getId().toLowerCase());
columnData.put(wordFieldProperties.getColumnName(),btmTypeAttributeVO.getName());
- String attrDataType = btmTypeAttributeVO.getAttrDataType();
+ String attrDataType = btmTypeAttributeVO.getAttributeDataType();
String columnType = VciFieldTypeEnum.getTextByValue(attrDataType);
if(StringUtils.isBlank(columnType)){
columnType = "瀛楃涓�";
@@ -1114,7 +1143,6 @@
return "";
}
-
/**
* 娣诲姞灞炴�у埌oracle
* @param addedAbList 娣诲姞鐨勫睘鎬�
@@ -1122,12 +1150,15 @@
*/
private void addAttrToDB(Collection<String> addedAbList,String btmType,boolean linkType){
if (!CollectionUtils.isEmpty(addedAbList)) {
- String tableName = linkType? LinkTypeProvider.getInstance().getLTTableName(btmType):BtmProvider.getInstance().getBTTableName(btmType);
+ //todo 姝ゆ殏鏃犳硶寮曠敤锛屽悗缁細杩涜璋冩暣锛屽啀杩涜寮曠敤
+// String tableName = linkType? LinkTypeProvider.getInstance().getLTTableName(btmType):BtmProvider.getInstance().getBTTableName(btmType);
+ String tableName = null;
String addSql = "alter table " + tableName + " add(";
Map<String, OsAttributeVO> attributeMap = attrService.selectAllAttributeMap();
for (String abName : addedAbList) {
AttributeDef abItem = attrService.attributeVO2DO(attributeMap.get(abName));
- addSql = addSql + Tool.getInstance().getAbSql(abItem);
+ //todo 姝ゆ殏鏃犳硶寮曠敤锛屽悗缁細杩涜璋冩暣锛屽啀杩涜寮曠敤
+// addSql = addSql + Tool.getInstance().getAbSql(abItem);
}
addSql = VciBaseUtil.removeComma(addSql.replace("\n\t",""));
addSql = addSql + ")";
@@ -1143,21 +1174,18 @@
*/
private void removeAttrToDB(Collection<String> removeAbList,String btmType,boolean linkType){
if (!CollectionUtils.isEmpty(removeAbList)) {
- String tableName = linkType?LinkTypeProvider.getInstance().getLTTableName(btmType):BtmProvider.getInstance().getBTTableName(btmType);
- String removeSql = "alter table " + tableName + " drop(";
- for (String abName : removeAbList) {
- removeSql = removeSql + abName + ",";
- }
- removeSql = VciBaseUtil.removeComma(removeSql.replace("\n\t",""));
- removeSql = removeSql + ")";
+ //todo 姝ゆ殏鏃犳硶寮曠敤锛屽悗缁細杩涜璋冩暣锛屽啀杩涜寮曠敤
+// String tableName = linkType?LinkTypeProvider.getInstance().getLTTableName(btmType):BtmProvider.getInstance().getBTTableName(btmType);
+// String removeSql = "alter table " + tableName + " drop(";
+// for (String abName : removeAbList) {
+// removeSql = removeSql + abName + ",";
+// }
+// removeSql = VciBaseUtil.removeComma(removeSql.replace("\n\t",""));
+// removeSql = removeSql + ")";
//TODO 涓嶆竻妤氬叿浣撲娇鐢ㄤ粈涔堟柟娉曪紝鏆傛椂娉ㄩ噴锛屼絾涓嶈鍒犻櫎
// DDLToolClient.getService().batchExecuteUpdateOracle(new String[]{removeSql});
}
}
-
-
-
-
/**
* 灏佽涓氬姟绫诲瀷
@@ -1189,15 +1217,8 @@
} else {
btmItem.verRuleName = 0;
}
- //鍖呭惈鐨勫睘鎬х殑鏁扮粍
- List<OsBtmTypeLinkAttributesDTO> attributesDTOList = btmTypeDTO.getAttributesDTOList();
- List<String> attrIdList = new ArrayList<String>();
- if (!CollectionUtils.isEmpty(attributesDTOList)) {
- for (OsBtmTypeLinkAttributesDTO attr : attributesDTOList) {
- attrIdList.add(attr.getId().toLowerCase());
- }
- }
- btmItem.apNameArray = attrIdList.toArray(new String[0]);
+ //鍖呭惈鐨勫睘鎬у悕绉�
+ btmItem.apNameArray = btmTypeDTO.getApNameArray().split(",");
}
/**
@@ -1210,7 +1231,7 @@
List<LinkType> addLinkTypeList = new ArrayList<LinkType>();
List<LinkType> editLinkTypeList = new ArrayList<LinkType>();
String userId = WebUtil.getCurrentUserId();
- long now = VciDateUtil.getTime(VciDateUtil.getNow());
+ long now = VciDateUtil.getNowTime();
for(OsLinkTypeDTO linkTypeDTO : linkTypeDTOS){
String linkId = linkTypeDTO.getId().toLowerCase().trim();
LinkType linkType = null;
@@ -1234,7 +1255,7 @@
linkType.modifyTime = now;
linkType.id = "";
linkType.name = linkId;
- linkType.tag = linkTypeDTO.getName();
+ linkType.label = linkTypeDTO.getName();
linkType.description = linkTypeDTO.getDescription() == null ?"":linkTypeDTO.getDescription();
linkType.implClass = "";
linkType.shape = "";
@@ -1275,14 +1296,17 @@
for(LinkType linkType : linkTypes){
try{
platformClientUtil.getLinkTypeService().addLinkType(linkType);
- String tableName = LinkTypeProvider.getInstance().getLTTableName(linkType.name);
+ //todo 姝ゆ殏鏃犳硶寮曠敤锛屽悗缁細杩涜璋冩暣锛屽啀杩涜寮曠敤
+// String tableName = LinkTypeProvider.getInstance().getLTTableName(linkType.name);
+ String tableName = null;
String sql = "create table " + tableName + "(" + "\n\tOID VARCHAR2(36) not null,\n\tCreator VARCHAR2(36),\n\tCreateTime TIMESTAMP,\n\tLastModifier VARCHAR2(36),\n\tLastModifyTime TIMESTAMP,\n\tTS TIMESTAMP,\n\t";
String[] apNameArray = linkType.attributes;
if(apNameArray!=null && apNameArray.length>0){
for(String attrId : apNameArray){
OsAttributeVO attrVO = attributeMap.get(attrId.toLowerCase().trim());
- String abSql = Tool.getInstance().getAbSql(attrService.attributeVO2DO(attrVO));
- sql = sql + abSql;
+ //todo 姝ゆ殏鏃犳硶寮曠敤锛屽悗缁細杩涜璋冩暣锛屽啀杩涜寮曠敤
+// String abSql = Tool.getInstance().getAbSql(attrService.attributeVO2DO(attrVO));
+// sql = sql + abSql;
}
}
sql = sql.substring(0, sql.lastIndexOf(","));
--
Gitblit v1.9.3