提交 d8746068 编写于 作者: sq3536's avatar sq3536

Merge remote-tracking branch 'origin/dev' into dev

...@@ -1072,9 +1072,9 @@ public class ${item.getCodeName()}ServiceImpl implements I${de.getCodeName()}Ser ...@@ -1072,9 +1072,9 @@ public class ${item.getCodeName()}ServiceImpl implements I${de.getCodeName()}Ser
public ${item.getCodeName()} get(${srfjavatype(keyfield.stdDataType)} ${keyfield.getCodeName()?lower_case}) { public ${item.getCodeName()} get(${srfjavatype(keyfield.stdDataType)} ${keyfield.getCodeName()?lower_case}) {
<#if item.isEnableAPIStorage()> <#if item.isEnableAPIStorage()>
<#if deaction.getPSSubSysServiceAPIDEMethod()?? > <#if deaction.getPSSubSysServiceAPIDEMethod()?? >
<#comment>附加数据逻辑-操作前</#comment> <#--<#comment>附加数据逻辑-操作前</#comment>-->
<@buildEntityParam deaction/> <#--<@buildEntityParam deaction/>-->
<@addGetActionBoforeLogic deaction/> <#--<@addGetActionBoforeLogic deaction/>-->
${item.getCodeName()} et=${subSysServiceApiDECodeName?uncap_first}FeignClient.${deaction.getPSSubSysServiceAPIDEMethod().getCodeName()?uncap_first}(${keyfield.getCodeName()?lower_case}); ${item.getCodeName()} et=${subSysServiceApiDECodeName?uncap_first}FeignClient.${deaction.getPSSubSysServiceAPIDEMethod().getCodeName()?uncap_first}(${keyfield.getCodeName()?lower_case});
if(et==null){ if(et==null){
et=new ${item.getCodeName()}(); et=new ${item.getCodeName()}();
...@@ -1106,8 +1106,8 @@ public class ${item.getCodeName()}ServiceImpl implements I${de.getCodeName()}Ser ...@@ -1106,8 +1106,8 @@ public class ${item.getCodeName()}ServiceImpl implements I${de.getCodeName()}Ser
</#list> </#list>
</#if> </#if>
} }
<#comment>附加数据逻辑-操作后</#comment> <#--<#comment>附加数据逻辑-操作后</#comment>-->
<@addAfterLogic deaction/> <#--<@addAfterLogic deaction/>-->
return et; return et;
<#else> <#else>
return null; return null;
...@@ -1300,12 +1300,12 @@ public class ${item.getCodeName()}ServiceImpl implements I${de.getCodeName()}Ser ...@@ -1300,12 +1300,12 @@ public class ${item.getCodeName()}ServiceImpl implements I${de.getCodeName()}Ser
</#if> </#if>
<#if item.isEnableAPIStorage()> <#if item.isEnableAPIStorage()>
<#if deaction.getPSSubSysServiceAPIDEMethod()?? > <#if deaction.getPSSubSysServiceAPIDEMethod()?? >
<#comment>附加数据逻辑-操作前</#comment> <#--<#comment>附加数据逻辑-操作前</#comment>-->
<@buildEntityParam deaction/> <#--<@buildEntityParam deaction/>-->
<@addBoforeLogic deaction/> <#--<@addBoforeLogic deaction/>-->
boolean result=${subSysServiceApiDECodeName?uncap_first}FeignClient.remove(${keyfield.getCodeName()?lower_case}) ; boolean result=${subSysServiceApiDECodeName?uncap_first}FeignClient.remove(${keyfield.getCodeName()?lower_case}) ;
<#comment>附加数据逻辑-操作后</#comment> <#--<#comment>附加数据逻辑-操作后</#comment>-->
<@addAfterLogic deaction/> <#--<@addAfterLogic deaction/>-->
return result; return result;
<#else> <#else>
return false; return false;
...@@ -1498,7 +1498,6 @@ public class ${item.getCodeName()}ServiceImpl implements I${de.getCodeName()}Ser ...@@ -1498,7 +1498,6 @@ public class ${item.getCodeName()}ServiceImpl implements I${de.getCodeName()}Ser
@Service @Service
public class ${item.getCodeName()}ServiceImpl implements I${de.getCodeName()}Service { public class ${item.getCodeName()}ServiceImpl implements I${de.getCodeName()}Service {
<#assign keyfield=de.getKeyPSDEField()> <#assign keyfield=de.getKeyPSDEField()>
<#comment>引入关联依赖</#comment> <#comment>引入关联依赖</#comment>
...@@ -1554,15 +1553,24 @@ public class ${item.getCodeName()}ServiceImpl implements I${de.getCodeName()}Ser ...@@ -1554,15 +1553,24 @@ public class ${item.getCodeName()}ServiceImpl implements I${de.getCodeName()}Ser
@Override @Override
@Transactional @Transactional
public ${item.getCodeName()} ${srfmethodname(deaction.getCodeName())}(${item.getCodeName()} et) { public ${item.getCodeName()} ${srfmethodname(deaction.getCodeName())}(${item.getCodeName()} et) {
<#comment>附加数据逻辑-操作前</#comment>
<@addBoforeLogic deaction/>
${deaction.getPSDELogic().getCodeName()?lower_case}Logic.execute(et); ${deaction.getPSDELogic().getCodeName()?lower_case}Logic.execute(et);
<#comment>附加数据逻辑-操作后</#comment>
<@addAfterLogic deaction/>
return et ; return et ;
} }
<#elseif deaction.getCodeName()?lower_case == 'get'> <#elseif deaction.getCodeName()?lower_case == 'get'>
@Override @Override
public ${item.getCodeName()} get(${srfjavatype(keyfield.stdDataType)} ${keyfield.getCodeName()?lower_case}) { public ${item.getCodeName()} get(${srfjavatype(keyfield.stdDataType)} key) {
<#comment>附加数据逻辑-操作前</#comment>
<@buildEntityParam deaction/>
<@addGetActionBoforeLogic deaction/>
${item.getCodeName()} et = new ${item.getCodeName()}(); ${item.getCodeName()} et = new ${item.getCodeName()}();
et.set${srfcaseformat(keyfield.codeName,'l_u2lC')?cap_first}(${keyfield.getCodeName()?lower_case}); et.set${srfcaseformat(keyfield.codeName,'l_u2lC')?cap_first}(${keyfield.getCodeName()?lower_case});
<#comment>附加数据逻辑-操作后</#comment>
<@addAfterLogic deaction/>
return et; return et;
} }
...@@ -1619,7 +1627,12 @@ public class ${item.getCodeName()}ServiceImpl implements I${de.getCodeName()}Ser ...@@ -1619,7 +1627,12 @@ public class ${item.getCodeName()}ServiceImpl implements I${de.getCodeName()}Ser
<#elseif deaction.getCodeName()?lower_case == "remove"> <#elseif deaction.getCodeName()?lower_case == "remove">
@Override @Override
public boolean remove(${srfjavatype(keyfield.stdDataType)} ${keyfield.getCodeName()?lower_case}) { public boolean remove(${srfjavatype(keyfield.stdDataType)} key) {
<#comment>附加数据逻辑-操作前</#comment>
<@buildEntityParam deaction/>
<@addBoforeLogic deaction/>
<#comment>附加数据逻辑-操作后</#comment>
<@addAfterLogic deaction/>
return true; return true;
} }
...@@ -1630,17 +1643,29 @@ public class ${item.getCodeName()}ServiceImpl implements I${de.getCodeName()}Ser ...@@ -1630,17 +1643,29 @@ public class ${item.getCodeName()}ServiceImpl implements I${de.getCodeName()}Ser
<#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>
<@addBoforeLogic deaction/>
<#comment>附加数据逻辑-操作后</#comment>
<@addAfterLogic deaction/>
return et; return et;
} }
<#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>
<@addBoforeLogic deaction/>
<#comment>附加数据逻辑-操作后</#comment>
<@addAfterLogic deaction/>
return false; return false;
} }
<#else> <#else>
@Override @Override
public ${item.getCodeName()} ${srfmethodname(deaction.getCodeName())}(${item.getCodeName()} et) { public ${item.getCodeName()} ${srfmethodname(deaction.getCodeName())}(${item.getCodeName()} et) {
<#comment>附加数据逻辑-操作前</#comment>
<@addBoforeLogic deaction/>
<#comment>附加数据逻辑-操作后</#comment>
<@addAfterLogic deaction/>
return et; return et;
} }
</#if> </#if>
......
Markdown 格式
0% or
您添加了 0 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册