From 629710987690b5bf93800d5b1b782fd1199eb671 Mon Sep 17 00:00:00 2001 From: wangyandong01 Date: Thu, 10 Apr 2025 11:46:12 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=94=AF=E6=8C=81=E5=9C=B0=E7=90=86?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- business-entity-generator/pom.xml | 8 +++++ .../BefExtendAddPropertyInfoProcessor.java | 3 +- .../AddGeometryPropertyInfoStrategy.java | 35 +++++++++++++++++++ pom.xml | 11 ++++-- 4 files changed, 53 insertions(+), 4 deletions(-) create mode 100644 common-entity-generator/src/main/java/com/inspur/edp/cef/generator/apiGenerator/dataType/entityInterface/resourceInfo/initcolumnsstragety/AddGeometryPropertyInfoStrategy.java diff --git a/business-entity-generator/pom.xml b/business-entity-generator/pom.xml index bbc106a..7b55981 100644 --- a/business-entity-generator/pom.xml +++ b/business-entity-generator/pom.xml @@ -26,6 +26,14 @@ business-entity-generator + + com.inspur.edp + common-entity-framework-api + + + com.inspur.edp + common-entity-model + com.inspur.edp common-entity-generator diff --git a/business-entity-generator/src/main/java/com/inspur/edp/bef/dtgenerator/api/entityInterface/resourceInfo/BefExtendAddPropertyInfoProcessor.java b/business-entity-generator/src/main/java/com/inspur/edp/bef/dtgenerator/api/entityInterface/resourceInfo/BefExtendAddPropertyInfoProcessor.java index c4984ba..4f1ebe1 100644 --- a/business-entity-generator/src/main/java/com/inspur/edp/bef/dtgenerator/api/entityInterface/resourceInfo/BefExtendAddPropertyInfoProcessor.java +++ b/business-entity-generator/src/main/java/com/inspur/edp/bef/dtgenerator/api/entityInterface/resourceInfo/BefExtendAddPropertyInfoProcessor.java @@ -182,7 +182,6 @@ public class BefExtendAddPropertyInfoProcessor extends BaseExtendAddPropertyInfo private boolean isTypeEquals(IGspCommonField field, GspDbDataType dbDataType) { switch (field.getMDataType()) { - case String: return GspDbDataType.VarChar.equals(dbDataType); case Text: @@ -199,6 +198,8 @@ public class BefExtendAddPropertyInfoProcessor extends BaseExtendAddPropertyInfo return GspDbDataType.DateTime.equals(dbDataType); case Binary: return GspDbDataType.Blob.equals(dbDataType); + case Geometry: + return GspDbDataType.Geometry.equals(dbDataType); default: return false; } diff --git a/common-entity-generator/src/main/java/com/inspur/edp/cef/generator/apiGenerator/dataType/entityInterface/resourceInfo/initcolumnsstragety/AddGeometryPropertyInfoStrategy.java b/common-entity-generator/src/main/java/com/inspur/edp/cef/generator/apiGenerator/dataType/entityInterface/resourceInfo/initcolumnsstragety/AddGeometryPropertyInfoStrategy.java new file mode 100644 index 0000000..c0df58f --- /dev/null +++ b/common-entity-generator/src/main/java/com/inspur/edp/cef/generator/apiGenerator/dataType/entityInterface/resourceInfo/initcolumnsstragety/AddGeometryPropertyInfoStrategy.java @@ -0,0 +1,35 @@ +package com.inspur.edp.cef.generator.apiGenerator.dataType.entityInterface.resourceInfo.initcolumnsstragety; + +import com.inspur.edp.cef.designtime.api.IGspCommonDataType; +import com.inspur.edp.cef.designtime.api.IGspCommonField; +import com.inspur.edp.cef.generator.apiGenerator.dataType.entityInterface.DataTypeInterfaceGeneratorContext; +import org.eclipse.jdt.core.dom.AST; +import org.eclipse.jdt.core.dom.Block; +import org.eclipse.jdt.core.dom.MethodInvocation; + +public class AddGeometryPropertyInfoStrategy extends BaseAddColumnStragety { + public AddGeometryPropertyInfoStrategy(Block block, + IGspCommonDataType commonDataType, + IGspCommonField field, AST ast, + DataTypeInterfaceGeneratorContext parentContext, ExtendAddPropertyInfoProcessor extendAddPropertyInfoProcessor) { + super(block, commonDataType, field, ast, parentContext,extendAddPropertyInfoProcessor); + } + + @Override + protected void addComplexAddStatement(MethodInvocation methodInvocation) { + addDisplayValueKeyStatement(methodInvocation); + addRequiredArgStatement(methodInvocation); + addDefaultValueStatement(methodInvocation); + addDefaultNullStatment(methodInvocation); + } + + @Override + protected void addSimpleAddStatement(MethodInvocation methodInvocation) { + addRequiredArgStatement(methodInvocation); + } + + @Override + protected String getMethodName() { + return "addGeometryPropertyInfo"; + } +} \ No newline at end of file diff --git a/pom.xml b/pom.xml index 67c1af6..eda2ae6 100644 --- a/pom.xml +++ b/pom.xml @@ -50,8 +50,8 @@ 1.8 1.8 0.3.1 - 0.1.5 - 0.1.7 + 0.2.0-SNAPSHOT + 0.3.1-SNAPSHOT @@ -150,6 +150,11 @@ common-entity-model ${cef.version} + + com.inspur.edp + common-entity-framework-api + ${befframework.version} + com.inspur.edp common-entity-framework-spi @@ -183,7 +188,7 @@ com.inspur.edp unified-datatype-api - ${cef.version} + ${befframework.version} com.inspur.edp -- Gitee From 1311a1203b4f4ae5b6a4ee55d6570bf02378a194 Mon Sep 17 00:00:00 2001 From: wangyandong01 Date: Tue, 6 May 2025 20:00:44 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=94=AF=E6=8C=81=E5=87=A0=E4=BD=95?= =?UTF-8?q?=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- common-entity-generator/pom.xml | 43 +++++++++------ .../propertyInfo/PropInfoTypeGenerator.java | 2 + .../resourceInfo/InitColumnsGenerator.java | 2 + .../AddPropertyInfoStragetyFactory.java | 4 +- .../DataStaticEqualsMethodGenerator.java | 6 ++- .../property/AssoUdtPropGenerator.java | 3 ++ .../edp/cef/generator/overall/Utils.java | 4 ++ .../repository/CefRepoAssembler.java | 5 ++ .../adaptor/NestedAdaptorGenerator.java | 11 ++-- .../adaptor/method/InitColumnsGenerator.java | 2 + ...metryPropertyCreateDefMethodGenerator.java | 54 +++++++++++++++++++ .../InitColumnInfoMethodGenerator.java | 5 ++ .../ValueObjInitColumnMethodGenerator.java | 2 + pom.xml | 4 +- 14 files changed, 119 insertions(+), 28 deletions(-) create mode 100644 common-entity-generator/src/main/java/com/inspur/edp/cef/generator/repository/adaptor/method/createpropertydefmethod/GeometryPropertyCreateDefMethodGenerator.java diff --git a/common-entity-generator/pom.xml b/common-entity-generator/pom.xml index 1f8bdac..cfe8c0b 100644 --- a/common-entity-generator/pom.xml +++ b/common-entity-generator/pom.xml @@ -26,6 +26,10 @@ common-entity-generator + + io.iec.edp + caf-database-object-api + com.inspur.edp metadata-service-dev-api @@ -42,6 +46,28 @@ com.inspur.edp caf-generator + + com.inspur.edp + common-entity-framework-spi + + + com.inspur.edp + common-entity-framework-repository + + + com.inspur.edp + common-entity-framework-entity + + + com.inspur.edp + business-entity-framework-api + + + com.inspur.edp + business-entity-framework-spi + + + com.inspur.edp cef-gencommon @@ -69,22 +95,7 @@ com.inspur.edp lcm-database-object-api - - com.inspur.edp - common-entity-framework-spi - - - com.inspur.edp - business-entity-framework-api - - - com.inspur.edp - business-entity-framework-spi - - - com.inspur.edp - common-entity-framework-repository - + com.inspur.edp common-entity-model diff --git a/common-entity-generator/src/main/java/com/inspur/edp/cef/generator/apiGenerator/dataType/entityInterface/propertyInfo/PropInfoTypeGenerator.java b/common-entity-generator/src/main/java/com/inspur/edp/cef/generator/apiGenerator/dataType/entityInterface/propertyInfo/PropInfoTypeGenerator.java index e975b17..57c6127 100644 --- a/common-entity-generator/src/main/java/com/inspur/edp/cef/generator/apiGenerator/dataType/entityInterface/propertyInfo/PropInfoTypeGenerator.java +++ b/common-entity-generator/src/main/java/com/inspur/edp/cef/generator/apiGenerator/dataType/entityInterface/propertyInfo/PropInfoTypeGenerator.java @@ -115,6 +115,8 @@ public class PropInfoTypeGenerator extends ClassPropertyGenerator { return FieldType.Integer.toString(); case Text: return FieldType.Text.toString(); + case Geometry: + return FieldType.Geometry.toString(); default: throw new CefGenException("设计时未正确给PropertyInfo中Type正确赋值！"); } diff --git a/common-entity-generator/src/main/java/com/inspur/edp/cef/generator/apiGenerator/dataType/entityInterface/resourceInfo/InitColumnsGenerator.java b/common-entity-generator/src/main/java/com/inspur/edp/cef/generator/apiGenerator/dataType/entityInterface/resourceInfo/InitColumnsGenerator.java index 5eb64ec..cf8b04b 100644 --- a/common-entity-generator/src/main/java/com/inspur/edp/cef/generator/apiGenerator/dataType/entityInterface/resourceInfo/InitColumnsGenerator.java +++ b/common-entity-generator/src/main/java/com/inspur/edp/cef/generator/apiGenerator/dataType/entityInterface/resourceInfo/InitColumnsGenerator.java @@ -941,6 +941,8 @@ protected ExtendAddPropertyInfoProcessor getExtendAddPropertyInfoProcessor() { return FieldType.Integer.toString(); case Text: return FieldType.Text.toString(); + case Geometry: + return FieldType.Geometry.toString(); default: throw new CefGenException("当前没有类型为" + field.getMDataType() + "的字段"); } diff --git a/common-entity-generator/src/main/java/com/inspur/edp/cef/generator/apiGenerator/dataType/entityInterface/resourceInfo/initcolumnsstragety/AddPropertyInfoStragetyFactory.java b/common-entity-generator/src/main/java/com/inspur/edp/cef/generator/apiGenerator/dataType/entityInterface/resourceInfo/initcolumnsstragety/AddPropertyInfoStragetyFactory.java index a8bab58..2513b22 100644 --- a/common-entity-generator/src/main/java/com/inspur/edp/cef/generator/apiGenerator/dataType/entityInterface/resourceInfo/initcolumnsstragety/AddPropertyInfoStragetyFactory.java +++ b/common-entity-generator/src/main/java/com/inspur/edp/cef/generator/apiGenerator/dataType/entityInterface/resourceInfo/initcolumnsstragety/AddPropertyInfoStragetyFactory.java @@ -78,7 +78,9 @@ public class AddPropertyInfoStragetyFactory { return new AddDateTimePropertyInfoStragety(block,commonDataType,field,ast,parentContext,extendAddPropertyInfoProcessor); case Binary: return new AddBytesPropertyInfoStragety(block,commonDataType,field,ast,parentContext,extendAddPropertyInfoProcessor); - default: + case Geometry: + return new AddGeometryPropertyInfoStrategy(block,commonDataType,field,ast,parentContext,extendAddPropertyInfoProcessor); + default: throw new CefGenException("未识别的字段类型"+field.getMDataType()); } } diff --git a/common-entity-generator/src/main/java/com/inspur/edp/cef/generator/common/DataStaticEqualsMethodGenerator.java b/common-entity-generator/src/main/java/com/inspur/edp/cef/generator/common/DataStaticEqualsMethodGenerator.java index 3761a99..0dc0c86 100644 --- a/common-entity-generator/src/main/java/com/inspur/edp/cef/generator/common/DataStaticEqualsMethodGenerator.java +++ b/common-entity-generator/src/main/java/com/inspur/edp/cef/generator/common/DataStaticEqualsMethodGenerator.java @@ -131,9 +131,9 @@ public class DataStaticEqualsMethodGenerator extends ClassMethodGenerator { if(propertyInfo.getElement().getObjectType()== GspElementObjectType.Association) return "isAssoValueEqueals"; if(propertyInfo.getElement().getObjectType()==GspElementObjectType.Enum) - return "isEnumEqueals"; + return "isEnumEqueals"; if(propertyInfo.getElement().getObjectType()==GspElementObjectType.DynamicProp) - return "isDynamicEqueals"; + return "isDynamicEqueals"; switch (propertyInfo.getElement().getMDataType()) { @@ -151,6 +151,8 @@ public class DataStaticEqualsMethodGenerator extends ClassMethodGenerator { return "isDateEqueals"; case Binary: return "isBytesEqueals"; + case Geometry: + return "isGeometryEqueals"; } throw new CefGenException("未识别的类型"+propertyInfo.getElement().getName()); } diff --git a/common-entity-generator/src/main/java/com/inspur/edp/cef/generator/coreGenerator/base/entitygen/property/AssoUdtPropGenerator.java b/common-entity-generator/src/main/java/com/inspur/edp/cef/generator/coreGenerator/base/entitygen/property/AssoUdtPropGenerator.java index df1d05a..04198a2 100644 --- a/common-entity-generator/src/main/java/com/inspur/edp/cef/generator/coreGenerator/base/entitygen/property/AssoUdtPropGenerator.java +++ b/common-entity-generator/src/main/java/com/inspur/edp/cef/generator/coreGenerator/base/entitygen/property/AssoUdtPropGenerator.java @@ -198,6 +198,9 @@ public class AssoUdtPropGenerator extends ClassPropertyGenerator { case Binary: methodName = "getBinaryPropertyDefaultValue"; break; + case Geometry: + methodName = "getGeometryPropertyDefaultValue"; + break; default: break; } diff --git a/common-entity-generator/src/main/java/com/inspur/edp/cef/generator/overall/Utils.java b/common-entity-generator/src/main/java/com/inspur/edp/cef/generator/overall/Utils.java index 6c108e1..30923c1 100644 --- a/common-entity-generator/src/main/java/com/inspur/edp/cef/generator/overall/Utils.java +++ b/common-entity-generator/src/main/java/com/inspur/edp/cef/generator/overall/Utils.java @@ -44,6 +44,7 @@ import com.inspur.edp.das.commonmodel.IGspCommonObject; import com.inspur.edp.lcm.metadata.api.entity.ProcessMode; import com.inspur.edp.udt.designtime.api.entity.UnifiedDataTypeDef; import com.inspur.edp.udt.entity.IUdtData; +import org.locationtech.jts.geom.Geometry; import java.math.BigDecimal; import java.util.ArrayList; @@ -85,6 +86,9 @@ public final class Utils { TypeInfo binaryTypeInfo = new TypeInfo(byte.class); binaryTypeInfo.setArray(true); return binaryTypeInfo; + case Geometry: + TypeInfo geometryTypeInfo = new TypeInfo(Geometry.class); + return geometryTypeInfo; default: throw new CefGenException("invalid enum values" + field.getMDataType()); } diff --git a/common-entity-generator/src/main/java/com/inspur/edp/cef/generator/repository/CefRepoAssembler.java b/common-entity-generator/src/main/java/com/inspur/edp/cef/generator/repository/CefRepoAssembler.java index f6c41d0..46aeba0 100644 --- a/common-entity-generator/src/main/java/com/inspur/edp/cef/generator/repository/CefRepoAssembler.java +++ b/common-entity-generator/src/main/java/com/inspur/edp/cef/generator/repository/CefRepoAssembler.java @@ -275,6 +275,8 @@ public class CefRepoAssembler extends MainEntityAssembler { return ClobTransProcesser.getInstacne(); case Binary: return BinaryTransProcesser.getInstacne(); + case Geometry: + return GeometryTransProcesser.getInstacne(); } String beObjectCode = this.gspCommonObject.getCode(); throw new CefGenException( @@ -327,6 +329,9 @@ public class CefRepoAssembler extends MainEntityAssembler { case Boolean: dbDataType = GspDbDataType.Boolean; break; + case Geometry: + dbDataType = GspDbDataType.Geometry; + break; } return dbDataType; } diff --git a/common-entity-generator/src/main/java/com/inspur/edp/cef/generator/repository/adaptor/NestedAdaptorGenerator.java b/common-entity-generator/src/main/java/com/inspur/edp/cef/generator/repository/adaptor/NestedAdaptorGenerator.java index 9b31307..69fff4f 100644 --- a/common-entity-generator/src/main/java/com/inspur/edp/cef/generator/repository/adaptor/NestedAdaptorGenerator.java +++ b/common-entity-generator/src/main/java/com/inspur/edp/cef/generator/repository/adaptor/NestedAdaptorGenerator.java @@ -35,13 +35,7 @@ import com.inspur.edp.cef.generator.repository.adaptor.method.InitAssosGenerator import com.inspur.edp.cef.generator.repository.adaptor.method.NestedInitColumnGenerator; import com.inspur.edp.cef.generator.repository.adaptor.method.NestedInitReaderGenerator; import com.inspur.edp.cef.generator.repository.adaptor.method.createinstance.NestedCreateInsGenerator; -import com.inspur.edp.cef.generator.repository.adaptor.method.createpropertydefmethod.BinaryPropertyCreateDefMethodGenerator; -import com.inspur.edp.cef.generator.repository.adaptor.method.createpropertydefmethod.BoolPropertyCreateDefMethodGenerator; -import com.inspur.edp.cef.generator.repository.adaptor.method.createpropertydefmethod.CreateUdtDefMethodGenerator; -import com.inspur.edp.cef.generator.repository.adaptor.method.createpropertydefmethod.DecimalPropertyCreateDefMethodGenerator; -import com.inspur.edp.cef.generator.repository.adaptor.method.createpropertydefmethod.EntityGetAssocationDBMappingMethodGenerator; -import com.inspur.edp.cef.generator.repository.adaptor.method.createpropertydefmethod.GetDateTimePropetyCreateDefMethodGenerator; -import com.inspur.edp.cef.generator.repository.adaptor.method.createpropertydefmethod.IntPropertyCreateDefMethodGenerator; +import com.inspur.edp.cef.generator.repository.adaptor.method.createpropertydefmethod.*; import com.inspur.edp.cef.generator.repository.adaptor.method.readproperty.DataTypeReadPropertyGenerator; import com.inspur.edp.cef.generator.repository.adaptor.property.DataTypeMappingGenerator; import com.inspur.edp.cef.generator.repository.common.IntermediateType; @@ -297,6 +291,9 @@ public abstract class NestedAdaptorGenerator extends DataTypeAdaptorGenerator { } else if (gspCommonField.getMDataType() == GspElementDataType.Binary) { gens.add(new BinaryPropertyCreateDefMethodGenerator(gspCommonField.getLabelID(), gspCommonField)); + } else if (gspCommonField.getMDataType() == GspElementDataType.Geometry) { + gens.add(new GeometryPropertyCreateDefMethodGenerator(gspCommonField.getLabelID(), + gspCommonField)); } else { // throw new RuntimeException("AddNormalGetPropValueGenerator"); // } diff --git a/common-entity-generator/src/main/java/com/inspur/edp/cef/generator/repository/adaptor/method/InitColumnsGenerator.java b/common-entity-generator/src/main/java/com/inspur/edp/cef/generator/repository/adaptor/method/InitColumnsGenerator.java index 26b7bc1..ff530e7 100644 --- a/common-entity-generator/src/main/java/com/inspur/edp/cef/generator/repository/adaptor/method/InitColumnsGenerator.java +++ b/common-entity-generator/src/main/java/com/inspur/edp/cef/generator/repository/adaptor/method/InitColumnsGenerator.java @@ -456,6 +456,8 @@ public class InitColumnsGenerator extends ClassMethodGenerator { return ClobTransProcesser.class; case Binary: return BinaryTransProcesser.class; + case Geometry: + return GeometryTransProcesser.class; } throw new CefGenException( diff --git a/common-entity-generator/src/main/java/com/inspur/edp/cef/generator/repository/adaptor/method/createpropertydefmethod/GeometryPropertyCreateDefMethodGenerator.java b/common-entity-generator/src/main/java/com/inspur/edp/cef/generator/repository/adaptor/method/createpropertydefmethod/GeometryPropertyCreateDefMethodGenerator.java new file mode 100644 index 0000000..b38296e --- /dev/null +++ b/common-entity-generator/src/main/java/com/inspur/edp/cef/generator/repository/adaptor/method/createpropertydefmethod/GeometryPropertyCreateDefMethodGenerator.java @@ -0,0 +1,54 @@ +/* + * Copyright (c) 2020 - present, Inspur Genersoft Co., Ltd. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.inspur.edp.cef.generator.repository.adaptor.method.createpropertydefmethod; + +import com.inspur.edp.caf.generator.baseInfo.TypeInfo; +import com.inspur.edp.cef.designtime.api.IGspCommonField; +import com.inspur.edp.cef.entity.entity.EntityDataPropertyValueUtils; +import com.inspur.edp.cef.generator.repository.RepositoryGenUtil; +import org.eclipse.jdt.core.dom.MethodInvocation; +import org.eclipse.jdt.core.dom.ReturnStatement; +import org.locationtech.jts.geom.Geometry; + +public class GeometryPropertyCreateDefMethodGenerator extends NormalPropertyCreateDefMethodGenerator { + public GeometryPropertyCreateDefMethodGenerator(String propertyName, IGspCommonField gspCommonField) { + super(propertyName, gspCommonField); + } + + @Override + protected ReturnStatement getReturnDefaultStatement() { + MethodInvocation methodInvocation = RepositoryGenUtil.createMethodInvocation(ast, ast.newName(EntityDataPropertyValueUtils.class.getTypeName()), getDefaultValueMethodName(), null); + ReturnStatement returnStatement = ast.newReturnStatement(); + returnStatement.setExpression(methodInvocation); + return returnStatement; + } + @Override + protected String getDbTypeName(){ + return "getGeometryValue"; + } + + + @Override + protected String getDefaultValueMethodName() { + return "getGeometryPropertyDefaultValue"; + } + + @Override + protected TypeInfo getReturnType() { + return new TypeInfo(Geometry.class); + } +} diff --git a/common-entity-generator/src/main/java/com/inspur/edp/cef/generator/repository/entity/methods/InitColumnInfoMethodGenerator.java b/common-entity-generator/src/main/java/com/inspur/edp/cef/generator/repository/entity/methods/InitColumnInfoMethodGenerator.java index 76e0f9e..0871e78 100644 --- a/common-entity-generator/src/main/java/com/inspur/edp/cef/generator/repository/entity/methods/InitColumnInfoMethodGenerator.java +++ b/common-entity-generator/src/main/java/com/inspur/edp/cef/generator/repository/entity/methods/InitColumnInfoMethodGenerator.java @@ -261,6 +261,9 @@ public abstract class InitColumnInfoMethodGenerator extends ClassMethodGenerator case NClob: dbDataType = GspDbDataType.NClob; break; + case Geometry: + dbDataType = GspDbDataType.Geometry; + break; } return dbDataType; } @@ -318,6 +321,8 @@ public abstract class InitColumnInfoMethodGenerator extends ClassMethodGenerator return ClobTransProcesser.class; case Binary: return BinaryTransProcesser.class; + case Geometry: + return GeometryTransProcesser.class; } throw new CefGenException( diff --git a/common-entity-generator/src/main/java/com/inspur/edp/cef/generator/repository/valueObject/methods/ValueObjInitColumnMethodGenerator.java b/common-entity-generator/src/main/java/com/inspur/edp/cef/generator/repository/valueObject/methods/ValueObjInitColumnMethodGenerator.java index b4ebd6f..cf36636 100644 --- a/common-entity-generator/src/main/java/com/inspur/edp/cef/generator/repository/valueObject/methods/ValueObjInitColumnMethodGenerator.java +++ b/common-entity-generator/src/main/java/com/inspur/edp/cef/generator/repository/valueObject/methods/ValueObjInitColumnMethodGenerator.java @@ -136,6 +136,8 @@ public abstract class ValueObjInitColumnMethodGenerator extends ClassMethodGener } else { return GspDbDataType.Clob; } + case Geometry: + return GspDbDataType.Geometry; default: return GspDbDataType.VarChar; } diff --git a/pom.xml b/pom.xml index eda2ae6..0541fe6 100644 --- a/pom.xml +++ b/pom.xml @@ -49,7 +49,7 @@ 1.8 1.8 1.8 - 0.3.1 + 2.0.0 0.2.0-SNAPSHOT 0.3.1-SNAPSHOT @@ -82,7 +82,7 @@ io.iec.edp caf-database-object-api - 0.3.1 + ${database.object.api.version} com.inspur.edp -- Gitee From 6c82d2914a29164b2688a8493b660d8257a25e05 Mon Sep 17 00:00:00 2001 From: wangyandong01 Date: Fri, 9 May 2025 13:31:26 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=AD=A3=E5=BC=8F?= =?UTF-8?q?=E7=89=88=E4=BE=9D=E8=B5=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/pom.xml b/pom.xml index 0541fe6..e7348af 100644 --- a/pom.xml +++ b/pom.xml @@ -50,8 +50,8 @@ 1.8 1.8 2.0.0 - 0.2.0-SNAPSHOT - 0.3.1-SNAPSHOT + 0.2.0 + 0.3.1 @@ -148,62 +148,62 @@ com.inspur.edp common-entity-model - ${cef.version} + ${cef.model.version} com.inspur.edp common-entity-framework-api - ${befframework.version} + ${bef.framework.version} com.inspur.edp common-entity-framework-spi - ${befframework.version} + ${bef.framework.version} com.inspur.edp common-entity-framework-core - ${befframework.version} + ${bef.framework.version} com.inspur.edp common-entity-framwork-repository - ${befframework.version} + ${bef.framework.version} com.inspur.edp unified-datatype-core - ${befframework.version} + ${bef.framework.version} com.inspur.edp unified-datatype-spi - ${befframework.version} + ${bef.framework.version} com.inspur.edp unified-datatype-model - ${cef.version} + ${cef.model.version} com.inspur.edp unified-datatype-api - ${befframework.version} + ${bef.framework.version} com.inspur.edp common-entity-framework-entity-api - ${befframework.version} + ${bef.framework.version} com.inspur.edp common-entity-framework-entity - ${befframework.version} + ${bef.framework.version} com.inspur.edp common-entity-framework-repository - ${befframework.version} + ${bef.framework.version} com.inspur.edp @@ -214,7 +214,7 @@ com.inspur.edp common-entity-framework-variable-core - ${befframework.version} + ${bef.framework.version} com.inspur.edp @@ -225,17 +225,17 @@ com.inspur.edp business-entity-framework-api - ${befframework.version} + ${bef.framework.version} com.inspur.edp business-entity-framework-spi - ${befframework.version} + ${bef.framework.version} com.inspur.edp business-entity-framework-core - ${befframework.version} + ${bef.framework.version} com.inspur.edp @@ -247,12 +247,12 @@ com.inspur.edp common-model - ${cef.version} + ${cef.model.version} com.inspur.edp business-entity-model - ${cef.version} + ${cef.model.version} -- Gitee