提交 905498eb 编写于 作者: zhouweidong's avatar zhouweidong

合并分支 'dev_camtest' 到 'dev'

驼峰转换

查看合并请求 !42
<#ibiztemplate> <#ibiztemplate>
TARGET=PSDATAENTITY TARGET=PSDATAENTITY
</#ibiztemplate> </#ibiztemplate>
<#comment>引入驼峰配置</#comment>
<#ibizinclude>/SLN/globalfunc.cfg</#ibizinclude>
<#assign hasResetField=false> <#assign hasResetField=false>
package ${pub.getPKGCodeName()}.core.${item.getPSSystemModule().getCodeName()?lower_case}.domain; package ${pub.getPKGCodeName()}.core.${item.getPSSystemModule().getCodeName()?lower_case}.domain;
...@@ -59,7 +61,7 @@ public class ${item.getCodeName()} extends EntityMP implements Serializable { ...@@ -59,7 +61,7 @@ public class ${item.getCodeName()} extends EntityMP implements Serializable {
<#assign defDataType = (defield.getDataType())!""> <#assign defDataType = (defield.getDataType())!"">
<#if defDataType!='ONE2MANYDATA'> <#if defDataType!='ONE2MANYDATA'>
<#assign columnname = defield.getName()?lower_case> <#assign columnname = defield.getName()?lower_case>
<#assign prvateCodeName = srfcaseformat(defield.getCodeName(),'l_u2lC') > <#assign prvateCodeName = srfr7templcaseformat(defield.getCodeName()) >
<#assign publicCodeName = prvateCodeName?cap_first > <#assign publicCodeName = prvateCodeName?cap_first >
<#assign jsonfield = defield.getCodeName()?lower_case > <#assign jsonfield = defield.getCodeName()?lower_case >
<#assign tablefieldano = "value = \""+columnname+"\"" > <#assign tablefieldano = "value = \""+columnname+"\"" >
...@@ -124,7 +126,7 @@ public class ${item.getCodeName()} extends EntityMP implements Serializable { ...@@ -124,7 +126,7 @@ public class ${item.getCodeName()} extends EntityMP implements Serializable {
<#assign defieldano = defieldano+", "> <#assign defieldano = defieldano+", ">
</#if> </#if>
<#if defield.getDupCheckPSDEField?? && defield.getDupCheckPSDEField()??> <#if defield.getDupCheckPSDEField?? && defield.getDupCheckPSDEField()??>
<#assign dupCheckField = srfcaseformat(defield.getDupCheckPSDEField().getCodeName(),'l_u2lC') > <#assign dupCheckField = srfr7templcaseformat(defield.getDupCheckPSDEField().getCodeName()) >
<#assign defieldano=defieldano+"dupCheck = DupCheck.ALL, dupCheckField = \""+dupCheckField+"\""> <#assign defieldano=defieldano+"dupCheck = DupCheck.ALL, dupCheckField = \""+dupCheckField+"\"">
<#else> <#else>
<#assign defieldano=defieldano+"dupCheck = DupCheck.ALL" > <#assign defieldano=defieldano+"dupCheck = DupCheck.ALL" >
...@@ -196,7 +198,7 @@ public class ${item.getCodeName()} extends EntityMP implements Serializable { ...@@ -196,7 +198,7 @@ public class ${item.getCodeName()} extends EntityMP implements Serializable {
@JsonIgnore @JsonIgnore
@JSONField(serialize = false) @JSONField(serialize = false)
@TableField(exist = false) @TableField(exist = false)
private ${pub.getPKGCodeName()}.core.${MajorEntity.getPSSystemModule().getCodeName()?lower_case}.domain.${MajorEntity.getCodeName()} ${srfcaseformat(MinorPSDER.getCodeName(),'l_u2lC')}; private ${pub.getPKGCodeName()}.core.${MajorEntity.getPSSystemModule().getCodeName()?lower_case}.domain.${MajorEntity.getCodeName()} ${srfr7templcaseformat(MinorPSDER.getCodeName())};
</#if> </#if>
</#if> </#if>
...@@ -210,7 +212,7 @@ public class ${item.getCodeName()} extends EntityMP implements Serializable { ...@@ -210,7 +212,7 @@ public class ${item.getCodeName()} extends EntityMP implements Serializable {
<#if der.getDERType() =='DER1N' > <#if der.getDERType() =='DER1N' >
<#assign listcode=(der.getMinorCodeName()!der.getMinorPSDataEntity().getCodeName())> <#assign listcode=(der.getMinorCodeName()!der.getMinorPSDataEntity().getCodeName())>
<#if listcode?? && listcode==''><#assign listcode=der.getMinorPSDataEntity().getCodeName()></#if> <#if listcode?? && listcode==''><#assign listcode=der.getMinorPSDataEntity().getCodeName()></#if>
<#assign columnname=srfcaseformat(listcode,'l_u2lC')> <#assign columnname=srfr7templcaseformat(listcode)>
<#assign subDTOs = srfpluralize(listcode)?lower_case > <#assign subDTOs = srfpluralize(listcode)?lower_case >
<#assign nested=der.isNestedRS()> <#assign nested=der.isNestedRS()>
<#if nested == false && der.getMinorPSDataEntity().getAllPSDEServiceAPIs()??> <#if nested == false && der.getMinorPSDataEntity().getAllPSDEServiceAPIs()??>
...@@ -238,15 +240,15 @@ public class ${item.getCodeName()} extends EntityMP implements Serializable { ...@@ -238,15 +240,15 @@ public class ${item.getCodeName()} extends EntityMP implements Serializable {
@JSONField(serialize = false) @JSONField(serialize = false)
@TableField(exist = false) @TableField(exist = false)
</#if> </#if>
private List<${pub.getPKGCodeName()}.core.${der.getMinorPSDataEntity().getPSSystemModule().getCodeName()?lower_case}.domain.${der.getMinorPSDataEntity().getCodeName()}> ${srfcaseformat(listcode,'l_u2lC')}; private List<${pub.getPKGCodeName()}.core.${der.getMinorPSDataEntity().getPSSystemModule().getCodeName()?lower_case}.domain.${der.getMinorPSDataEntity().getCodeName()}> ${srfr7templcaseformat(listcode)};
<#if der.getMinorPSDataEntity().getStorageMode()==0 && der.getPSOne2ManyDataDEField()?? && der.getPSOne2ManyDataDEField().isPhisicalDEField()==true> <#if der.getMinorPSDataEntity().getStorageMode()==0 && der.getPSOne2ManyDataDEField()?? && der.getPSOne2ManyDataDEField().isPhisicalDEField()==true>
/** /**
* 设置 [${der.getMinorPSDataEntity().getLogicName()}] * 设置 [${der.getMinorPSDataEntity().getLogicName()}]
*/ */
public void set${srfcaseformat(listcode,'l_u2lC')?cap_first}(List<${pub.getPKGCodeName()}.core.${der.getMinorPSDataEntity().getPSSystemModule().getCodeName()?lower_case}.domain.${der.getMinorPSDataEntity().getCodeName()}> ${srfcaseformat(listcode,'l_u2lC')}) { public void set${srfr7templcaseformat(listcode)?cap_first}(List<${pub.getPKGCodeName()}.core.${der.getMinorPSDataEntity().getPSSystemModule().getCodeName()?lower_case}.domain.${der.getMinorPSDataEntity().getCodeName()}> ${srfr7templcaseformat(listcode)}) {
this.${srfcaseformat(listcode,'l_u2lC')} = ${srfcaseformat(listcode,'l_u2lC')}; this.${srfr7templcaseformat(listcode)} = ${srfr7templcaseformat(listcode)};
this.modify("${columnname}", (${srfcaseformat(listcode,'l_u2lC')}!=null)?${srfcaseformat(listcode,'l_u2lC')}:(new ArrayList())); this.modify("${columnname}", (${srfr7templcaseformat(listcode)}!=null)?${srfr7templcaseformat(listcode)}:(new ArrayList()));
} }
</#if> </#if>
</#if> </#if>
...@@ -258,7 +260,7 @@ public class ${item.getCodeName()} extends EntityMP implements Serializable { ...@@ -258,7 +260,7 @@ public class ${item.getCodeName()} extends EntityMP implements Serializable {
<#list de.getPSDEFields() as defield> <#list de.getPSDEFields() as defield>
<#assign defDataType = (defield.getDataType())!""> <#assign defDataType = (defield.getDataType())!"">
<#assign columnname = defield.getName()?lower_case> <#assign columnname = defield.getName()?lower_case>
<#assign prvateCodeName = srfcaseformat(defield.getCodeName(),'l_u2lC') > <#assign prvateCodeName = srfr7templcaseformat(defield.getCodeName()) >
<#assign publicCodeName = prvateCodeName?cap_first > <#assign publicCodeName = prvateCodeName?cap_first >
<#assign jsonfield = defield.getCodeName()?lower_case > <#assign jsonfield = defield.getCodeName()?lower_case >
<#assign defieldIsDate=false> <#assign defieldIsDate=false>
...@@ -304,7 +306,7 @@ public class ${item.getCodeName()} extends EntityMP implements Serializable { ...@@ -304,7 +306,7 @@ public class ${item.getCodeName()} extends EntityMP implements Serializable {
<#comment>联合主键</#comment> <#comment>联合主键</#comment>
<#assign keyField = item.getKeyPSDEField()> <#assign keyField = item.getKeyPSDEField()>
<#if item.getUnionKeyValuePSDEFields()??> <#if item.getUnionKeyValuePSDEFields()??>
<#assign prvateCodeName = srfcaseformat(keyField.getCodeName(),'l_u2lC') > <#assign prvateCodeName = srfr7templcaseformat(keyField.getCodeName()) >
<#assign publicCodeName = prvateCodeName?cap_first > <#assign publicCodeName = prvateCodeName?cap_first >
<#if keyField.isPhisicalDEField()==false> <#if keyField.isPhisicalDEField()==false>
<#comment>虚拟联合主键</#comment> <#comment>虚拟联合主键</#comment>
...@@ -329,7 +331,7 @@ public class ${item.getCodeName()} extends EntityMP implements Serializable { ...@@ -329,7 +331,7 @@ public class ${item.getCodeName()} extends EntityMP implements Serializable {
if(args.length == ${unionKeySize}){ if(args.length == ${unionKeySize}){
${checkUnionKey2(item.getUnionKeyValuePSDEFields())} { ${checkUnionKey2(item.getUnionKeyValuePSDEFields())} {
<#list item.getUnionKeyValuePSDEFields() as defield> <#list item.getUnionKeyValuePSDEFields() as defield>
<#assign unionKeyPrivateCodeName = srfcaseformat(defield.getCodeName(),'l_u2lC') > <#assign unionKeyPrivateCodeName = srfr7templcaseformat(defield.getCodeName()) >
<#assign unionKeyPublicCodeName = unionKeyPrivateCodeName?cap_first > <#assign unionKeyPublicCodeName = unionKeyPrivateCodeName?cap_first >
this.set("${unionKeyPrivateCodeName}", args[${defield_index}]); this.set("${unionKeyPrivateCodeName}", args[${defield_index}]);
</#list> </#list>
...@@ -426,7 +428,7 @@ public class ${item.getCodeName()} extends EntityMongo implements Serializable { ...@@ -426,7 +428,7 @@ public class ${item.getCodeName()} extends EntityMongo implements Serializable {
<#assign defDataType = (defield.getDataType())!""> <#assign defDataType = (defield.getDataType())!"">
<#if defDataType!='ONE2MANYDATA'> <#if defDataType!='ONE2MANYDATA'>
<#assign columnname = defield.getName()?lower_case> <#assign columnname = defield.getName()?lower_case>
<#assign prvateCodeName = srfcaseformat(defield.getCodeName(),'l_u2lC') > <#assign prvateCodeName = srfr7templcaseformat(defield.getCodeName()) >
<#assign publicCodeName = prvateCodeName?cap_first > <#assign publicCodeName = prvateCodeName?cap_first >
<#assign jsonfield = defield.getCodeName()?lower_case > <#assign jsonfield = defield.getCodeName()?lower_case >
<#assign defieldano = "" > <#assign defieldano = "" >
...@@ -508,7 +510,7 @@ public class ${item.getCodeName()} extends EntityMongo implements Serializable { ...@@ -508,7 +510,7 @@ public class ${item.getCodeName()} extends EntityMongo implements Serializable {
@JsonIgnore @JsonIgnore
@JSONField(serialize = false) @JSONField(serialize = false)
@Transient @Transient
private ${pub.getPKGCodeName()}.core.${MajorEntity.getPSSystemModule().getCodeName()?lower_case}.domain.${MajorEntity.getCodeName()} ${srfcaseformat(MinorPSDER.getCodeName(),'l_u2lC')}; private ${pub.getPKGCodeName()}.core.${MajorEntity.getPSSystemModule().getCodeName()?lower_case}.domain.${MajorEntity.getCodeName()} ${srfr7templcaseformat(MinorPSDER.getCodeName())};
</#if> </#if>
</#if> </#if>
...@@ -541,14 +543,14 @@ public class ${item.getCodeName()} extends EntityMongo implements Serializable { ...@@ -541,14 +543,14 @@ public class ${item.getCodeName()} extends EntityMongo implements Serializable {
<#if der.getPSOne2ManyDataDEField()??> <#if der.getPSOne2ManyDataDEField()??>
@Field(name = "${der.getPSOne2ManyDataDEField().getName()?lower_case}" @Field(name = "${der.getPSOne2ManyDataDEField().getName()?lower_case}"
<#else > <#else >
@Field(name = "${srfcaseformat(listcode,'l_u2lC')}") @Field(name = "${srfr7templcaseformat(listcode)}")
</#if> </#if>
<#else > <#else >
@JsonIgnore @JsonIgnore
@JSONField(serialize = false) @JSONField(serialize = false)
@Transient @Transient
</#if> </#if>
private List<${pub.getPKGCodeName()}.core.${der.getMinorPSDataEntity().getPSSystemModule().getCodeName()?lower_case}.domain.${der.getMinorPSDataEntity().getCodeName()}> ${srfcaseformat(listcode,'l_u2lC')}; private List<${pub.getPKGCodeName()}.core.${der.getMinorPSDataEntity().getPSSystemModule().getCodeName()?lower_case}.domain.${der.getMinorPSDataEntity().getCodeName()}> ${srfr7templcaseformat(listcode)};
</#if> </#if>
</#if> </#if>
...@@ -559,7 +561,7 @@ public class ${item.getCodeName()} extends EntityMongo implements Serializable { ...@@ -559,7 +561,7 @@ public class ${item.getCodeName()} extends EntityMongo implements Serializable {
<#assign keyField = item.getKeyPSDEField()> <#assign keyField = item.getKeyPSDEField()>
<#comment>联合主键</#comment> <#comment>联合主键</#comment>
<#if item.getUnionKeyValuePSDEFields()??> <#if item.getUnionKeyValuePSDEFields()??>
<#assign privateCodeName = srfcaseformat(keyField.getCodeName(),'l_u2lC') > <#assign privateCodeName = srfr7templcaseformat(keyField.getCodeName()) >
<#assign publicCodeName = privateCodeName?cap_first > <#assign publicCodeName = privateCodeName?cap_first >
/** /**
* 获取 [${keyField.getLogicName()}] * 获取 [${keyField.getLogicName()}]
...@@ -598,7 +600,7 @@ public class ${item.getCodeName()} extends EntityClient implements Serializable ...@@ -598,7 +600,7 @@ public class ${item.getCodeName()} extends EntityClient implements Serializable
<#assign defDataType = (defield.getDataType())!""> <#assign defDataType = (defield.getDataType())!"">
<#if defDataType!='ONE2MANYDATA'> <#if defDataType!='ONE2MANYDATA'>
<#assign columnname = defield.getName()?lower_case> <#assign columnname = defield.getName()?lower_case>
<#assign prvateCodeName = srfcaseformat(defield.getCodeName(),'l_u2lC') > <#assign prvateCodeName = srfr7templcaseformat(defield.getCodeName()) >
<#assign publicCodeName = prvateCodeName?cap_first > <#assign publicCodeName = prvateCodeName?cap_first >
<#assign jsonfield = defield.getCodeName()?lower_case > <#assign jsonfield = defield.getCodeName()?lower_case >
<#if de.getStorageMode()==0><#assign jsonfield = defield.getCodeName()?uncap_first ></#if> <#if de.getStorageMode()==0><#assign jsonfield = defield.getCodeName()?uncap_first ></#if>
...@@ -672,9 +674,9 @@ public class ${item.getCodeName()} extends EntityClient implements Serializable ...@@ -672,9 +674,9 @@ public class ${item.getCodeName()} extends EntityClient implements Serializable
/** /**
* ${MinorPSDER.getLogicName()} * ${MinorPSDER.getLogicName()}
*/ */
@JSONField(name = "${srfcaseformat(MinorPSDER.getCodeName(),'l_u2lC')?lower_case}") @JSONField(name = "${srfr7templcaseformat(MinorPSDER.getCodeName())?lower_case}")
@JsonProperty("${srfcaseformat(MinorPSDER.getCodeName(),'l_u2lC')?lower_case}") @JsonProperty("${srfr7templcaseformat(MinorPSDER.getCodeName())?lower_case}")
private ${pub.getPKGCodeName()}.core.${MajorEntity.getPSSystemModule().getCodeName()?lower_case}.domain.${MajorEntity.getCodeName()} ${srfcaseformat(MinorPSDER.getCodeName(),'l_u2lC')}; private ${pub.getPKGCodeName()}.core.${MajorEntity.getPSSystemModule().getCodeName()?lower_case}.domain.${MajorEntity.getCodeName()} ${srfr7templcaseformat(MinorPSDER.getCodeName())};
</#if> </#if>
</#if> </#if>
...@@ -703,7 +705,7 @@ public class ${item.getCodeName()} extends EntityClient implements Serializable ...@@ -703,7 +705,7 @@ public class ${item.getCodeName()} extends EntityClient implements Serializable
*/ */
@JSONField(name = "${subDTOs}") @JSONField(name = "${subDTOs}")
@JsonProperty("${subDTOs}") @JsonProperty("${subDTOs}")
private List<${pub.getPKGCodeName()}.core.${der.getMinorPSDataEntity().getPSSystemModule().getCodeName()?lower_case}.domain.${der.getMinorPSDataEntity().getCodeName()}> ${srfcaseformat(listcode,'l_u2lC')}; private List<${pub.getPKGCodeName()}.core.${der.getMinorPSDataEntity().getPSSystemModule().getCodeName()?lower_case}.domain.${der.getMinorPSDataEntity().getCodeName()}> ${srfr7templcaseformat(listcode)};
</#if> </#if>
</#if> </#if>
...@@ -715,7 +717,7 @@ public class ${item.getCodeName()} extends EntityClient implements Serializable ...@@ -715,7 +717,7 @@ public class ${item.getCodeName()} extends EntityClient implements Serializable
<#list de.getPSDEFields() as defield> <#list de.getPSDEFields() as defield>
<#assign defDataType = (defield.getDataType())!""> <#assign defDataType = (defield.getDataType())!"">
<#assign columnname = defield.getName()?lower_case> <#assign columnname = defield.getName()?lower_case>
<#assign prvateCodeName = srfcaseformat(defield.getCodeName(),'l_u2lC') > <#assign prvateCodeName = srfr7templcaseformat(defield.getCodeName()) >
<#assign publicCodeName = prvateCodeName?cap_first > <#assign publicCodeName = prvateCodeName?cap_first >
<#assign jsonfield = defield.getCodeName()?lower_case > <#assign jsonfield = defield.getCodeName()?lower_case >
<#assign defieldIsDate=false> <#assign defieldIsDate=false>
...@@ -808,7 +810,7 @@ public class ${item.getCodeName()} extends EntityBase implements Serializable { ...@@ -808,7 +810,7 @@ public class ${item.getCodeName()} extends EntityBase implements Serializable {
<#assign defDataType = (defield.getDataType())!""> <#assign defDataType = (defield.getDataType())!"">
<#if defDataType!='ONE2MANYDATA'> <#if defDataType!='ONE2MANYDATA'>
<#assign columnname = defield.getName()?lower_case> <#assign columnname = defield.getName()?lower_case>
<#assign prvateCodeName = srfcaseformat(defield.getCodeName(),'l_u2lC') > <#assign prvateCodeName = srfr7templcaseformat(defield.getCodeName()) >
<#assign publicCodeName = prvateCodeName?cap_first > <#assign publicCodeName = prvateCodeName?cap_first >
<#assign jsonfield = defield.getCodeName()?lower_case > <#assign jsonfield = defield.getCodeName()?lower_case >
<#if de.getStorageMode()==0><#assign jsonfield = defield.getCodeName()?uncap_first ></#if> <#if de.getStorageMode()==0><#assign jsonfield = defield.getCodeName()?uncap_first ></#if>
...@@ -882,9 +884,9 @@ public class ${item.getCodeName()} extends EntityBase implements Serializable { ...@@ -882,9 +884,9 @@ public class ${item.getCodeName()} extends EntityBase implements Serializable {
/** /**
* ${MinorPSDER.getLogicName()} * ${MinorPSDER.getLogicName()}
*/ */
@JSONField(name = "${srfcaseformat(MinorPSDER.getCodeName(),'l_u2lC')?lower_case}") @JSONField(name = "${srfr7templcaseformat(MinorPSDER.getCodeName())?lower_case}")
@JsonProperty("${srfcaseformat(MinorPSDER.getCodeName(),'l_u2lC')?lower_case}") @JsonProperty("${srfr7templcaseformat(MinorPSDER.getCodeName())?lower_case}")
private ${pub.getPKGCodeName()}.core.${MajorEntity.getPSSystemModule().getCodeName()?lower_case}.domain.${MajorEntity.getCodeName()} ${srfcaseformat(MinorPSDER.getCodeName(),'l_u2lC')}; private ${pub.getPKGCodeName()}.core.${MajorEntity.getPSSystemModule().getCodeName()?lower_case}.domain.${MajorEntity.getCodeName()} ${srfr7templcaseformat(MinorPSDER.getCodeName())};
</#if> </#if>
</#if> </#if>
...@@ -913,7 +915,7 @@ public class ${item.getCodeName()} extends EntityBase implements Serializable { ...@@ -913,7 +915,7 @@ public class ${item.getCodeName()} extends EntityBase implements Serializable {
*/ */
@JSONField(name = "${subDTOs}") @JSONField(name = "${subDTOs}")
@JsonProperty("${subDTOs}") @JsonProperty("${subDTOs}")
private List<${pub.getPKGCodeName()}.core.${der.getMinorPSDataEntity().getPSSystemModule().getCodeName()?lower_case}.domain.${der.getMinorPSDataEntity().getCodeName()}> ${srfcaseformat(listcode,'l_u2lC')}; private List<${pub.getPKGCodeName()}.core.${der.getMinorPSDataEntity().getPSSystemModule().getCodeName()?lower_case}.domain.${der.getMinorPSDataEntity().getCodeName()}> ${srfr7templcaseformat(listcode)};
</#if> </#if>
</#if> </#if>
...@@ -923,7 +925,7 @@ public class ${item.getCodeName()} extends EntityBase implements Serializable { ...@@ -923,7 +925,7 @@ public class ${item.getCodeName()} extends EntityBase implements Serializable {
<#list de.getPSDEFields() as defield> <#list de.getPSDEFields() as defield>
<#assign defDataType = (defield.getDataType())!""> <#assign defDataType = (defield.getDataType())!"">
<#assign columnname = defield.getName()?lower_case> <#assign columnname = defield.getName()?lower_case>
<#assign prvateCodeName = srfcaseformat(defield.getCodeName(),'l_u2lC') > <#assign prvateCodeName = srfr7templcaseformat(defield.getCodeName()) >
<#assign publicCodeName = prvateCodeName?cap_first > <#assign publicCodeName = prvateCodeName?cap_first >
<#assign jsonfield = defield.getCodeName()?lower_case > <#assign jsonfield = defield.getCodeName()?lower_case >
<#assign defieldIsDate=false> <#assign defieldIsDate=false>
...@@ -967,7 +969,7 @@ public class ${item.getCodeName()} extends EntityBase implements Serializable { ...@@ -967,7 +969,7 @@ public class ${item.getCodeName()} extends EntityBase implements Serializable {
<#assign formatValue=""> <#assign formatValue="">
<#list item.getUnionKeyValuePSDEFields() as defield> <#list item.getUnionKeyValuePSDEFields() as defield>
<#assign dataType = (defield.getDataType())!""> <#assign dataType = (defield.getDataType())!"">
<#assign unionKeyPrivateCodeName = srfcaseformat(defield.getCodeName(),'l_u2lC') > <#assign unionKeyPrivateCodeName = srfr7templcaseformat(defield.getCodeName()) >
<#assign unionKeyPublicCodeName = unionKeyPrivateCodeName?cap_first > <#assign unionKeyPublicCodeName = unionKeyPrivateCodeName?cap_first >
<#assign formatKey=formatKey+"%s"> <#assign formatKey=formatKey+"%s">
<#if defield_has_next> <#if defield_has_next>
...@@ -990,7 +992,7 @@ public class ${item.getCodeName()} extends EntityBase implements Serializable { ...@@ -990,7 +992,7 @@ public class ${item.getCodeName()} extends EntityBase implements Serializable {
<#function checkUnionKey unionKeyList> <#function checkUnionKey unionKeyList>
<#assign formatValue=""> <#assign formatValue="">
<#list item.getUnionKeyValuePSDEFields() as defield> <#list item.getUnionKeyValuePSDEFields() as defield>
<#assign unionKeyPrivateCodeName = srfcaseformat(defield.getCodeName(),'l_u2lC') > <#assign unionKeyPrivateCodeName = srfr7templcaseformat(defield.getCodeName()) >
<#assign unionKeyPublicCodeName = unionKeyPrivateCodeName?cap_first > <#assign unionKeyPublicCodeName = unionKeyPrivateCodeName?cap_first >
<#assign formatValue=formatValue+"(!ObjectUtils.isEmpty(this.get"+unionKeyPublicCodeName+"()))"> <#assign formatValue=formatValue+"(!ObjectUtils.isEmpty(this.get"+unionKeyPublicCodeName+"()))">
<#if defield_has_next> <#if defield_has_next>
...@@ -1013,9 +1015,3 @@ public class ${item.getCodeName()} extends EntityBase implements Serializable { ...@@ -1013,9 +1015,3 @@ public class ${item.getCodeName()} extends EntityBase implements Serializable {
<#assign unionKeyResult="if("+formatValue+")"> <#assign unionKeyResult="if("+formatValue+")">
<#return unionKeyResult> <#return unionKeyResult>
</#function> </#function>
\ No newline at end of file
<#ibiztemplate> <#ibiztemplate>
TARGET=PSDATAENTITY TARGET=PSDATAENTITY
</#ibiztemplate> </#ibiztemplate>
<#comment>引入驼峰配置</#comment>
<#ibizinclude>/SLN/globalfunc.cfg</#ibizinclude>
<#if de.getStorageMode()==1> <#if de.getStorageMode()==1>
package ${pub.getPKGCodeName()}.core.${item.getPSSystemModule().codeName?lower_case}.mapper; package ${pub.getPKGCodeName()}.core.${item.getPSSystemModule().codeName?lower_case}.mapper;
...@@ -33,7 +35,7 @@ public interface ${item.getCodeName()}Mapper extends BaseMapper<${item.getCodeNa ...@@ -33,7 +35,7 @@ public interface ${item.getCodeName()}Mapper extends BaseMapper<${item.getCodeNa
Page<<#if dedataset.isEnableGroup()>Map<#else>${item.getCodeName()}</#if>> search${dedataset.getCodeName()}(IPage page, @Param("srf") ${de.codeName}SearchContext context, @Param("ew") Wrapper<${item.getCodeName()}> wrapper); Page<<#if dedataset.isEnableGroup()>Map<#else>${item.getCodeName()}</#if>> search${dedataset.getCodeName()}(IPage page, @Param("srf") ${de.codeName}SearchContext context, @Param("ew") Wrapper<${item.getCodeName()}> wrapper);
</#list> </#list>
</#if> </#if>
<#assign keyfieldCodeName=srfcaseformat(item.getKeyPSDEField().codeName,'l_u2lC')> <#assign keyfieldCodeName=srfr7templcaseformat(item.getKeyPSDEField().codeName)>
@Override @Override
<#if item.isEnableEntityCache()==true> <#if item.isEnableEntityCache()==true>
@Cacheable(value ="${item.codeName?lower_case}", key = "'row:'+#p0") @Cacheable(value ="${item.codeName?lower_case}", key = "'row:'+#p0")
...@@ -104,7 +106,7 @@ public interface ${item.getCodeName()}Mapper extends BaseMapper<${item.getCodeNa ...@@ -104,7 +106,7 @@ public interface ${item.getCodeName()}Mapper extends BaseMapper<${item.getCodeNa
<#if de.getDefaultPSDEDataSet()??> <#if de.getDefaultPSDEDataSet()??>
<#assign deDefaultDataSet=de.getDefaultPSDEDataSet()> <#assign deDefaultDataSet=de.getDefaultPSDEDataSet()>
<#if deDefaultDataSet.getPSDEDataQueries()??> <#if deDefaultDataSet.getPSDEDataQueries()??>
List<${item.getCodeName()}> selectBy${srfcaseformat(MajorField.codeName,'l_u2lC')?cap_first}(@Param("${MajorkeyField.codeName?lower_case}") Serializable ${MajorkeyField.codeName?lower_case}); List<${item.getCodeName()}> selectBy${srfr7templcaseformat(MajorField.codeName)?cap_first}(@Param("${MajorkeyField.codeName?lower_case}") Serializable ${MajorkeyField.codeName?lower_case});
</#if> </#if>
</#if> </#if>
......
<#ibiztemplate> <#ibiztemplate>
TARGET=PSDEDATAIMP TARGET=PSDEDATAIMP
</#ibiztemplate> </#ibiztemplate>
<#comment>引入驼峰配置</#comment>
<#ibizinclude>/SLN/globalfunc.cfg</#ibizinclude>
package ${pub.getPKGCodeName()}.core.${de.getPSSystemModule().codeName?lower_case}.mapping; package ${pub.getPKGCodeName()}.core.${de.getPSSystemModule().codeName?lower_case}.mapping;
import ${pub.getPKGCodeName()}.core.${de.getPSSystemModule().codeName?lower_case}.domain.${de.codeName}; import ${pub.getPKGCodeName()}.core.${de.getPSSystemModule().codeName?lower_case}.domain.${de.codeName};
...@@ -9,13 +11,13 @@ import java.util.List; ...@@ -9,13 +11,13 @@ import java.util.List;
@Mapper(componentModel = "spring", uses = {}) @Mapper(componentModel = "spring", uses = {})
public interface ${de.codeName}${item.codeName} { public interface ${de.codeName}${item.codeName} {
<#assign keyFieldName=srfcaseformat(de.getKeyPSDEField().getCodeName(),'l_u2lC')> <#assign keyFieldName=srfr7templcaseformat(de.getKeyPSDEField().getCodeName())>
<#if item.getPSDEDataImportItems?? && item.getPSDEDataImportItems()??> <#if item.getPSDEDataImportItems?? && item.getPSDEDataImportItems()??>
@Mappings({ @Mappings({
@Mapping(target = "${keyFieldName}", source = "${keyFieldName}"), @Mapping(target = "${keyFieldName}", source = "${keyFieldName}"),
<#list item.getPSDEDataImportItems() as importItem> <#list item.getPSDEDataImportItems() as importItem>
<#if importItem.getPSDEField()?? && importItem.getPSDEField().isKeyDEField()==false> <#if importItem.getPSDEField()?? && importItem.getPSDEField().isKeyDEField()==false>
<#assign deFieldName = srfcaseformat(importItem.getPSDEField().getCodeName(),'l_u2lC')> <#assign deFieldName = srfr7templcaseformat(importItem.getPSDEField().getCodeName())>
@Mapping(target = "${deFieldName}", source = "${deFieldName}"), @Mapping(target = "${deFieldName}", source = "${deFieldName}"),
</#if> </#if>
</#list> </#list>
...@@ -26,7 +28,3 @@ public interface ${de.codeName}${item.codeName} { ...@@ -26,7 +28,3 @@ public interface ${de.codeName}${item.codeName} {
List<${de.codeName}> toDomain(List<${de.codeName}> entities); List<${de.codeName}> toDomain(List<${de.codeName}> entities);
} }
\ No newline at end of file
<#ibiztemplate> <#ibiztemplate>
TARGET=PSDATAENTITY TARGET=PSDATAENTITY
</#ibiztemplate> </#ibiztemplate>
<#comment>引入驼峰配置</#comment>
<#ibizinclude>/SLN/globalfunc.cfg</#ibizinclude>
<#comment>索引从实体</#comment> <#comment>索引从实体</#comment>
<#assign isIndexSubDE=false> <#assign isIndexSubDE=false>
<#if de.getMinorPSDERs()??> <#if de.getMinorPSDERs()??>
...@@ -23,13 +25,13 @@ TARGET=PSDATAENTITY ...@@ -23,13 +25,13 @@ TARGET=PSDATAENTITY
<#comment>索引主实体</#comment> <#comment>索引主实体</#comment>
<#assign majorIndexDE=indexPSDER.getMajorPSDataEntity()> <#assign majorIndexDE=indexPSDER.getMajorPSDataEntity()>
<#assign majorIndexDECodeName=indexPSDER.getMajorPSDataEntity().codeName> <#assign majorIndexDECodeName=indexPSDER.getMajorPSDataEntity().codeName>
<#assign majorIndexDECodeNameCamel = srfcaseformat(majorIndexDECodeName,'l_u2lC')?cap_first> <#assign majorIndexDECodeNameCamel = srfr7templcaseformat(majorIndexDECodeName)?cap_first>
<#assign majorIndexDEKeyFieldCodeName=srfcaseformat(majorIndexDE.getKeyPSDEField().codeName,'l_u2lC')> <#assign majorIndexDEKeyFieldCodeName=srfr7templcaseformat(majorIndexDE.getKeyPSDEField().codeName)>
<#assign majorIndexDEMajorTextFieldCodeName=srfcaseformat(majorIndexDE.getMajorPSDEField().codeName,'l_u2lC')> <#assign majorIndexDEMajorTextFieldCodeName=srfr7templcaseformat(majorIndexDE.getMajorPSDEField().codeName)>
<#assign MinorIndexDECodeName=de.codeName> <#assign MinorIndexDECodeName=de.codeName>
<#assign MinorIndexDECodeNameCamel = srfcaseformat(MinorIndexDECodeName,'l_u2lC')?cap_first> <#assign MinorIndexDECodeNameCamel = srfr7templcaseformat(MinorIndexDECodeName)?cap_first>
<#assign MinorIndexDEKeyFieldCodeName=srfcaseformat(de.getKeyPSDEField().codeName,'l_u2lC')> <#assign MinorIndexDEKeyFieldCodeName=srfr7templcaseformat(de.getKeyPSDEField().codeName)>
<#assign MinorIndexDEMajorTextFieldCodeName=srfcaseformat(de.getMajorPSDEField().codeName,'l_u2lC')> <#assign MinorIndexDEMajorTextFieldCodeName=srfr7templcaseformat(de.getMajorPSDEField().codeName)>
package ${pub.getPKGCodeName()}.core.${de.getPSSystemModule().codeName?lower_case}.mapping; package ${pub.getPKGCodeName()}.core.${de.getPSSystemModule().codeName?lower_case}.mapping;
...@@ -53,7 +55,7 @@ public interface ${de.codeName}InheritMapping { ...@@ -53,7 +55,7 @@ public interface ${de.codeName}InheritMapping {
<#assign MinorDEField=indexFieldmapping.getMinorPSDEField()> <#assign MinorDEField=indexFieldmapping.getMinorPSDEField()>
<#if majorDEField.isKeyDEField()==false && MinorDEField.isKeyDEField()==false && majorDEField.isMajorDEField()==false && MinorDEField.isMajorDEField()==false> <#if majorDEField.isKeyDEField()==false && MinorDEField.isKeyDEField()==false && majorDEField.isMajorDEField()==false && MinorDEField.isMajorDEField()==false>
<#if !P.exists(MinorDEField.codeName,majorDEField.codeName)> <#if !P.exists(MinorDEField.codeName,majorDEField.codeName)>
@Mapping(source ="${srfcaseformat(MinorDEField.codeName,'l_u2lC')}",target = "${srfcaseformat(majorDEField.codeName,'l_u2lC')}"), @Mapping(source ="${srfr7templcaseformat(MinorDEField.codeName)}",target = "${srfr7templcaseformat(majorDEField.codeName)}"),
</#if> </#if>
</#if> </#if>
</#if> </#if>
...@@ -74,7 +76,7 @@ public interface ${de.codeName}InheritMapping { ...@@ -74,7 +76,7 @@ public interface ${de.codeName}InheritMapping {
<#assign MinorDEField=indexFieldmapping.getMinorPSDEField()> <#assign MinorDEField=indexFieldmapping.getMinorPSDEField()>
<#if majorDEField.isKeyDEField()==false && MinorDEField.isKeyDEField()==false && majorDEField.isMajorDEField()==false && MinorDEField.isMajorDEField()==false> <#if majorDEField.isKeyDEField()==false && MinorDEField.isKeyDEField()==false && majorDEField.isMajorDEField()==false && MinorDEField.isMajorDEField()==false>
<#if !P.exists(majorDEField.codeName,MinorDEField.codeName)> <#if !P.exists(majorDEField.codeName,MinorDEField.codeName)>
@Mapping(source ="${srfcaseformat(majorDEField.codeName,'l_u2lC')}",target = "${srfcaseformat(MinorDEField.codeName,'l_u2lC')}"), @Mapping(source ="${srfr7templcaseformat(majorDEField.codeName)}",target = "${srfr7templcaseformat(MinorDEField.codeName)}"),
</#if> </#if>
</#if> </#if>
</#if> </#if>
...@@ -90,5 +92,3 @@ public interface ${de.codeName}InheritMapping { ...@@ -90,5 +92,3 @@ public interface ${de.codeName}InheritMapping {
} }
</#if> </#if>
</#if> </#if>
\ No newline at end of file
<#ibiztemplate> <#ibiztemplate>
TARGET=PSDATAENTITY TARGET=PSDATAENTITY
</#ibiztemplate> </#ibiztemplate>
<#assign deCodeNameCamel = srfcaseformat(de.codeName,'l_u2lC')?cap_first> <#comment>引入驼峰配置</#comment>
<#ibizinclude>/SLN/globalfunc.cfg</#ibizinclude>
<#assign deCodeNameCamel = srfr7templcaseformat(de.codeName)?cap_first>
<#comment>实体是否配置预置属性</#comment> <#comment>实体是否配置预置属性</#comment>
<#assign hasDEPrefield=false> <#assign hasDEPrefield=false>
<#if de.getPSDEFieldByPDT('ORGID',true)?? || de.getPSDEFieldByPDT('ORGSECTORID',true)?? || de.getPSDEFieldByPDT('CREATEMAN',true)?? > <#if de.getPSDEFieldByPDT('ORGID',true)?? || de.getPSDEFieldByPDT('ORGSECTORID',true)?? || de.getPSDEFieldByPDT('CREATEMAN',true)?? >
...@@ -182,25 +184,25 @@ public interface I${item.codeName}Service { ...@@ -182,25 +184,25 @@ public interface I${item.codeName}Service {
<#if de.getDefaultPSDEDataSet()??> <#if de.getDefaultPSDEDataSet()??>
<#assign deDefaultDataSet=de.getDefaultPSDEDataSet()> <#assign deDefaultDataSet=de.getDefaultPSDEDataSet()>
<#if deDefaultDataSet.getPSDEDataQueries()??> <#if deDefaultDataSet.getPSDEDataQueries()??>
List<${item.getCodeName()}> selectBy${srfcaseformat(MajorField.codeName,'l_u2lC')?cap_first}(${srfr7javatype(MajorField.stdDataType)} ${MajorkeyField.codeName?lower_case}); List<${item.getCodeName()}> selectBy${srfr7templcaseformat(MajorField.codeName)?cap_first}(${srfr7javatype(MajorField.stdDataType)} ${MajorkeyField.codeName?lower_case});
<#comment>主实体关联实体行为</#comment> <#comment>主实体关联实体行为</#comment>
<#if MinorPSDER.getRemoveActionType()??> <#if MinorPSDER.getRemoveActionType()??>
<#if MinorPSDER.getRemoveActionType()?c=='3'><#comment>限制删除</#comment> <#if MinorPSDER.getRemoveActionType()?c=='3'><#comment>限制删除</#comment>
List<${item.getCodeName()}> selectBy${srfcaseformat(MajorField.codeName,'l_u2lC')?cap_first}(Collection<${srfr7javatype(MajorField.stdDataType)}> ids); List<${item.getCodeName()}> selectBy${srfr7templcaseformat(MajorField.codeName)?cap_first}(Collection<${srfr7javatype(MajorField.stdDataType)}> ids);
<#elseif MinorPSDER.getRemoveActionType()?c=='2'><#comment>置空</#comment> <#elseif MinorPSDER.getRemoveActionType()?c=='2'><#comment>置空</#comment>
void resetBy${srfcaseformat(MajorField.codeName,'l_u2lC')?cap_first}(${srfr7javatype(MajorField.stdDataType)} ${MajorkeyField.codeName?lower_case}); void resetBy${srfr7templcaseformat(MajorField.codeName)?cap_first}(${srfr7javatype(MajorField.stdDataType)} ${MajorkeyField.codeName?lower_case});
void resetBy${srfcaseformat(MajorField.codeName,'l_u2lC')?cap_first}(Collection<${srfr7javatype(MajorField.stdDataType)}> ids); void resetBy${srfr7templcaseformat(MajorField.codeName)?cap_first}(Collection<${srfr7javatype(MajorField.stdDataType)}> ids);
<#elseif MinorPSDER.getRemoveActionType()?c=='1'><#comment>同时删除</#comment> <#elseif MinorPSDER.getRemoveActionType()?c=='1'><#comment>同时删除</#comment>
<#if item.isEnableEntityCache()==true> <#if item.isEnableEntityCache()==true>
@CacheEvict(value = "${item.codeName?lower_case}", allEntries = true) @CacheEvict(value = "${item.codeName?lower_case}", allEntries = true)
</#if> </#if>
void removeBy${srfcaseformat(MajorField.codeName,'l_u2lC')?cap_first}(Collection<${srfr7javatype(MajorField.stdDataType)}> ids); void removeBy${srfr7templcaseformat(MajorField.codeName)?cap_first}(Collection<${srfr7javatype(MajorField.stdDataType)}> ids);
</#if> </#if>
</#if> </#if>
<#if item.isEnableEntityCache()==true> <#if item.isEnableEntityCache()==true>
@CacheEvict(value = "${item.codeName?lower_case}", allEntries = true) @CacheEvict(value = "${item.codeName?lower_case}", allEntries = true)
</#if> </#if>
void removeBy${srfcaseformat(MajorField.codeName,'l_u2lC')?cap_first}(${srfr7javatype(MajorField.stdDataType)} ${MajorkeyField.codeName?lower_case}); void removeBy${srfr7templcaseformat(MajorField.codeName)?cap_first}(${srfr7javatype(MajorField.stdDataType)} ${MajorkeyField.codeName?lower_case});
<#assign nested=MinorPSDER.isNestedRS()> <#assign nested=MinorPSDER.isNestedRS()>
<#if nested == false && MinorPSDER.getMinorPSDataEntity().getAllPSDEServiceAPIs()??> <#if nested == false && MinorPSDER.getMinorPSDataEntity().getAllPSDEServiceAPIs()??>
<#list MinorPSDER.getMinorPSDataEntity().getAllPSDEServiceAPIs() as api> <#list MinorPSDER.getMinorPSDataEntity().getAllPSDEServiceAPIs() as api>
...@@ -213,7 +215,7 @@ public interface I${item.codeName}Service { ...@@ -213,7 +215,7 @@ public interface I${item.codeName}Service {
<#if item.isEnableEntityCache()==true> <#if item.isEnableEntityCache()==true>
@CacheEvict(value = "${item.codeName?lower_case}", allEntries = true) @CacheEvict(value = "${item.codeName?lower_case}", allEntries = true)
</#if> </#if>
void saveBy${srfcaseformat(MajorField.codeName,'l_u2lC')?cap_first}(${srfr7javatype(MajorField.stdDataType)} ${MajorkeyField.codeName?lower_case}, List<${item.getCodeName()}> list) ; void saveBy${srfr7templcaseformat(MajorField.codeName)?cap_first}(${srfr7javatype(MajorField.stdDataType)} ${MajorkeyField.codeName?lower_case}, List<${item.getCodeName()}> list) ;
</#if> </#if>
</#if> </#if>
</#if> </#if>
......
<#ibiztemplate> <#ibiztemplate>
TARGET=PSDATAENTITY TARGET=PSDATAENTITY
</#ibiztemplate> </#ibiztemplate>
<#assign deCodeNameCamel = srfcaseformat(de.codeName,'l_u2lC')?cap_first> <#comment>引入驼峰配置</#comment>
<#ibizinclude>/SLN/globalfunc.cfg</#ibizinclude>
<#assign deCodeNameCamel = srfr7templcaseformat(de.codeName)?cap_first>
<#comment>实体是否配置预置属性</#comment> <#comment>实体是否配置预置属性</#comment>
<#assign hasDEPrefield=false> <#assign hasDEPrefield=false>
<#if de.getPSDEFieldByPDT('ORGID',true)?? || de.getPSDEFieldByPDT('ORGSECTORID',true)?? || de.getPSDEFieldByPDT('CREATEMAN',true)?? > <#if de.getPSDEFieldByPDT('ORGID',true)?? || de.getPSDEFieldByPDT('ORGSECTORID',true)?? || de.getPSDEFieldByPDT('CREATEMAN',true)?? >
...@@ -49,7 +51,7 @@ TARGET=PSDATAENTITY ...@@ -49,7 +51,7 @@ TARGET=PSDATAENTITY
<#assign indexPSDER=MinorPSDER> <#assign indexPSDER=MinorPSDER>
<#assign majorIndexDE=indexPSDER.getMajorPSDataEntity()> <#assign majorIndexDE=indexPSDER.getMajorPSDataEntity()>
<#assign majorIndexDECodeName=indexPSDER.getMajorPSDataEntity().codeName> <#assign majorIndexDECodeName=indexPSDER.getMajorPSDataEntity().codeName>
<#assign majorIndexDECodeNameCamel = srfcaseformat(majorIndexDECodeName,'l_u2lC')?cap_first> <#assign majorIndexDECodeNameCamel = srfr7templcaseformat(majorIndexDECodeName)?cap_first>
<#if MinorPSDER.getDERType()=="DERINHERIT" && MinorPSDER.isLogicInherit()> <#if MinorPSDER.getDERType()=="DERINHERIT" && MinorPSDER.isLogicInherit()>
<#assign isLogicInheritDE=true> <#assign isLogicInheritDE=true>
</#if> </#if>
...@@ -88,7 +90,7 @@ TARGET=PSDATAENTITY ...@@ -88,7 +90,7 @@ TARGET=PSDATAENTITY
</#if> </#if>
<#assign isDupCheck=isDupCheckEntity(de)> <#assign isDupCheck=isDupCheckEntity(de)>
<#assign keyfield=de.getKeyPSDEField()> <#assign keyfield=de.getKeyPSDEField()>
<#assign keyfieldPrivateCodeName = srfcaseformat(keyfield.getCodeName(),'l_u2lC') > <#assign keyfieldPrivateCodeName = srfr7templcaseformat(keyfield.getCodeName()) >
<#assign keyfieldPublicCodeName = keyfieldPrivateCodeName?cap_first > <#assign keyfieldPublicCodeName = keyfieldPrivateCodeName?cap_first >
package ${pub.getPKGCodeName()}.core.${item.getPSSystemModule().getCodeName()?lower_case}.service.impl; package ${pub.getPKGCodeName()}.core.${item.getPSSystemModule().getCodeName()?lower_case}.service.impl;
...@@ -152,11 +154,11 @@ public class ${item.getCodeName()}ServiceImpl extends ServiceImpl<${de.getCodeNa ...@@ -152,11 +154,11 @@ public class ${item.getCodeName()}ServiceImpl extends ServiceImpl<${de.getCodeNa
<#if !P.exists('DER1N',der.getMinorPSDataEntity().getCodeName())> <#if !P.exists('DER1N',der.getMinorPSDataEntity().getCodeName())>
<#if der.getMinorPSDataEntity().getCodeName()==de.codeName> <#if der.getMinorPSDataEntity().getCodeName()==de.codeName>
protected ${pub.getPKGCodeName()}.core.${der.getMinorPSDataEntity().getPSSystemModule().getCodeName()?lower_case}.service.I${der.getMinorPSDataEntity().getCodeName()}Service ${srfcaseformat(der.getMinorPSDataEntity().getCodeName(),'l_u2lC')}Service = this; protected ${pub.getPKGCodeName()}.core.${der.getMinorPSDataEntity().getPSSystemModule().getCodeName()?lower_case}.service.I${der.getMinorPSDataEntity().getCodeName()}Service ${srfr7templcaseformat(der.getMinorPSDataEntity().getCodeName())}Service = this;
<#else> <#else>
@Autowired @Autowired
@Lazy @Lazy
protected ${pub.getPKGCodeName()}.core.${der.getMinorPSDataEntity().getPSSystemModule().getCodeName()?lower_case}.service.I${der.getMinorPSDataEntity().getCodeName()}Service ${srfcaseformat(der.getMinorPSDataEntity().getCodeName(),'l_u2lC')}Service; protected ${pub.getPKGCodeName()}.core.${der.getMinorPSDataEntity().getPSSystemModule().getCodeName()?lower_case}.service.I${der.getMinorPSDataEntity().getCodeName()}Service ${srfr7templcaseformat(der.getMinorPSDataEntity().getCodeName())}Service;
</#if> </#if>
</#if> </#if>
</#if> </#if>
...@@ -169,11 +171,11 @@ public class ${item.getCodeName()}ServiceImpl extends ServiceImpl<${de.getCodeNa ...@@ -169,11 +171,11 @@ public class ${item.getCodeName()}ServiceImpl extends ServiceImpl<${de.getCodeNa
<#if !P.exists('DER1N',der.getMajorPSDataEntity().getCodeName())> <#if !P.exists('DER1N',der.getMajorPSDataEntity().getCodeName())>
<#if der.getMajorPSDataEntity().getCodeName()==de.codeName> <#if der.getMajorPSDataEntity().getCodeName()==de.codeName>
protected ${pub.getPKGCodeName()}.core.${der.getMajorPSDataEntity().getPSSystemModule().getCodeName()?lower_case}.service.I${der.getMajorPSDataEntity().getCodeName()}Service ${srfcaseformat(der.getMajorPSDataEntity().getCodeName(),'l_u2lC')}Service = this; protected ${pub.getPKGCodeName()}.core.${der.getMajorPSDataEntity().getPSSystemModule().getCodeName()?lower_case}.service.I${der.getMajorPSDataEntity().getCodeName()}Service ${srfr7templcaseformat(der.getMajorPSDataEntity().getCodeName())}Service = this;
<#else> <#else>
@Autowired @Autowired
@Lazy @Lazy
protected ${pub.getPKGCodeName()}.core.${der.getMajorPSDataEntity().getPSSystemModule().getCodeName()?lower_case}.service.I${der.getMajorPSDataEntity().getCodeName()}Service ${srfcaseformat(der.getMajorPSDataEntity().getCodeName(),'l_u2lC')}Service; protected ${pub.getPKGCodeName()}.core.${der.getMajorPSDataEntity().getPSSystemModule().getCodeName()?lower_case}.service.I${der.getMajorPSDataEntity().getCodeName()}Service ${srfr7templcaseformat(der.getMajorPSDataEntity().getCodeName())}Service;
</#if> </#if>
</#if> </#if>
</#if> </#if>
...@@ -273,7 +275,7 @@ public class ${item.getCodeName()}ServiceImpl extends ServiceImpl<${de.getCodeNa ...@@ -273,7 +275,7 @@ public class ${item.getCodeName()}ServiceImpl extends ServiceImpl<${de.getCodeNa
</#list> </#list>
</#if> </#if>
<#if nested> <#if nested>
et.set${srfcaseformat(listcode,'l_u2lC')?cap_first}(${srfcaseformat(MinorEntity.getCodeName(),'l_u2lC')}Service.selectBy${srfcaseformat(MajorDerField.codeName,'l_u2lC')?cap_first}(key)); et.set${srfr7templcaseformat(listcode)?cap_first}(${srfr7templcaseformat(MinorEntity.getCodeName())}Service.selectBy${srfr7templcaseformat(MajorDerField.codeName)?cap_first}(key));
</#if> </#if>
</#if> </#if>
</#if> </#if>
...@@ -305,7 +307,7 @@ public class ${item.getCodeName()}ServiceImpl extends ServiceImpl<${de.getCodeNa ...@@ -305,7 +307,7 @@ public class ${item.getCodeName()}ServiceImpl extends ServiceImpl<${de.getCodeNa
createIndexMajorEntityData(et); createIndexMajorEntityData(et);
</#if> </#if>
<#if isLogicInheritDE> <#if isLogicInheritDE>
if(!update(et, (Wrapper) et.getUpdateWrapper(true).eq("${keyfield.name?lower_case}", et.get${srfcaseformat(keyfield.codeName,'l_u2lC')?cap_first}()))) { if(!update(et, (Wrapper) et.getUpdateWrapper(true).eq("${keyfield.name?lower_case}", et.get${srfr7templcaseformat(keyfield.codeName)?cap_first}()))) {
return false; return false;
} }
<#else> <#else>
...@@ -331,14 +333,14 @@ public class ${item.getCodeName()}ServiceImpl extends ServiceImpl<${de.getCodeNa ...@@ -331,14 +333,14 @@ public class ${item.getCodeName()}ServiceImpl extends ServiceImpl<${de.getCodeNa
</#list> </#list>
</#if> </#if>
<#if nested> <#if nested>
${srfcaseformat(MinorEntity.getCodeName(),'l_u2lC')}Service.saveBy${srfcaseformat(MajorDerField.codeName,'l_u2lC')?cap_first}(et.get${srfcaseformat(keyfield.codeName,'l_u2lC')?cap_first}(), et.get${srfcaseformat(listcode,'l_u2lC')?cap_first}()); ${srfr7templcaseformat(MinorEntity.getCodeName())}Service.saveBy${srfr7templcaseformat(MajorDerField.codeName)?cap_first}(et.get${srfr7templcaseformat(keyfield.codeName)?cap_first}(), et.get${srfr7templcaseformat(listcode)?cap_first}());
</#if> </#if>
</#if> </#if>
</#if> </#if>
</#list> </#list>
</#if> </#if>
<#comment>成功后get填充一次完整信息</#comment> <#comment>成功后get填充一次完整信息</#comment>
CachedBeanCopier.copy(get(et.get${srfcaseformat(keyfield.codeName,'l_u2lC')?cap_first}()), et); CachedBeanCopier.copy(get(et.get${srfr7templcaseformat(keyfield.codeName)?cap_first}()), et);
<#if hasPSDERsMapping> <#if hasPSDERsMapping>
updateParentData(et); updateParentData(et);
</#if> </#if>
...@@ -391,7 +393,7 @@ public class ${item.getCodeName()}ServiceImpl extends ServiceImpl<${de.getCodeNa ...@@ -391,7 +393,7 @@ public class ${item.getCodeName()}ServiceImpl extends ServiceImpl<${de.getCodeNa
<@addBoforeLogic deaction/> <@addBoforeLogic deaction/>
<#comment>同步更新索引主实体、继承主实体数据:继承子实体属性来源与父,先保存父,再保存子,最后get一次获取父数据返回</#comment> <#comment>同步更新索引主实体、继承主实体数据:继承子实体属性来源与父,先保存父,再保存子,最后get一次获取父数据返回</#comment>
<#if isIndexSubDE> <#if isIndexSubDE>
${srfcaseformat(majorIndexDECodeName,'l_u2lC')}Service.update(${de.codeName?lower_case}InheritMapping.to${majorIndexDECodeNameCamel}(et)); ${srfr7templcaseformat(majorIndexDECodeName)}Service.update(${de.codeName?lower_case}InheritMapping.to${majorIndexDECodeNameCamel}(et));
</#if> </#if>
<#if de.getKeyPSDEField()??> <#if de.getKeyPSDEField()??>
<#if de.getKeyPSDEField().isPhisicalDEField()==false && de.getUnionKeyValuePSDEFields()??> <#if de.getKeyPSDEField().isPhisicalDEField()==false && de.getUnionKeyValuePSDEFields()??>
...@@ -400,7 +402,7 @@ public class ${item.getCodeName()}ServiceImpl extends ServiceImpl<${de.getCodeNa ...@@ -400,7 +402,7 @@ public class ${item.getCodeName()}ServiceImpl extends ServiceImpl<${de.getCodeNa
return false; return false;
} }
<#else> <#else>
if(!update(et, (Wrapper) et.getUpdateWrapper(true).eq("${keyfield.name?lower_case}", et.get${srfcaseformat(keyfield.codeName,'l_u2lC')?cap_first}()))) { if(!update(et, (Wrapper) et.getUpdateWrapper(true).eq("${keyfield.name?lower_case}", et.get${srfr7templcaseformat(keyfield.codeName)?cap_first}()))) {
return false; return false;
} }
</#if> </#if>
...@@ -422,14 +424,14 @@ public class ${item.getCodeName()}ServiceImpl extends ServiceImpl<${de.getCodeNa ...@@ -422,14 +424,14 @@ public class ${item.getCodeName()}ServiceImpl extends ServiceImpl<${de.getCodeNa
</#list> </#list>
</#if> </#if>
<#if nested> <#if nested>
${srfcaseformat(MinorEntity.getCodeName(),'l_u2lC')}Service.saveBy${srfcaseformat(MajorDerField.codeName,'l_u2lC')?cap_first}(et.get${srfcaseformat(keyfield.codeName,'l_u2lC')?cap_first}(), et.get${srfcaseformat(listcode,'l_u2lC')?cap_first}()); ${srfr7templcaseformat(MinorEntity.getCodeName())}Service.saveBy${srfr7templcaseformat(MajorDerField.codeName)?cap_first}(et.get${srfr7templcaseformat(keyfield.codeName)?cap_first}(), et.get${srfr7templcaseformat(listcode)?cap_first}());
</#if> </#if>
</#if> </#if>
</#if> </#if>
</#list> </#list>
</#if> </#if>
<#comment>成功后get填充一次完整信息</#comment> <#comment>成功后get填充一次完整信息</#comment>
CachedBeanCopier.copy(get(et.get${srfcaseformat(keyfield.codeName,'l_u2lC')?cap_first}()), et); CachedBeanCopier.copy(get(et.get${srfr7templcaseformat(keyfield.codeName)?cap_first}()), et);
<#if hasPSDERsMapping> <#if hasPSDERsMapping>
updateParentData(et); updateParentData(et);
</#if> </#if>
...@@ -531,7 +533,7 @@ public class ${item.getCodeName()}ServiceImpl extends ServiceImpl<${de.getCodeNa ...@@ -531,7 +533,7 @@ public class ${item.getCodeName()}ServiceImpl extends ServiceImpl<${de.getCodeNa
<#if der.getDERType() =='DER1N' && der.isNestedRS() && der.getMinorPSDataEntity()?? && (der.getMinorPSDataEntity().getStorageMode()==1||der.getMinorPSDataEntity().getStorageMode()==2||der.getMinorPSDataEntity().getStorageMode()==4) > <#if der.getDERType() =='DER1N' && der.isNestedRS() && der.getMinorPSDataEntity()?? && (der.getMinorPSDataEntity().getStorageMode()==1||der.getMinorPSDataEntity().getStorageMode()==2||der.getMinorPSDataEntity().getStorageMode()==4) >
<#assign MajorDerField = der.getPSPickupDEField()> <#assign MajorDerField = der.getPSPickupDEField()>
<#assign minorKeyField = der.getMinorPSDataEntity().getKeyPSDEField()> <#assign minorKeyField = der.getMinorPSDataEntity().getKeyPSDEField()>
${srfcaseformat(der.getMinorPSDataEntity().getCodeName(),'l_u2lC')}Service.removeBy${srfcaseformat(MajorDerField.codeName,'l_u2lC')?cap_first}(key) ; ${srfr7templcaseformat(der.getMinorPSDataEntity().getCodeName())}Service.removeBy${srfr7templcaseformat(MajorDerField.codeName)?cap_first}(key) ;
</#if> </#if>
<#comment>主实体删除操作(同时删除、置空、限制删除)</#comment> <#comment>主实体删除操作(同时删除、置空、限制删除)</#comment>
<@majorEntityRemove der/> <@majorEntityRemove der/>
...@@ -539,7 +541,7 @@ public class ${item.getCodeName()}ServiceImpl extends ServiceImpl<${de.getCodeNa ...@@ -539,7 +541,7 @@ public class ${item.getCodeName()}ServiceImpl extends ServiceImpl<${de.getCodeNa
</#if> </#if>
<#comment>同步清除索引主实体数据</#comment> <#comment>同步清除索引主实体数据</#comment>
<#if isIndexSubDE> <#if isIndexSubDE>
${srfcaseformat(majorIndexDECodeName,'l_u2lC')}Service.remove(key); ${srfr7templcaseformat(majorIndexDECodeName)}Service.remove(key);
</#if> </#if>
boolean result = removeById(key); boolean result = removeById(key);
<#if hasPSDERsMapping> <#if hasPSDERsMapping>
...@@ -594,7 +596,7 @@ public class ${item.getCodeName()}ServiceImpl extends ServiceImpl<${de.getCodeNa ...@@ -594,7 +596,7 @@ public class ${item.getCodeName()}ServiceImpl extends ServiceImpl<${de.getCodeNa
public boolean checkKey(${item.getCodeName()} et) { public boolean checkKey(${item.getCodeName()} et) {
<#comment>输出测试行为</#comment> <#comment>输出测试行为</#comment>
<@outputTestAction deaction "checkkey"/> <@outputTestAction deaction "checkkey"/>
return (!ObjectUtils.isEmpty(et.get${srfcaseformat(keyfield.codeName,'l_u2lC')?cap_first}())) && (!Objects.isNull(this.getById(et.get${srfcaseformat(keyfield.codeName,'l_u2lC')?cap_first}()))); return (!ObjectUtils.isEmpty(et.get${srfr7templcaseformat(keyfield.codeName)?cap_first}())) && (!Objects.isNull(this.getById(et.get${srfr7templcaseformat(keyfield.codeName)?cap_first}())));
} }
<#comment>用户扩展新建、更新</#comment> <#comment>用户扩展新建、更新</#comment>
<#elseif deaction.getActionType()== "USERCREATE" || deaction.getActionType()== "USERUPDATE"> <#elseif deaction.getActionType()== "USERCREATE" || deaction.getActionType()== "USERUPDATE">
...@@ -647,13 +649,13 @@ public class ${item.getCodeName()}ServiceImpl extends ServiceImpl<${de.getCodeNa ...@@ -647,13 +649,13 @@ public class ${item.getCodeName()}ServiceImpl extends ServiceImpl<${de.getCodeNa
<#assign deDefaultDataSet=de.getDefaultPSDEDataSet()> <#assign deDefaultDataSet=de.getDefaultPSDEDataSet()>
<#if deDefaultDataSet.getPSDEDataQueries()??> <#if deDefaultDataSet.getPSDEDataQueries()??>
@Override @Override
public List<${item.getCodeName()}> selectBy${srfcaseformat(MajorField.codeName,'l_u2lC')?cap_first}(${srfr7javatype(MajorField.stdDataType)} ${MajorkeyField.codeName?lower_case}) { public List<${item.getCodeName()}> selectBy${srfr7templcaseformat(MajorField.codeName)?cap_first}(${srfr7javatype(MajorField.stdDataType)} ${MajorkeyField.codeName?lower_case}) {
return baseMapper.selectBy${srfcaseformat(MajorField.codeName,'l_u2lC')?cap_first}(${MajorkeyField.codeName?lower_case}); return baseMapper.selectBy${srfr7templcaseformat(MajorField.codeName)?cap_first}(${MajorkeyField.codeName?lower_case});
} }
<#comment>主实体删除关联实体行为</#comment> <#comment>主实体删除关联实体行为</#comment>
<@majorEntityRemove_RefAction_SqlStore MinorPSDER /> <@majorEntityRemove_RefAction_SqlStore MinorPSDER />
@Override @Override
public void removeBy${srfcaseformat(MajorField.codeName,'l_u2lC')?cap_first}(${srfr7javatype(MajorField.stdDataType)} ${MajorkeyField.codeName?lower_case}) { public void removeBy${srfr7templcaseformat(MajorField.codeName)?cap_first}(${srfr7javatype(MajorField.stdDataType)} ${MajorkeyField.codeName?lower_case}) {
this.remove(new QueryWrapper<${item.getCodeName()}>().eq("${MajorField.getName()?lower_case}",${MajorkeyField.codeName?lower_case})); this.remove(new QueryWrapper<${item.getCodeName()}>().eq("${MajorField.getName()?lower_case}",${MajorkeyField.codeName?lower_case}));
} }
...@@ -668,21 +670,21 @@ public class ${item.getCodeName()}ServiceImpl extends ServiceImpl<${de.getCodeNa ...@@ -668,21 +670,21 @@ public class ${item.getCodeName()}ServiceImpl extends ServiceImpl<${de.getCodeNa
<#if nested> <#if nested>
<@autowiredProxyService/> <@autowiredProxyService/>
@Override @Override
public void saveBy${srfcaseformat(MajorField.codeName,'l_u2lC')?cap_first}(${srfr7javatype(MajorField.stdDataType)} ${MajorkeyField.codeName?lower_case},List<${item.getCodeName()}> list) { public void saveBy${srfr7templcaseformat(MajorField.codeName)?cap_first}(${srfr7javatype(MajorField.stdDataType)} ${MajorkeyField.codeName?lower_case},List<${item.getCodeName()}> list) {
if(list==null) if(list==null)
return; return;
Set<${srfr7javatype(keyfield.stdDataType)}> delIds=new HashSet<${srfr7javatype(keyfield.stdDataType)}>(); Set<${srfr7javatype(keyfield.stdDataType)}> delIds=new HashSet<${srfr7javatype(keyfield.stdDataType)}>();
List<${item.getCodeName()}> _update=new ArrayList<${item.getCodeName()}>(); List<${item.getCodeName()}> _update=new ArrayList<${item.getCodeName()}>();
List<${item.getCodeName()}> _create=new ArrayList<${item.getCodeName()}>(); List<${item.getCodeName()}> _create=new ArrayList<${item.getCodeName()}>();
for(${item.getCodeName()} before:selectBy${srfcaseformat(MajorField.codeName,'l_u2lC')?cap_first}(${MajorkeyField.codeName?lower_case})){ for(${item.getCodeName()} before:selectBy${srfr7templcaseformat(MajorField.codeName)?cap_first}(${MajorkeyField.codeName?lower_case})){
delIds.add(before.get${srfcaseformat(keyfield.getCodeName(),'l_u2lC')?cap_first}()); delIds.add(before.get${srfr7templcaseformat(keyfield.getCodeName())?cap_first}());
} }
for(${item.getCodeName()} sub:list) { for(${item.getCodeName()} sub:list) {
sub.set${srfcaseformat(MajorField.codeName,'l_u2lC')?cap_first}(${MajorkeyField.codeName?lower_case}); sub.set${srfr7templcaseformat(MajorField.codeName)?cap_first}(${MajorkeyField.codeName?lower_case});
if(ObjectUtils.isEmpty(sub.get${srfcaseformat(keyfield.getCodeName(),'l_u2lC')?cap_first}())) if(ObjectUtils.isEmpty(sub.get${srfr7templcaseformat(keyfield.getCodeName())?cap_first}()))
sub.set${srfcaseformat(keyfield.getCodeName(),'l_u2lC')?cap_first}((${srfr7javatype(keyfield.stdDataType)})sub.getDefaultKey(true)); sub.set${srfr7templcaseformat(keyfield.getCodeName())?cap_first}((${srfr7javatype(keyfield.stdDataType)})sub.getDefaultKey(true));
if(delIds.contains(sub.get${srfcaseformat(keyfield.getCodeName(),'l_u2lC')?cap_first}())) { if(delIds.contains(sub.get${srfr7templcaseformat(keyfield.getCodeName())?cap_first}())) {
delIds.remove(sub.get${srfcaseformat(keyfield.getCodeName(),'l_u2lC')?cap_first}()); delIds.remove(sub.get${srfr7templcaseformat(keyfield.getCodeName())?cap_first}());
_update.add(sub); _update.add(sub);
} }
else else
...@@ -779,7 +781,7 @@ public class ${item.getCodeName()}ServiceImpl extends ServiceImpl<${de.getCodeNa ...@@ -779,7 +781,7 @@ public class ${item.getCodeName()}ServiceImpl extends ServiceImpl<${de.getCodeNa
private void fillWFParam(com.baomidou.mybatisplus.extension.plugins.pagination.Page<${item.getCodeName()}> pages, Map<String, Map<String, Object>> businesskeys) { private void fillWFParam(com.baomidou.mybatisplus.extension.plugins.pagination.Page<${item.getCodeName()}> pages, Map<String, Map<String, Object>> businesskeys) {
if (!ObjectUtils.isEmpty(businesskeys)) { if (!ObjectUtils.isEmpty(businesskeys)) {
for (${item.getCodeName()} entity : pages.getRecords()) { for (${item.getCodeName()} entity : pages.getRecords()) {
Object id = entity.get${srfcaseformat(keyfield.getCodeName(),'l_u2lC')?cap_first}(); Object id = entity.get${srfr7templcaseformat(keyfield.getCodeName())?cap_first}();
if (!ObjectUtils.isEmpty(id) && businesskeys.containsKey(id)) { if (!ObjectUtils.isEmpty(id) && businesskeys.containsKey(id)) {
Map<String, Object> params = businesskeys.get(id); Map<String, Object> params = businesskeys.get(id);
for (Map.Entry<String, Object> entry : params.entrySet()) { for (Map.Entry<String, Object> entry : params.entrySet()) {
...@@ -822,9 +824,9 @@ public class ${item.getCodeName()}ServiceImpl extends ServiceImpl<${de.getCodeNa ...@@ -822,9 +824,9 @@ public class ${item.getCodeName()}ServiceImpl extends ServiceImpl<${de.getCodeNa
</#list> </#list>
<#if hasPickupData==true && MinorPSDER.getMajorPSDataEntity?? && MinorPSDER.getMajorPSDataEntity()?? && MinorPSDER.getCodeName?? && MinorPSDER.getCodeName()??> <#if hasPickupData==true && MinorPSDER.getMajorPSDataEntity?? && MinorPSDER.getMajorPSDataEntity()?? && MinorPSDER.getCodeName?? && MinorPSDER.getCodeName()??>
<#assign MajorEntity = MinorPSDER.getMajorPSDataEntity()> <#assign MajorEntity = MinorPSDER.getMajorPSDataEntity()>
<#assign MajorEntityName=srfcaseformat(MinorPSDER.getCodeName(),'l_u2lC')> <#assign MajorEntityName=srfr7templcaseformat(MinorPSDER.getCodeName())>
<#assign MajorKeyFieldCodeName =srfcaseformat(MinorPSDER.getPSPickupDEField().codeName,'l_u2lC')?cap_first> <#assign MajorKeyFieldCodeName =srfr7templcaseformat(MinorPSDER.getPSPickupDEField().codeName)?cap_first>
<#assign MajorEntityService=srfcaseformat(MinorPSDER.getMajorPSDataEntity().getCodeName(),'l_u2lC')+"Service"> <#assign MajorEntityService=srfr7templcaseformat(MinorPSDER.getMajorPSDataEntity().getCodeName())+"Service">
//实体关系[${MinorPSDER.name}] //实体关系[${MinorPSDER.name}]
if(!ObjectUtils.isEmpty(et.get${MajorKeyFieldCodeName}())){ if(!ObjectUtils.isEmpty(et.get${MajorKeyFieldCodeName}())){
${pub.getPKGCodeName()}.core.${MajorEntity.getPSSystemModule().getCodeName()?lower_case}.domain.${MajorEntity.getCodeName()} ${MajorEntityName}=et.get${MajorEntityName?cap_first}(); ${pub.getPKGCodeName()}.core.${MajorEntity.getPSSystemModule().getCodeName()?lower_case}.domain.${MajorEntity.getCodeName()} ${MajorEntityName}=et.get${MajorEntityName?cap_first}();
...@@ -836,8 +838,8 @@ public class ${item.getCodeName()}ServiceImpl extends ServiceImpl<${de.getCodeNa ...@@ -836,8 +838,8 @@ public class ${item.getCodeName()}ServiceImpl extends ServiceImpl<${de.getCodeNa
<#comment>找出当前关系的外键值文本及附加数据字段</#comment> <#comment>找出当前关系的外键值文本及附加数据字段</#comment>
<#list de.getAllPSDEFields() as defield> <#list de.getAllPSDEFields() as defield>
<#if defield.getPSDER1N?? && defield.getPSDER1N()?? && defield.getPSDER1N().name==MinorPSDER.name && (((defield.getDataType())!'')!='PICKUP')> <#if defield.getPSDER1N?? && defield.getPSDER1N()?? && defield.getPSDER1N().name==MinorPSDER.name && (((defield.getDataType())!'')!='PICKUP')>
<#assign minorFieldCodeName = srfcaseformat(defield.getCodeName(),'l_u2lC')?cap_first > <#assign minorFieldCodeName = srfr7templcaseformat(defield.getCodeName())?cap_first >
<#assign majorFieldCodeName = srfcaseformat(defield.getRelatedPSDEField().getCodeName(),'l_u2lC')?cap_first > <#assign majorFieldCodeName = srfr7templcaseformat(defield.getRelatedPSDEField().getCodeName())?cap_first >
et.set${minorFieldCodeName}(${MajorEntityName}.get${majorFieldCodeName}()); et.set${minorFieldCodeName}(${MajorEntityName}.get${majorFieldCodeName}());
</#if> </#if>
</#list> </#list>
...@@ -846,12 +848,12 @@ public class ${item.getCodeName()}ServiceImpl extends ServiceImpl<${de.getCodeNa ...@@ -846,12 +848,12 @@ public class ${item.getCodeName()}ServiceImpl extends ServiceImpl<${de.getCodeNa
// 父关系等价 // 父关系等价
<#assign marjorPPSDer1n=MinorPSDER.getMajorPPSDER1N()> <#assign marjorPPSDer1n=MinorPSDER.getMajorPPSDER1N()>
<#assign minorPPSDer1n=MinorPSDER.getMinorPPSDER1N()> <#assign minorPPSDer1n=MinorPSDER.getMinorPPSDER1N()>
<#assign marjorkeyFieldCodeName=srfcaseformat(marjorPPSDer1n.getPSPickupDEField().codeName,'l_u2lC')?cap_first> <#assign marjorkeyFieldCodeName=srfr7templcaseformat(marjorPPSDer1n.getPSPickupDEField().codeName)?cap_first>
<#assign minorkeyFieldCodeName=srfcaseformat(minorPPSDer1n.getPSPickupDEField().codeName,'l_u2lC')?cap_first> <#assign minorkeyFieldCodeName=srfr7templcaseformat(minorPPSDer1n.getPSPickupDEField().codeName)?cap_first>
et.set${minorkeyFieldCodeName}(${MajorEntityName}.get${marjorkeyFieldCodeName}()); et.set${minorkeyFieldCodeName}(${MajorEntityName}.get${marjorkeyFieldCodeName}());
<#if marjorPPSDer1n.getPSPickupTextDEField()?? && minorPPSDer1n.getPSPickupTextDEField()??> <#if marjorPPSDer1n.getPSPickupTextDEField()?? && minorPPSDer1n.getPSPickupTextDEField()??>
<#assign marjorPickupTextCodeName=srfcaseformat(marjorPPSDer1n.getPSPickupTextDEField().codeName,'l_u2lC')?cap_first> <#assign marjorPickupTextCodeName=srfr7templcaseformat(marjorPPSDer1n.getPSPickupTextDEField().codeName)?cap_first>
<#assign minorPickupTextCodeName=srfcaseformat(minorPPSDer1n.getPSPickupTextDEField().codeName,'l_u2lC')?cap_first> <#assign minorPickupTextCodeName=srfr7templcaseformat(minorPPSDer1n.getPSPickupTextDEField().codeName)?cap_first>
et.set${minorPickupTextCodeName}(${MajorEntityName}.get${marjorPickupTextCodeName}()); et.set${minorPickupTextCodeName}(${MajorEntityName}.get${marjorPickupTextCodeName}());
</#if> </#if>
</#if> </#if>
...@@ -873,16 +875,16 @@ public class ${item.getCodeName()}ServiceImpl extends ServiceImpl<${de.getCodeNa ...@@ -873,16 +875,16 @@ public class ${item.getCodeName()}ServiceImpl extends ServiceImpl<${de.getCodeNa
<#if MinorPSDER?? && MinorPSDER.getDERType()=='DER1N' && (MinorPSDER.getMajorPSDataEntity().getStorageMode()==1||MinorPSDER.getMajorPSDataEntity().getStorageMode()==2||MinorPSDER.getMajorPSDataEntity().getStorageMode()==4)> <#if MinorPSDER?? && MinorPSDER.getDERType()=='DER1N' && (MinorPSDER.getMajorPSDataEntity().getStorageMode()==1||MinorPSDER.getMajorPSDataEntity().getStorageMode()==2||MinorPSDER.getMajorPSDataEntity().getStorageMode()==4)>
<#if MinorPSDER.getMajorPSDataEntity?? && MinorPSDER.getMajorPSDataEntity()?? && MinorPSDER.getCodeName?? && MinorPSDER.getCodeName()??> <#if MinorPSDER.getMajorPSDataEntity?? && MinorPSDER.getMajorPSDataEntity()?? && MinorPSDER.getCodeName?? && MinorPSDER.getCodeName()??>
<#assign MajorEntity = MinorPSDER.getMajorPSDataEntity()> <#assign MajorEntity = MinorPSDER.getMajorPSDataEntity()>
<#assign MajorEntityName=srfcaseformat(MinorPSDER.getCodeName(),'l_u2lC')> <#assign MajorEntityName=srfr7templcaseformat(MinorPSDER.getCodeName())>
<#assign MajorKeyFieldName =MinorPSDER.getPSPickupDEField().name?lower_case> <#assign MajorKeyFieldName =MinorPSDER.getPSPickupDEField().name?lower_case>
<#assign MajorKeyFieldCodeName =srfcaseformat(MinorPSDER.getPSPickupDEField().codeName,'l_u2lC')?cap_first> <#assign MajorKeyFieldCodeName =srfr7templcaseformat(MinorPSDER.getPSPickupDEField().codeName)?cap_first>
//实体关系[${MinorPSDER.name}] //实体关系[${MinorPSDER.name}]
if(!ObjectUtils.isEmpty(et.get${MajorKeyFieldCodeName}())){ if(!ObjectUtils.isEmpty(et.get${MajorKeyFieldCodeName}())){
<#if MinorPSDER.getPSDER1NDEFieldMaps?? && MinorPSDER.getPSDER1NDEFieldMaps()??> <#if MinorPSDER.getPSDER1NDEFieldMaps?? && MinorPSDER.getPSDER1NDEFieldMaps()??>
${pub.getPKGCodeName()}.core.${MajorEntity.getPSSystemModule().getCodeName()?lower_case}.domain.${MajorEntity.getCodeName()} ${MajorEntityName}=new ${pub.getPKGCodeName()}.core.${MajorEntity.getPSSystemModule().getCodeName()?lower_case}.domain.${MajorEntity.getCodeName()}(); ${pub.getPKGCodeName()}.core.${MajorEntity.getPSSystemModule().getCodeName()?lower_case}.domain.${MajorEntity.getCodeName()} ${MajorEntityName}=new ${pub.getPKGCodeName()}.core.${MajorEntity.getPSSystemModule().getCodeName()?lower_case}.domain.${MajorEntity.getCodeName()}();
<#list MinorPSDER.getPSDER1NDEFieldMaps() as derField> <#list MinorPSDER.getPSDER1NDEFieldMaps() as derField>
<#if derField.getMapType()=="COUNT" || derField.getMapType()=="SUM"|| derField.getMapType()=="AVG" || derField.getMapType()=="MAX" || derField.getMapType()=="MIN"> <#if derField.getMapType()=="COUNT" || derField.getMapType()=="SUM"|| derField.getMapType()=="AVG" || derField.getMapType()=="MAX" || derField.getMapType()=="MIN">
<#assign MajorEntityDEFieldCodeName=srfcaseformat(derField.getMajorPSDEField().codeName,'l_u2lC')> <#assign MajorEntityDEFieldCodeName=srfr7templcaseformat(derField.getMajorPSDEField().codeName)>
<#if derField.getMapType()=="COUNT"> <#if derField.getMapType()=="COUNT">
${MajorEntityName}.set("${MajorEntityDEFieldCodeName}",baseMapper.selectCount(new QueryWrapper().eq(true,"${MajorKeyFieldName}",et.get${MajorKeyFieldCodeName}()))); ${MajorEntityName}.set("${MajorEntityDEFieldCodeName}",baseMapper.selectCount(new QueryWrapper().eq(true,"${MajorKeyFieldName}",et.get${MajorKeyFieldCodeName}())));
<#else> <#else>
...@@ -906,7 +908,7 @@ public class ${item.getCodeName()}ServiceImpl extends ServiceImpl<${de.getCodeNa ...@@ -906,7 +908,7 @@ public class ${item.getCodeName()}ServiceImpl extends ServiceImpl<${de.getCodeNa
</#if> </#if>
</#list> </#list>
${MajorEntityName}.set("${MajorKeyFieldCodeName?lower_case}",et.get${MajorKeyFieldCodeName}()); ${MajorEntityName}.set("${MajorKeyFieldCodeName?lower_case}",et.get${MajorKeyFieldCodeName}());
${srfcaseformat(MinorPSDER.getMajorPSDataEntity().getCodeName(),'l_u2lC')}Service.update(${MajorEntityName}); ${srfr7templcaseformat(MinorPSDER.getMajorPSDataEntity().getCodeName())}Service.update(${MajorEntityName});
</#if> </#if>
} }
</#if> </#if>
...@@ -928,7 +930,7 @@ public class ${item.getCodeName()}ServiceImpl extends ServiceImpl<${de.getCodeNa ...@@ -928,7 +930,7 @@ public class ${item.getCodeName()}ServiceImpl extends ServiceImpl<${de.getCodeNa
<#list item.getMinorPSDERs() as MinorPSDER> <#list item.getMinorPSDERs() as MinorPSDER>
<#if MinorPSDER?? && MinorPSDER.getDERType()=='DER1N' && (MinorPSDER.getMajorPSDataEntity().getStorageMode()==1||MinorPSDER.getMajorPSDataEntity().getStorageMode()==2||MinorPSDER.getMajorPSDataEntity().getStorageMode()==4)> <#if MinorPSDER?? && MinorPSDER.getDERType()=='DER1N' && (MinorPSDER.getMajorPSDataEntity().getStorageMode()==1||MinorPSDER.getMajorPSDataEntity().getStorageMode()==2||MinorPSDER.getMajorPSDataEntity().getStorageMode()==4)>
<#if MinorPSDER.getMajorPSDataEntity?? && MinorPSDER.getMajorPSDataEntity()?? && MinorPSDER.getCodeName?? && MinorPSDER.getCodeName()??> <#if MinorPSDER.getMajorPSDataEntity?? && MinorPSDER.getMajorPSDataEntity()?? && MinorPSDER.getCodeName?? && MinorPSDER.getCodeName()??>
<#assign MajorKeyFieldCodeName =srfcaseformat(MinorPSDER.getPSPickupDEField().codeName,'l_u2lC')?cap_first> <#assign MajorKeyFieldCodeName =srfr7templcaseformat(MinorPSDER.getPSPickupDEField().codeName)?cap_first>
//实体关系[${MinorPSDER.name}] //实体关系[${MinorPSDER.name}]
if(!ObjectUtils.isEmpty(entity.get${MajorKeyFieldCodeName}()) && !map.containsKey(entity.get${MajorKeyFieldCodeName}())){ if(!ObjectUtils.isEmpty(entity.get${MajorKeyFieldCodeName}()) && !map.containsKey(entity.get${MajorKeyFieldCodeName}())){
map.put(entity.get${MajorKeyFieldCodeName}(),entity); map.put(entity.get${MajorKeyFieldCodeName}(),entity);
...@@ -951,7 +953,7 @@ public class ${item.getCodeName()}ServiceImpl extends ServiceImpl<${de.getCodeNa ...@@ -951,7 +953,7 @@ public class ${item.getCodeName()}ServiceImpl extends ServiceImpl<${de.getCodeNa
<#if !P.exists('DER1N',majorIndexDECodeName)> <#if !P.exists('DER1N',majorIndexDECodeName)>
@Autowired @Autowired
@Lazy @Lazy
protected ${pub.getPKGCodeName()}.core.${majorIndexDE.getPSSystemModule().getCodeName()?lower_case}.service.I${majorIndexDECodeName}Service ${srfcaseformat(majorIndexDECodeName,'l_u2lC')}Service; protected ${pub.getPKGCodeName()}.core.${majorIndexDE.getPSSystemModule().getCodeName()?lower_case}.service.I${majorIndexDECodeName}Service ${srfr7templcaseformat(majorIndexDECodeName)}Service;
</#if> </#if>
/** /**
...@@ -959,13 +961,13 @@ public class ${item.getCodeName()}ServiceImpl extends ServiceImpl<${de.getCodeNa ...@@ -959,13 +961,13 @@ public class ${item.getCodeName()}ServiceImpl extends ServiceImpl<${de.getCodeNa
* @param et * @param et
*/ */
private void createIndexMajorEntityData(${de.codeName} et){ private void createIndexMajorEntityData(${de.codeName} et){
if(ObjectUtils.isEmpty(et.get${srfcaseformat(keyfield.codeName,'l_u2lC')?cap_first}())) if(ObjectUtils.isEmpty(et.get${srfr7templcaseformat(keyfield.codeName)?cap_first}()))
et.set${srfcaseformat(keyfield.codeName,'l_u2lC')?cap_first}((${srfr7javatype(keyfield.stdDataType)})et.getDefaultKey(true)); et.set${srfr7templcaseformat(keyfield.codeName)?cap_first}((${srfr7javatype(keyfield.stdDataType)})et.getDefaultKey(true));
${pub.getPKGCodeName()}.core.${majorIndexDE.getPSSystemModule().getCodeName()?lower_case}.domain.${majorIndexDECodeName} ${majorIndexDECodeName?lower_case} =${de.codeName?lower_case}InheritMapping.to${majorIndexDECodeNameCamel}(et); ${pub.getPKGCodeName()}.core.${majorIndexDE.getPSSystemModule().getCodeName()?lower_case}.domain.${majorIndexDECodeName} ${majorIndexDECodeName?lower_case} =${de.codeName?lower_case}InheritMapping.to${majorIndexDECodeNameCamel}(et);
<#if majorIndexDE.getIndexTypePSDEField()??> <#if majorIndexDE.getIndexTypePSDEField()??>
${majorIndexDECodeName?lower_case}.set("${majorIndexDE.getIndexTypePSDEField().codeName?lower_case}","${indexPSDER.getTypeValue()}"); ${majorIndexDECodeName?lower_case}.set("${majorIndexDE.getIndexTypePSDEField().codeName?lower_case}","${indexPSDER.getTypeValue()}");
</#if> </#if>
${srfcaseformat(majorIndexDECodeName,'l_u2lC')}Service.create(${majorIndexDECodeName?lower_case}); ${srfr7templcaseformat(majorIndexDECodeName)}Service.create(${majorIndexDECodeName?lower_case});
} }
</#if> </#if>
...@@ -1004,7 +1006,7 @@ public class ${item.getCodeName()}ServiceImpl extends ServiceImpl<${de.getCodeNa ...@@ -1004,7 +1006,7 @@ public class ${item.getCodeName()}ServiceImpl extends ServiceImpl<${de.getCodeNa
public List<${de.codeName}> get${deCodeNameCamel}ByEntities(List<${de.codeName}> entities) { public List<${de.codeName}> get${deCodeNameCamel}ByEntities(List<${de.codeName}> entities) {
List ids =new ArrayList(); List ids =new ArrayList();
for(${de.codeName} entity : entities){ for(${de.codeName} entity : entities){
Serializable id=entity.get${srfcaseformat(keyfield.codeName,'l_u2lC')?cap_first}(); Serializable id=entity.get${srfr7templcaseformat(keyfield.codeName)?cap_first}();
if(!ObjectUtils.isEmpty(id)){ if(!ObjectUtils.isEmpty(id)){
ids.add(id); ids.add(id);
} }
...@@ -1025,8 +1027,8 @@ public class ${item.getCodeName()}ServiceImpl extends ServiceImpl<${de.getCodeNa ...@@ -1025,8 +1027,8 @@ public class ${item.getCodeName()}ServiceImpl extends ServiceImpl<${de.getCodeNa
<#if de.getKeyPSDEField().isPhisicalDEField()==false && de.getUnionKeyValuePSDEFields()??> <#if de.getKeyPSDEField().isPhisicalDEField()==false && de.getUnionKeyValuePSDEFields()??>
private ${item.getCodeName()} getById(${srfr7javatype(keyfield.getStdDataType())} id){ private ${item.getCodeName()} getById(${srfr7javatype(keyfield.getStdDataType())} id){
${item.getCodeName()} entity=new ${item.getCodeName()}(); ${item.getCodeName()} entity=new ${item.getCodeName()}();
entity.set${srfcaseformat(keyfield.codeName,'l_u2lC')?cap_first}(id); entity.set${srfr7templcaseformat(keyfield.codeName)?cap_first}(id);
if(ObjectUtils.isEmpty(entity.get${srfcaseformat(keyfield.codeName,'l_u2lC')?cap_first}())){ if(ObjectUtils.isEmpty(entity.get${srfr7templcaseformat(keyfield.codeName)?cap_first}())){
log.error("获取数据失败,联合键值为空"); log.error("获取数据失败,联合键值为空");
return entity; return entity;
} }
...@@ -1036,8 +1038,8 @@ public class ${item.getCodeName()}ServiceImpl extends ServiceImpl<${de.getCodeNa ...@@ -1036,8 +1038,8 @@ public class ${item.getCodeName()}ServiceImpl extends ServiceImpl<${de.getCodeNa
private boolean removeById(${srfr7javatype(keyfield.getStdDataType())} id){ private boolean removeById(${srfr7javatype(keyfield.getStdDataType())} id){
${item.getCodeName()} entity=new ${item.getCodeName()}(); ${item.getCodeName()} entity=new ${item.getCodeName()}();
entity.set${srfcaseformat(keyfield.codeName,'l_u2lC')?cap_first}(id); entity.set${srfr7templcaseformat(keyfield.codeName)?cap_first}(id);
if(ObjectUtils.isEmpty(entity.get${srfcaseformat(keyfield.codeName,'l_u2lC')?cap_first}())){ if(ObjectUtils.isEmpty(entity.get${srfr7templcaseformat(keyfield.codeName)?cap_first}())){
log.error("删除数据失败,联合键值为空"); log.error("删除数据失败,联合键值为空");
return false; return false;
} }
...@@ -1046,7 +1048,7 @@ public class ${item.getCodeName()}ServiceImpl extends ServiceImpl<${de.getCodeNa ...@@ -1046,7 +1048,7 @@ public class ${item.getCodeName()}ServiceImpl extends ServiceImpl<${de.getCodeNa
public boolean updateById(${item.getCodeName()} et){ public boolean updateById(${item.getCodeName()} et){
UpdateWrapper<${item.getCodeName()}> wrapper=et.getUpdateWrapper(true); UpdateWrapper<${item.getCodeName()}> wrapper=et.getUpdateWrapper(true);
if(ObjectUtils.isEmpty(et.get${srfcaseformat(keyfield.codeName,'l_u2lC')?cap_first}())){ if(ObjectUtils.isEmpty(et.get${srfr7templcaseformat(keyfield.codeName)?cap_first}())){
log.error("更新数据失败,联合键值为空"); log.error("更新数据失败,联合键值为空");
return false; return false;
} }
...@@ -1113,7 +1115,7 @@ public class ${item.getCodeName()}ServiceImpl implements I${de.getCodeName()}Ser ...@@ -1113,7 +1115,7 @@ public class ${item.getCodeName()}ServiceImpl implements I${de.getCodeName()}Ser
<#if !P.exists('DEMinorPSDataEntity',der.getMinorPSDataEntity().getCodeName())> <#if !P.exists('DEMinorPSDataEntity',der.getMinorPSDataEntity().getCodeName())>
@Autowired @Autowired
@Lazy @Lazy
protected ${pub.getPKGCodeName()}.core.${der.getMinorPSDataEntity().getPSSystemModule().getCodeName()?lower_case}.service.I${der.getMinorPSDataEntity().getCodeName()}Service ${srfcaseformat(der.getMinorPSDataEntity().getCodeName(),'l_u2lC')}Service; protected ${pub.getPKGCodeName()}.core.${der.getMinorPSDataEntity().getPSSystemModule().getCodeName()?lower_case}.service.I${der.getMinorPSDataEntity().getCodeName()}Service ${srfr7templcaseformat(der.getMinorPSDataEntity().getCodeName())}Service;
</#if> </#if>
</#if> </#if>
</#list> </#list>
...@@ -1208,7 +1210,7 @@ public class ${item.getCodeName()}ServiceImpl implements I${de.getCodeName()}Ser ...@@ -1208,7 +1210,7 @@ public class ${item.getCodeName()}ServiceImpl implements I${de.getCodeName()}Ser
</#list> </#list>
</#if> </#if>
<#if nested> <#if nested>
et.set${srfcaseformat(listcode,'l_u2lC')?cap_first}(${srfcaseformat(MinorEntity.getCodeName(),'l_u2lC')}Service.selectBy${srfcaseformat(MajorDerField.codeName,'l_u2lC')?cap_first}(key)); et.set${srfr7templcaseformat(listcode)?cap_first}(${srfr7templcaseformat(MinorEntity.getCodeName())}Service.selectBy${srfr7templcaseformat(MajorDerField.codeName)?cap_first}(key));
</#if> </#if>
</#if> </#if>
</#if> </#if>
...@@ -1249,14 +1251,14 @@ public class ${item.getCodeName()}ServiceImpl implements I${de.getCodeName()}Ser ...@@ -1249,14 +1251,14 @@ public class ${item.getCodeName()}ServiceImpl implements I${de.getCodeName()}Ser
</#list> </#list>
</#if> </#if>
<#if nested> <#if nested>
${srfcaseformat(MinorEntity.getCodeName(),'l_u2lC')}Service.saveBy${srfcaseformat(MajorDerField.codeName,'l_u2lC')?cap_first}(et.get${srfcaseformat(keyfield.codeName,'l_u2lC')?cap_first}(), et.get${srfcaseformat(listcode,'l_u2lC')?cap_first}()); ${srfr7templcaseformat(MinorEntity.getCodeName())}Service.saveBy${srfr7templcaseformat(MajorDerField.codeName)?cap_first}(et.get${srfr7templcaseformat(keyfield.codeName)?cap_first}(), et.get${srfr7templcaseformat(listcode)?cap_first}());
</#if> </#if>
</#if> </#if>
</#if> </#if>
</#list> </#list>
</#if> </#if>
<#comment>成功后get填充一次完整信息</#comment> <#comment>成功后get填充一次完整信息</#comment>
CachedBeanCopier.copy(get(et.get${srfcaseformat(keyfield.codeName,'l_u2lC')?cap_first}()), et); CachedBeanCopier.copy(get(et.get${srfr7templcaseformat(keyfield.codeName)?cap_first}()), et);
<#comment>附加数据逻辑-操作后</#comment> <#comment>附加数据逻辑-操作后</#comment>
<@addAfterLogic deaction/> <@addAfterLogic deaction/>
return true ; return true ;
...@@ -1311,14 +1313,14 @@ public class ${item.getCodeName()}ServiceImpl implements I${de.getCodeName()}Ser ...@@ -1311,14 +1313,14 @@ public class ${item.getCodeName()}ServiceImpl implements I${de.getCodeName()}Ser
</#list> </#list>
</#if> </#if>
<#if nested> <#if nested>
${srfcaseformat(MinorEntity.getCodeName(),'l_u2lC')}Service.saveBy${srfcaseformat(MajorDerField.codeName,'l_u2lC')?cap_first}(et.get${srfcaseformat(keyfield.codeName,'l_u2lC')?cap_first}(), et.get${srfcaseformat(listcode,'l_u2lC')?cap_first}()); ${srfr7templcaseformat(MinorEntity.getCodeName())}Service.saveBy${srfr7templcaseformat(MajorDerField.codeName)?cap_first}(et.get${srfr7templcaseformat(keyfield.codeName)?cap_first}(), et.get${srfr7templcaseformat(listcode)?cap_first}());
</#if> </#if>
</#if> </#if>
</#if> </#if>
</#list> </#list>
</#if> </#if>
<#comment>成功后get填充一次完整信息</#comment> <#comment>成功后get填充一次完整信息</#comment>
CachedBeanCopier.copy(get(et.get${srfcaseformat(keyfield.codeName,'l_u2lC')?cap_first}()), et); CachedBeanCopier.copy(get(et.get${srfr7templcaseformat(keyfield.codeName)?cap_first}()), et);
<#comment>附加数据逻辑-操作后</#comment> <#comment>附加数据逻辑-操作后</#comment>
<@addAfterLogic deaction/> <@addAfterLogic deaction/>
return true ; return true ;
...@@ -1366,14 +1368,14 @@ public class ${item.getCodeName()}ServiceImpl implements I${de.getCodeName()}Ser ...@@ -1366,14 +1368,14 @@ public class ${item.getCodeName()}ServiceImpl implements I${de.getCodeName()}Ser
</#list> </#list>
</#if> </#if>
<#if nested> <#if nested>
${srfcaseformat(MinorEntity.getCodeName(),'l_u2lC')}Service.saveBy${srfcaseformat(MajorDerField.codeName,'l_u2lC')?cap_first}(et.get${srfcaseformat(keyfield.codeName,'l_u2lC')?cap_first}(), et.get${srfcaseformat(listcode,'l_u2lC')?cap_first}()); ${srfr7templcaseformat(MinorEntity.getCodeName())}Service.saveBy${srfr7templcaseformat(MajorDerField.codeName)?cap_first}(et.get${srfr7templcaseformat(keyfield.codeName)?cap_first}(), et.get${srfr7templcaseformat(listcode)?cap_first}());
</#if> </#if>
</#if> </#if>
</#if> </#if>
</#list> </#list>
</#if> </#if>
<#comment>成功后get填充一次完整信息</#comment> <#comment>成功后get填充一次完整信息</#comment>
CachedBeanCopier.copy(get(et.get${srfcaseformat(keyfield.codeName,'l_u2lC')?cap_first}()), et); CachedBeanCopier.copy(get(et.get${srfr7templcaseformat(keyfield.codeName)?cap_first}()), et);
<#comment>附加数据逻辑-操作后</#comment> <#comment>附加数据逻辑-操作后</#comment>
<@addAfterLogic deaction/> <@addAfterLogic deaction/>
return true ; return true ;
...@@ -1402,7 +1404,7 @@ public class ${item.getCodeName()}ServiceImpl implements I${de.getCodeName()}Ser ...@@ -1402,7 +1404,7 @@ public class ${item.getCodeName()}ServiceImpl implements I${de.getCodeName()}Ser
<#if der.getDERType() =='DER1N' && der.isNestedRS() && der.getMinorPSDataEntity()?? && (der.getMinorPSDataEntity().getStorageMode()==1||der.getMinorPSDataEntity().getStorageMode()==2||der.getMinorPSDataEntity().getStorageMode()==4) > <#if der.getDERType() =='DER1N' && der.isNestedRS() && der.getMinorPSDataEntity()?? && (der.getMinorPSDataEntity().getStorageMode()==1||der.getMinorPSDataEntity().getStorageMode()==2||der.getMinorPSDataEntity().getStorageMode()==4) >
<#assign MajorDerField = der.getPSPickupDEField()> <#assign MajorDerField = der.getPSPickupDEField()>
<#assign minorKeyField = der.getMinorPSDataEntity().getKeyPSDEField()> <#assign minorKeyField = der.getMinorPSDataEntity().getKeyPSDEField()>
${srfcaseformat(der.getMinorPSDataEntity().getCodeName(),'l_u2lC')}Service.removeBy${srfcaseformat(MajorDerField.codeName,'l_u2lC')?cap_first}(key) ; ${srfr7templcaseformat(der.getMinorPSDataEntity().getCodeName())}Service.removeBy${srfr7templcaseformat(MajorDerField.codeName)?cap_first}(key) ;
</#if> </#if>
</#list> </#list>
</#if> </#if>
...@@ -1439,7 +1441,7 @@ public class ${item.getCodeName()}ServiceImpl implements I${de.getCodeName()}Ser ...@@ -1439,7 +1441,7 @@ public class ${item.getCodeName()}ServiceImpl implements I${de.getCodeName()}Ser
@Override @Override
public boolean checkKey(${item.getCodeName()} et) { public boolean checkKey(${item.getCodeName()} et) {
<@outputTestAction deaction "checkkey"/> <@outputTestAction deaction "checkkey"/>
return repository.findById(et.get${srfcaseformat(keyfield.codeName,'l_u2lC')?cap_first}()).isPresent(); return repository.findById(et.get${srfr7templcaseformat(keyfield.codeName)?cap_first}()).isPresent();
} }
<#else> <#else>
...@@ -1477,7 +1479,7 @@ public class ${item.getCodeName()}ServiceImpl implements I${de.getCodeName()}Ser ...@@ -1477,7 +1479,7 @@ public class ${item.getCodeName()}ServiceImpl implements I${de.getCodeName()}Ser
<#assign deDefaultDataSet=de.getDefaultPSDEDataSet()> <#assign deDefaultDataSet=de.getDefaultPSDEDataSet()>
<#if deDefaultDataSet.getPSDEDataQueries()??> <#if deDefaultDataSet.getPSDEDataQueries()??>
@Override @Override
public List<${item.getCodeName()}> selectBy${srfcaseformat(MajorField.codeName,'l_u2lC')?cap_first}(${srfr7javatype(MajorField.stdDataType)} ${MajorkeyField.codeName?lower_case}) { public List<${item.getCodeName()}> selectBy${srfr7templcaseformat(MajorField.codeName)?cap_first}(${srfr7javatype(MajorField.stdDataType)} ${MajorkeyField.codeName?lower_case}) {
${item.getCodeName()}SearchContext context=new ${item.getCodeName()}SearchContext(); ${item.getCodeName()}SearchContext context=new ${item.getCodeName()}SearchContext();
context.setN_${MajorField.name?lower_case}_eq(${MajorkeyField.codeName?lower_case}); context.setN_${MajorField.name?lower_case}_eq(${MajorkeyField.codeName?lower_case});
Query query = new BasicQuery(context.getSelectCond().get().toString()); Query query = new BasicQuery(context.getSelectCond().get().toString());
...@@ -1486,10 +1488,10 @@ public class ${item.getCodeName()}ServiceImpl implements I${de.getCodeName()}Ser ...@@ -1486,10 +1488,10 @@ public class ${item.getCodeName()}ServiceImpl implements I${de.getCodeName()}Ser
<#comment>输出主实体删除关联行为</#comment> <#comment>输出主实体删除关联行为</#comment>
<@majorEntityRemove_RefAction MinorPSDER/> <@majorEntityRemove_RefAction MinorPSDER/>
@Override @Override
public void removeBy${srfcaseformat(MajorField.codeName,'l_u2lC')?cap_first}(${srfr7javatype(MajorField.stdDataType)} ${MajorkeyField.codeName?lower_case}) { public void removeBy${srfr7templcaseformat(MajorField.codeName)?cap_first}(${srfr7javatype(MajorField.stdDataType)} ${MajorkeyField.codeName?lower_case}) {
Set<${srfr7javatype(keyfield.stdDataType)}> delIds=new HashSet<${srfr7javatype(keyfield.stdDataType)}>(); Set<${srfr7javatype(keyfield.stdDataType)}> delIds=new HashSet<${srfr7javatype(keyfield.stdDataType)}>();
for(${item.getCodeName()} before:selectBy${srfcaseformat(MajorField.codeName,'l_u2lC')?cap_first}(${MajorkeyField.codeName?lower_case})){ for(${item.getCodeName()} before:selectBy${srfr7templcaseformat(MajorField.codeName)?cap_first}(${MajorkeyField.codeName?lower_case})){
delIds.add(before.get${srfcaseformat(keyfield.getCodeName(),'l_u2lC')?cap_first}()); delIds.add(before.get${srfr7templcaseformat(keyfield.getCodeName())?cap_first}());
} }
if(delIds.size()>0) if(delIds.size()>0)
this.removeBatch(delIds); this.removeBatch(delIds);
...@@ -1505,21 +1507,21 @@ public class ${item.getCodeName()}ServiceImpl implements I${de.getCodeName()}Ser ...@@ -1505,21 +1507,21 @@ public class ${item.getCodeName()}ServiceImpl implements I${de.getCodeName()}Ser
<#if nested> <#if nested>
<@autowiredProxyService/> <@autowiredProxyService/>
@Override @Override
public void saveBy${srfcaseformat(MajorField.codeName,'l_u2lC')?cap_first}(${srfr7javatype(MajorField.stdDataType)} ${MajorkeyField.codeName?lower_case},List<${item.getCodeName()}> list) { public void saveBy${srfr7templcaseformat(MajorField.codeName)?cap_first}(${srfr7javatype(MajorField.stdDataType)} ${MajorkeyField.codeName?lower_case},List<${item.getCodeName()}> list) {
if(list==null) if(list==null)
return; return;
Set<${srfr7javatype(keyfield.stdDataType)}> delIds=new HashSet<${srfr7javatype(keyfield.stdDataType)}>(); Set<${srfr7javatype(keyfield.stdDataType)}> delIds=new HashSet<${srfr7javatype(keyfield.stdDataType)}>();
List<${item.getCodeName()}> _update=new ArrayList<${item.getCodeName()}>(); List<${item.getCodeName()}> _update=new ArrayList<${item.getCodeName()}>();
List<${item.getCodeName()}> _create=new ArrayList<${item.getCodeName()}>(); List<${item.getCodeName()}> _create=new ArrayList<${item.getCodeName()}>();
for(${item.getCodeName()} before:selectBy${srfcaseformat(MajorField.codeName,'l_u2lC')?cap_first}(${MajorkeyField.codeName?lower_case})){ for(${item.getCodeName()} before:selectBy${srfr7templcaseformat(MajorField.codeName)?cap_first}(${MajorkeyField.codeName?lower_case})){
delIds.add(before.get${srfcaseformat(keyfield.getCodeName(),'l_u2lC')?cap_first}()); delIds.add(before.get${srfr7templcaseformat(keyfield.getCodeName())?cap_first}());
} }
for(${item.getCodeName()} sub:list) { for(${item.getCodeName()} sub:list) {
sub.set${srfcaseformat(MajorField.codeName,'l_u2lC')?cap_first}(${MajorkeyField.codeName?lower_case}); sub.set${srfr7templcaseformat(MajorField.codeName)?cap_first}(${MajorkeyField.codeName?lower_case});
if(ObjectUtils.isEmpty(sub.get${srfcaseformat(keyfield.getCodeName(),'l_u2lC')?cap_first}())) if(ObjectUtils.isEmpty(sub.get${srfr7templcaseformat(keyfield.getCodeName())?cap_first}()))
sub.set${srfcaseformat(keyfield.getCodeName(),'l_u2lC')?cap_first}((${srfr7javatype(keyfield.stdDataType)})sub.getDefaultKey(true)); sub.set${srfr7templcaseformat(keyfield.getCodeName())?cap_first}((${srfr7javatype(keyfield.stdDataType)})sub.getDefaultKey(true));
if(delIds.contains(sub.get${srfcaseformat(keyfield.getCodeName(),'l_u2lC')?cap_first}())) { if(delIds.contains(sub.get${srfr7templcaseformat(keyfield.getCodeName())?cap_first}())) {
delIds.remove(sub.get${srfcaseformat(keyfield.getCodeName(),'l_u2lC')?cap_first}()); delIds.remove(sub.get${srfr7templcaseformat(keyfield.getCodeName())?cap_first}());
_update.add(sub); _update.add(sub);
} }
else else
...@@ -1582,7 +1584,7 @@ public class ${item.getCodeName()}ServiceImpl implements I${de.getCodeName()}Ser ...@@ -1582,7 +1584,7 @@ public class ${item.getCodeName()}ServiceImpl implements I${de.getCodeName()}Ser
List ids =new ArrayList(); List ids =new ArrayList();
for(${de.codeName} entity : entities){ for(${de.codeName} entity : entities){
Serializable id=entity.get${srfcaseformat(keyfield.codeName,'l_u2lC')?cap_first}(); Serializable id=entity.get${srfr7templcaseformat(keyfield.codeName)?cap_first}();
if(!ObjectUtils.isEmpty(id)){ if(!ObjectUtils.isEmpty(id)){
ids.add(id); ids.add(id);
} }
...@@ -1639,7 +1641,7 @@ public class ${item.getCodeName()}ServiceImpl implements I${de.getCodeName()}Ser ...@@ -1639,7 +1641,7 @@ public class ${item.getCodeName()}ServiceImpl implements I${de.getCodeName()}Ser
<#if !P.exists('DEMinorPSDataEntity',der.getMinorPSDataEntity().getCodeName())> <#if !P.exists('DEMinorPSDataEntity',der.getMinorPSDataEntity().getCodeName())>
@Autowired @Autowired
@Lazy @Lazy
protected ${pub.getPKGCodeName()}.core.${der.getMinorPSDataEntity().getPSSystemModule().getCodeName()?lower_case}.service.I${der.getMinorPSDataEntity().getCodeName()}Service ${srfcaseformat(der.getMinorPSDataEntity().getCodeName(),'l_u2lC')}Service; protected ${pub.getPKGCodeName()}.core.${der.getMinorPSDataEntity().getPSSystemModule().getCodeName()?lower_case}.service.I${der.getMinorPSDataEntity().getCodeName()}Service ${srfr7templcaseformat(der.getMinorPSDataEntity().getCodeName())}Service;
</#if> </#if>
</#if> </#if>
</#list> </#list>
...@@ -1659,7 +1661,7 @@ public class ${item.getCodeName()}ServiceImpl implements I${de.getCodeName()}Ser ...@@ -1659,7 +1661,7 @@ public class ${item.getCodeName()}ServiceImpl implements I${de.getCodeName()}Ser
<@outputTestAction deaction "usercustom"/> <@outputTestAction deaction "usercustom"/>
<#comment>附加数据逻辑-操作前</#comment> <#comment>附加数据逻辑-操作前</#comment>
<@addBoforeLogic deaction/> <@addBoforeLogic deaction/>
et = ${subSysServiceApiDECodeName?uncap_first}FeignClient.${deaction.getPSSubSysServiceAPIDEMethod().getCodeName()?uncap_first}(et.get${srfcaseformat(keyfield.codeName,'l_u2lC')?cap_first}(), et); et = ${subSysServiceApiDECodeName?uncap_first}FeignClient.${deaction.getPSSubSysServiceAPIDEMethod().getCodeName()?uncap_first}(et.get${srfr7templcaseformat(keyfield.codeName)?cap_first}(), et);
<#comment>附加数据逻辑-操作后</#comment> <#comment>附加数据逻辑-操作后</#comment>
<@addAfterLogic deaction/> <@addAfterLogic deaction/>
return et; return et;
...@@ -1714,7 +1716,7 @@ public class ${item.getCodeName()}ServiceImpl implements I${de.getCodeName()}Ser ...@@ -1714,7 +1716,7 @@ public class ${item.getCodeName()}ServiceImpl implements I${de.getCodeName()}Ser
</#list> </#list>
</#if> </#if>
<#if nested> <#if nested>
et.set${srfcaseformat(listcode,'l_u2lC')?cap_first}(${srfcaseformat(MinorEntity.getCodeName(),'l_u2lC')}Service.selectBy${srfcaseformat(MajorDerField.codeName,'l_u2lC')?cap_first}(key)); et.set${srfr7templcaseformat(listcode)?cap_first}(${srfr7templcaseformat(MinorEntity.getCodeName())}Service.selectBy${srfr7templcaseformat(MajorDerField.codeName)?cap_first}(key));
</#if> </#if>
</#if> </#if>
</#if> </#if>
...@@ -1763,8 +1765,8 @@ public class ${item.getCodeName()}ServiceImpl implements I${de.getCodeName()}Ser ...@@ -1763,8 +1765,8 @@ public class ${item.getCodeName()}ServiceImpl implements I${de.getCodeName()}Ser
</#list> </#list>
</#if> </#if>
<#if nested> <#if nested>
${srfcaseformat(MinorEntity.getCodeName(),'l_u2lC')}Service.saveBy${srfcaseformat(MajorDerField.codeName,'l_u2lC')?cap_first}(rt.get${srfcaseformat(keyfield.codeName,'l_u2lC')?cap_first}(), et.get${srfcaseformat(listcode,'l_u2lC')?cap_first}()); ${srfr7templcaseformat(MinorEntity.getCodeName())}Service.saveBy${srfr7templcaseformat(MajorDerField.codeName)?cap_first}(rt.get${srfr7templcaseformat(keyfield.codeName)?cap_first}(), et.get${srfr7templcaseformat(listcode)?cap_first}());
rt.set${srfcaseformat(listcode,'l_u2lC')?cap_first}(et.get${srfcaseformat(listcode,'l_u2lC')?cap_first}()); rt.set${srfr7templcaseformat(listcode)?cap_first}(et.get${srfr7templcaseformat(listcode)?cap_first}());
</#if> </#if>
</#if> </#if>
</#if> </#if>
...@@ -1805,7 +1807,7 @@ public class ${item.getCodeName()}ServiceImpl implements I${de.getCodeName()}Ser ...@@ -1805,7 +1807,7 @@ public class ${item.getCodeName()}ServiceImpl implements I${de.getCodeName()}Ser
<#if deaction.getPSSubSysServiceAPIDEMethod()?? > <#if deaction.getPSSubSysServiceAPIDEMethod()?? >
<#comment>附加数据逻辑-操作前</#comment> <#comment>附加数据逻辑-操作前</#comment>
<@addBoforeLogic deaction/> <@addBoforeLogic deaction/>
${item.getCodeName()} rt = ${subSysServiceApiDECodeName?uncap_first}FeignClient.update(et.get${srfcaseformat(keyfield.codeName,'l_u2lC')?cap_first}(),et); ${item.getCodeName()} rt = ${subSysServiceApiDECodeName?uncap_first}FeignClient.update(et.get${srfr7templcaseformat(keyfield.codeName)?cap_first}(),et);
if(rt==null) if(rt==null)
return false; return false;
<#comment>1N关系中,在父实体中创建子实体的List集合</#comment> <#comment>1N关系中,在父实体中创建子实体的List集合</#comment>
...@@ -1826,8 +1828,8 @@ public class ${item.getCodeName()}ServiceImpl implements I${de.getCodeName()}Ser ...@@ -1826,8 +1828,8 @@ public class ${item.getCodeName()}ServiceImpl implements I${de.getCodeName()}Ser
</#list> </#list>
</#if> </#if>
<#if nested> <#if nested>
${srfcaseformat(MinorEntity.getCodeName(),'l_u2lC')}Service.saveBy${srfcaseformat(MajorDerField.codeName,'l_u2lC')?cap_first}(et.get${srfcaseformat(keyfield.codeName,'l_u2lC')?cap_first}(), et.get${srfcaseformat(listcode,'l_u2lC')?cap_first}())); ${srfr7templcaseformat(MinorEntity.getCodeName())}Service.saveBy${srfr7templcaseformat(MajorDerField.codeName)?cap_first}(et.get${srfr7templcaseformat(keyfield.codeName)?cap_first}(), et.get${srfr7templcaseformat(listcode)?cap_first}()));
rt.set${srfcaseformat(listcode,'l_u2lC')?cap_first}(et.get${srfcaseformat(listcode,'l_u2lC')?cap_first}()); rt.set${srfr7templcaseformat(listcode)?cap_first}(et.get${srfr7templcaseformat(listcode)?cap_first}());
</#if> </#if>
</#if> </#if>
</#if> </#if>
...@@ -1892,8 +1894,8 @@ public class ${item.getCodeName()}ServiceImpl implements I${de.getCodeName()}Ser ...@@ -1892,8 +1894,8 @@ public class ${item.getCodeName()}ServiceImpl implements I${de.getCodeName()}Ser
</#list> </#list>
</#if> </#if>
<#if nested> <#if nested>
${srfcaseformat(MinorEntity.getCodeName(),'l_u2lC')}Service.saveBy${srfcaseformat(MajorDerField.codeName,'l_u2lC')?cap_first}(et.get${srfcaseformat(keyfield.codeName,'l_u2lC')?cap_first}(),et.get${srfcaseformat(listcode,'l_u2lC')?cap_first}()); ${srfr7templcaseformat(MinorEntity.getCodeName())}Service.saveBy${srfr7templcaseformat(MajorDerField.codeName)?cap_first}(et.get${srfr7templcaseformat(keyfield.codeName)?cap_first}(),et.get${srfr7templcaseformat(listcode)?cap_first}());
rt.set${srfcaseformat(listcode,'l_u2lC')?cap_first}(et.get${srfcaseformat(listcode,'l_u2lC')?cap_first}()); rt.set${srfr7templcaseformat(listcode)?cap_first}(et.get${srfr7templcaseformat(listcode)?cap_first}());
</#if> </#if>
</#if> </#if>
</#if> </#if>
...@@ -1941,7 +1943,7 @@ public class ${item.getCodeName()}ServiceImpl implements I${de.getCodeName()}Ser ...@@ -1941,7 +1943,7 @@ public class ${item.getCodeName()}ServiceImpl implements I${de.getCodeName()}Ser
<#if der.getDERType() =='DER1N' && der.isNestedRS() && der.getMinorPSDataEntity()?? && (der.getMinorPSDataEntity().getStorageMode()==1||der.getMinorPSDataEntity().getStorageMode()==2) > <#if der.getDERType() =='DER1N' && der.isNestedRS() && der.getMinorPSDataEntity()?? && (der.getMinorPSDataEntity().getStorageMode()==1||der.getMinorPSDataEntity().getStorageMode()==2) >
<#assign MajorDerField = der.getPSPickupDEField()> <#assign MajorDerField = der.getPSPickupDEField()>
<#assign minorKeyField = der.getMinorPSDataEntity().getKeyPSDEField()> <#assign minorKeyField = der.getMinorPSDataEntity().getKeyPSDEField()>
${srfcaseformat(der.getMinorPSDataEntity().getCodeName(),'l_u2lC')}Service.removeBy${srfcaseformat(MajorDerField.codeName,'l_u2lC')?cap_first}(key) ; ${srfr7templcaseformat(der.getMinorPSDataEntity().getCodeName())}Service.removeBy${srfr7templcaseformat(MajorDerField.codeName)?cap_first}(key) ;
</#if> </#if>
</#list> </#list>
</#if> </#if>
...@@ -2019,7 +2021,7 @@ public class ${item.getCodeName()}ServiceImpl implements I${de.getCodeName()}Ser ...@@ -2019,7 +2021,7 @@ public class ${item.getCodeName()}ServiceImpl implements I${de.getCodeName()}Ser
<#if deaction.getPSSubSysServiceAPIDEMethod()?? > <#if deaction.getPSSubSysServiceAPIDEMethod()?? >
<#comment>附加数据逻辑-操作前</#comment> <#comment>附加数据逻辑-操作前</#comment>
<@addBoforeLogic deaction/> <@addBoforeLogic deaction/>
et=${subSysServiceApiDECodeName?uncap_first}FeignClient.${deaction.getPSSubSysServiceAPIDEMethod().getCodeName()?uncap_first}(et.get${srfcaseformat(keyfield.codeName,'l_u2lC')?cap_first}(),et); et=${subSysServiceApiDECodeName?uncap_first}FeignClient.${deaction.getPSSubSysServiceAPIDEMethod().getCodeName()?uncap_first}(et.get${srfr7templcaseformat(keyfield.codeName)?cap_first}(),et);
<#comment>附加数据逻辑-操作后</#comment> <#comment>附加数据逻辑-操作后</#comment>
<@addAfterLogic deaction/> <@addAfterLogic deaction/>
return et; return et;
...@@ -2053,7 +2055,7 @@ public class ${item.getCodeName()}ServiceImpl implements I${de.getCodeName()}Ser ...@@ -2053,7 +2055,7 @@ public class ${item.getCodeName()}ServiceImpl implements I${de.getCodeName()}Ser
<#assign deDefaultDataSet=de.getDefaultPSDEDataSet()> <#assign deDefaultDataSet=de.getDefaultPSDEDataSet()>
<#if deDefaultDataSet.getPSDEDataQueries()??> <#if deDefaultDataSet.getPSDEDataQueries()??>
@Override @Override
public List<${item.getCodeName()}> selectBy${srfcaseformat(MajorField.codeName,'l_u2lC')?cap_first}(${srfr7javatype(MajorField.stdDataType)} ${MajorkeyField.codeName?lower_case}) { public List<${item.getCodeName()}> selectBy${srfr7templcaseformat(MajorField.codeName)?cap_first}(${srfr7javatype(MajorField.stdDataType)} ${MajorkeyField.codeName?lower_case}) {
${item.getCodeName()}SearchContext context=new ${item.getCodeName()}SearchContext(); ${item.getCodeName()}SearchContext context=new ${item.getCodeName()}SearchContext();
context.setSize(Integer.MAX_VALUE); context.setSize(Integer.MAX_VALUE);
context.setN_${MajorField.name?lower_case}_eq(${MajorkeyField.codeName?lower_case}); context.setN_${MajorField.name?lower_case}_eq(${MajorkeyField.codeName?lower_case});
...@@ -2062,10 +2064,10 @@ public class ${item.getCodeName()}ServiceImpl implements I${de.getCodeName()}Ser ...@@ -2062,10 +2064,10 @@ public class ${item.getCodeName()}ServiceImpl implements I${de.getCodeName()}Ser
<#comment>输出主实体删除关联行为</#comment> <#comment>输出主实体删除关联行为</#comment>
<@majorEntityRemove_RefAction MinorPSDER/> <@majorEntityRemove_RefAction MinorPSDER/>
@Override @Override
public void removeBy${srfcaseformat(MajorField.codeName,'l_u2lC')?cap_first}(${srfr7javatype(MajorField.stdDataType)} ${MajorkeyField.codeName?lower_case}) { public void removeBy${srfr7templcaseformat(MajorField.codeName)?cap_first}(${srfr7javatype(MajorField.stdDataType)} ${MajorkeyField.codeName?lower_case}) {
Set<${srfr7javatype(keyfield.stdDataType)}> delIds=new HashSet<${srfr7javatype(keyfield.stdDataType)}>(); Set<${srfr7javatype(keyfield.stdDataType)}> delIds=new HashSet<${srfr7javatype(keyfield.stdDataType)}>();
for(${item.getCodeName()} before:selectBy${srfcaseformat(MajorField.codeName,'l_u2lC')?cap_first}(${MajorkeyField.codeName?lower_case})){ for(${item.getCodeName()} before:selectBy${srfr7templcaseformat(MajorField.codeName)?cap_first}(${MajorkeyField.codeName?lower_case})){
delIds.add(before.get${srfcaseformat(keyfield.getCodeName(),'l_u2lC')?cap_first}()); delIds.add(before.get${srfr7templcaseformat(keyfield.getCodeName())?cap_first}());
} }
if(delIds.size()>0) if(delIds.size()>0)
this.removeBatch(delIds); this.removeBatch(delIds);
...@@ -2082,21 +2084,21 @@ public class ${item.getCodeName()}ServiceImpl implements I${de.getCodeName()}Ser ...@@ -2082,21 +2084,21 @@ public class ${item.getCodeName()}ServiceImpl implements I${de.getCodeName()}Ser
<#if nested> <#if nested>
<@autowiredProxyService/> <@autowiredProxyService/>
@Override @Override
public void saveBy${srfcaseformat(MajorField.codeName,'l_u2lC')?cap_first}(${srfr7javatype(MajorField.stdDataType)} ${MajorkeyField.codeName?lower_case},List<${item.getCodeName()}> list) { public void saveBy${srfr7templcaseformat(MajorField.codeName)?cap_first}(${srfr7javatype(MajorField.stdDataType)} ${MajorkeyField.codeName?lower_case},List<${item.getCodeName()}> list) {
if(list==null) if(list==null)
return; return;
Set<${srfr7javatype(keyfield.stdDataType)}> delIds=new HashSet<${srfr7javatype(keyfield.stdDataType)}>(); Set<${srfr7javatype(keyfield.stdDataType)}> delIds=new HashSet<${srfr7javatype(keyfield.stdDataType)}>();
List<${item.getCodeName()}> _update=new ArrayList<${item.getCodeName()}>(); List<${item.getCodeName()}> _update=new ArrayList<${item.getCodeName()}>();
List<${item.getCodeName()}> _create=new ArrayList<${item.getCodeName()}>(); List<${item.getCodeName()}> _create=new ArrayList<${item.getCodeName()}>();
for(${item.getCodeName()} before:selectBy${srfcaseformat(MajorField.codeName,'l_u2lC')?cap_first}(${MajorkeyField.codeName?lower_case})){ for(${item.getCodeName()} before:selectBy${srfr7templcaseformat(MajorField.codeName)?cap_first}(${MajorkeyField.codeName?lower_case})){
delIds.add(before.get${srfcaseformat(keyfield.getCodeName(),'l_u2lC')?cap_first}()); delIds.add(before.get${srfr7templcaseformat(keyfield.getCodeName())?cap_first}());
} }
for(${item.getCodeName()} sub:list) { for(${item.getCodeName()} sub:list) {
sub.set${srfcaseformat(MajorField.codeName,'l_u2lC')?cap_first}(${MajorkeyField.codeName?lower_case}); sub.set${srfr7templcaseformat(MajorField.codeName)?cap_first}(${MajorkeyField.codeName?lower_case});
if(ObjectUtils.isEmpty(sub.get${srfcaseformat(keyfield.getCodeName(),'l_u2lC')?cap_first}())) if(ObjectUtils.isEmpty(sub.get${srfr7templcaseformat(keyfield.getCodeName())?cap_first}()))
sub.set${srfcaseformat(keyfield.getCodeName(),'l_u2lC')?cap_first}((${srfr7javatype(keyfield.stdDataType)})sub.getDefaultKey(true)); sub.set${srfr7templcaseformat(keyfield.getCodeName())?cap_first}((${srfr7javatype(keyfield.stdDataType)})sub.getDefaultKey(true));
if(delIds.contains(sub.get${srfcaseformat(keyfield.getCodeName(),'l_u2lC')?cap_first}())) { if(delIds.contains(sub.get${srfr7templcaseformat(keyfield.getCodeName())?cap_first}())) {
delIds.remove(sub.get${srfcaseformat(keyfield.getCodeName(),'l_u2lC')?cap_first}()); delIds.remove(sub.get${srfr7templcaseformat(keyfield.getCodeName())?cap_first}());
_update.add(sub); _update.add(sub);
} }
else else
...@@ -2183,7 +2185,7 @@ public class ${item.getCodeName()}ServiceImpl implements I${de.getCodeName()}Ser ...@@ -2183,7 +2185,7 @@ public class ${item.getCodeName()}ServiceImpl implements I${de.getCodeName()}Ser
<#if !P.exists('DEMinorPSDataEntity',der.getMinorPSDataEntity().getCodeName())> <#if !P.exists('DEMinorPSDataEntity',der.getMinorPSDataEntity().getCodeName())>
@Autowired @Autowired
@Lazy @Lazy
protected ${pub.getPKGCodeName()}.core.${der.getMinorPSDataEntity().getPSSystemModule().getCodeName()?lower_case}.service.I${der.getMinorPSDataEntity().getCodeName()}Service ${srfcaseformat(der.getMinorPSDataEntity().getCodeName(),'l_u2lC')}Service; protected ${pub.getPKGCodeName()}.core.${der.getMinorPSDataEntity().getPSSystemModule().getCodeName()?lower_case}.service.I${der.getMinorPSDataEntity().getCodeName()}Service ${srfr7templcaseformat(der.getMinorPSDataEntity().getCodeName())}Service;
</#if> </#if>
</#if> </#if>
</#list> </#list>
...@@ -2256,7 +2258,7 @@ public class ${item.getCodeName()}ServiceImpl implements I${de.getCodeName()}Ser ...@@ -2256,7 +2258,7 @@ public class ${item.getCodeName()}ServiceImpl implements I${de.getCodeName()}Ser
<@buildEntityParam deaction/> <@buildEntityParam deaction/>
<@addGetActionBoforeLogic deaction/> <@addGetActionBoforeLogic deaction/>
${item.getCodeName()} et = new ${item.getCodeName()}(); ${item.getCodeName()} et = new ${item.getCodeName()}();
et.set${srfcaseformat(keyfield.codeName,'l_u2lC')?cap_first}(key); et.set${srfr7templcaseformat(keyfield.codeName)?cap_first}(key);
<#comment>附加数据逻辑-操作后</#comment> <#comment>附加数据逻辑-操作后</#comment>
<@addAfterLogic deaction/> <@addAfterLogic deaction/>
return et; return et;
...@@ -2401,16 +2403,16 @@ public class ${item.getCodeName()}ServiceImpl implements I${de.getCodeName()}Ser ...@@ -2401,16 +2403,16 @@ public class ${item.getCodeName()}ServiceImpl implements I${de.getCodeName()}Ser
<#assign deDefaultDataSet=de.getDefaultPSDEDataSet()> <#assign deDefaultDataSet=de.getDefaultPSDEDataSet()>
<#if deDefaultDataSet.getPSDEDataQueries()??> <#if deDefaultDataSet.getPSDEDataQueries()??>
@Override @Override
public List<${item.getCodeName()}> selectBy${srfcaseformat(MajorField.codeName,'l_u2lC')?cap_first}(${srfr7javatype(MajorField.stdDataType)} ${MajorkeyField.codeName?lower_case}) { public List<${item.getCodeName()}> selectBy${srfr7templcaseformat(MajorField.codeName)?cap_first}(${srfr7javatype(MajorField.stdDataType)} ${MajorkeyField.codeName?lower_case}) {
return null; return null;
} }
<#comment>输出主实体删除关联行为</#comment> <#comment>输出主实体删除关联行为</#comment>
<@majorEntityRemove_RefAction MinorPSDER/> <@majorEntityRemove_RefAction MinorPSDER/>
@Override @Override
public void removeBy${srfcaseformat(MajorField.codeName,'l_u2lC')?cap_first}(${srfr7javatype(MajorField.stdDataType)} ${MajorkeyField.codeName?lower_case}) { public void removeBy${srfr7templcaseformat(MajorField.codeName)?cap_first}(${srfr7javatype(MajorField.stdDataType)} ${MajorkeyField.codeName?lower_case}) {
Set<${srfr7javatype(keyfield.stdDataType)}> delIds=new HashSet<${srfr7javatype(keyfield.stdDataType)}>(); Set<${srfr7javatype(keyfield.stdDataType)}> delIds=new HashSet<${srfr7javatype(keyfield.stdDataType)}>();
for(${item.getCodeName()} before:selectBy${srfcaseformat(MajorField.codeName,'l_u2lC')?cap_first}(${MajorkeyField.codeName?lower_case})){ for(${item.getCodeName()} before:selectBy${srfr7templcaseformat(MajorField.codeName)?cap_first}(${MajorkeyField.codeName?lower_case})){
delIds.add(before.get${srfcaseformat(keyfield.getCodeName(),'l_u2lC')?cap_first}()); delIds.add(before.get${srfr7templcaseformat(keyfield.getCodeName())?cap_first}());
} }
if(delIds.size()>0) if(delIds.size()>0)
this.removeBatch(delIds); this.removeBatch(delIds);
...@@ -2427,21 +2429,21 @@ public class ${item.getCodeName()}ServiceImpl implements I${de.getCodeName()}Ser ...@@ -2427,21 +2429,21 @@ public class ${item.getCodeName()}ServiceImpl implements I${de.getCodeName()}Ser
<#if nested> <#if nested>
<@autowiredProxyService/> <@autowiredProxyService/>
@Override @Override
public void saveBy${srfcaseformat(MajorField.codeName,'l_u2lC')?cap_first}(${srfr7javatype(MajorField.stdDataType)} ${MajorkeyField.codeName?lower_case},List<${item.getCodeName()}> list) { public void saveBy${srfr7templcaseformat(MajorField.codeName)?cap_first}(${srfr7javatype(MajorField.stdDataType)} ${MajorkeyField.codeName?lower_case},List<${item.getCodeName()}> list) {
if(list==null) if(list==null)
return; return;
Set<${srfr7javatype(keyfield.stdDataType)}> delIds=new HashSet<${srfr7javatype(keyfield.stdDataType)}>(); Set<${srfr7javatype(keyfield.stdDataType)}> delIds=new HashSet<${srfr7javatype(keyfield.stdDataType)}>();
List<${item.getCodeName()}> _update=new ArrayList<${item.getCodeName()}>(); List<${item.getCodeName()}> _update=new ArrayList<${item.getCodeName()}>();
List<${item.getCodeName()}> _create=new ArrayList<${item.getCodeName()}>(); List<${item.getCodeName()}> _create=new ArrayList<${item.getCodeName()}>();
for(${item.getCodeName()} before:selectBy${srfcaseformat(MajorField.codeName,'l_u2lC')?cap_first}(${MajorkeyField.codeName?lower_case})){ for(${item.getCodeName()} before:selectBy${srfr7templcaseformat(MajorField.codeName)?cap_first}(${MajorkeyField.codeName?lower_case})){
delIds.add(before.get${srfcaseformat(keyfield.getCodeName(),'l_u2lC')?cap_first}()); delIds.add(before.get${srfr7templcaseformat(keyfield.getCodeName())?cap_first}());
} }
for(${item.getCodeName()} sub:list) { for(${item.getCodeName()} sub:list) {
sub.set${srfcaseformat(MajorField.codeName,'l_u2lC')?cap_first}(${MajorkeyField.codeName?lower_case}); sub.set${srfr7templcaseformat(MajorField.codeName)?cap_first}(${MajorkeyField.codeName?lower_case});
if(ObjectUtils.isEmpty(sub.get${srfcaseformat(keyfield.getCodeName(),'l_u2lC')?cap_first}())) if(ObjectUtils.isEmpty(sub.get${srfr7templcaseformat(keyfield.getCodeName())?cap_first}()))
sub.set${srfcaseformat(keyfield.getCodeName(),'l_u2lC')?cap_first}((${srfr7javatype(keyfield.stdDataType)})sub.getDefaultKey(true)); sub.set${srfr7templcaseformat(keyfield.getCodeName())?cap_first}((${srfr7javatype(keyfield.stdDataType)})sub.getDefaultKey(true));
if(delIds.contains(sub.get${srfcaseformat(keyfield.getCodeName(),'l_u2lC')?cap_first}())) { if(delIds.contains(sub.get${srfr7templcaseformat(keyfield.getCodeName())?cap_first}())) {
delIds.remove(sub.get${srfcaseformat(keyfield.getCodeName(),'l_u2lC')?cap_first}()); delIds.remove(sub.get${srfr7templcaseformat(keyfield.getCodeName())?cap_first}());
_update.add(sub); _update.add(sub);
} }
else else
...@@ -2591,13 +2593,13 @@ public class ${item.getCodeName()}ServiceImpl implements I${de.getCodeName()}Ser ...@@ -2591,13 +2593,13 @@ public class ${item.getCodeName()}ServiceImpl implements I${de.getCodeName()}Ser
<#assign actionLogicDEAction=actionlogic.getDstPSDEAction()> <#assign actionLogicDEAction=actionlogic.getDstPSDEAction()>
${pub.getPKGCodeName()}.core.${actionLogicDE.getPSSystemModule().getCodeName()?lower_case}.domain.${actionLogicDE.getCodeName()} actionLogicDE =new ${pub.getPKGCodeName()}.core.${actionLogicDE.getPSSystemModule().getCodeName()?lower_case}.domain.${actionLogicDE.getCodeName()}(); ${pub.getPKGCodeName()}.core.${actionLogicDE.getPSSystemModule().getCodeName()?lower_case}.domain.${actionLogicDE.getCodeName()} actionLogicDE =new ${pub.getPKGCodeName()}.core.${actionLogicDE.getPSSystemModule().getCodeName()?lower_case}.domain.${actionLogicDE.getCodeName()}();
et.copyTo(actionLogicDE,true); et.copyTo(actionLogicDE,true);
${srfcaseformat(actionLogicDE.getCodeName(),'l_u2lC')}Service.${srfmethodname(actionLogicDEAction.getCodeName())}(actionLogicDE); ${srfr7templcaseformat(actionLogicDE.getCodeName())}Service.${srfmethodname(actionLogicDEAction.getCodeName())}(actionLogicDE);
</#macro> </#macro>
<#comment>实体行为附加逻辑-remove</#comment> <#comment>实体行为附加逻辑-remove</#comment>
<#macro actionLogic_remove actionlogic> <#macro actionLogic_remove actionlogic>
<#if de.getKeyPSDEField().getStdDataType()==actionLogicDE.getKeyPSDEField().getStdDataType()> <#if de.getKeyPSDEField().getStdDataType()==actionLogicDE.getKeyPSDEField().getStdDataType()>
${srfcaseformat(actionLogicDE.getCodeName(),'l_u2lC')}Service.remove(key); ${srfr7templcaseformat(actionLogicDE.getCodeName())}Service.remove(key);
</#if> </#if>
</#macro> </#macro>
...@@ -2634,7 +2636,7 @@ public class ${item.getCodeName()}ServiceImpl implements I${de.getCodeName()}Ser ...@@ -2634,7 +2636,7 @@ public class ${item.getCodeName()}ServiceImpl implements I${de.getCodeName()}Ser
@Autowired @Autowired
@Lazy @Lazy
protected ${pub.getPKGCodeName()}.core.${actionLogicDE.getPSSystemModule().getCodeName()?lower_case}.service.I${actionLogicDE.getCodeName()}Service ${srfcaseformat(actionLogicDE.getCodeName(),'l_u2lC')}Service; protected ${pub.getPKGCodeName()}.core.${actionLogicDE.getPSSystemModule().getCodeName()?lower_case}.service.I${actionLogicDE.getCodeName()}Service ${srfr7templcaseformat(actionLogicDE.getCodeName())}Service;
</#if> </#if>
</#if> </#if>
</#macro> </#macro>
...@@ -2650,7 +2652,7 @@ public class ${item.getCodeName()}ServiceImpl implements I${de.getCodeName()}Ser ...@@ -2650,7 +2652,7 @@ public class ${item.getCodeName()}ServiceImpl implements I${de.getCodeName()}Ser
<#if actionParam.getValueType()=='SESSION' || actionParam.getValueType()=='PARAM'|| actionParam.getValueType()=='CONTEXT'> <#if actionParam.getValueType()=='SESSION' || actionParam.getValueType()=='PARAM'|| actionParam.getValueType()=='CONTEXT'>
<#assign targetFieldName=actionParam.getValue()> <#assign targetFieldName=actionParam.getValue()>
<#if de.getPSDEField(targetFieldName,true)??> <#if de.getPSDEField(targetFieldName,true)??>
<#assign targetFieldName=srfcaseformat(de.getPSDEField(targetFieldName,true).getCodeName(),'l_u2lC')> <#assign targetFieldName=srfr7templcaseformat(de.getPSDEField(targetFieldName,true).getCodeName())>
</#if> </#if>
</#if> </#if>
<#assign actionParamFieldCodeName=actionParam.getPSDEField().codeName> <#assign actionParamFieldCodeName=actionParam.getPSDEField().codeName>
...@@ -2916,11 +2918,11 @@ public class ${item.getCodeName()}ServiceImpl implements I${de.getCodeName()}Ser ...@@ -2916,11 +2918,11 @@ public class ${item.getCodeName()}ServiceImpl implements I${de.getCodeName()}Ser
<#list de.getMinorPSDERs() as MinorPSDER> <#list de.getMinorPSDERs() as MinorPSDER>
<#if MinorPSDER?? && MinorPSDER.getDERType()=='DER1N' && (MinorPSDER.getMajorPSDataEntity().getStorageMode()==1||MinorPSDER.getMajorPSDataEntity().getStorageMode()==2||MinorPSDER.getMajorPSDataEntity().getStorageMode()==4)> <#if MinorPSDER?? && MinorPSDER.getDERType()=='DER1N' && (MinorPSDER.getMajorPSDataEntity().getStorageMode()==1||MinorPSDER.getMajorPSDataEntity().getStorageMode()==2||MinorPSDER.getMajorPSDataEntity().getStorageMode()==4)>
<#if MinorPSDER.getMajorPSDataEntity?? && MinorPSDER.getMajorPSDataEntity()?? && MinorPSDER.getCodeName?? && MinorPSDER.getCodeName()??> <#if MinorPSDER.getMajorPSDataEntity?? && MinorPSDER.getMajorPSDataEntity()?? && MinorPSDER.getCodeName?? && MinorPSDER.getCodeName()??>
<#assign MajorKeyFieldCodeName =srfcaseformat(MinorPSDER.getPSPickupDEField().codeName,'l_u2lC')?cap_first> <#assign MajorKeyFieldCodeName =srfr7templcaseformat(MinorPSDER.getPSPickupDEField().codeName)?cap_first>
<#assign MajorEntity=MinorPSDER.getMajorPSDataEntity()> <#assign MajorEntity=MinorPSDER.getMajorPSDataEntity()>
<#assign MajorEntityCodeName=MinorPSDER.getMajorPSDataEntity().codeName> <#assign MajorEntityCodeName=MinorPSDER.getMajorPSDataEntity().codeName>
<#assign MajorEntityService=srfcaseformat(MinorPSDER.getMajorPSDataEntity().getCodeName(),'l_u2lC')+"Service"> <#assign MajorEntityService=srfr7templcaseformat(MinorPSDER.getMajorPSDataEntity().getCodeName())+"Service">
<#assign MajorEntityKeyFieldCodeName=srfcaseformat(MajorEntity.getKeyPSDEField().codeName,'l_u2lC')?cap_first> <#assign MajorEntityKeyFieldCodeName=srfr7templcaseformat(MajorEntity.getKeyPSDEField().codeName)?cap_first>
//实体关系[${MinorPSDER.name}] //实体关系[${MinorPSDER.name}]
if(!ObjectUtils.isEmpty(entity.get${MajorKeyFieldCodeName}())){ if(!ObjectUtils.isEmpty(entity.get${MajorKeyFieldCodeName}())){
${pub.getPKGCodeName()}.core.${MajorEntity.getPSSystemModule().getCodeName()?lower_case}.domain.${MajorEntityCodeName} fkEntity=new ${pub.getPKGCodeName()}.core.${MajorEntity.getPSSystemModule().getCodeName()?lower_case}.domain.${MajorEntityCodeName}(); ${pub.getPKGCodeName()}.core.${MajorEntity.getPSSystemModule().getCodeName()?lower_case}.domain.${MajorEntityCodeName} fkEntity=new ${pub.getPKGCodeName()}.core.${MajorEntity.getPSSystemModule().getCodeName()?lower_case}.domain.${MajorEntityCodeName}();
...@@ -2942,7 +2944,7 @@ public class ${item.getCodeName()}ServiceImpl implements I${de.getCodeName()}Ser ...@@ -2942,7 +2944,7 @@ public class ${item.getCodeName()}ServiceImpl implements I${de.getCodeName()}Ser
<#comment>通过外键值文本填充外键值</#comment> <#comment>通过外键值文本填充外键值</#comment>
<#assign foreignkeyId = MajorKeyFieldCodeName> <#assign foreignkeyId = MajorKeyFieldCodeName>
<#assign foreignkeyField = MinorPSDER.getPSPickupTextDEField()> <#assign foreignkeyField = MinorPSDER.getPSPickupTextDEField()>
<#assign foreignkeyName = srfcaseformat(foreignkeyField.getCodeName(),'l_u2lC')?cap_first> <#assign foreignkeyName = srfr7templcaseformat(foreignkeyField.getCodeName())?cap_first>
<#assign importTag=foreignkeyField.getCodeName()> <#assign importTag=foreignkeyField.getCodeName()>
<#if ((foreignkeyField.getImportTag())!'')!=''> <#if ((foreignkeyField.getImportTag())!'')!=''>
<#assign importTag=foreignkeyField.getImportTag()> <#assign importTag=foreignkeyField.getImportTag()>
...@@ -3092,7 +3094,7 @@ public class ${item.getCodeName()}ServiceImpl implements I${de.getCodeName()}Ser ...@@ -3092,7 +3094,7 @@ public class ${item.getCodeName()}ServiceImpl implements I${de.getCodeName()}Ser
<#function getUnionKeyUpdateCond unionKeyList> <#function getUnionKeyUpdateCond unionKeyList>
<#assign formatValue=""> <#assign formatValue="">
<#list item.getUnionKeyValuePSDEFields() as defield> <#list item.getUnionKeyValuePSDEFields() as defield>
<#assign unionKeyPrivateCodeName = srfcaseformat(defield.getCodeName(),'l_u2lC') > <#assign unionKeyPrivateCodeName = srfr7templcaseformat(defield.getCodeName()) >
<#assign unionKeyPublicCodeName = unionKeyPrivateCodeName?cap_first > <#assign unionKeyPublicCodeName = unionKeyPrivateCodeName?cap_first >
<#assign unionKeyCodeName = unionKeyPrivateCodeName?lower_case > <#assign unionKeyCodeName = unionKeyPrivateCodeName?lower_case >
<#assign formatValue=formatValue+".eq(\""+unionKeyCodeName+"\",et.get"+unionKeyPublicCodeName+"())"> <#assign formatValue=formatValue+".eq(\""+unionKeyCodeName+"\",et.get"+unionKeyPublicCodeName+"())">
...@@ -3137,11 +3139,11 @@ public class ${item.getCodeName()}ServiceImpl implements I${de.getCodeName()}Ser ...@@ -3137,11 +3139,11 @@ public class ${item.getCodeName()}ServiceImpl implements I${de.getCodeName()}Ser
<#assign minorKeyField = der.getMinorPSDataEntity().getKeyPSDEField()> <#assign minorKeyField = der.getMinorPSDataEntity().getKeyPSDEField()>
<#assign minorEntityCodeName=der.getMinorPSDataEntity().getCodeName()> <#assign minorEntityCodeName=der.getMinorPSDataEntity().getCodeName()>
<#if der.getRemoveActionType()?c=='1'><#comment>同时删除</#comment> <#if der.getRemoveActionType()?c=='1'><#comment>同时删除</#comment>
${srfcaseformat(minorEntityCodeName,'l_u2lC')}Service.removeBy${srfcaseformat(MajorDerField.codeName,'l_u2lC')?cap_first}(key); ${srfr7templcaseformat(minorEntityCodeName)}Service.removeBy${srfr7templcaseformat(MajorDerField.codeName)?cap_first}(key);
<#elseif der.getRemoveActionType()?c=='2'><#comment>置空</#comment> <#elseif der.getRemoveActionType()?c=='2'><#comment>置空</#comment>
${srfcaseformat(minorEntityCodeName,'l_u2lC')}Service.resetBy${srfcaseformat(MajorDerField.codeName,'l_u2lC')?cap_first}(key); ${srfr7templcaseformat(minorEntityCodeName)}Service.resetBy${srfr7templcaseformat(MajorDerField.codeName)?cap_first}(key);
<#elseif der.getRemoveActionType()?c=='3'><#comment>限制删除</#comment> <#elseif der.getRemoveActionType()?c=='3'><#comment>限制删除</#comment>
if(!ObjectUtils.isEmpty(${srfcaseformat(minorEntityCodeName,'l_u2lC')}Service.selectBy${srfcaseformat(MajorDerField.codeName,'l_u2lC')?cap_first}(key))) if(!ObjectUtils.isEmpty(${srfr7templcaseformat(minorEntityCodeName)}Service.selectBy${srfr7templcaseformat(MajorDerField.codeName)?cap_first}(key)))
throw new BadRequestAlertException("删除数据失败,当前数据存在关系实体[${minorEntityCodeName}]数据,无法删除!","",""); throw new BadRequestAlertException("删除数据失败,当前数据存在关系实体[${minorEntityCodeName}]数据,无法删除!","","");
</#if> </#if>
</#if> </#if>
...@@ -3156,11 +3158,11 @@ public class ${item.getCodeName()}ServiceImpl implements I${de.getCodeName()}Ser ...@@ -3156,11 +3158,11 @@ public class ${item.getCodeName()}ServiceImpl implements I${de.getCodeName()}Ser
<#assign minorKeyField = der.getMinorPSDataEntity().getKeyPSDEField()> <#assign minorKeyField = der.getMinorPSDataEntity().getKeyPSDEField()>
<#assign minorEntityCodeName=der.getMinorPSDataEntity().getCodeName()> <#assign minorEntityCodeName=der.getMinorPSDataEntity().getCodeName()>
<#if der.getRemoveActionType()?c=='1'><#comment>同时删除</#comment> <#if der.getRemoveActionType()?c=='1'><#comment>同时删除</#comment>
${srfcaseformat(minorEntityCodeName,'l_u2lC')}Service.removeBy${srfcaseformat(MajorDerField.codeName,'l_u2lC')?cap_first}(idList); ${srfr7templcaseformat(minorEntityCodeName)}Service.removeBy${srfr7templcaseformat(MajorDerField.codeName)?cap_first}(idList);
<#elseif der.getRemoveActionType()?c=='2'><#comment>置空</#comment> <#elseif der.getRemoveActionType()?c=='2'><#comment>置空</#comment>
${srfcaseformat(minorEntityCodeName,'l_u2lC')}Service.resetBy${srfcaseformat(MajorDerField.codeName,'l_u2lC')?cap_first}(idList); ${srfr7templcaseformat(minorEntityCodeName)}Service.resetBy${srfr7templcaseformat(MajorDerField.codeName)?cap_first}(idList);
<#elseif der.getRemoveActionType()?c=='3'><#comment>限制删除</#comment> <#elseif der.getRemoveActionType()?c=='3'><#comment>限制删除</#comment>
if(!ObjectUtils.isEmpty(${srfcaseformat(minorEntityCodeName,'l_u2lC')}Service.selectBy${srfcaseformat(MajorDerField.codeName,'l_u2lC')?cap_first}(idList))) if(!ObjectUtils.isEmpty(${srfr7templcaseformat(minorEntityCodeName)}Service.selectBy${srfr7templcaseformat(MajorDerField.codeName)?cap_first}(idList)))
throw new BadRequestAlertException("删除数据失败,当前数据存在关系实体[${minorEntityCodeName}]数据,无法删除!","",""); throw new BadRequestAlertException("删除数据失败,当前数据存在关系实体[${minorEntityCodeName}]数据,无法删除!","","");
</#if> </#if>
</#if> </#if>
...@@ -3173,24 +3175,24 @@ public class ${item.getCodeName()}ServiceImpl implements I${de.getCodeName()}Ser ...@@ -3173,24 +3175,24 @@ public class ${item.getCodeName()}ServiceImpl implements I${de.getCodeName()}Ser
<#if MinorPSDER.getRemoveActionType()??> <#if MinorPSDER.getRemoveActionType()??>
<#if MinorPSDER.getRemoveActionType()?c=='3'><#comment>限制删除</#comment> <#if MinorPSDER.getRemoveActionType()?c=='3'><#comment>限制删除</#comment>
@Override @Override
public List<${item.getCodeName()}> selectBy${srfcaseformat(MajorField.codeName,'l_u2lC')?cap_first}(Collection<${srfr7javatype(MajorField.stdDataType)}> ids) { public List<${item.getCodeName()}> selectBy${srfr7templcaseformat(MajorField.codeName)?cap_first}(Collection<${srfr7javatype(MajorField.stdDataType)}> ids) {
return this.list(new QueryWrapper<${item.getCodeName()}>().in("${MajorkeyField.codeName?lower_case}",ids)); return this.list(new QueryWrapper<${item.getCodeName()}>().in("${MajorkeyField.codeName?lower_case}",ids));
} }
<#elseif MinorPSDER.getRemoveActionType()?c=='2'><#comment>置空</#comment> <#elseif MinorPSDER.getRemoveActionType()?c=='2'><#comment>置空</#comment>
@Override @Override
public void resetBy${srfcaseformat(MajorField.codeName,'l_u2lC')?cap_first}(${srfr7javatype(MajorField.stdDataType)} ${MajorkeyField.codeName?lower_case}) { public void resetBy${srfr7templcaseformat(MajorField.codeName)?cap_first}(${srfr7javatype(MajorField.stdDataType)} ${MajorkeyField.codeName?lower_case}) {
this.update(new UpdateWrapper<${item.getCodeName()}>().set("${MajorField.getName()?lower_case}",null).eq("${MajorField.getName()?lower_case}",${MajorkeyField.codeName?lower_case})); this.update(new UpdateWrapper<${item.getCodeName()}>().set("${MajorField.getName()?lower_case}",null).eq("${MajorField.getName()?lower_case}",${MajorkeyField.codeName?lower_case}));
} }
@Override @Override
public void resetBy${srfcaseformat(MajorField.codeName,'l_u2lC')?cap_first}(Collection<${srfr7javatype(MajorField.stdDataType)}> ids) { public void resetBy${srfr7templcaseformat(MajorField.codeName)?cap_first}(Collection<${srfr7javatype(MajorField.stdDataType)}> ids) {
this.update(new UpdateWrapper<${item.getCodeName()}>().set("${MajorField.getName()?lower_case}",null).in("${MajorField.getName()?lower_case}",ids)); this.update(new UpdateWrapper<${item.getCodeName()}>().set("${MajorField.getName()?lower_case}",null).in("${MajorField.getName()?lower_case}",ids));
} }
<#elseif MinorPSDER.getRemoveActionType()?c=='1'><#comment>同时删除</#comment> <#elseif MinorPSDER.getRemoveActionType()?c=='1'><#comment>同时删除</#comment>
@Override @Override
public void removeBy${srfcaseformat(MajorField.codeName,'l_u2lC')?cap_first}(Collection<${srfr7javatype(MajorField.stdDataType)}> ids) { public void removeBy${srfr7templcaseformat(MajorField.codeName)?cap_first}(Collection<${srfr7javatype(MajorField.stdDataType)}> ids) {
this.remove(new QueryWrapper<${item.getCodeName()}>().in("${MajorField.getName()?lower_case}",ids)); this.remove(new QueryWrapper<${item.getCodeName()}>().in("${MajorField.getName()?lower_case}",ids));
} }
...@@ -3203,23 +3205,23 @@ public class ${item.getCodeName()}ServiceImpl implements I${de.getCodeName()}Ser ...@@ -3203,23 +3205,23 @@ public class ${item.getCodeName()}ServiceImpl implements I${de.getCodeName()}Ser
<#if MinorPSDER.getRemoveActionType()??> <#if MinorPSDER.getRemoveActionType()??>
<#if MinorPSDER.getRemoveActionType()?c=='3'><#comment>限制删除</#comment> <#if MinorPSDER.getRemoveActionType()?c=='3'><#comment>限制删除</#comment>
@Override @Override
public List<${item.getCodeName()}> selectBy${srfcaseformat(MajorField.codeName,'l_u2lC')?cap_first}(Collection<${srfr7javatype(MajorField.stdDataType)}> ids) { public List<${item.getCodeName()}> selectBy${srfr7templcaseformat(MajorField.codeName)?cap_first}(Collection<${srfr7javatype(MajorField.stdDataType)}> ids) {
//暂未支持 //暂未支持
return null; return null;
} }
<#elseif MinorPSDER.getRemoveActionType()?c=='2'><#comment>置空</#comment> <#elseif MinorPSDER.getRemoveActionType()?c=='2'><#comment>置空</#comment>
@Override @Override
public void resetBy${srfcaseformat(MajorField.codeName,'l_u2lC')?cap_first}(${srfr7javatype(MajorField.stdDataType)} ${MajorkeyField.codeName?lower_case}) { public void resetBy${srfr7templcaseformat(MajorField.codeName)?cap_first}(${srfr7javatype(MajorField.stdDataType)} ${MajorkeyField.codeName?lower_case}) {
} }
@Override @Override
public void resetBy${srfcaseformat(MajorField.codeName,'l_u2lC')?cap_first}(Collection<${srfr7javatype(MajorField.stdDataType)}> ids) { public void resetBy${srfr7templcaseformat(MajorField.codeName)?cap_first}(Collection<${srfr7javatype(MajorField.stdDataType)}> ids) {
} }
<#elseif MinorPSDER.getRemoveActionType()?c=='1'><#comment>同时删除</#comment> <#elseif MinorPSDER.getRemoveActionType()?c=='1'><#comment>同时删除</#comment>
@Override @Override
public void removeBy${srfcaseformat(MajorField.codeName,'l_u2lC')?cap_first}(Collection<${srfr7javatype(MajorField.stdDataType)}> ids) { public void removeBy${srfr7templcaseformat(MajorField.codeName)?cap_first}(Collection<${srfr7javatype(MajorField.stdDataType)}> ids) {
} }
</#if> </#if>
......
<#ibiztemplate> <#ibiztemplate>
TARGET=PSDATAENTITY TARGET=PSDATAENTITY
</#ibiztemplate> </#ibiztemplate>
<#comment>引入驼峰配置</#comment>
<#ibizinclude>/SLN/globalfunc.cfg</#ibizinclude>
<#if de.getUserTag()?? && de.getUserTag()=='elasticsearch'> <#if de.getUserTag()?? && de.getUserTag()=='elasticsearch'>
package ${pub.getPKGCodeName()}.core.es.domain; package ${pub.getPKGCodeName()}.core.es.domain;
...@@ -23,7 +25,7 @@ public class ${item.codeName} implements Serializable { ...@@ -23,7 +25,7 @@ public class ${item.codeName} implements Serializable {
<#comment>输出实体属性</#comment> <#comment>输出实体属性</#comment>
<#list de.getPSDEFields() as defield> <#list de.getPSDEFields() as defield>
<#if defield.isPhisicalDEField()==true> <#if defield.isPhisicalDEField()==true>
<#assign privateCodeName = srfcaseformat(defield.getCodeName(),'l_u2lC') > <#assign privateCodeName = srfr7templcaseformat(defield.getCodeName()) >
<#assign javaType=srfr7javatype(defield.getStdDataType())> <#assign javaType=srfr7javatype(defield.getStdDataType())>
<#assign esType="FieldType.Text"> <#assign esType="FieldType.Text">
<#if javaType=='Long'> <#if javaType=='Long'>
...@@ -46,8 +48,3 @@ public class ${item.codeName} implements Serializable { ...@@ -46,8 +48,3 @@ public class ${item.codeName} implements Serializable {
</#if> </#if>
} }
</#if> </#if>
\ No newline at end of file
<#ibiztemplate> <#ibiztemplate>
TARGET=PSDATAENTITY TARGET=PSDATAENTITY
</#ibiztemplate> </#ibiztemplate>
<#comment>引入驼峰配置</#comment>
<#ibizinclude>/SLN/globalfunc.cfg</#ibizinclude>
<#if de.getUserTag()?? && de.getUserTag()=='elasticsearch'> <#if de.getUserTag()?? && de.getUserTag()=='elasticsearch'>
package ${pub.getPKGCodeName()}.core.es.service.impl; package ${pub.getPKGCodeName()}.core.es.service.impl;
...@@ -38,7 +40,7 @@ public class ${item.getCodeName()}ESServiceImpl implements I${de.getCodeName()}E ...@@ -38,7 +40,7 @@ public class ${item.getCodeName()}ESServiceImpl implements I${de.getCodeName()}E
Optional<${item.getCodeName()}> result = repository.findById(key); Optional<${item.getCodeName()}> result = repository.findById(key);
if(!result.isPresent()){ if(!result.isPresent()){
${item.getCodeName()} et=new ${item.getCodeName()}(); ${item.getCodeName()} et=new ${item.getCodeName()}();
et.set${srfcaseformat(keyfield.codeName,'l_u2lC')?cap_first}(key); et.set${srfr7templcaseformat(keyfield.codeName)?cap_first}(key);
return et; return et;
} }
else{ else{
...@@ -50,7 +52,7 @@ public class ${item.getCodeName()}ESServiceImpl implements I${de.getCodeName()}E ...@@ -50,7 +52,7 @@ public class ${item.getCodeName()}ESServiceImpl implements I${de.getCodeName()}E
@Override @Override
public boolean create(${item.getCodeName()} et) { public boolean create(${item.getCodeName()} et) {
repository.save(et); repository.save(et);
CachedBeanCopier.copy(get(et.get${srfcaseformat(keyfield.codeName,'l_u2lC')?cap_first}()),et); CachedBeanCopier.copy(get(et.get${srfr7templcaseformat(keyfield.codeName)?cap_first}()),et);
return true; return true;
} }
...@@ -63,7 +65,7 @@ public class ${item.getCodeName()}ESServiceImpl implements I${de.getCodeName()}E ...@@ -63,7 +65,7 @@ public class ${item.getCodeName()}ESServiceImpl implements I${de.getCodeName()}E
@Override @Override
public boolean update(${item.getCodeName()} et) { public boolean update(${item.getCodeName()} et) {
repository.save(et); repository.save(et);
CachedBeanCopier.copy(get(et.get${srfcaseformat(keyfield.codeName,'l_u2lC')?cap_first}()),et); CachedBeanCopier.copy(get(et.get${srfr7templcaseformat(keyfield.codeName)?cap_first}()),et);
return true; return true;
} }
...@@ -76,7 +78,7 @@ public class ${item.getCodeName()}ESServiceImpl implements I${de.getCodeName()}E ...@@ -76,7 +78,7 @@ public class ${item.getCodeName()}ESServiceImpl implements I${de.getCodeName()}E
@Override @Override
public boolean save(${item.getCodeName()} et) { public boolean save(${item.getCodeName()} et) {
repository.save(et); repository.save(et);
CachedBeanCopier.copy(get(et.get${srfcaseformat(keyfield.codeName,'l_u2lC')?cap_first}()),et); CachedBeanCopier.copy(get(et.get${srfr7templcaseformat(keyfield.codeName)?cap_first}()),et);
return true; return true;
} }
......
<#ibiztemplate> <#ibiztemplate>
TARGET=PSSYSTEM TARGET=PSSYSTEM
</#ibiztemplate> </#ibiztemplate>
<#comment>引入驼峰配置</#comment>
<#ibizinclude>/SLN/globalfunc.cfg</#ibizinclude>
<#assign hasMQConsumer=false> <#assign hasMQConsumer=false>
<#comment>实体中配置输入数据同步</#comment> <#comment>实体中配置输入数据同步</#comment>
<#list sys.getAllPSDataEntities() as dataEntity> <#list sys.getAllPSDataEntities() as dataEntity>
...@@ -99,7 +101,7 @@ public class RocketMQListenerProcessor implements MessageListenerOrderly { ...@@ -99,7 +101,7 @@ public class RocketMQListenerProcessor implements MessageListenerOrderly {
domain.set(entry.getKey(),entry.getValue()); domain.set(entry.getKey(),entry.getValue());
} }
<#if inputAction?lower_case == 'get' || inputAction?lower_case == 'remove'> <#if inputAction?lower_case == 'get' || inputAction?lower_case == 'remove'>
${entityName}Service.${inputAction}(domain.get${srfcaseformat(dataEntity.getKeyPSDEField().codeName,'l_u2lC')?cap_first}()); ${entityName}Service.${inputAction}(domain.get${srfr7templcaseformat(dataEntity.getKeyPSDEField().codeName)?cap_first}());
<#else> <#else>
${entityName}Service.${inputAction}(domain); ${entityName}Service.${inputAction}(domain);
</#if> </#if>
......
<#ibiztemplate> <#ibiztemplate>
TARGET=PSSYSBACKSERVICE TARGET=PSSYSBACKSERVICE
</#ibiztemplate> </#ibiztemplate>
<#comment>引入驼峰配置</#comment>
<#ibizinclude>/SLN/globalfunc.cfg</#ibizinclude>
package ${pub.getPKGCodeName()}.core.util.job; package ${pub.getPKGCodeName()}.core.util.job;
import com.baomidou.jobs.api.JobsResponse; import com.baomidou.jobs.api.JobsResponse;
...@@ -24,7 +26,7 @@ public class ${item.codeName}JobHandler implements IJobsHandler { ...@@ -24,7 +26,7 @@ public class ${item.codeName}JobHandler implements IJobsHandler {
<#if hasDEAction> <#if hasDEAction>
@Autowired @Autowired
@Lazy @Lazy
protected ${pub.getPKGCodeName()}.core.${de.getPSSystemModule().getCodeName()?lower_case}.service.I${de.getCodeName()}Service ${srfcaseformat(de.getCodeName(),'l_u2lC')}Service; protected ${pub.getPKGCodeName()}.core.${de.getPSSystemModule().getCodeName()?lower_case}.service.I${de.getCodeName()}Service ${srfr7templcaseformat(de.getCodeName())}Service;
</#if> </#if>
@Override @Override
...@@ -33,7 +35,7 @@ public class ${item.codeName}JobHandler implements IJobsHandler { ...@@ -33,7 +35,7 @@ public class ${item.codeName}JobHandler implements IJobsHandler {
${pub.getPKGCodeName()}.core.${de.getPSSystemModule().getCodeName()?lower_case}.domain.${de.codeName} entity = ${pub.getPKGCodeName()}.util.helper.Setting.getEntity(param, new ${pub.getPKGCodeName()}.core.${de.getPSSystemModule().getCodeName()?lower_case}.domain.${de.codeName}()); ${pub.getPKGCodeName()}.core.${de.getPSSystemModule().getCodeName()?lower_case}.domain.${de.codeName} entity = ${pub.getPKGCodeName()}.util.helper.Setting.getEntity(param, new ${pub.getPKGCodeName()}.core.${de.getPSSystemModule().getCodeName()?lower_case}.domain.${de.codeName}());
entity.set("tenantid", tenantId); entity.set("tenantid", tenantId);
entity.set("param", param); entity.set("param", param);
${srfcaseformat(de.getCodeName(),'l_u2lC')}Service.${srfmethodname(deaction.getCodeName())}(entity); ${srfr7templcaseformat(de.getCodeName())}Service.${srfmethodname(deaction.getCodeName())}(entity);
</#if> </#if>
log.info("执行 DemoJobHandler tenantId=" + tenantId + ",param=" + param); log.info("执行 DemoJobHandler tenantId=" + tenantId + ",param=" + param);
return JobsResponse.ok(); return JobsResponse.ok();
......
...@@ -10,7 +10,6 @@ TARGET=PSDATAENTITY ...@@ -10,7 +10,6 @@ TARGET=PSDATAENTITY
</#if> </#if>
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="${pub.getPKGCodeName()}.core.${de.getPSSystemModule().codeName?lower_case}.mapper.${de.codeName}Mapper"> <mapper namespace="${pub.getPKGCodeName()}.core.${de.getPSSystemModule().codeName?lower_case}.mapper.${de.codeName}Mapper">
<!--该方法用于重写mybatis中selectById方法,以实现查询逻辑属性--> <!--该方法用于重写mybatis中selectById方法,以实现查询逻辑属性-->
...@@ -46,14 +45,14 @@ TARGET=PSDATAENTITY ...@@ -46,14 +45,14 @@ TARGET=PSDATAENTITY
<!--通过mybatis将查询结果注入到entity中,通过配置autoMapping="true"由mybatis自动处理映射关系 --> <!--通过mybatis将查询结果注入到entity中,通过配置autoMapping="true"由mybatis自动处理映射关系 -->
<resultMap id="${de.codeName}ResultMap" type="${pub.getPKGCodeName()}.core.${de.getPSSystemModule().codeName?lower_case}.domain.${de.codeName}" autoMapping="true"> <resultMap id="${de.codeName}ResultMap" type="${pub.getPKGCodeName()}.core.${de.getPSSystemModule().codeName?lower_case}.domain.${de.codeName}" autoMapping="true">
<#if de.getKeyPSDEField().isPhisicalDEField()==true> <#if de.getKeyPSDEField().isPhisicalDEField()==true>
<id property="${srfcaseformat(de.getKeyPSDEField().codeName,'l_u2lC')}" column="${de.getKeyPSDEField().getName()?lower_case}" /><!--主键字段映射--> <id property="${srfr7templcaseformat(de.getKeyPSDEField().codeName)}" column="${de.getKeyPSDEField().getName()?lower_case}" /><!--主键字段映射-->
</#if> </#if>
<#comment>外键值字段映射:由于需要将一个数据库列注入到2个domian属性中(主关系实体对象),由于已经手动将列映射给主关系对象,所以autoMapping将不会自动注入外键id,需要再次声明映射关系</#comment> <#comment>外键值字段映射:由于需要将一个数据库列注入到2个domian属性中(主关系实体对象),由于已经手动将列映射给主关系对象,所以autoMapping将不会自动注入外键id,需要再次声明映射关系</#comment>
<#comment>属性名称与代码名称不一致时,强制进行映射</#comment> <#comment>属性名称与代码名称不一致时,强制进行映射</#comment>
<#list item.getPSDEFields() as defield> <#list item.getPSDEFields() as defield>
<#if defield.isKeyDEField()!=true && ((defield.getDataType())!"")!='ONE2MANYDATA'> <#if defield.isKeyDEField()!=true && ((defield.getDataType())!"")!='ONE2MANYDATA'>
<#if srfcaseformat(defield.codeName,'l_u2lC')?lower_case != defield.name?lower_case || defield.getDataType()=='PICKUP'> <#if srfr7templcaseformat(defield.codeName)?lower_case != defield.name?lower_case || defield.getDataType()=='PICKUP'>
<result property="${srfcaseformat(defield.codeName,'l_u2lC')}" column="${defield.getName()?lower_case}" /> <result property="${srfr7templcaseformat(defield.codeName)}" column="${defield.getName()?lower_case}" />
</#if> </#if>
</#if> </#if>
</#list> </#list>
...@@ -78,9 +77,9 @@ TARGET=PSDATAENTITY ...@@ -78,9 +77,9 @@ TARGET=PSDATAENTITY
<#if nested> <#if nested>
<#if MinorEntity.getStorageMode()==0 && MajorPSDER.getPSOne2ManyDataDEField()?? && MajorPSDER.getPSOne2ManyDataDEField().isPhisicalDEField()==true> <#if MinorEntity.getStorageMode()==0 && MajorPSDER.getPSOne2ManyDataDEField()?? && MajorPSDER.getPSOne2ManyDataDEField().isPhisicalDEField()==true>
<#assign columnname=MajorPSDER.getPSOne2ManyDataDEField().getName()?lower_case> <#assign columnname=MajorPSDER.getPSOne2ManyDataDEField().getName()?lower_case>
<result property="${srfcaseformat(listcode,'l_u2lC')}" column="${columnname}" typeHandler="${pub.getPKGCodeName()}.core.${MinorEntity.getPSSystemModule().codeName?lower_case}.domain.handlers.${MinorEntity.codeName}TypeHandler" /> <result property="${srfr7templcaseformat(listcode)}" column="${columnname}" typeHandler="${pub.getPKGCodeName()}.core.${MinorEntity.getPSSystemModule().codeName?lower_case}.domain.handlers.${MinorEntity.codeName}TypeHandler" />
</#if> </#if>
<#--<collection property="${srfcaseformat(listcode,'l_u2lC')}" ofType="${pub.getPKGCodeName()}.core.${MinorEntity.getPSSystemModule().codeName?lower_case}.domain.${MinorEntity.codeName}" column="${de.getKeyPSDEField().getName()?lower_case}" select="${pub.getPKGCodeName()}.core.${MinorEntity.getPSSystemModule().codeName?lower_case}.mapper.${MinorEntity.codeName}Mapper.selectBy${srfcaseformat(MajorDerField.codeName,'l_u2lC')?cap_first}" fetchType="lazy"></collection>--> <#--<collection property="${srfr7templcaseformat(listcode)}" ofType="${pub.getPKGCodeName()}.core.${MinorEntity.getPSSystemModule().codeName?lower_case}.domain.${MinorEntity.codeName}" column="${de.getKeyPSDEField().getName()?lower_case}" select="${pub.getPKGCodeName()}.core.${MinorEntity.getPSSystemModule().codeName?lower_case}.mapper.${MinorEntity.codeName}Mapper.selectBy${srfr7templcaseformat(MajorDerField.codeName)?cap_first}" fetchType="lazy"></collection>-->
</#if> </#if>
</#if> </#if>
</#if> </#if>
...@@ -98,7 +97,7 @@ TARGET=PSDATAENTITY ...@@ -98,7 +97,7 @@ TARGET=PSDATAENTITY
<#assign MajorkeyField = MajorEntity.getKeyPSDEField()> <#assign MajorkeyField = MajorEntity.getKeyPSDEField()>
<#assign MajorField = MinorPSDER.getPSPickupDEField()> <#assign MajorField = MinorPSDER.getPSPickupDEField()>
<!--通过mybatis自动注入关系属性[主实体],fetchType="lazy"为懒加载配置 --> <!--通过mybatis自动注入关系属性[主实体],fetchType="lazy"为懒加载配置 -->
<association property="${srfcaseformat(MinorPSDER.getCodeName(),'l_u2lC')}" javaType="${pub.getPKGCodeName()}.core.${MajorEntity.getPSSystemModule().codeName?lower_case}.domain.${MajorEntity.codeName}" column="${MajorField.getName()?lower_case}" select="${pub.getPKGCodeName()}.core.${MajorEntity.getPSSystemModule().codeName?lower_case}.mapper.${MajorEntity.codeName}Mapper.selectById" fetchType="lazy"></association> <association property="${srfr7templcaseformat(MinorPSDER.getCodeName())}" javaType="${pub.getPKGCodeName()}.core.${MajorEntity.getPSSystemModule().codeName?lower_case}.domain.${MajorEntity.codeName}" column="${MajorField.getName()?lower_case}" select="${pub.getPKGCodeName()}.core.${MajorEntity.getPSSystemModule().codeName?lower_case}.mapper.${MajorEntity.codeName}Mapper.selectById" fetchType="lazy"></association>
</#if> </#if>
</#if> </#if>
</#if> </#if>
...@@ -134,7 +133,7 @@ TARGET=PSDATAENTITY ...@@ -134,7 +133,7 @@ TARGET=PSDATAENTITY
</#if> </#if>
</#list> </#list>
</#if> </#if>
<select id="selectBy${srfcaseformat(MajorField.codeName,'l_u2lC')?cap_first}" resultMap="${de.codeName}ResultMap"> <select id="selectBy${srfr7templcaseformat(MajorField.codeName)?cap_first}" resultMap="${de.codeName}ResultMap">
<#if enableGroup || enableOrderby> <#if enableGroup || enableOrderby>
select <#if enableGroup><@outputGroup deDefaultDataSet/><#else>*</#if> from ( select <#if enableGroup><@outputGroup deDefaultDataSet/><#else>*</#if> from (
</#if> </#if>
...@@ -307,3 +306,6 @@ TARGET=PSDATAENTITY ...@@ -307,3 +306,6 @@ TARGET=PSDATAENTITY
<#macro outputGroup singleSet> <#macro outputGroup singleSet>
<#list singleSet.getPSDEDataSetGroupParams() as groupParam><#if groupParam_index gt 0>,</#if><#if groupParam.isEnableGroup()><#if groupParam.getGroupCode()??>${groupParam.getGroupCode()}<#else>${groupParam.getName()}</#if><#else>${groupParam.getGroupCode()}</#if> as "${groupParam.getName()?lower_case}"</#list> <#list singleSet.getPSDEDataSetGroupParams() as groupParam><#if groupParam_index gt 0>,</#if><#if groupParam.isEnableGroup()><#if groupParam.getGroupCode()??>${groupParam.getGroupCode()}<#else>${groupParam.getName()}</#if><#else>${groupParam.getGroupCode()}</#if> as "${groupParam.getName()?lower_case}"</#list>
</#macro> </#macro>
<#comment>引入驼峰配置</#comment>
<#ibizinclude>/SLN/globalfunc.cfg</#ibizinclude>
\ No newline at end of file
<#ibiztemplate> <#ibiztemplate>
TARGET=PSDELOGIC TARGET=PSDELOGIC
</#ibiztemplate> </#ibiztemplate>
<#comment>引入驼峰配置</#comment>
<#ibizinclude>/SLN/globalfunc.cfg</#ibizinclude>
<#if item.isEnableBackend()> <#if item.isEnableBackend()>
package ${pub.getPKGCodeName()}.${de.getPSSystemModule().codeName?lower_case}.logic.${de.codeName?lower_case}logic.${item.getCodeName()?lower_case}; package ${pub.getPKGCodeName()}.${de.getPSSystemModule().codeName?lower_case}.logic.${de.codeName?lower_case}logic.${item.getCodeName()?lower_case};
<#comment>是否包含启动工作流节点</#comment> <#comment>是否包含启动工作流节点</#comment>
...@@ -71,7 +73,7 @@ ruleflow-group "${logicName+deLogicNode.getCodeName()?lower_case}" ...@@ -71,7 +73,7 @@ ruleflow-group "${logicName+deLogicNode.getCodeName()?lower_case}"
<#assign targetLogicParam=nodeParam.getDstPSDELogicParam()> <#assign targetLogicParam=nodeParam.getDstPSDELogicParam()>
<#assign targetLogicFieldName=nodeParam.getDstFieldName()> <#assign targetLogicFieldName=nodeParam.getDstFieldName()>
<#if targetLogicParam.getParamPSDataEntity().getPSDEField(targetLogicFieldName,true)??> <#if targetLogicParam.getParamPSDataEntity().getPSDEField(targetLogicFieldName,true)??>
<#assign targetLogicFieldName=srfcaseformat(targetLogicParam.getParamPSDataEntity().getPSDEField(targetLogicFieldName,true).getCodeName(),'l_u2lC')> <#assign targetLogicFieldName=srfr7templcaseformat(targetLogicParam.getParamPSDataEntity().getPSDEField(targetLogicFieldName,true).getCodeName())>
</#if> </#if>
<#if nodeParam.getSrcValueType()=='SRCVALUE'><#comment>直接值</#comment> <#if nodeParam.getSrcValueType()=='SRCVALUE'><#comment>直接值</#comment>
${logicName+targetLogicParam.getCodeName()?lower_case}.set("${targetLogicFieldName?lower_case}","${nodeParam.getSrcValue()}"); ${logicName+targetLogicParam.getCodeName()?lower_case}.set("${targetLogicFieldName?lower_case}","${nodeParam.getSrcValue()}");
...@@ -79,7 +81,7 @@ ruleflow-group "${logicName+deLogicNode.getCodeName()?lower_case}" ...@@ -79,7 +81,7 @@ ruleflow-group "${logicName+deLogicNode.getCodeName()?lower_case}"
<#assign srcPSDELogicParam=nodeParam.getSrcPSDELogicParam()> <#assign srcPSDELogicParam=nodeParam.getSrcPSDELogicParam()>
<#assign srcFieldName=nodeParam.getSrcFieldName()> <#assign srcFieldName=nodeParam.getSrcFieldName()>
<#if srcPSDELogicParam.getParamPSDataEntity().getPSDEField(srcFieldName,true)??> <#if srcPSDELogicParam.getParamPSDataEntity().getPSDEField(srcFieldName,true)??>
<#assign srcFieldName=srfcaseformat(srcPSDELogicParam.getParamPSDataEntity().getPSDEField(srcFieldName,true).getCodeName(),'l_u2lC')> <#assign srcFieldName=srfr7templcaseformat(srcPSDELogicParam.getParamPSDataEntity().getPSDEField(srcFieldName,true).getCodeName())>
</#if> </#if>
${logicName+targetLogicParam.getCodeName()?lower_case}.set("${targetLogicFieldName?lower_case}",${logicName+srcPSDELogicParam.getCodeName()?lower_case}.get("${srcFieldName?lower_case}"));<#comment>源逻辑参数选择了实体</#comment> ${logicName+targetLogicParam.getCodeName()?lower_case}.set("${targetLogicFieldName?lower_case}",${logicName+srcPSDELogicParam.getCodeName()?lower_case}.get("${srcFieldName?lower_case}"));<#comment>源逻辑参数选择了实体</#comment>
<#else> <#else>
...@@ -106,13 +108,13 @@ ruleflow-group "${logicName+deLogicNode.getCodeName()?lower_case}" ...@@ -106,13 +108,13 @@ ruleflow-group "${logicName+deLogicNode.getCodeName()?lower_case}"
<#assign logicParamEntity=logicName+operateParam.codeName?lower_case> <#assign logicParamEntity=logicName+operateParam.codeName?lower_case>
<#if deLogicNode.getDstPSDEAction().codeName?lower_case=='get'> <#if deLogicNode.getDstPSDEAction().codeName?lower_case=='get'>
<#if operateEntity.getKeyPSDEField()??> <#if operateEntity.getKeyPSDEField()??>
<#assign operateEntityKeyField=srfcaseformat(operateEntity.getKeyPSDEField().getCodeName(),'l_u2lC')?cap_first> <#assign operateEntityKeyField=srfr7templcaseformat(operateEntity.getKeyPSDEField().getCodeName())?cap_first>
${pub.getPKGCodeName()}.util.helper.CachedBeanCopier.copy(${operateEntity.codeName?lower_case}service.get(${logicParamEntity}.get${operateEntityKeyField}()),${logicParamEntity}); ${pub.getPKGCodeName()}.util.helper.CachedBeanCopier.copy(${operateEntity.codeName?lower_case}service.get(${logicParamEntity}.get${operateEntityKeyField}()),${logicParamEntity});
<#else> <#else>
//操作实体没有主键属性,未能正常发布出get行为 //操作实体没有主键属性,未能正常发布出get行为
</#if> </#if>
<#elseif deLogicNode.getDstPSDEAction().codeName?lower_case=='remove'> <#elseif deLogicNode.getDstPSDEAction().codeName?lower_case=='remove'>
<#assign operateEntityKeyField=srfcaseformat(operateEntity.getKeyPSDEField().getCodeName(),'l_u2lC')?cap_first> <#assign operateEntityKeyField=srfr7templcaseformat(operateEntity.getKeyPSDEField().getCodeName())?cap_first>
${operateEntity.codeName?lower_case}service.remove(${logicParamEntity}.get${operateEntityKeyField}()); ${operateEntity.codeName?lower_case}service.remove(${logicParamEntity}.get${operateEntityKeyField}());
<#else> <#else>
${operateEntity.codeName?lower_case}service.${operateAction.codeName?uncap_first}(${logicParamEntity}); ${operateEntity.codeName?lower_case}service.${operateAction.codeName?uncap_first}(${logicParamEntity});
...@@ -181,7 +183,7 @@ ruleflow-group "${logicName+deLogicNode.getCodeName()?lower_case}" ...@@ -181,7 +183,7 @@ ruleflow-group "${logicName+deLogicNode.getCodeName()?lower_case}"
} }
<#elseif deLogicNode.getLogicNodeType()=='STARTWF'><#comment>启动工作流</#comment> <#elseif deLogicNode.getLogicNodeType()=='STARTWF'><#comment>启动工作流</#comment>
<#assign wfDE=deLogicNode.getPSDEWF().getPSDataEntity()> <#assign wfDE=deLogicNode.getPSDEWF().getPSDataEntity()>
<#assign wfDEKeyField=srfcaseformat(wfDE.getKeyPSDEField().codeName,'l_u2lC')> <#assign wfDEKeyField=srfr7templcaseformat(wfDE.getKeyPSDEField().codeName)>
<#assign wfParam=deLogicNode.getDstPSDELogicParam()> <#assign wfParam=deLogicNode.getDstPSDELogicParam()>
<#assign wfLogicParam=(logicName+wfParam.codeName)?lower_case> <#assign wfLogicParam=(logicName+wfParam.codeName)?lower_case>
<#assign wfDECodeName=srfpluralize(wfDE.getCodeName()?lower_case)> <#assign wfDECodeName=srfpluralize(wfDE.getCodeName()?lower_case)>
...@@ -222,7 +224,7 @@ ruleflow-group "${logicName+deLogicNode.getCodeName()?lower_case}" ...@@ -222,7 +224,7 @@ ruleflow-group "${logicName+deLogicNode.getCodeName()?lower_case}"
<#if nodeParam.getSrcValueType()=='SRCDLPARAM'><#comment>源逻辑参数</#comment> <#if nodeParam.getSrcValueType()=='SRCDLPARAM'><#comment>源逻辑参数</#comment>
<#assign srcPSDELogicParam=nodeParam.getSrcPSDELogicParam()> <#assign srcPSDELogicParam=nodeParam.getSrcPSDELogicParam()>
<#if srcPSDELogicParam.getParamPSDataEntity().getPSDEField(srcFieldName,true)??> <#if srcPSDELogicParam.getParamPSDataEntity().getPSDEField(srcFieldName,true)??>
<#assign srcFieldName=srfcaseformat(srcPSDELogicParam.getParamPSDataEntity().getPSDEField(srcFieldName,true).getCodeName(),'l_u2lC')> <#assign srcFieldName=srfr7templcaseformat(srcPSDELogicParam.getParamPSDataEntity().getPSDEField(srcFieldName,true).getCodeName())>
</#if> </#if>
<#assign srfLogicParamEntity=logicName+srcPSDELogicParam.getCodeName()?lower_case> <#assign srfLogicParamEntity=logicName+srcPSDELogicParam.getCodeName()?lower_case>
<#assign sqlParam=srfLogicParamEntity+".get(\""+srcFieldName?lower_case+"\")"> <#assign sqlParam=srfLogicParamEntity+".get(\""+srcFieldName?lower_case+"\")">
......
<#ibiztemplate> <#ibiztemplate>
TARGET=PSDELOGIC TARGET=PSDELOGIC
</#ibiztemplate> </#ibiztemplate>
<#comment>引入驼峰配置</#comment>
<#ibizinclude>/SLN/globalfunc.cfg</#ibizinclude>
<#if item.isEnableBackend()> <#if item.isEnableBackend()>
<?xml version="1.0" encoding="UTF-8" standalone="yes"?> <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<definitions xmlns="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:activiti="http://activiti.org/bpmn" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" xmlns:g="http://www.jboss.org/drools/flow/gpd" xmlns:tns="http://www.jboss.org/drools" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" expressionLanguage="http://www.mvel.org/2.0" id="Definition" name="" targetNamespace="http://www.jboss.org/drools" typeLanguage="http://www.java.com/javaTypes"> <definitions xmlns="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:activiti="http://activiti.org/bpmn" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" xmlns:g="http://www.jboss.org/drools/flow/gpd" xmlns:tns="http://www.jboss.org/drools" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" expressionLanguage="http://www.mvel.org/2.0" id="Definition" name="" targetNamespace="http://www.jboss.org/drools" typeLanguage="http://www.java.com/javaTypes">
...@@ -151,7 +153,7 @@ TARGET=PSDELOGIC ...@@ -151,7 +153,7 @@ TARGET=PSDELOGIC
<#assign targetDBValueOP=LogicLinkCond.getPSDBValueOPId()><#comment>表达式</#comment> <#assign targetDBValueOP=LogicLinkCond.getPSDBValueOPId()><#comment>表达式</#comment>
<#assign targetValue=LogicLinkCond.getValue()><#comment>值项</#comment> <#assign targetValue=LogicLinkCond.getValue()><#comment>值项</#comment>
<#if targetDEField!=''> <#if targetDEField!=''>
<#assign targetFieldName=srfcaseformat(targetDEField.codeName,'l_u2lC')> <#assign targetFieldName=srfr7templcaseformat(targetDEField.codeName)>
</#if> </#if>
<#assign condBody="RuleUtils.test($"+logicName+targetParam.getCodeName()?lower_case+".get(\""+targetFieldName+"\"),\""+targetDBValueOP+"\","+"\""+targetValue+"\")"> <#assign condBody="RuleUtils.test($"+logicName+targetParam.getCodeName()?lower_case+".get(\""+targetFieldName+"\"),\""+targetDBValueOP+"\","+"\""+targetValue+"\")">
<#assign fieldCond=fieldCond+condBody > <#assign fieldCond=fieldCond+condBody >
......
<#ibiztemplate> <#ibiztemplate>
TARGET=PSDEACTION TARGET=PSDEACTION
</#ibiztemplate> </#ibiztemplate>
<#comment>引入驼峰配置</#comment>
<#ibizinclude>/SLN/globalfunc.cfg</#ibizinclude>
<#assign hasAfterLogic =false> <#assign hasAfterLogic =false>
<#assign hasAfterDrl=false> <#assign hasAfterDrl=false>
<#assign de=item.getPSDataEntity()> <#assign de=item.getPSDataEntity()>
...@@ -32,7 +34,7 @@ TARGET=PSDEACTION ...@@ -32,7 +34,7 @@ TARGET=PSDEACTION
<#assign dataentity = afterlogic.getDstPSDE()> <#assign dataentity = afterlogic.getDstPSDE()>
<#assign deaction = afterlogic.getDstPSDEAction()> <#assign deaction = afterlogic.getDstPSDEAction()>
<#if !P.exists("refservice",dataentity+"service")> <#if !P.exists("refservice",dataentity+"service")>
<tns:metaData express="T(${pub.getPKGCodeName()}.util.security.SpringContextHolder).getBean(T(${pub.getPKGCodeName()}.core.${dataentity.getPSSystemModule().codeName?lower_case}.service.I${dataentity.codeName}Service))" name="${srfcaseformat(dataentity.getCodeName(),'l_u2lC')}Service" type="service"/> <tns:metaData express="T(${pub.getPKGCodeName()}.util.security.SpringContextHolder).getBean(T(${pub.getPKGCodeName()}.core.${dataentity.getPSSystemModule().codeName?lower_case}.service.I${dataentity.codeName}Service))" name="${srfr7templcaseformat(dataentity.getCodeName())}Service" type="service"/>
</#if> </#if>
</#if> </#if>
</#list> </#list>
......
<#ibiztemplate> <#ibiztemplate>
TARGET=PSDEACTION TARGET=PSDEACTION
</#ibiztemplate> </#ibiztemplate>
<#comment>引入驼峰配置</#comment>
<#ibizinclude>/SLN/globalfunc.cfg</#ibizinclude>
<#comment>实体行为调用实体行为</#comment> <#comment>实体行为调用实体行为</#comment>
<#assign hasAfterLogic =false> <#assign hasAfterLogic =false>
<#assign de=item.getPSDataEntity()> <#assign de=item.getPSDataEntity()>
...@@ -11,7 +13,7 @@ TARGET=PSDEACTION ...@@ -11,7 +13,7 @@ TARGET=PSDEACTION
<#assign hasAfterLogic=true> <#assign hasAfterLogic=true>
<#assign dataentity = afterlogic.getDstPSDE()> <#assign dataentity = afterlogic.getDstPSDE()>
<#if !P.exists("refservice",dataentity+"service")> <#if !P.exists("refservice",dataentity+"service")>
global ${pub.getPKGCodeName()}.core.${dataentity.getPSSystemModule().codeName?lower_case}.service.I${dataentity.codeName}Service ${srfcaseformat(dataentity.getCodeName(),'l_u2lC')}Service; global ${pub.getPKGCodeName()}.core.${dataentity.getPSSystemModule().codeName?lower_case}.service.I${dataentity.codeName}Service ${srfr7templcaseformat(dataentity.getCodeName())}Service;
</#if> </#if>
</#if> </#if>
</#if> </#if>
...@@ -91,8 +93,8 @@ global ${pub.getPKGCodeName()}.core.${de.getPSSystemModule().getCodeName()?lower ...@@ -91,8 +93,8 @@ global ${pub.getPKGCodeName()}.core.${de.getPSSystemModule().getCodeName()?lower
<#comment>实体行为附加逻辑-remove</#comment> <#comment>实体行为附加逻辑-remove</#comment>
<#macro actionLogic_remove actionlogic> <#macro actionLogic_remove actionlogic>
<#if de.getKeyPSDEField().getStdDataType()==actionLogicDE.getKeyPSDEField().getStdDataType()> <#if de.getKeyPSDEField().getStdDataType()==actionLogicDE.getKeyPSDEField().getStdDataType()>
<#assign privateCodeName = srfcaseformat(de.getKeyPSDEField().getCodeName(),'l_u2lC') > <#assign privateCodeName = srfr7templcaseformat(de.getKeyPSDEField().getCodeName()) >
<#assign publicCodeName = privateCodeName?cap_first > <#assign publicCodeName = privateCodeName?cap_first >
${srfcaseformat(actionLogicDE.getCodeName(),'l_u2lC')}Service.remove(et.get${publicCodeName}()); ${srfr7templcaseformat(actionLogicDE.getCodeName())}Service.remove(et.get${publicCodeName}());
</#if> </#if>
</#macro> </#macro>
\ No newline at end of file
<#ibiztemplate> <#ibiztemplate>
TARGET=PSDEACTION TARGET=PSDEACTION
</#ibiztemplate> </#ibiztemplate>
<#comment>引入驼峰配置</#comment>
<#ibizinclude>/SLN/globalfunc.cfg</#ibizinclude>
<#assign hasBeforeLogic =false> <#assign hasBeforeLogic =false>
<#assign hasBeforeDrl=false> <#assign hasBeforeDrl=false>
<#assign de=item.getPSDataEntity()> <#assign de=item.getPSDataEntity()>
...@@ -32,7 +34,7 @@ TARGET=PSDEACTION ...@@ -32,7 +34,7 @@ TARGET=PSDEACTION
<#assign dataentity = beforelogic.getDstPSDE()> <#assign dataentity = beforelogic.getDstPSDE()>
<#assign deaction = beforelogic.getDstPSDEAction()> <#assign deaction = beforelogic.getDstPSDEAction()>
<#if !P.exists("refservice",dataentity+"service")> <#if !P.exists("refservice",dataentity+"service")>
<tns:metaData express="T(${pub.getPKGCodeName()}.util.security.SpringContextHolder).getBean(T(${pub.getPKGCodeName()}.core.${dataentity.getPSSystemModule().codeName?lower_case}.service.I${dataentity.codeName}Service))" name="${srfcaseformat(dataentity.getCodeName(),'l_u2lC')}Service" type="service"/> <tns:metaData express="T(${pub.getPKGCodeName()}.util.security.SpringContextHolder).getBean(T(${pub.getPKGCodeName()}.core.${dataentity.getPSSystemModule().codeName?lower_case}.service.I${dataentity.codeName}Service))" name="${srfr7templcaseformat(dataentity.getCodeName())}Service" type="service"/>
</#if> </#if>
</#if> </#if>
</#list> </#list>
......
<#ibiztemplate> <#ibiztemplate>
TARGET=PSDEACTION TARGET=PSDEACTION
</#ibiztemplate> </#ibiztemplate>
<#comment>引入驼峰配置</#comment>
<#ibizinclude>/SLN/globalfunc.cfg</#ibizinclude>
<#comment>实体行为调用实体行为</#comment> <#comment>实体行为调用实体行为</#comment>
<#assign hasBeforeLogic =false> <#assign hasBeforeLogic =false>
<#assign de=item.getPSDataEntity()> <#assign de=item.getPSDataEntity()>
...@@ -11,7 +13,7 @@ TARGET=PSDEACTION ...@@ -11,7 +13,7 @@ TARGET=PSDEACTION
<#assign hasBeforeLogic=true> <#assign hasBeforeLogic=true>
<#assign dataentity = beforelogic.getDstPSDE()> <#assign dataentity = beforelogic.getDstPSDE()>
<#if !P.exists("refservice",dataentity+"service")> <#if !P.exists("refservice",dataentity+"service")>
global ${pub.getPKGCodeName()}.core.${dataentity.getPSSystemModule().codeName?lower_case}.service.I${dataentity.codeName}Service ${srfcaseformat(dataentity.getCodeName(),'l_u2lC')}Service; global ${pub.getPKGCodeName()}.core.${dataentity.getPSSystemModule().codeName?lower_case}.service.I${dataentity.codeName}Service ${srfr7templcaseformat(dataentity.getCodeName())}Service;
</#if> </#if>
</#if> </#if>
</#if> </#if>
...@@ -91,8 +93,8 @@ global ${pub.getPKGCodeName()}.core.${de.getPSSystemModule().getCodeName()?lower ...@@ -91,8 +93,8 @@ global ${pub.getPKGCodeName()}.core.${de.getPSSystemModule().getCodeName()?lower
<#comment>实体行为附加逻辑-remove</#comment> <#comment>实体行为附加逻辑-remove</#comment>
<#macro actionLogic_remove actionlogic> <#macro actionLogic_remove actionlogic>
<#if de.getKeyPSDEField().getStdDataType()==actionLogicDE.getKeyPSDEField().getStdDataType()> <#if de.getKeyPSDEField().getStdDataType()==actionLogicDE.getKeyPSDEField().getStdDataType()>
<#assign privateCodeName = srfcaseformat(de.getKeyPSDEField().getCodeName(),'l_u2lC') > <#assign privateCodeName = srfr7templcaseformat(de.getKeyPSDEField().getCodeName()) >
<#assign publicCodeName = privateCodeName?cap_first > <#assign publicCodeName = privateCodeName?cap_first >
${srfcaseformat(actionLogicDE.getCodeName(),'l_u2lC')}Service.remove(et.get${publicCodeName}()); ${srfr7templcaseformat(actionLogicDE.getCodeName())}Service.remove(et.get${publicCodeName}());
</#if> </#if>
</#macro> </#macro>
\ No newline at end of file
<#ibiztemplate> <#ibiztemplate>
TARGET=PSDESERVICEAPI TARGET=PSDESERVICEAPI
</#ibiztemplate> </#ibiztemplate>
<#comment>引入驼峰配置</#comment>
<#ibizinclude>/SLN/globalfunc.cfg</#ibizinclude>
<#comment>不发布子系统实体</#comment> <#comment>不发布子系统实体</#comment>
<#if de.isSubSysDE()==false> <#if de.isSubSysDE()==false>
<#assign pubPkgCodeName = pub.getPKGCodeName()> <#assign pubPkgCodeName = pub.getPKGCodeName()>
...@@ -66,7 +68,7 @@ public class ${item.getCodeName()}DTO extends ${dtoBase} implements Serializable ...@@ -66,7 +68,7 @@ public class ${item.getCodeName()}DTO extends ${dtoBase} implements Serializable
<#list item.getPSDEServiceAPIFields() as apifield> <#list item.getPSDEServiceAPIFields() as apifield>
<#assign defDataType = (apifield.getPSDEField().getDataType())!""> <#assign defDataType = (apifield.getPSDEField().getDataType())!"">
<#assign columnname = apifield.getName()?lower_case> <#assign columnname = apifield.getName()?lower_case>
<#assign prvateCodeName = srfcaseformat(apifield.getCodeName(),'l_u2lC') > <#assign prvateCodeName = srfr7templcaseformat(apifield.getCodeName()) >
<#assign publicCodeName = prvateCodeName?cap_first > <#assign publicCodeName = prvateCodeName?cap_first >
<#assign jsonfield = apifield.getCodeName()?lower_case > <#assign jsonfield = apifield.getCodeName()?lower_case >
<#assign defield=(apifield.getPSDEField())!""> <#assign defield=(apifield.getPSDEField())!"">
...@@ -105,7 +107,7 @@ public class ${item.getCodeName()}DTO extends ${dtoBase} implements Serializable ...@@ -105,7 +107,7 @@ public class ${item.getCodeName()}DTO extends ${dtoBase} implements Serializable
<#assign defield = apifield.getPSDEField() > <#assign defield = apifield.getPSDEField() >
<#assign defDataType = (defield.getDataType())!""> <#assign defDataType = (defield.getDataType())!"">
<#assign columnname = apifield.getName()?lower_case> <#assign columnname = apifield.getName()?lower_case>
<#assign prvateCodeName = srfcaseformat(apifield.getCodeName(),'l_u2lC') > <#assign prvateCodeName = srfr7templcaseformat(apifield.getCodeName()) >
<#assign publicCodeName = prvateCodeName?cap_first > <#assign publicCodeName = prvateCodeName?cap_first >
<#if defield.isPhisicalDEField()==true && defield.isKeyDEField()==false && defDataType!='ONE2MANYDATA'> <#if defield.isPhisicalDEField()==true && defield.isKeyDEField()==false && defDataType!='ONE2MANYDATA'>
<#if defield.getPredefinedType()?? && defield.getPredefinedType()!=''> <#if defield.getPredefinedType()?? && defield.getPredefinedType()!=''>
...@@ -129,8 +131,8 @@ public class ${item.getCodeName()}DTO extends ${dtoBase} implements Serializable ...@@ -129,8 +131,8 @@ public class ${item.getCodeName()}DTO extends ${dtoBase} implements Serializable
<#assign der = apider.getPSDER1N() > <#assign der = apider.getPSDER1N() >
<#if apider.getMinorPSDEServiceAPI().isNested()> <#if apider.getMinorPSDEServiceAPI().isNested()>
<#assign subDTOs = srfpluralize(apider.getMinorPSDEServiceAPI().getCodeName())?lower_case > <#assign subDTOs = srfpluralize(apider.getMinorPSDEServiceAPI().getCodeName())?lower_case >
<#assign subcode = srfcaseformat((der.getMinorCodeName()!der.getMinorPSDataEntity().getCodeName()),'l_u2lC') > <#assign subcode = srfr7templcaseformat((der.getMinorCodeName()!der.getMinorPSDataEntity().getCodeName())) >
<#if subcode?? && subcode==''><#assign subcode=srfcaseformat(der.getMinorPSDataEntity().getCodeName(),'l_u2lC')></#if> <#if subcode?? && subcode==''><#assign subcode=srfr7templcaseformat(der.getMinorPSDataEntity().getCodeName())></#if>
/** /**
* [${apider.getMinorPSDEServiceAPI().getName()}] * [${apider.getMinorPSDEServiceAPI().getName()}]
*/ */
......
<#ibiztemplate> <#ibiztemplate>
TARGET=PSDESERVICEAPI TARGET=PSDESERVICEAPI
</#ibiztemplate> </#ibiztemplate>
<#comment>引入驼峰配置</#comment>
<#ibizinclude>/SLN/globalfunc.cfg</#ibizinclude>
<#comment>不发布子系统实体</#comment> <#comment>不发布子系统实体</#comment>
<#if de.isSubSysDE()==false && de.getAllPSDEServiceAPIs()??> <#if de.isSubSysDE()==false && de.getAllPSDEServiceAPIs()??>
<#assign pubPkgCodeName = pub.getPKGCodeName()> <#assign pubPkgCodeName = pub.getPKGCodeName()>
...@@ -30,7 +32,7 @@ public interface ${item.getCodeName()}Mapping extends MappingBase<${item.codeNam ...@@ -30,7 +32,7 @@ public interface ${item.getCodeName()}Mapping extends MappingBase<${item.codeNam
<#--<#if first==true>--> <#--<#if first==true>-->
<#--@Mappings({--> <#--@Mappings({-->
<#--</#if>--> <#--</#if>-->
<#--<#assign subcode = srfcaseformat((der.getMinorCodeName()!der.getMinorPSDataEntity().getCodeName()),'l_u2lC') >--> <#--<#assign subcode = srfr7templcaseformat((der.getMinorCodeName()!der.getMinorPSDataEntity().getCodeName())) >-->
<#--<#if first==false>,</#if>@Mapping(target = "${subcode}", ignore = true )--> <#--<#if first==false>,</#if>@Mapping(target = "${subcode}", ignore = true )-->
<#--<#assign first=false>--> <#--<#assign first=false>-->
<#--</#if>--> <#--</#if>-->
...@@ -44,4 +46,3 @@ public interface ${item.getCodeName()}Mapping extends MappingBase<${item.codeNam ...@@ -44,4 +46,3 @@ public interface ${item.getCodeName()}Mapping extends MappingBase<${item.codeNam
} }
</#if> </#if>
\ No newline at end of file
<#ibiztemplate> <#ibiztemplate>
TARGET=PSDESERVICEAPI TARGET=PSDESERVICEAPI
</#ibiztemplate> </#ibiztemplate>
<#comment>引入驼峰配置</#comment>
<#ibizinclude>/SLN/globalfunc.cfg</#ibizinclude>
<#comment>不发布子系统实体</#comment> <#comment>不发布子系统实体</#comment>
<#if de.isSubSysDE()==false> <#if de.isSubSysDE()==false>
<#-- SYSAPIRESTFUL,主从接口(非嵌套) --> <#-- SYSAPIRESTFUL,主从接口(非嵌套) -->
...@@ -10,9 +12,9 @@ TARGET=PSDESERVICEAPI ...@@ -10,9 +12,9 @@ TARGET=PSDESERVICEAPI
<#assign itemCodeNameLC = itemCodeName?lower_case> <#assign itemCodeNameLC = itemCodeName?lower_case>
<#assign deCodeName = de.getCodeName()> <#assign deCodeName = de.getCodeName()>
<#assign deLogicName = de.getLogicName()> <#assign deLogicName = de.getLogicName()>
<#assign deCodeNameCamel = srfcaseformat(deCodeName,'l_u2lC')?cap_first> <#assign deCodeNameCamel = srfr7templcaseformat(deCodeName)?cap_first>
<#assign deCodeNameLC = deCodeName?lower_case> <#assign deCodeNameLC = deCodeName?lower_case>
<#assign dePKCodeNameLC = srfcaseformat(de.getKeyPSDEField().getCodeName(),'l_u2lC')> <#assign dePKCodeNameLC = srfr7templcaseformat(de.getKeyPSDEField().getCodeName())>
<#assign dePKCodeName = (dePKCodeNameLC)?cap_first> <#assign dePKCodeName = (dePKCodeNameLC)?cap_first>
<#assign deModelCodeNameLC = de.getPSSystemModule().getCodeName()?lower_case> <#assign deModelCodeNameLC = de.getPSSystemModule().getCodeName()?lower_case>
<#assign itemSysApiCodeName = item.getPSSysServiceAPI().getCodeName()> <#assign itemSysApiCodeName = item.getPSSysServiceAPI().getCodeName()>
...@@ -420,7 +422,7 @@ public class ${itemCodeName}Resource { ...@@ -420,7 +422,7 @@ public class ${itemCodeName}Resource {
<#assign byTagParams += rsMainDeLogicName > <#assign byTagParams += rsMainDeLogicName >
<#if rs.getPSDER1N()?? && apiRsPathLast.getCodeName() == rs.getCodeName()> <#if rs.getPSDER1N()?? && apiRsPathLast.getCodeName() == rs.getCodeName()>
<#assign parentSearchParams += "context.setN_" + rs.getPSDER1N().getPSPickupDEField().getName()?lower_case + "_eq("+ rsMainDeCNLC + keyCNLC +");" > <#assign parentSearchParams += "context.setN_" + rs.getPSDER1N().getPSPickupDEField().getName()?lower_case + "_eq("+ rsMainDeCNLC + keyCNLC +");" >
<#assign parentSetParams += "domain.set" + srfcaseformat(rs.getPSDER1N().getPSPickupDEField().getCodeName(),'l_u2lC')?cap_first + "("+ rsMainDeCNLC + keyCNLC +");" > <#assign parentSetParams += "domain.set" + srfr7templcaseformat(rs.getPSDER1N().getPSPickupDEField().getCodeName())?cap_first + "("+ rsMainDeCNLC + keyCNLC +");" >
</#if> </#if>
<#assign parentParams2 += "" + srfr7javatype(rsMainDePKDataType)+" " + rsMainDeCNLC + keyCNLC > <#assign parentParams2 += "" + srfr7javatype(rsMainDePKDataType)+" " + rsMainDeCNLC + keyCNLC >
<#assign parentParams3 += "" + rsMainDeCNLC + keyCNLC > <#assign parentParams3 += "" + rsMainDeCNLC + keyCNLC >
...@@ -789,7 +791,7 @@ public class ${itemCodeName}Resource { ...@@ -789,7 +791,7 @@ public class ${itemCodeName}Resource {
<#assign defield=apifield.getPSDEField()> <#assign defield=apifield.getPSDEField()>
<#if defield.getPredefinedType?? && defield.getPredefinedType()??> <#if defield.getPredefinedType?? && defield.getPredefinedType()??>
<#if defield.getPredefinedType()=='UPDATEDATE'> <#if defield.getPredefinedType()=='UPDATEDATE'>
<#assign updatedateField=srfcaseformat(defield.codeName,'l_u2lC')> <#assign updatedateField=srfr7templcaseformat(defield.codeName)>
@VersionCheck(entity = "${deCodeNameLC}" , versionfield = "${updatedateField}") @VersionCheck(entity = "${deCodeNameLC}" , versionfield = "${updatedateField}")
<#break> <#break>
</#if> </#if>
...@@ -1088,9 +1090,3 @@ public class ${itemCodeName}Resource { ...@@ -1088,9 +1090,3 @@ public class ${itemCodeName}Resource {
</#if> </#if>
} }
</#macro> </#macro>
\ No newline at end of file
<#ibiztemplate> <#ibiztemplate>
TARGET=PSSYSTEM TARGET=PSSYSTEM
</#ibiztemplate> </#ibiztemplate>
<#comment>引入驼峰配置</#comment>
<#ibizinclude>/SLN/globalfunc.cfg</#ibizinclude>
<#if sys.codeName == 'Sample'> <#if sys.codeName == 'Sample'>
package ${pub.getPKGCodeName()}.util.service; package ${pub.getPKGCodeName()}.util.service;
...@@ -115,7 +117,7 @@ public class ValueRuleValidator implements ConstraintValidator<ValueRuleCheck, D ...@@ -115,7 +117,7 @@ public class ValueRuleValidator implements ConstraintValidator<ValueRuleCheck, D
<#assign targetDBValueOP=fieldRule.getCondOp()><#comment>表达式</#comment> <#assign targetDBValueOP=fieldRule.getCondOp()><#comment>表达式</#comment>
<#assign targetValue=((fieldRule.getParamValue())!'')><#comment>值项</#comment> <#assign targetValue=((fieldRule.getParamValue())!'')><#comment>值项</#comment>
<#if targetDEField!=''> <#if targetDEField!=''>
<#assign targetFieldName=srfcaseformat(targetDEField.codeName,'l_u2lC')> <#assign targetFieldName=srfr7templcaseformat(targetDEField.codeName)>
</#if> </#if>
<#assign condBody="T(${pub.getPKGCodeName()}.util.helper.RuleUtils).test(#dto.get(\\\""+targetFieldName+"\\\"),\\\""+targetDBValueOP+"\\\","+"\\\""+targetValue+"\\\")"> <#assign condBody="T(${pub.getPKGCodeName()}.util.helper.RuleUtils).test(#dto.get(\\\""+targetFieldName+"\\\"),\\\""+targetDBValueOP+"\\\","+"\\\""+targetValue+"\\\")">
</#if> </#if>
......
<#comment>替换参数驼峰命名</#comment>
<#function srfr7templcaseformat codeName>
<#assign result = codeName>
<#if result!=''>
<#if ((pub.getPSSFStyleParam().getStyleParam("camelCase",""))!'') == "true">
<#assign result = srfcaseformat(result,'UC2l_u')>
<#assign result = srfcaseformat(result,'l_u2lC')>
<#else>
<#assign result = srfcaseformat(result,'l_u2lC')>
</#if>
</#if>
<#return result>
</#function>
Markdown 格式
0% or
您添加了 0 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册