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

test行为

上级 dc2fa391
...@@ -168,6 +168,8 @@ ${deaction.getRender().code} ...@@ -168,6 +168,8 @@ ${deaction.getRender().code}
@Override @Override
@Transactional @Transactional
public ${item.getCodeName()} ${srfmethodname(deaction.getCodeName())}(${item.getCodeName()} et) { public ${item.getCodeName()} ${srfmethodname(deaction.getCodeName())}(${item.getCodeName()} et) {
<#comment>输出测试行为</#comment>
<@outputTestAction deaction "usercustom"/>
<#comment>附加数据逻辑-操作前</#comment> <#comment>附加数据逻辑-操作前</#comment>
<@addBoforeLogic deaction/> <@addBoforeLogic deaction/>
//自定义代码 //自定义代码
...@@ -180,6 +182,8 @@ ${deaction.getRender().code} ...@@ -180,6 +182,8 @@ ${deaction.getRender().code}
@Override @Override
@Transactional @Transactional
public ${item.getCodeName()} ${srfmethodname(deaction.getCodeName())}(${item.getCodeName()} et) { public ${item.getCodeName()} ${srfmethodname(deaction.getCodeName())}(${item.getCodeName()} et) {
<#comment>输出测试行为</#comment>
<@outputTestAction deaction "delogic"/>
<#comment>附加数据逻辑-操作前</#comment> <#comment>附加数据逻辑-操作前</#comment>
<@addBoforeLogic deaction/> <@addBoforeLogic deaction/>
${deaction.getPSDELogic().getCodeName()?lower_case}Logic.execute(et); ${deaction.getPSDELogic().getCodeName()?lower_case}Logic.execute(et);
...@@ -192,6 +196,8 @@ ${deaction.getRender().code} ...@@ -192,6 +196,8 @@ ${deaction.getRender().code}
@Override @Override
@Transactional @Transactional
public ${item.getCodeName()} get(${srfjavatype(keyfield.stdDataType)} key) { public ${item.getCodeName()} get(${srfjavatype(keyfield.stdDataType)} key) {
<#comment>输出测试行为</#comment>
<@outputTestAction deaction "get"/>
<#comment>附加数据逻辑-操作前</#comment> <#comment>附加数据逻辑-操作前</#comment>
<@buildEntityParam deaction/> <@buildEntityParam deaction/>
<@addGetActionBoforeLogic deaction/> <@addGetActionBoforeLogic deaction/>
...@@ -239,6 +245,8 @@ ${deaction.getRender().code} ...@@ -239,6 +245,8 @@ ${deaction.getRender().code}
@Override @Override
@Transactional @Transactional
public boolean create(${item.getCodeName()} et) { public boolean create(${item.getCodeName()} et) {
<#comment>输出测试行为</#comment>
<@outputTestAction deaction "create"/>
<#if hasMinorPSDERs gt 0> <#if hasMinorPSDERs gt 0>
fillParentData(et); fillParentData(et);
</#if> </#if>
...@@ -286,6 +294,8 @@ ${deaction.getRender().code} ...@@ -286,6 +294,8 @@ ${deaction.getRender().code}
@Override @Override
public void createBatch(List<${item.getCodeName()}> list) { public void createBatch(List<${item.getCodeName()}> list) {
<#comment>输出测试行为</#comment>
<@outputTestAction deaction "createBatch"/>
<#if hasMinorPSDERs gt 0> <#if hasMinorPSDERs gt 0>
list.forEach(item->fillParentData(item)); list.forEach(item->fillParentData(item));
</#if> </#if>
...@@ -305,6 +315,8 @@ ${deaction.getRender().code} ...@@ -305,6 +315,8 @@ ${deaction.getRender().code}
@Override @Override
@Transactional @Transactional
public boolean update(${item.getCodeName()} et) { public boolean update(${item.getCodeName()} et) {
<#comment>输出测试行为</#comment>
<@outputTestAction deaction "update"/>
<#if hasMinorPSDERs gt 0> <#if hasMinorPSDERs gt 0>
fillParentData(et); fillParentData(et);
</#if> </#if>
...@@ -356,6 +368,8 @@ ${deaction.getRender().code} ...@@ -356,6 +368,8 @@ ${deaction.getRender().code}
@Override @Override
public void updateBatch(List<${item.getCodeName()}> list) { public void updateBatch(List<${item.getCodeName()}> list) {
<#comment>输出测试行为</#comment>
<@outputTestAction deaction "updateBatch"/>
<#if hasMinorPSDERs gt 0> <#if hasMinorPSDERs gt 0>
list.forEach(item->fillParentData(item)); list.forEach(item->fillParentData(item));
</#if> </#if>
...@@ -370,6 +384,8 @@ ${deaction.getRender().code} ...@@ -370,6 +384,8 @@ ${deaction.getRender().code}
@Override @Override
@Transactional @Transactional
public boolean save(${item.getCodeName()} et) { public boolean save(${item.getCodeName()} et) {
<#comment>输出测试行为</#comment>
<@outputTestAction deaction "save"/>
<#comment>附加数据逻辑-操作前</#comment> <#comment>附加数据逻辑-操作前</#comment>
<@addBoforeLogic deaction/> <@addBoforeLogic deaction/>
if(!saveOrUpdate(et)) if(!saveOrUpdate(et))
...@@ -384,6 +400,8 @@ ${deaction.getRender().code} ...@@ -384,6 +400,8 @@ ${deaction.getRender().code}
rollbackFor = {Exception.class} rollbackFor = {Exception.class}
) )
public boolean saveOrUpdate(${item.getCodeName()} et) { public boolean saveOrUpdate(${item.getCodeName()} et) {
<#comment>输出测试行为</#comment>
<@outputTestAction deaction "saveOrUpdate"/>
if (null == et) { if (null == et) {
return false; return false;
} else { } else {
...@@ -393,6 +411,8 @@ ${deaction.getRender().code} ...@@ -393,6 +411,8 @@ ${deaction.getRender().code}
@Override @Override
public boolean saveBatch(Collection<${item.getCodeName()}> list) { public boolean saveBatch(Collection<${item.getCodeName()}> list) {
<#comment>输出测试行为</#comment>
<@outputTestAction deaction "saveBatch"/>
<#if hasMinorPSDERs gt 0> <#if hasMinorPSDERs gt 0>
list.forEach(item->fillParentData(item)); list.forEach(item->fillParentData(item));
</#if> </#if>
...@@ -402,6 +422,8 @@ ${deaction.getRender().code} ...@@ -402,6 +422,8 @@ ${deaction.getRender().code}
@Override @Override
public void saveBatch(List<${item.getCodeName()}> list) { public void saveBatch(List<${item.getCodeName()}> list) {
<#comment>输出测试行为</#comment>
<@outputTestAction deaction "saveBatch"/>
<#if hasMinorPSDERs gt 0> <#if hasMinorPSDERs gt 0>
list.forEach(item->fillParentData(item)); list.forEach(item->fillParentData(item));
</#if> </#if>
...@@ -412,6 +434,8 @@ ${deaction.getRender().code} ...@@ -412,6 +434,8 @@ ${deaction.getRender().code}
@Override @Override
@Transactional @Transactional
public boolean remove(${srfjavatype(keyfield.stdDataType)} key) { public boolean remove(${srfjavatype(keyfield.stdDataType)} key) {
<#comment>输出测试行为</#comment>
<@outputTestAction deaction "remove"/>
<#comment>附加数据逻辑-操作前,通过key构造entity传入逻辑中</#comment> <#comment>附加数据逻辑-操作前,通过key构造entity传入逻辑中</#comment>
<@buildEntityParam deaction/> <@buildEntityParam deaction/>
<@addBoforeLogic deaction/> <@addBoforeLogic deaction/>
...@@ -442,6 +466,8 @@ ${deaction.getRender().code} ...@@ -442,6 +466,8 @@ ${deaction.getRender().code}
@Override @Override
public void removeBatch(Collection<${srfjavatype(keyfield.stdDataType)}> idList) { public void removeBatch(Collection<${srfjavatype(keyfield.stdDataType)}> idList) {
<#comment>输出测试行为</#comment>
<@outputTestAction deaction "removeBatch"/>
<#if hasPSDERsMapping> <#if hasPSDERsMapping>
List<${item.getCodeName()}> entities= baseMapper.selectBatchIds(idList); List<${item.getCodeName()}> entities= baseMapper.selectBatchIds(idList);
</#if> </#if>
...@@ -455,6 +481,8 @@ ${deaction.getRender().code} ...@@ -455,6 +481,8 @@ ${deaction.getRender().code}
<#elseif deaction.getCodeName()?lower_case == "getdraft"> <#elseif deaction.getCodeName()?lower_case == "getdraft">
@Override @Override
public ${item.getCodeName()} getDraft(${item.getCodeName()} et) { public ${item.getCodeName()} getDraft(${item.getCodeName()} et) {
<#comment>输出测试行为</#comment>
<@outputTestAction deaction "getdraft"/>
<#if hasMinorPSDERs gt 0> <#if hasMinorPSDERs gt 0>
fillParentData(et); fillParentData(et);
</#if> </#if>
...@@ -468,6 +496,8 @@ ${deaction.getRender().code} ...@@ -468,6 +496,8 @@ ${deaction.getRender().code}
<#elseif deaction.getCodeName()?lower_case == "checkkey"> <#elseif deaction.getCodeName()?lower_case == "checkkey">
@Override @Override
public boolean checkKey(${item.getCodeName()} et) { public boolean checkKey(${item.getCodeName()} et) {
<#comment>输出测试行为</#comment>
<@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${srfcaseformat(keyfield.codeName,'l_u2lC')?cap_first}()))&&(!Objects.isNull(this.getById(et.get${srfcaseformat(keyfield.codeName,'l_u2lC')?cap_first}())));
} }
<#comment>用户扩展新建、更新</#comment> <#comment>用户扩展新建、更新</#comment>
...@@ -475,6 +505,8 @@ ${deaction.getRender().code} ...@@ -475,6 +505,8 @@ ${deaction.getRender().code}
@Override @Override
@Transactional @Transactional
public ${item.getCodeName()} ${srfmethodname(deaction.getCodeName())}(${item.getCodeName()} et) { public ${item.getCodeName()} ${srfmethodname(deaction.getCodeName())}(${item.getCodeName()} et) {
<#comment>输出测试行为</#comment>
<@outputTestAction deaction "userex"/>
<#comment>附加数据逻辑-操作前</#comment> <#comment>附加数据逻辑-操作前</#comment>
<@addBoforeLogic deaction/> <@addBoforeLogic deaction/>
<#comment>附加实体行为参数</#comment> <#comment>附加实体行为参数</#comment>
...@@ -487,6 +519,8 @@ ${deaction.getRender().code} ...@@ -487,6 +519,8 @@ ${deaction.getRender().code}
@Override @Override
@Transactional @Transactional
public ${item.getCodeName()} ${srfmethodname(deaction.getCodeName())}(${item.getCodeName()} et) { public ${item.getCodeName()} ${srfmethodname(deaction.getCodeName())}(${item.getCodeName()} et) {
<#comment>输出测试行为</#comment>
<@outputTestAction deaction "other"/>
<#comment>附加数据逻辑-操作前</#comment> <#comment>附加数据逻辑-操作前</#comment>
<@addBoforeLogic deaction/> <@addBoforeLogic deaction/>
<#comment>附加数据逻辑-操作后</#comment> <#comment>附加数据逻辑-操作后</#comment>
...@@ -496,6 +530,9 @@ ${deaction.getRender().code} ...@@ -496,6 +530,9 @@ ${deaction.getRender().code}
} }
</#if> </#if>
<#comment>输出测试实体行为</#comment>
<#macro outputTestActionDetail deaction>
</#macro>
</#if> </#if>
</#if> </#if>
</#list> </#list>
...@@ -2172,4 +2209,153 @@ ${deaction.getRender().code} ...@@ -2172,4 +2209,153 @@ ${deaction.getRender().code}
</#if> </#if>
</#macro> </#macro>
<#comment>输出测试行为</#comment>
<#macro outputTestAction deaction actionParam>
<#if deaction.getTestActionMode()?? && (deaction.getTestActionMode() =="1" || deaction.getTestActionMode() =="3" ) >
<#if (deaction.getActionType()=='USERCUSTOM')>
test${srfmethodname(deaction.getCodeName())?cap_first}(et);
<#elseif deaction.getActionType()=='DELOGIC'>
test${srfmethodname(deaction.getCodeName())?cap_first}(et)
<#elseif deaction.getCodeName()?lower_case == 'get'>
testGet(key);
<#elseif deaction.getCodeName()?lower_case == "createbatch">
<#elseif deaction.getCodeName()?lower_case == "updatebatch">
<#elseif deaction.getCodeName()?lower_case == "removebatch">
<#elseif deaction.getCodeName()?lower_case == "savebatch">
<#elseif deaction.getCodeName()?lower_case == "create">
<#if actionParam=='createBatch'>
testCreateBatch(list);
<#else>
testCreate(et)
</#if>
<#elseif deaction.getCodeName()?lower_case == "update">
<#if actionParam=='updateBatch'>
testUpdateBatch(list);
<#else>
testUpdate(et)
</#if>
<#elseif deaction.getCodeName()?lower_case == "save">
<#if actionParam=='savebatch'>
testSaveBatch(list);
<#elseif actionParam=='saveOrUpdate'>
testSaveOrUpdate(et);
<#else>
testSave(et);
</#if>
<#elseif deaction.getCodeName()?lower_case == "remove">
<#if actionParam=='removeBatch'>
testRemoveBatch(idList);
<#else>
testRemove(key);
</#if>
<#elseif deaction.getCodeName()?lower_case == "getdraft">
testGetDraft(et);
<#elseif deaction.getCodeName()?lower_case == "checkkey">
testCheckKey(et);
<#else>
test${srfmethodname(deaction.getCodeName())?cap_first}(et);
</#if>
</#if>
</#macro>
<#comment>输出测试行为</#comment>
<#macro outputTestActionDetail deaction>
<#if deaction.getTestActionMode()?? && (deaction.getTestActionMode() =="1" || deaction.getTestActionMode() =="3" ) >
<#if (deaction.getActionType()=='USERCUSTOM')>
@Transactional
public ${item.getCodeName()} test${srfmethodname(deaction.getCodeName())?cap_first}(${item.getCodeName()} et) {
return et;
}
<#elseif deaction.getActionType()=='DELOGIC'>
@Transactional
public ${item.getCodeName()} test${srfmethodname(deaction.getCodeName())?cap_first}(${item.getCodeName()} et) {
return et ;
}
<#elseif deaction.getCodeName()?lower_case == 'get'>
@Transactional
public ${item.getCodeName()} testGet(${srfjavatype(keyfield.stdDataType)} key) {
return et;
}
<#elseif deaction.getCodeName()?lower_case == "createbatch">
<#elseif deaction.getCodeName()?lower_case == "updatebatch">
<#elseif deaction.getCodeName()?lower_case == "removebatch">
<#elseif deaction.getCodeName()?lower_case == "savebatch">
<#elseif deaction.getCodeName()?lower_case == "create">
@Transactional
public boolean testCreate(${item.getCodeName()} et) {
return true;
}
public void testCreateBatch(List<${item.getCodeName()}> list) {
}
<#elseif deaction.getCodeName()?lower_case == "update">
@Transactional
public boolean testUpdate(${item.getCodeName()} et) {
return true;
}
public void testUpdateBatch(List<${item.getCodeName()}> list) {
}
<#elseif deaction.getCodeName()?lower_case == "save">
@Transactional
public boolean testSave(${item.getCodeName()} et) {
return true;
}
@Transactional(
rollbackFor = {Exception.class}
)
public boolean testSaveOrUpdate(${item.getCodeName()} et) {
return true;
}
public boolean testSaveBatch(Collection<${item.getCodeName()}> list) {
return true;
}
public void testSaveBatch(List<${item.getCodeName()}> list) {
}
<#elseif deaction.getCodeName()?lower_case == "remove">
@Transactional
public boolean testRemove(${srfjavatype(keyfield.stdDataType)} key) {
return result ;
}
public void testRemoveBatch(Collection<${srfjavatype(keyfield.stdDataType)}> idList) {
}
<#elseif deaction.getCodeName()?lower_case == "getdraft">
public ${item.getCodeName()} testGetDraft(${item.getCodeName()} et) {
return et;
}
<#elseif deaction.getCodeName()?lower_case == "checkkey">
public boolean testCheckKey(${item.getCodeName()} et) {
return true;
}
<#comment>用户扩展新建、更新</#comment>
<#elseif deaction.getActionType()== "USERCREATE" || deaction.getActionType()== "USERUPDATE">
@Transactional
public ${item.getCodeName()} test${srfmethodname(deaction.getCodeName())?cap_first}(${item.getCodeName()} et) {
return et;
}
<#else>
@Transactional
public ${item.getCodeName()} test${srfmethodname(deaction.getCodeName())?cap_first}(${item.getCodeName()} et) {
return et;
}
</#if>
</#if>
</#macro>
</#if> </#if>
Markdown 格式
0% or
您添加了 0 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册