diff --git a/common-entity-generator/src/main/java/com/inspur/edp/cef/generator/repository/adaptor/BaseAdaptorGenerator.java b/common-entity-generator/src/main/java/com/inspur/edp/cef/generator/repository/adaptor/BaseAdaptorGenerator.java index 40996b2fcd147114aad7937ba517efb63a0773a8..347eb49fa4770b4040113e7961b4a39554372d3a 100644 --- a/common-entity-generator/src/main/java/com/inspur/edp/cef/generator/repository/adaptor/BaseAdaptorGenerator.java +++ b/common-entity-generator/src/main/java/com/inspur/edp/cef/generator/repository/adaptor/BaseAdaptorGenerator.java @@ -16,20 +16,11 @@ package com.inspur.edp.cef.generator.repository.adaptor; -import com.inspur.edp.cef.api.repository.GspDbDataType; -import com.inspur.edp.cef.gencommon.CefPropertyInfo; -import com.inspur.edp.cef.generator.repository.AssemblerInfo; import com.inspur.edp.cef.generator.repository.dac.DataTypeDacGenContext; -import com.inspur.edp.cef.repository.adaptoritem.EntityRelationalReposAdaptor; -import com.inspur.edp.cef.repository.dbcolumninfo.DbColumnInfo; -import com.inspur.edp.cef.repository.sqlgenerator.BaseSqlGenerator; -import com.inspur.edp.cef.repository.sqlgenerator.OraSqlGenerator; import com.inspur.edp.das.commonmodel.IGspCommonObject; -import com.inspur.edp.das.commonmodel.entity.GspCommonObject; public class BaseAdaptorGenerator extends EntityRelationReposAdaptorGenerator { - private BaseSqlGenerator sqlGenerator = new OraSqlGenerator(); public BaseAdaptorGenerator(IGspCommonObject gspCommonObject, DataTypeDacGenContext dacContext, String nodeCode, boolean isChild) { super(gspCommonObject, dacContext, nodeCode, isChild); diff --git a/common-entity-generator/src/main/java/com/inspur/edp/cef/generator/repository/adaptor/adaptoritem/RootNodeEntityAdaptorItemGenerator.java b/common-entity-generator/src/main/java/com/inspur/edp/cef/generator/repository/adaptor/adaptoritem/RootNodeEntityAdaptorItemGenerator.java index a6af1905eede1d188048c190ddf79929fc2c4ab6..8e191b87e35a060c98110f9b7182b16c80ba175f 100644 --- a/common-entity-generator/src/main/java/com/inspur/edp/cef/generator/repository/adaptor/adaptoritem/RootNodeEntityAdaptorItemGenerator.java +++ b/common-entity-generator/src/main/java/com/inspur/edp/cef/generator/repository/adaptor/adaptoritem/RootNodeEntityAdaptorItemGenerator.java @@ -18,15 +18,15 @@ package com.inspur.edp.cef.generator.repository.adaptor.adaptoritem; import com.inspur.edp.caf.generator.baseInfo.TypeInfo; import com.inspur.edp.caf.generator.method.ClassMethodGenerator; -import com.inspur.edp.cef.generator.repository.AssemblerInfo; +import com.inspur.edp.cef.api.repository.GspDbType; import com.inspur.edp.cef.generator.repository.dac.DataTypeDacGenContext; import com.inspur.edp.cef.repository.adaptoritem.BaseAdaptorItem; +import com.inspur.edp.cef.repository.adaptoritem.sqlsnippetprocessor.SqlGeneratorFactory; import com.inspur.edp.cef.repository.sqlgenerator.BaseSqlGenerator; -import com.inspur.edp.cef.repository.sqlgenerator.PgSqlGenerator; import com.inspur.edp.das.commonmodel.IGspCommonObject; public class RootNodeEntityAdaptorItemGenerator extends AdaptorItemGenerator { - private BaseSqlGenerator sqlGenerator = new PgSqlGenerator(); + private BaseSqlGenerator sqlGenerator = null; public RootNodeEntityAdaptorItemGenerator(IGspCommonObject gspCommonObject, DataTypeDacGenContext dacContext, String nodeCode, boolean isChild) { super(gspCommonObject, dacContext, nodeCode, isChild); @@ -43,7 +43,12 @@ public class RootNodeEntityAdaptorItemGenerator extends AdaptorItemGenerator { protected TypeInfo setParentClass(){return new TypeInfo(BaseAdaptorItem.class.getTypeName());} @Override - protected BaseSqlGenerator getSqlGenerator(){return sqlGenerator;} + protected BaseSqlGenerator getSqlGenerator(){ + if(sqlGenerator ==null){ + sqlGenerator = (BaseSqlGenerator) SqlGeneratorFactory.getSqlProcessor(GspDbType.PgSQL); + } + return sqlGenerator; + } @Override protected java.util.ArrayList createConstructorGenerators() diff --git a/common-entity-generator/src/main/java/com/inspur/edp/cef/generator/repository/dac/EntityDacGenerator.java b/common-entity-generator/src/main/java/com/inspur/edp/cef/generator/repository/dac/EntityDacGenerator.java index 4ef1036b74714b33ea5fdbc2855027f8c3420847..fc8ceb790dd1a40797802dfd5706115921d24f62 100644 --- a/common-entity-generator/src/main/java/com/inspur/edp/cef/generator/repository/dac/EntityDacGenerator.java +++ b/common-entity-generator/src/main/java/com/inspur/edp/cef/generator/repository/dac/EntityDacGenerator.java @@ -19,13 +19,11 @@ package com.inspur.edp.cef.generator.repository.dac; import com.inspur.edp.caf.generator.BaseGenerator; import com.inspur.edp.caf.generator.method.ClassMethodGenerator; import com.inspur.edp.caf.generator.property.ClassPropertyGenerator; -import com.inspur.edp.cef.api.attr.ChildAssemblerAttribute; import com.inspur.edp.cef.api.attr.ExtendChildAssemblerAttribute; import com.inspur.edp.cef.gencommon.ReflectionUtils; import com.inspur.edp.cef.generator.exception.CefGenException; import com.inspur.edp.cef.generator.repository.AssemblerInfo; import com.inspur.edp.cef.generator.repository.adaptor.BaseAdaptorGenerator; -import com.inspur.edp.cef.generator.repository.adaptor.adaptoritem.RootNodeEntityAdaptorItemGenerator; import com.inspur.edp.cef.generator.repository.dac.method.*; import com.inspur.edp.cef.generator.repository.dac.property.NodeCodePropGenerator; import com.inspur.edp.cef.generator.repository.repository.nestedrepository.DataTypeReposGenContext; @@ -184,7 +182,7 @@ public abstract class EntityDacGenerator extends DataTypeDacGenerator { addChildDacGenerator(extendGens); EntityDacGenContext entityDacGenContext = (EntityDacGenContext) getContext(); //TODO DbTypeList; - RootNodeEntityAdaptorItemGenerator entityItemGen = new RootNodeEntityAdaptorItemGenerator(gspCommonObject, entityDacGenContext, NodeCode, getIsChildDac()); + //RootNodeEntityAdaptorItemGenerator entityItemGen = new RootNodeEntityAdaptorItemGenerator(gspCommonObject, entityDacGenContext, NodeCode, getIsChildDac()); BaseAdaptorGenerator baseGen = new BaseAdaptorGenerator(gspCommonObject, entityDacGenContext, NodeCode, getIsChildDac()); getEntityDacGenContext().getGeneratedAdaptorTypes().put("base", baseGen.getGeneratedName()); diff --git a/i18nresources/bef_generator_exception.properties b/i18nresources/bef_generator_exception.properties new file mode 100644 index 0000000000000000000000000000000000000000..bef34e88893e5aeda55012ac5d0d1787bf3ce4b0 --- /dev/null +++ b/i18nresources/bef_generator_exception.properties @@ -0,0 +1,15 @@ +BEF_GENERATOR_0001=\u9519\u8BEF\u7684\u7C7B\u578B\uFF1A{0} +BEF_GENERATOR_0002={0}\u4E0D\u662F\u5185\u7F6E\u52A8\u4F5C +BEF_GENERATOR_0003=\u65B9\u6CD5{0}\u8FD4\u56DE\u503C\u89E3\u6790\u5F02\u5E38 +BEF_GENERATOR_0004=\u7F3A\u5C11dbo\u6587\u4EF6\uFF0C\u8BF7\u91CD\u65B0\u4FDD\u5B58BE\u751F\u6210dbo\u3002BE\u7F16\u53F7\uFF1A{0}\uFF0CBE\u540D\u79F0\uFF1A{1} +BEF_GENERATOR_0005=\u67E5\u627E\u5B9E\u4F53\u3010{0}\u3011\u4E2D\u7684\u5B57\u6BB5\u3010{1}\u3011\u4E2D\u5BF9\u5E94\u7684\u6570\u636E\u5E93\u5BF9\u8C61\u5217\u51FA\u9519\uFF0C\u627E\u4E0D\u5230\u5BF9\u5E94\u7684\u5217\uFF0C\u6570\u636E\u5E93\u5BF9\u8C61\u540D\u79F0\u3010{2}\u3011 +BEF_GENERATOR_0006={0}\u6A21\u578B\u4E0A\u8BBE\u7F6E\u7684\u7248\u672C\u5B57\u6BB5\u4E0D\u5B58\u5728 +BEF_GENERATOR_0007=#GSPBefError#BE\u52A8\u4F5C\u6784\u4EF6\u4E0D\u5B58\u5728:{0} #GSPBefError# +BEF_GENERATOR_0008=\u4E1A\u52A1\u5B9E\u4F53[{0}]\u4E0A\u7684\u81EA\u5B9A\u4E49\u52A8\u4F5C[{1}]\u6CA1\u6709\u5BF9\u5E94\u7684\u6784\u4EF6\u5143\u6570\u636E, \u8BF7\u6253\u5F00be\u8BBE\u8BA1\u5668\u70B9\u51FB\u4FDD\u5B58\u5E76\u540C\u6B65. +BEF_GENERATOR_0009=\u81EA\u5B9A\u4E49\u52A8\u4F5C\u7F16\u53F7{0}\u4E0E\u5185\u7F6E\u52A8\u4F5C\u7F16\u53F7\u91CD\u590D\uFF0C\u8BF7\u66F4\u6362\u81EA\u5B9A\u4E49\u52A8\u4F5C\u7F16\u53F7\u3002BE\u7F16\u53F7:{apiGenContext.getBeGenCtx().BE.getCode()}\uFF1BBE\u540D\u79F0\uFF1A{apiGenContext.getBeGenCtx().BE.Name},\u52A8\u4F5C\u7F16\u53F7\uFF1A{bo.getCode()}\uFF1B\u52A8\u4F5C\u540D\u79F0\uFF1A{bo.Name}\uFF1B\u8282\u70B9\u7F16\u53F7\uFF1A{node.getCode()}\uFF1B\u8282\u70B9\u540D\u79F0\uFF1A{node.Name}\u3002 +BEF_GENERATOR_0010=\u65E0\u6548\u7684\u679A\u4E3E\u503C{0} +BEF_GENERATOR_0011={0} +BEF_GENERATOR_0012=\u53C2\u6570\u6DFB\u52A0\u5931\u8D25{0} +BEF_GENERATOR_0013=\u65B9\u6CD5{0}\u8FD4\u56DE\u503C\u89E3\u6790\u5F02\u5E38 +BEF_GENERATOR_0014={0}\u7684dbo(\u6570\u636E\u5E93\u5BF9\u8C61)\u672A\u751F\u6210 +BEF_GENERATOR_0015={0}\u7684dbo(\u6570\u636E\u5E93\u5BF9\u8C61)\u4E0D\u5B58\u5728 \ No newline at end of file diff --git a/i18nresources/en/bef_generator_exception.en.properties b/i18nresources/en/bef_generator_exception.en.properties new file mode 100644 index 0000000000000000000000000000000000000000..c014db77af4cad92c3b2de31fdf85e1521ef60e5 --- /dev/null +++ b/i18nresources/en/bef_generator_exception.en.properties @@ -0,0 +1,15 @@ +BEF_GENERATOR_0001=Incorrect type: {0} +BEF_GENERATOR_0002={0} is not a built-in action +BEF_GENERATOR_0003=Exception occurred while parsing the return value of method {0} +BEF_GENERATOR_0004=Missing dbo file, please save the BE to generate dbo again. BE number: {0}, BE name: {1} +BEF_GENERATOR_0005=Error retrieving the database object column corresponding to the field {1} in entity {0}, column not found, database object name: {2} +BEF_GENERATOR_0006=Version field set on {0} model does not exist +BEF_GENERATOR_0007=#GSPBefError#BE action component does not exist: {0} #GSPBefError# +BEF_GENERATOR_0008=Custom action [{1}] on business entity [{0}] does not have corresponding component metadata, please open the BE designer, click save and sync. +BEF_GENERATOR_0009=Custom action number {0} conflicts with built-in action number, please change the custom action number. BE number: {apiGenContext.getBeGenCtx().BE.getCode()}; BE name: {apiGenContext.getBeGenCtx().BE.Name}, action number: {bo.getCode()}; action name: {bo.Name}; node number: {node.getCode()}; node name: {node.Name}. +BEF_GENERATOR_0010=Invalid enum value {0} +BEF_GENERATOR_0011={0} +BEF_GENERATOR_0012=Failed to add parameter {0} +BEF_GENERATOR_0013=Exception occurred while parsing the return value of method {0} +BEF_GENERATOR_0014=Dbo (Database Object) not generated for {0} +BEF_GENERATOR_0015=Dbo (Database Object) does not exist for {0} \ No newline at end of file diff --git a/i18nresources/zh-CHT/bef_generator_exception.zh-CHT.properties b/i18nresources/zh-CHT/bef_generator_exception.zh-CHT.properties new file mode 100644 index 0000000000000000000000000000000000000000..3775f6be713b572b065bf79300f72e28830783f1 --- /dev/null +++ b/i18nresources/zh-CHT/bef_generator_exception.zh-CHT.properties @@ -0,0 +1,15 @@ +BEF_GENERATOR_0001=\u932F\u8AA4\u7684\u985E\u578B\uFF1A{0} +BEF_GENERATOR_0002={0}\u4E0D\u662F\u5167\u7F6E\u52D5\u4F5C +BEF_GENERATOR_0003=\u65B9\u6CD5{0}\u8FD4\u56DE\u503C\u89E3\u6790\u7570\u5E38 +BEF_GENERATOR_0004=\u7F3A\u5C11dbo\u6587\u4EF6\uFF0C\u8ACB\u91CD\u65B0\u4FDD\u5B58BE\u751F\u6210dbo\u3002BE\u7DE8\u865F\uFF1A{0}\uFF0CBE\u540D\u7A31\uFF1A{1} +BEF_GENERATOR_0005=\u67E5\u627E\u5BE6\u9AD4\u3010{0}\u3011\u4E2D\u7684\u5B57\u6BB5\u3010{1}\u3011\u4E2D\u5C0D\u61C9\u7684\u6578\u64DA\u5EAB\u5C0D\u8C61\u5217\u51FA\u932F\uFF0C\u627E\u4E0D\u5230\u5C0D\u61C9\u7684\u5217\uFF0C\u6578\u64DA\u5EAB\u5C0D\u8C61\u540D\u7A31\u3010{2}\u3011 +BEF_GENERATOR_0006={0}\u6A21\u578B\u4E0A\u8A2D\u7F6E\u7684\u7248\u672C\u5B57\u6BB5\u4E0D\u5B58\u5728 +BEF_GENERATOR_0007=#GSPBefError#BE\u52D5\u4F5C\u69CB\u4EF6\u4E0D\u5B58\u5728:{0} #GSPBefError# +BEF_GENERATOR_0008=\u696D\u52D9\u5BE6\u9AD4[{0}]\u4E0A\u7684\u81EA\u5B9A\u7FA9\u52D5\u4F5C[{1}]\u6C92\u6709\u5C0D\u61C9\u7684\u69CB\u4EF6\u5143\u6578\u64DA, \u8ACB\u6253\u958Bbe\u8A2D\u8A08\u5668\u9EDE\u64CA\u4FDD\u5B58\u4E26\u540C\u6B65. +BEF_GENERATOR_0009=\u81EA\u5B9A\u7FA9\u52D5\u4F5C\u7DE8\u865F{0}\u8207\u5167\u7F6E\u52D5\u4F5C\u7DE8\u865F\u91CD\u8907\uFF0C\u8ACB\u66F4\u63DB\u81EA\u5B9A\u7FA9\u52D5\u4F5C\u7DE8\u865F\u3002BE\u7DE8\u865F:{apiGenContext.getBeGenCtx().BE.getCode()}\uFF1BBE\u540D\u7A31\uFF1A{apiGenContext.getBeGenCtx().BE.Name},\u52D5\u4F5C\u7DE8\u865F\uFF1A{bo.getCode()}\uFF1B\u52D5\u4F5C\u540D\u7A31\uFF1A{bo.Name}\uFF1B\u7BC0\u9EDE\u7DE8\u865F\uFF1A{node.getCode()}\uFF1B\u7BC0\u9EDE\u540D\u7A31\uFF1A{node.Name}\u3002 +BEF_GENERATOR_0010=\u7121\u6548\u7684\u679A\u8209\u503C{0} +BEF_GENERATOR_0011={0} +BEF_GENERATOR_0012=\u53C3\u6578\u6DFB\u52A0\u5931\u6557{0} +BEF_GENERATOR_0013=\u65B9\u6CD5{0}\u8FD4\u56DE\u503C\u89E3\u6790\u7570\u5E38 +BEF_GENERATOR_0014={0}\u7684dbo(\u6578\u64DA\u5EAB\u5C0D\u8C61)\u672A\u751F\u6210 +BEF_GENERATOR_0015={0}\u7684dbo(\u6578\u64DA\u5EAB\u5C0D\u8C61)\u4E0D\u5B58\u5728 \ No newline at end of file diff --git a/unified-datatype-generator/src/main/java/com/inspur/edp/udt/generator/api/typeprocessers/persistencevaluereader/UdtEnumPersistenceValueGenerator.java b/unified-datatype-generator/src/main/java/com/inspur/edp/udt/generator/api/typeprocessers/persistencevaluereader/UdtEnumPersistenceValueGenerator.java index e77b60599968bc0794f44ad733e88db42922364c..fd1e78dfaf5191c5142c2014d52aa3618b9ce0cb 100644 --- a/unified-datatype-generator/src/main/java/com/inspur/edp/udt/generator/api/typeprocessers/persistencevaluereader/UdtEnumPersistenceValueGenerator.java +++ b/unified-datatype-generator/src/main/java/com/inspur/edp/udt/generator/api/typeprocessers/persistencevaluereader/UdtEnumPersistenceValueGenerator.java @@ -50,7 +50,7 @@ public class UdtEnumPersistenceValueGenerator extends NullableTransPersistenceVa protected Statement getPropValueStatement() { var frag = ast.newVariableDeclarationFragment(); var invocation = ExpressionUtils.getMethodInvocation(ast, asDataVarName, "get" + propertyName); - MethodInvocation getValueInvocation = ExpressionUtils.getMethodInvocation(ast, invocation, "ordinal"); + MethodInvocation getValueInvocation = ExpressionUtils.getMethodInvocation(ast, invocation, "getValue"); ConditionalExpression conditionalExpression = ast.newConditionalExpression(); InfixExpression infixExpression = ast.newInfixExpression();