From 88c5cf35a5ea870378d7964086ed2c09ddc299c8 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期一, 09 九月 2024 17:52:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsCodeGenSchemaServiceImpl.java | 27 ++++++++++++++-------------
1 files changed, 14 insertions(+), 13 deletions(-)
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsCodeGenSchemaServiceImpl.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsCodeGenSchemaServiceImpl.java
index 4df0334..edd1a2a 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsCodeGenSchemaServiceImpl.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsCodeGenSchemaServiceImpl.java
@@ -1,7 +1,7 @@
package com.vci.web.service.impl;
import com.alibaba.fastjson.JSONObject;
-import com.vci.file.util.VciZipUtil;
+import com.vci.corba.common.PLException;
import com.vci.starter.revision.service.RevisionModelUtil;
import com.vci.starter.web.annotation.Column;
import com.vci.starter.web.constant.FrameWorkLcStatusConstant;
@@ -15,20 +15,21 @@
import com.vci.starter.web.util.VciBaseUtil;
import com.vci.starter.web.util.VciDateUtil;
import com.vci.starter.web.wrapper.VciQueryWrapperForDO;
-import com.vci.web.bo.OsCodeGenAttributeBO;
-import com.vci.web.bo.OsCodeGenButtonBO;
+import com.vci.bo.OsCodeGenAttributeBO;
+import com.vci.bo.OsCodeGenButtonBO;
import com.vci.web.dao.OsCodeGenSchemaDaoI;
-import com.vci.web.dto.OsCodeGenSchemaDTO;
+import com.vci.dto.OsCodeGenSchemaDTO;
import com.vci.web.enumpck.OsCodeGenJsPanelTypeEnum;
-import com.vci.web.model.OsCodeGenSchemaDO;
-import com.vci.web.pageModel.OsBtmTypeAttributeVO;
-import com.vci.web.pageModel.OsBtmTypeVO;
-import com.vci.web.pageModel.OsCodeGenSchemaVO;
+import com.vci.model.OsCodeGenSchemaDO;
+import com.vci.pagemodel.OsBtmTypeAttributeVO;
+import com.vci.pagemodel.OsBtmTypeVO;
+import com.vci.pagemodel.OsCodeGenSchemaVO;
import com.vci.web.service.OsAttributeServiceI;
import com.vci.web.service.OsBtmServiceI;
import com.vci.web.service.OsCodeGenSchemaServiceI;
import com.vci.web.service.WebBtmIOServiceI;
import com.vci.web.util.WebUtil;
+import com.vci.web.util.file.VciZipUtil;
import org.apache.commons.io.IOUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.velocity.Template;
@@ -268,7 +269,7 @@
* @throws VciBaseException 鍙傛暟涓虹┖锛屾柟妗堜笉瀛樺湪浼氭姏鍑哄紓甯�
*/
@Override
- public void productCodeFile(String oid) throws VciBaseException {
+ public void productCodeFile(String oid) throws VciBaseException, PLException {
OsCodeGenSchemaDO codeGenSchemaDO = selectByOid(oid);
//澶勭悊涓存椂鏂囦欢澶癸紝鍦ㄤ复鏃舵枃浠跺す涓坊鍔燾odes/{涓氬姟绫诲瀷鐨勮嫳鏂囧悕绉皚
String tempFolder =LocalFileUtil.getProjectFolder();
@@ -412,7 +413,7 @@
if(StringUtils.isBlank(idAttr.getName())){
idAttr.setName("缂栧彿");
}
- idAttr.setAttrDataType(VciFieldTypeEnum.VTString.name());
+ idAttr.setAttributeDataType(VciFieldTypeEnum.VTString.name());
if(idAttr.getAttributeLength() == null || idAttr.getAttributeLength() <= 0){
idAttr.setAttributeLength(50);
}
@@ -426,7 +427,7 @@
if(StringUtils.isBlank(nameAttr.getName())){
nameAttr.setName("鍚嶇О");
}
- nameAttr.setAttrDataType(VciFieldTypeEnum.VTString.name());
+ nameAttr.setAttributeDataType(VciFieldTypeEnum.VTString.name());
if(nameAttr.getAttributeLength() == null || nameAttr.getAttributeLength() <= 0){
nameAttr.setAttributeLength(150);
}
@@ -440,7 +441,7 @@
if(StringUtils.isBlank(descAttr.getName())){
descAttr.setName("鎻忚堪");
}
- descAttr.setAttrDataType(VciFieldTypeEnum.VTString.name());
+ descAttr.setAttributeDataType(VciFieldTypeEnum.VTString.name());
if(descAttr.getAttributeLength() == null || descAttr.getAttributeLength() <= 0){
descAttr.setAttributeLength(250);
}
@@ -455,7 +456,7 @@
if(VciQueryWrapperForDO.LC_STATUS_FIELD.equalsIgnoreCase(attributeBO.getId())){
attributeBO.setName("鐘舵��");
}
- attributeBO.setVciAttrDataType(attr.getAttrDataType());
+ attributeBO.setVciAttrDataType(attr.getAttributeDataType());
attributeBO.setNullable(String.valueOf(attr.isNullableFlag()));
attributeBO.setAttrDataType(getAttrDateTypeFromVci(attributeBO.getVciAttrDataType()));
attributeBO.setJdbcType(getJdbcTypeFromVci(attributeBO.getVciAttrDataType()));
--
Gitblit v1.9.3