From 9f46e04d61a13f0fc39e307d6f1a1f7d9a9f75ca Mon Sep 17 00:00:00 2001
From: lihang <lihang@vci-tech.com>
Date: 星期六, 06 五月 2023 11:14:52 +0800
Subject: [PATCH] ddl取消word
---
Source/UBCS/ubcs-service/ubcs-ddl/src/main/java/com/vci/ubcs/ddl/service/impl/DdlServiceImpl.java | 39 +++++++++++++++++++++++++++++----------
1 files changed, 29 insertions(+), 10 deletions(-)
diff --git a/Source/UBCS/ubcs-service/ubcs-ddl/src/main/java/com/vci/ubcs/ddl/service/impl/DdlServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-ddl/src/main/java/com/vci/ubcs/ddl/service/impl/DdlServiceImpl.java
index 85e886c..f493a6b 100644
--- a/Source/UBCS/ubcs-service/ubcs-ddl/src/main/java/com/vci/ubcs/ddl/service/impl/DdlServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-ddl/src/main/java/com/vci/ubcs/ddl/service/impl/DdlServiceImpl.java
@@ -1,8 +1,8 @@
package com.vci.ubcs.ddl.service.impl;
+import com.alibaba.cloud.commons.lang.StringUtils;
import com.alibaba.nacos.shaded.com.google.protobuf.ServiceException;
-import com.vci.starter.word.bo.WordMergeStartTableDataBO;
import com.vci.ubcs.ddl.bo.DdlTableBO;
import com.vci.ubcs.ddl.bo.DdlTableInDataBaseBO;
import com.vci.ubcs.ddl.enums.BusinessTypeEnum;
@@ -11,7 +11,6 @@
import com.vci.ubcs.ddl.processor.ddl.DdlMapperProcessor;
import com.vci.ubcs.ddl.processor.dll.DllMapperProcessor;
import com.vci.ubcs.ddl.processor.dll.DllMapperProcessorStrategy;
-import com.vci.ubcs.ddl.properties.DdlExportWordFieldProperties;
import com.vci.ubcs.ddl.properties.DdlPropertise;
import com.vci.ubcs.ddl.service.IDdlService;
import com.vci.ubcs.omd.cache.BtmTypeCache;
@@ -24,7 +23,6 @@
import com.vci.ubcs.starter.web.enumpck.BooleanEnum;
import com.vci.ubcs.starter.web.enumpck.VciFieldTypeEnum;
import com.vci.ubcs.starter.web.util.VciBaseUtil;
-import org.apache.commons.lang3.StringUtils;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.BeanUtil;
@@ -57,8 +55,8 @@
/**
* word瀵煎嚭鐨勬椂鍊欑殑鍩熷瓧娈垫槧灏�
*/
- @Autowired
- private DdlExportWordFieldProperties wordFieldProperties;
+// @Autowired
+// private DdlExportWordFieldProperties wordFieldProperties;
/**
* ddl鏁版嵁鎿嶄綔鏈嶅姟
@@ -1008,11 +1006,11 @@
*
* @param tableDataBO 瑕佸啓鍏ョ殑鏁版嵁
* @return word 鏂囦欢璺緞
- */
+ *//*
@Override
public String writeDataToWord(WordMergeStartTableDataBO tableDataBO) {
return null;
- }
+ }*/
/**
* 鍒ゆ柇鏄惁涓哄吋瀹规�х殑琛紝杩欎簺琛ㄤ笉搴旇琚垱寤哄拰淇敼
@@ -1099,14 +1097,35 @@
* @return 琛ㄤ俊鎭泦鍚�
*/
@Override
- public List<DdlTableBO> getAllTableInfo() {
+ public List<BtmTypeVO> getAllTableInfo() {
List<String> allTableName = listAllTableName();
if (!CollectionUtils.isEmpty(allTableName)) {
List<DdlTableBO> allTableBO = listTableInfoInDB(allTableName);
+ List<BtmTypeVO> btmTypeVOList = new ArrayList<>();
allTableBO.forEach(table -> {
- table.setColumns(selectTableColumnInfo(table.getTableName()));
+ BtmTypeVO vo = new BtmTypeVO();
+ vo.setTableName(table.getTableName());
+ vo.setDescription(table.getTableDesc());
+ List<DdlTableInDataBaseBO> columns = selectTableColumnInfo(table.getTableName());
+ List<BtmTypeAttributeVO> attributes = new ArrayList<>();
+ columns.forEach(col -> {
+ BtmTypeAttributeVO attributeVO = new BtmTypeAttributeVO();
+ attributeVO.setId(col.getId());
+ attributeVO.setName(col.getName());
+ attributeVO.setNullableFlag(col.getNullableFlag());
+ attributeVO.setAttributeLength(col.getAttributeLength());
+ attributeVO.setPrecisionLength(col.getPrecisionLength());
+ attributeVO.setScaleLength(col.getScaleLength());
+ VciFieldTypeEnum field = dllMapper.getFieldTypeByColumnStr(col.getAttrDataType(), col.getAttributeLength());
+ if (field != null){
+ attributeVO.setAttrDataType(field.name());
+ }
+ attributes.add(attributeVO);
+ });
+ vo.setAttributes(attributes);
+ btmTypeVOList.add(vo);
});
- return allTableBO;
+ return btmTypeVOList;
}
return new ArrayList<>();
}
--
Gitblit v1.9.3