Skip to content

iBiz4j Spring R7
iBiz4j Spring R7
提交 a8f07731 编写于 作者: zhouweidong's avatar zhouweidong
浏览文件
操作

调整javatype

上级 98f9a209
显示空白字符变更
内嵌 并排
正在显示 包含 82 行增加 和 82 行删除
SLN/%PUBPRJ%-core/src/main/java/%SYS_PKGPATH%/core/%MOD_PKGPATH%/client/%ITEM%Fallback.java.ftl
浏览文件 @ a8f07731
......@@ -46,17 +46,17 @@ public class ${item.codeName}Fallback implements ${item.codeName}FeignClient{
<#-- ${return_type} ${srfmethodname(apiMethod.getCodeName())}(<#if req_param_type?? && req_param_type=='ENTITY'><#if apiMethod.getPSDEName()??>${apiMethod.getPSDEName()} entity</#if></#if>); -->
<#if apiMethod.getCodeName()?lower_case == 'get'>
<#--@RequestMapping(method = RequestMethod.<#if apiMethod.getRequestMethod()??>${apiMethod.getRequestMethod()}<#else>POST</#if>, value = "${fullpath}/{${item.getKeyDEField().getCodeName()?lower_case}}")-->
public ${refDE.codeName} get(${srfjavatype(refDE.getKeyDEField().stdDataType)} ${refDE.getKeyDEField().getCodeName()?lower_case}){
public ${refDE.codeName} get(${srfr7javatype(refDE.getKeyDEField().stdDataType)} ${refDE.getKeyDEField().getCodeName()?lower_case}){
return null;
}
<#elseif apiMethod.getCodeName()?lower_case == 'remove'>
<#--@RequestMapping(method = RequestMethod.<#if apiMethod.getRequestMethod()??>${apiMethod.getRequestMethod()}<#else>POST</#if>, value = "${fullpath}/{${item.getKeyDEField().getCodeName()?lower_case}}")-->
public Boolean remove(${srfjavatype(refDE.getKeyDEField().stdDataType)} ${refDE.getKeyDEField().getCodeName()?lower_case}){
public Boolean remove(${srfr7javatype(refDE.getKeyDEField().stdDataType)} ${refDE.getKeyDEField().getCodeName()?lower_case}){
return false;
}
<#--@RequestMapping(method = RequestMethod.<#if apiMethod.getRequestMethod()??>${apiMethod.getRequestMethod()}<#else>POST</#if>, value = "${fullpath}/${apiMethod.getCodeName()?lower_case}")-->
public Boolean removeBatch(Collection<${srfjavatype(refDE.getKeyDEField().stdDataType)}> idList){
public Boolean removeBatch(Collection<${srfr7javatype(refDE.getKeyDEField().stdDataType)}> idList){
return false;
}
<#elseif apiMethod.getCodeName()?lower_case == 'create'>
......@@ -79,7 +79,7 @@ public class ${item.codeName}Fallback implements ${item.codeName}FeignClient{
}
<#elseif apiMethod.getCodeName()?lower_case == 'update'>
<#--@RequestMapping(method = RequestMethod.<#if apiMethod.getRequestMethod()??>${apiMethod.getRequestMethod()}<#else>POST</#if>, value = "${fullpath}/{${item.getKeyDEField().getCodeName()?lower_case}}")-->
public ${refDE.codeName} update(${srfjavatype(refDE.getKeyDEField().stdDataType)} ${refDE.getKeyDEField().getCodeName()?lower_case}, ${refDE.codeName} ${refDE.codeName?lower_case}){
public ${refDE.codeName} update(${srfr7javatype(refDE.getKeyDEField().stdDataType)} ${refDE.getKeyDEField().getCodeName()?lower_case}, ${refDE.codeName} ${refDE.codeName?lower_case}){
return null;
}
<#--@RequestMapping(method = RequestMethod.<#if apiMethod.getRequestMethod()??>${apiMethod.getRequestMethod()}<#else>POST</#if>, value = "${fullpath}/${apiMethod.getCodeName()?lower_case}")-->
......@@ -104,7 +104,7 @@ public class ${item.codeName}Fallback implements ${item.codeName}FeignClient{
<#elseif apiMethod.getCodeName()?lower_case == 'savebatch'>
<#else>
<#--@RequestMapping(method = RequestMethod.<#if apiMethod.getRequestMethod()??>${apiMethod.getRequestMethod()}<#else>POST</#if>, value = "${fullpath}/{${item.getKeyDEField().getCodeName()?lower_case}}/${apiMethod.getCodeName()?lower_case}")-->
public ${refDE.codeName} ${apiMethod.getCodeName()?uncap_first}( ${srfjavatype(refDE.getKeyDEField().stdDataType)} ${refDE.getKeyDEField().getCodeName()?lower_case}, ${refDE.codeName} ${refDE.codeName?lower_case}){
public ${refDE.codeName} ${apiMethod.getCodeName()?uncap_first}( ${srfr7javatype(refDE.getKeyDEField().stdDataType)} ${refDE.getKeyDEField().getCodeName()?lower_case}, ${refDE.codeName} ${refDE.codeName?lower_case}){
return null;
}
</#if>
......
SLN/%PUBPRJ%-core/src/main/java/%SYS_PKGPATH%/core/%MOD_PKGPATH%/client/%ITEM%FeignClient.java.ftl
浏览文件 @ a8f07731
......@@ -49,14 +49,14 @@ public interface ${item.codeName}FeignClient {
<#-- ${return_type} ${srfmethodname(apiMethod.getCodeName())}(<#if req_param_type?? && req_param_type=='ENTITY'><#if apiMethod.getPSDEName()??>${apiMethod.getPSDEName()} entity</#if></#if>); -->
<#if apiMethod.getCodeName()?lower_case == 'get'>
@RequestMapping(method = RequestMethod.<#if apiMethod.getRequestMethod()??>${apiMethod.getRequestMethod()}<#else>POST</#if>, value = "${fullpath}/{${refDE.getKeyDEField().getCodeName()?lower_case}}")
${refDE.codeName} get(@PathVariable("${refDE.getKeyDEField().getCodeName()?lower_case}") ${srfjavatype(refDE.getKeyDEField().stdDataType)} ${refDE.getKeyDEField().getCodeName()?lower_case});
${refDE.codeName} get(@PathVariable("${refDE.getKeyDEField().getCodeName()?lower_case}") ${srfr7javatype(refDE.getKeyDEField().stdDataType)} ${refDE.getKeyDEField().getCodeName()?lower_case});
<#elseif apiMethod.getCodeName()?lower_case == 'remove'>
@RequestMapping(method = RequestMethod.<#if apiMethod.getRequestMethod()??>${apiMethod.getRequestMethod()}<#else>POST</#if>, value = "${fullpath}/{${refDE.getKeyDEField().getCodeName()?lower_case}}")
Boolean remove(@PathVariable("${refDE.getKeyDEField().getCodeName()?lower_case}") ${srfjavatype(refDE.getKeyDEField().stdDataType)} ${refDE.getKeyDEField().getCodeName()?lower_case});
Boolean remove(@PathVariable("${refDE.getKeyDEField().getCodeName()?lower_case}") ${srfr7javatype(refDE.getKeyDEField().stdDataType)} ${refDE.getKeyDEField().getCodeName()?lower_case});
@RequestMapping(method = RequestMethod.DELETE, value = "${fullpath}/batch}")
Boolean removeBatch(@RequestBody Collection<${srfjavatype(refDE.getKeyDEField().stdDataType)}> idList);
Boolean removeBatch(@RequestBody Collection<${srfr7javatype(refDE.getKeyDEField().stdDataType)}> idList);
<#elseif apiMethod.getCodeName()?lower_case == 'create'>
@RequestMapping(method = RequestMethod.<#if apiMethod.getRequestMethod()??>${apiMethod.getRequestMethod()}<#else>POST</#if>, value = "${fullpath}")
......@@ -82,7 +82,7 @@ public interface ${item.codeName}FeignClient {
<#elseif apiMethod.getCodeName()?lower_case == 'update'>
@RequestMapping(method = RequestMethod.<#if apiMethod.getRequestMethod()??>${apiMethod.getRequestMethod()}<#else>POST</#if>, value = "${fullpath}/{${refDE.getKeyDEField().getCodeName()?lower_case}}")
${refDE.codeName} update(@PathVariable("${refDE.getKeyDEField().getCodeName()?lower_case}") ${srfjavatype(refDE.getKeyDEField().stdDataType)} ${refDE.getKeyDEField().getCodeName()?lower_case},@RequestBody ${refDE.codeName} ${refDE.codeName?lower_case});
${refDE.codeName} update(@PathVariable("${refDE.getKeyDEField().getCodeName()?lower_case}") ${srfr7javatype(refDE.getKeyDEField().stdDataType)} ${refDE.getKeyDEField().getCodeName()?lower_case},@RequestBody ${refDE.codeName} ${refDE.codeName?lower_case});
@RequestMapping(method = RequestMethod.PUT, value = "${fullpath}/batch")
Boolean updateBatch(@RequestBody List<${refDE.codeName}> ${srfpluralize(refDE.getCodeName()?lower_case)});
......@@ -93,7 +93,7 @@ public interface ${item.codeName}FeignClient {
<#elseif apiMethod.getCodeName()?lower_case == 'savebatch'>
<#else>
@RequestMapping(method = RequestMethod.<#if apiMethod.getRequestMethod()??>${apiMethod.getRequestMethod()}<#else>POST</#if>, value = "${fullpath}/{${refDE.getKeyDEField().getCodeName()?lower_case}}/${apiMethod.getCodeName()?lower_case}")
${refDE.codeName} ${apiMethod.getCodeName()?uncap_first}(@PathVariable("${refDE.getKeyDEField().getCodeName()?lower_case}") ${srfjavatype(refDE.getKeyDEField().stdDataType)} ${refDE.getKeyDEField().getCodeName()?lower_case},@RequestBody ${refDE.codeName} ${refDE.codeName?lower_case});
${refDE.codeName} ${apiMethod.getCodeName()?uncap_first}(@PathVariable("${refDE.getKeyDEField().getCodeName()?lower_case}") ${srfr7javatype(refDE.getKeyDEField().stdDataType)} ${refDE.getKeyDEField().getCodeName()?lower_case},@RequestBody ${refDE.codeName} ${refDE.codeName?lower_case});
</#if>
<#elseif apiMethod.getActionType()=='SELECT'><#comment>简单查询</#comment>
......
SLN/%PUBPRJ%-core/src/main/java/%SYS_PKGPATH%/core/%MOD_PKGPATH%/filter/%DE%SearchContext.java.ftl
浏览文件 @ a8f07731
......@@ -47,7 +47,7 @@ public class ${item.codeName}SearchContext extends QueryWrapperContext<${item.co
@JsonFormat(pattern="HH:mm", timezone="GMT+8")
@JSONField(format="HH:mm")
</#if>
<#assign formItemDataType=srfjavatype(formitem.getPSDEField().stdDataType)>
<#assign formItemDataType=srfr7javatype(formitem.getPSDEField().stdDataType)>
<#comment>in条件通过String接，通过split拆后再进行查询</#comment>
<#if formitem.getValueOp() == "IN">
<#assign formItemDataType="String">
......@@ -156,7 +156,7 @@ public class ${item.codeName}SearchContext extends QueryBuildContext {
@JsonFormat(pattern="HH:mm", timezone="GMT+8")
@JSONField(format="HH:mm")
</#if>
<#assign formItemDataType=srfjavatype(formitem.getPSDEField().stdDataType)>
<#assign formItemDataType=srfr7javatype(formitem.getPSDEField().stdDataType)>
<#comment>in条件通过String接，通过split拆后再进行查询</#comment>
<#if formitem.getValueOp() == "IN">
<#assign formItemDataType="String">
......@@ -252,7 +252,7 @@ public class ${item.codeName}SearchContext extends SearchContextBase {
@JsonFormat(pattern="HH:mm", timezone="GMT+8")
@JSONField(format="HH:mm")
</#if>
<#assign formItemDataType=srfjavatype(formitem.getPSDEField().stdDataType)>
<#assign formItemDataType=srfr7javatype(formitem.getPSDEField().stdDataType)>
<#comment>in条件通过String接，通过split拆后再进行查询</#comment>
<#if formitem.getValueOp() == "IN">
<#assign formItemDataType="String">
......@@ -289,7 +289,7 @@ public class ${item.codeName}SearchContext extends SearchContextBase {
@JsonFormat(pattern="HH:mm", timezone="GMT+8")
@JSONField(format="HH:mm")
</#if>
<#assign formItemDataType=srfjavatype(formitem.getPSDEField().stdDataType)>
<#assign formItemDataType=srfr7javatype(formitem.getPSDEField().stdDataType)>
<#comment>in条件通过String接，通过split拆后再进行查询</#comment>
<#if formitem.getValueOp() == "IN">
<#assign formItemDataType="String">
......
SLN/%PUBPRJ%-core/src/main/java/%SYS_PKGPATH%/core/%MOD_PKGPATH%/service/I%DE%Service.java.ftl
浏览文件 @ a8f07731
......@@ -118,7 +118,7 @@ public interface I${item.codeName}Service{
<#elseif deaction.getActionType()=='DELOGIC'>
${item.codeName} ${srfmethodname(deaction.getCodeName())}(${item.codeName} et) ;
<#elseif deaction.codeName?lower_case == 'get'>
${item.codeName} get(${srfjavatype(keyfield.stdDataType)} key) ;
${item.codeName} get(${srfr7javatype(keyfield.stdDataType)} key) ;
<#elseif deaction.codeName?lower_case == "create">
boolean create(${item.codeName} et) ;
<#if item.isEnableEntityCache()==true>
......@@ -132,11 +132,11 @@ public interface I${item.codeName}Service{
</#if>
void updateBatch(List<${item.codeName}> list) ;
<#elseif deaction.codeName?lower_case == "remove">
boolean remove(${srfjavatype(keyfield.stdDataType)} key) ;
boolean remove(${srfr7javatype(keyfield.stdDataType)} key) ;
<#if item.isEnableEntityCache()==true>
@CacheEvict(value="${item.codeName?lower_case}",allEntries=true)
</#if>
void removeBatch(Collection<${srfjavatype(keyfield.stdDataType)}> idList) ;
void removeBatch(Collection<${srfr7javatype(keyfield.stdDataType)}> idList) ;
<#elseif deaction.codeName?lower_case == "save">
boolean save(${item.codeName} et) ;
<#if item.isEnableEntityCache()==true>
......@@ -176,11 +176,11 @@ public interface I${item.codeName}Service{
<#if de.getDefaultPSDEDataSet()??>
<#assign deDefaultDataSet=de.getDefaultPSDEDataSet()>
<#if deDefaultDataSet.getPSDEDataQueries()??>
List<${item.getCodeName()}> selectBy${srfcaseformat(MajorField.codeName,'l_u2lC')?cap_first}(${srfjavatype(MajorField.stdDataType)} ${MajorkeyField.codeName?lower_case}) ;
List<${item.getCodeName()}> selectBy${srfcaseformat(MajorField.codeName,'l_u2lC')?cap_first}(${srfr7javatype(MajorField.stdDataType)} ${MajorkeyField.codeName?lower_case}) ;
<#if item.isEnableEntityCache()==true>
@CacheEvict(value="${item.codeName?lower_case}",allEntries=true)
</#if>
void removeBy${srfcaseformat(MajorField.codeName,'l_u2lC')?cap_first}(${srfjavatype(MajorField.stdDataType)} ${MajorkeyField.codeName?lower_case}) ;
void removeBy${srfcaseformat(MajorField.codeName,'l_u2lC')?cap_first}(${srfr7javatype(MajorField.stdDataType)} ${MajorkeyField.codeName?lower_case}) ;
<#assign nested=MinorPSDER.isNestedRS()>
<#if nested == false && MinorPSDER.getMinorPSDataEntity().getAllPSDEServiceAPIs()??>
<#list MinorPSDER.getMinorPSDataEntity().getAllPSDEServiceAPIs() as api>
......@@ -193,7 +193,7 @@ public interface I${item.codeName}Service{
<#if item.isEnableEntityCache()==true>
@CacheEvict(value="${item.codeName?lower_case}",allEntries=true)
</#if>
void saveBy${srfcaseformat(MajorField.codeName,'l_u2lC')?cap_first}(${srfjavatype(MajorField.stdDataType)} ${MajorkeyField.codeName?lower_case},List<${item.getCodeName()}> list) ;
void saveBy${srfcaseformat(MajorField.codeName,'l_u2lC')?cap_first}(${srfr7javatype(MajorField.stdDataType)} ${MajorkeyField.codeName?lower_case},List<${item.getCodeName()}> list) ;
</#if>
</#if>
</#if>
......@@ -220,7 +220,7 @@ public interface I${item.codeName}Service{
<#elseif deaction.getActionType()=='DELOGIC'>
boolean test${srfmethodname(deaction.getCodeName())?cap_first}(${item.getCodeName()} et);
<#elseif deaction.getCodeName()?lower_case == 'get'>
boolean testGet(${srfjavatype(keyfield.stdDataType)} key);
boolean testGet(${srfr7javatype(keyfield.stdDataType)} key);
<#elseif deaction.getCodeName()?lower_case == "createbatch">
<#elseif deaction.getCodeName()?lower_case == "updatebatch">
<#elseif deaction.getCodeName()?lower_case == "removebatch">
......@@ -237,8 +237,8 @@ public interface I${item.codeName}Service{
boolean testSaveBatch(Collection<${item.getCodeName()}> list);
boolean testSaveBatch(List<${item.getCodeName()}> list);
<#elseif deaction.getCodeName()?lower_case == "remove">
boolean testRemove(${srfjavatype(keyfield.stdDataType)} key);
boolean testRemoveBatch(Collection<${srfjavatype(keyfield.stdDataType)}> idList);
boolean testRemove(${srfr7javatype(keyfield.stdDataType)} key);
boolean testRemoveBatch(Collection<${srfr7javatype(keyfield.stdDataType)}> idList);
<#elseif deaction.getCodeName()?lower_case == "getdraft">
boolean testGetDraft(${item.getCodeName()} et);
......
SLN/%PUBPRJ%-core/src/main/java/%SYS_PKGPATH%/core/%MOD_PKGPATH%/service/impl/%DE%ServiceImpl.java.ftl
浏览文件 @ a8f07731
......@@ -215,7 +215,7 @@ public class ${item.getCodeName()}ServiceImpl extends ServiceImpl<${de.getCodeNa
<#elseif deaction.getCodeName()?lower_case == 'get'>
@Override
<@transactionalAnno deaction/>
public ${item.getCodeName()} get(${srfjavatype(keyfield.stdDataType)} key) {
public ${item.getCodeName()} get(${srfr7javatype(keyfield.stdDataType)} key) {
<#comment>输出测试行为</#comment>
<@outputTestAction deaction "get"/>
<#comment>附加数据逻辑-操作前</#comment>
......@@ -455,7 +455,7 @@ public class ${item.getCodeName()}ServiceImpl extends ServiceImpl<${de.getCodeNa
<#elseif deaction.getCodeName()?lower_case == "remove">
@Override
<@transactionalAnno deaction/>
public boolean remove(${srfjavatype(keyfield.stdDataType)} key) {
public boolean remove(${srfr7javatype(keyfield.stdDataType)} key) {
<#comment>输出测试行为</#comment>
<@outputTestAction deaction "remove"/>
<#comment>附加数据逻辑-操作前，通过key构造entity传入逻辑中</#comment>
......@@ -487,7 +487,7 @@ public class ${item.getCodeName()}ServiceImpl extends ServiceImpl<${de.getCodeNa
}
@Override
public void removeBatch(Collection<${srfjavatype(keyfield.stdDataType)}> idList) {
public void removeBatch(Collection<${srfr7javatype(keyfield.stdDataType)}> idList) {
<#comment>输出测试行为</#comment>
<@outputTestAction deaction "removeBatch"/>
<#if hasPSDERsMapping>
......@@ -573,12 +573,12 @@ public class ${item.getCodeName()}ServiceImpl extends ServiceImpl<${de.getCodeNa
<#assign deDefaultDataSet=de.getDefaultPSDEDataSet()>
<#if deDefaultDataSet.getPSDEDataQueries()??>
@Override
public List<${item.getCodeName()}> selectBy${srfcaseformat(MajorField.codeName,'l_u2lC')?cap_first}(${srfjavatype(MajorField.stdDataType)} ${MajorkeyField.codeName?lower_case}) {
public List<${item.getCodeName()}> selectBy${srfcaseformat(MajorField.codeName,'l_u2lC')?cap_first}(${srfr7javatype(MajorField.stdDataType)} ${MajorkeyField.codeName?lower_case}) {
return baseMapper.selectBy${srfcaseformat(MajorField.codeName,'l_u2lC')?cap_first}(${MajorkeyField.codeName?lower_case});
}
@Override
public void removeBy${srfcaseformat(MajorField.codeName,'l_u2lC')?cap_first}(${srfjavatype(MajorField.stdDataType)} ${MajorkeyField.codeName?lower_case}) {
public void removeBy${srfcaseformat(MajorField.codeName,'l_u2lC')?cap_first}(${srfr7javatype(MajorField.stdDataType)} ${MajorkeyField.codeName?lower_case}) {
this.remove(new QueryWrapper<${item.getCodeName()}>().eq("${MajorField.getName()?lower_case}",${MajorkeyField.codeName?lower_case}));
}
......@@ -593,10 +593,10 @@ public class ${item.getCodeName()}ServiceImpl extends ServiceImpl<${de.getCodeNa
<#if nested>
<@autowiredProxyService/>
@Override
public void saveBy${srfcaseformat(MajorField.codeName,'l_u2lC')?cap_first}(${srfjavatype(MajorField.stdDataType)} ${MajorkeyField.codeName?lower_case},List<${item.getCodeName()}> list) {
public void saveBy${srfcaseformat(MajorField.codeName,'l_u2lC')?cap_first}(${srfr7javatype(MajorField.stdDataType)} ${MajorkeyField.codeName?lower_case},List<${item.getCodeName()}> list) {
if(list==null)
return;
Set<${srfjavatype(keyfield.stdDataType)}> delIds=new HashSet<${srfjavatype(keyfield.stdDataType)}>();
Set<${srfr7javatype(keyfield.stdDataType)}> delIds=new HashSet<${srfr7javatype(keyfield.stdDataType)}>();
List<${item.getCodeName()}> _update=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})){
......@@ -605,7 +605,7 @@ public class ${item.getCodeName()}ServiceImpl extends ServiceImpl<${de.getCodeNa
for(${item.getCodeName()} sub:list) {
sub.set${srfcaseformat(MajorField.codeName,'l_u2lC')?cap_first}(${MajorkeyField.codeName?lower_case});
if(ObjectUtils.isEmpty(sub.get${srfcaseformat(keyfield.getCodeName(),'l_u2lC')?cap_first}()))
sub.set${srfcaseformat(keyfield.getCodeName(),'l_u2lC')?cap_first}((${srfjavatype(keyfield.stdDataType)})sub.getDefaultKey(true));
sub.set${srfcaseformat(keyfield.getCodeName(),'l_u2lC')?cap_first}((${srfr7javatype(keyfield.stdDataType)})sub.getDefaultKey(true));
if(delIds.contains(sub.get${srfcaseformat(keyfield.getCodeName(),'l_u2lC')?cap_first}())) {
delIds.remove(sub.get${srfcaseformat(keyfield.getCodeName(),'l_u2lC')?cap_first}());
_update.add(sub);
......@@ -825,7 +825,7 @@ public class ${item.getCodeName()}ServiceImpl extends ServiceImpl<${de.getCodeNa
*/
private void createIndexMajorEntityData(${de.codeName} et){
if(ObjectUtils.isEmpty(et.get${srfcaseformat(keyfield.codeName,'l_u2lC')?cap_first}()))
et.set${srfcaseformat(keyfield.codeName,'l_u2lC')?cap_first}((${srfjavatype(keyfield.stdDataType)})et.getDefaultKey(true));
et.set${srfcaseformat(keyfield.codeName,'l_u2lC')?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);
<#if majorIndexDE.getIndexTypePSDEField()??>
${majorIndexDECodeName?lower_case}.set("${majorIndexDE.getIndexTypePSDEField().codeName?lower_case}","${indexPSDER.getTypeValue()}");
......@@ -973,7 +973,7 @@ public class ${item.getCodeName()}ServiceImpl implements I${de.getCodeName()}Ser
<#elseif deaction.getCodeName()?lower_case == 'get'>
@Override
<@transactionalAnno deaction/>
public ${item.getCodeName()} get(${srfjavatype(keyfield.stdDataType)} key) {
public ${item.getCodeName()} get(${srfr7javatype(keyfield.stdDataType)} key) {
<@outputTestAction deaction "get"/>
<@buildEntityParam deaction/>
<@addGetActionBoforeLogic deaction/>
......@@ -1171,7 +1171,7 @@ public class ${item.getCodeName()}ServiceImpl implements I${de.getCodeName()}Ser
<#elseif deaction.getCodeName()?lower_case == "remove">
@Override
<@transactionalAnno deaction/>
public boolean remove(${srfjavatype(keyfield.stdDataType)} key) {
public boolean remove(${srfr7javatype(keyfield.stdDataType)} key) {
<@outputTestAction deaction "remove"/>
<#comment>附加数据逻辑-操作前</#comment>
<@buildEntityParam deaction/>
......@@ -1192,7 +1192,7 @@ public class ${item.getCodeName()}ServiceImpl implements I${de.getCodeName()}Ser
}
@Override
public void removeBatch(Collection<${srfjavatype(keyfield.stdDataType)}> idList) {
public void removeBatch(Collection<${srfr7javatype(keyfield.stdDataType)}> idList) {
<@outputTestAction deaction "removeBatch"/>
repository.deleteAll(repository.findAllById(idList));
}
......@@ -1250,7 +1250,7 @@ public class ${item.getCodeName()}ServiceImpl implements I${de.getCodeName()}Ser
<#assign deDefaultDataSet=de.getDefaultPSDEDataSet()>
<#if deDefaultDataSet.getPSDEDataQueries()??>
@Override
public List<${item.getCodeName()}> selectBy${srfcaseformat(MajorField.codeName,'l_u2lC')?cap_first}(${srfjavatype(MajorField.stdDataType)} ${MajorkeyField.codeName?lower_case}) {
public List<${item.getCodeName()}> selectBy${srfcaseformat(MajorField.codeName,'l_u2lC')?cap_first}(${srfr7javatype(MajorField.stdDataType)} ${MajorkeyField.codeName?lower_case}) {
${item.getCodeName()}SearchContext context=new ${item.getCodeName()}SearchContext();
context.setN_${MajorField.name?lower_case}_eq(${MajorkeyField.codeName?lower_case});
Query query = new BasicQuery(context.getSelectCond().get().toString());
......@@ -1258,8 +1258,8 @@ public class ${item.getCodeName()}ServiceImpl implements I${de.getCodeName()}Ser
}
@Override
public void removeBy${srfcaseformat(MajorField.codeName,'l_u2lC')?cap_first}(${srfjavatype(MajorField.stdDataType)} ${MajorkeyField.codeName?lower_case}) {
Set<${srfjavatype(keyfield.stdDataType)}> delIds=new HashSet<${srfjavatype(keyfield.stdDataType)}>();
public void removeBy${srfcaseformat(MajorField.codeName,'l_u2lC')?cap_first}(${srfr7javatype(MajorField.stdDataType)} ${MajorkeyField.codeName?lower_case}) {
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})){
delIds.add(before.get${srfcaseformat(keyfield.getCodeName(),'l_u2lC')?cap_first}());
}
......@@ -1278,10 +1278,10 @@ public class ${item.getCodeName()}ServiceImpl implements I${de.getCodeName()}Ser
<#if nested>
<@autowiredProxyService/>
@Override
public void saveBy${srfcaseformat(MajorField.codeName,'l_u2lC')?cap_first}(${srfjavatype(MajorField.stdDataType)} ${MajorkeyField.codeName?lower_case},List<${item.getCodeName()}> list) {
public void saveBy${srfcaseformat(MajorField.codeName,'l_u2lC')?cap_first}(${srfr7javatype(MajorField.stdDataType)} ${MajorkeyField.codeName?lower_case},List<${item.getCodeName()}> list) {
if(list==null)
return;
Set<${srfjavatype(keyfield.stdDataType)}> delIds=new HashSet<${srfjavatype(keyfield.stdDataType)}>();
Set<${srfr7javatype(keyfield.stdDataType)}> delIds=new HashSet<${srfr7javatype(keyfield.stdDataType)}>();
List<${item.getCodeName()}> _update=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})){
......@@ -1290,7 +1290,7 @@ public class ${item.getCodeName()}ServiceImpl implements I${de.getCodeName()}Ser
for(${item.getCodeName()} sub:list) {
sub.set${srfcaseformat(MajorField.codeName,'l_u2lC')?cap_first}(${MajorkeyField.codeName?lower_case});
if(ObjectUtils.isEmpty(sub.get${srfcaseformat(keyfield.getCodeName(),'l_u2lC')?cap_first}()))
sub.set${srfcaseformat(keyfield.getCodeName(),'l_u2lC')?cap_first}((${srfjavatype(keyfield.stdDataType)})sub.getDefaultKey(true));
sub.set${srfcaseformat(keyfield.getCodeName(),'l_u2lC')?cap_first}((${srfr7javatype(keyfield.stdDataType)})sub.getDefaultKey(true));
if(delIds.contains(sub.get${srfcaseformat(keyfield.getCodeName(),'l_u2lC')?cap_first}())) {
delIds.remove(sub.get${srfcaseformat(keyfield.getCodeName(),'l_u2lC')?cap_first}());
_update.add(sub);
......@@ -1443,7 +1443,7 @@ public class ${item.getCodeName()}ServiceImpl implements I${de.getCodeName()}Ser
<#elseif deaction.getCodeName()?lower_case == 'get'>
@Override
public ${item.getCodeName()} get(${srfjavatype(keyfield.stdDataType)} ${keyfield.getCodeName()?lower_case}) {
public ${item.getCodeName()} get(${srfr7javatype(keyfield.stdDataType)} ${keyfield.getCodeName()?lower_case}) {
<@outputTestAction deaction "get"/>
<#if item.isEnableAPIStorage()>
<#if deaction.getPSSubSysServiceAPIDEMethod()?? >
......@@ -1618,7 +1618,7 @@ public class ${item.getCodeName()}ServiceImpl implements I${de.getCodeName()}Ser
<#if deaction.getPSSubSysServiceAPIDEMethod()?? >
<#comment>附加数据逻辑-操作前</#comment>
<@addBoforeLogic deaction/>
if(et.get${srfcaseformat(keyfield.codeName,'l_u2lC')?cap_first}()==null) et.set${srfcaseformat(keyfield.codeName,'l_u2lC')?cap_first}((${srfjavatype(keyfield.stdDataType)})et.getDefaultKey(true));
if(et.get${srfcaseformat(keyfield.codeName,'l_u2lC')?cap_first}()==null) et.set${srfcaseformat(keyfield.codeName,'l_u2lC')?cap_first}((${srfr7javatype(keyfield.stdDataType)})et.getDefaultKey(true));
if(!${subSysServiceApiDECodeName?uncap_first}FeignClient.save(et))
return false;
<#comment>1：N关系中，在父实体中创建子实体的List集合</#comment>
......@@ -1669,7 +1669,7 @@ public class ${item.getCodeName()}ServiceImpl implements I${de.getCodeName()}Ser
<#elseif deaction.getCodeName()?lower_case == "remove">
@Override
public boolean remove(${srfjavatype(keyfield.stdDataType)} ${keyfield.getCodeName()?lower_case}) {
public boolean remove(${srfr7javatype(keyfield.stdDataType)} ${keyfield.getCodeName()?lower_case}) {
<@outputTestAction deaction "remove"/>
<#if de.getMajorPSDERs()??>
<#list de.getMajorPSDERs() as der>
......@@ -1697,7 +1697,7 @@ public class ${item.getCodeName()}ServiceImpl implements I${de.getCodeName()}Ser
</#if>
}
public void removeBatch(Collection<${srfjavatype(keyfield.stdDataType)}> idList){
public void removeBatch(Collection<${srfr7javatype(keyfield.stdDataType)}> idList){
<@outputTestAction deaction "removeBatch"/>
<#if item.isEnableAPIStorage()>
<#if deaction.getPSSubSysServiceAPIDEMethod()?? >
......@@ -1782,7 +1782,7 @@ public class ${item.getCodeName()}ServiceImpl implements I${de.getCodeName()}Ser
<#assign deDefaultDataSet=de.getDefaultPSDEDataSet()>
<#if deDefaultDataSet.getPSDEDataQueries()??>
@Override
public List<${item.getCodeName()}> selectBy${srfcaseformat(MajorField.codeName,'l_u2lC')?cap_first}(${srfjavatype(MajorField.stdDataType)} ${MajorkeyField.codeName?lower_case}) {
public List<${item.getCodeName()}> selectBy${srfcaseformat(MajorField.codeName,'l_u2lC')?cap_first}(${srfr7javatype(MajorField.stdDataType)} ${MajorkeyField.codeName?lower_case}) {
${item.getCodeName()}SearchContext context=new ${item.getCodeName()}SearchContext();
context.setSize(Integer.MAX_VALUE);
context.setN_${MajorField.name?lower_case}_eq(${MajorkeyField.codeName?lower_case});
......@@ -1790,8 +1790,8 @@ public class ${item.getCodeName()}ServiceImpl implements I${de.getCodeName()}Ser
}
@Override
public void removeBy${srfcaseformat(MajorField.codeName,'l_u2lC')?cap_first}(${srfjavatype(MajorField.stdDataType)} ${MajorkeyField.codeName?lower_case}) {
Set<${srfjavatype(keyfield.stdDataType)}> delIds=new HashSet<${srfjavatype(keyfield.stdDataType)}>();
public void removeBy${srfcaseformat(MajorField.codeName,'l_u2lC')?cap_first}(${srfr7javatype(MajorField.stdDataType)} ${MajorkeyField.codeName?lower_case}) {
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})){
delIds.add(before.get${srfcaseformat(keyfield.getCodeName(),'l_u2lC')?cap_first}());
}
......@@ -1810,10 +1810,10 @@ public class ${item.getCodeName()}ServiceImpl implements I${de.getCodeName()}Ser
<#if nested>
<@autowiredProxyService/>
@Override
public void saveBy${srfcaseformat(MajorField.codeName,'l_u2lC')?cap_first}(${srfjavatype(MajorField.stdDataType)} ${MajorkeyField.codeName?lower_case},List<${item.getCodeName()}> list) {
public void saveBy${srfcaseformat(MajorField.codeName,'l_u2lC')?cap_first}(${srfr7javatype(MajorField.stdDataType)} ${MajorkeyField.codeName?lower_case},List<${item.getCodeName()}> list) {
if(list==null)
return;
Set<${srfjavatype(keyfield.stdDataType)}> delIds=new HashSet<${srfjavatype(keyfield.stdDataType)}>();
Set<${srfr7javatype(keyfield.stdDataType)}> delIds=new HashSet<${srfr7javatype(keyfield.stdDataType)}>();
List<${item.getCodeName()}> _update=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})){
......@@ -1822,7 +1822,7 @@ public class ${item.getCodeName()}ServiceImpl implements I${de.getCodeName()}Ser
for(${item.getCodeName()} sub:list) {
sub.set${srfcaseformat(MajorField.codeName,'l_u2lC')?cap_first}(${MajorkeyField.codeName?lower_case});
if(ObjectUtils.isEmpty(sub.get${srfcaseformat(keyfield.getCodeName(),'l_u2lC')?cap_first}()))
sub.set${srfcaseformat(keyfield.getCodeName(),'l_u2lC')?cap_first}((${srfjavatype(keyfield.stdDataType)})sub.getDefaultKey(true));
sub.set${srfcaseformat(keyfield.getCodeName(),'l_u2lC')?cap_first}((${srfr7javatype(keyfield.stdDataType)})sub.getDefaultKey(true));
if(delIds.contains(sub.get${srfcaseformat(keyfield.getCodeName(),'l_u2lC')?cap_first}())) {
delIds.remove(sub.get${srfcaseformat(keyfield.getCodeName(),'l_u2lC')?cap_first}());
_update.add(sub);
......@@ -1963,7 +1963,7 @@ public class ${item.getCodeName()}ServiceImpl implements I${de.getCodeName()}Ser
<#elseif deaction.getCodeName()?lower_case == 'get'>
@Override
public ${item.getCodeName()} get(${srfjavatype(keyfield.stdDataType)} key) {
public ${item.getCodeName()} get(${srfr7javatype(keyfield.stdDataType)} key) {
<@outputTestAction deaction "get"/>
<#comment>附加数据逻辑-操作前</#comment>
<@buildEntityParam deaction/>
......@@ -2031,7 +2031,7 @@ public class ${item.getCodeName()}ServiceImpl implements I${de.getCodeName()}Ser
<#elseif deaction.getCodeName()?lower_case == "remove">
@Override
public boolean remove(${srfjavatype(keyfield.stdDataType)} key) {
public boolean remove(${srfr7javatype(keyfield.stdDataType)} key) {
<@outputTestAction deaction "remove"/>
<#comment>附加数据逻辑-操作前</#comment>
<@buildEntityParam deaction/>
......@@ -2041,7 +2041,7 @@ public class ${item.getCodeName()}ServiceImpl implements I${de.getCodeName()}Ser
return true;
}
public void removeBatch(Collection<${srfjavatype(keyfield.stdDataType)}> idList){
public void removeBatch(Collection<${srfr7javatype(keyfield.stdDataType)}> idList){
<@outputTestAction deaction "removeBatch"/>
}
......@@ -2099,13 +2099,13 @@ public class ${item.getCodeName()}ServiceImpl implements I${de.getCodeName()}Ser
<#assign deDefaultDataSet=de.getDefaultPSDEDataSet()>
<#if deDefaultDataSet.getPSDEDataQueries()??>
@Override
public List<${item.getCodeName()}> selectBy${srfcaseformat(MajorField.codeName,'l_u2lC')?cap_first}(${srfjavatype(MajorField.stdDataType)} ${MajorkeyField.codeName?lower_case}) {
public List<${item.getCodeName()}> selectBy${srfcaseformat(MajorField.codeName,'l_u2lC')?cap_first}(${srfr7javatype(MajorField.stdDataType)} ${MajorkeyField.codeName?lower_case}) {
return null;
}
@Override
public void removeBy${srfcaseformat(MajorField.codeName,'l_u2lC')?cap_first}(${srfjavatype(MajorField.stdDataType)} ${MajorkeyField.codeName?lower_case}) {
Set<${srfjavatype(keyfield.stdDataType)}> delIds=new HashSet<${srfjavatype(keyfield.stdDataType)}>();
public void removeBy${srfcaseformat(MajorField.codeName,'l_u2lC')?cap_first}(${srfr7javatype(MajorField.stdDataType)} ${MajorkeyField.codeName?lower_case}) {
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})){
delIds.add(before.get${srfcaseformat(keyfield.getCodeName(),'l_u2lC')?cap_first}());
}
......@@ -2124,10 +2124,10 @@ public class ${item.getCodeName()}ServiceImpl implements I${de.getCodeName()}Ser
<#if nested>
<@autowiredProxyService/>
@Override
public void saveBy${srfcaseformat(MajorField.codeName,'l_u2lC')?cap_first}(${srfjavatype(MajorField.stdDataType)} ${MajorkeyField.codeName?lower_case},List<${item.getCodeName()}> list) {
public void saveBy${srfcaseformat(MajorField.codeName,'l_u2lC')?cap_first}(${srfr7javatype(MajorField.stdDataType)} ${MajorkeyField.codeName?lower_case},List<${item.getCodeName()}> list) {
if(list==null)
return;
Set<${srfjavatype(keyfield.stdDataType)}> delIds=new HashSet<${srfjavatype(keyfield.stdDataType)}>();
Set<${srfr7javatype(keyfield.stdDataType)}> delIds=new HashSet<${srfr7javatype(keyfield.stdDataType)}>();
List<${item.getCodeName()}> _update=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})){
......@@ -2136,7 +2136,7 @@ public class ${item.getCodeName()}ServiceImpl implements I${de.getCodeName()}Ser
for(${item.getCodeName()} sub:list) {
sub.set${srfcaseformat(MajorField.codeName,'l_u2lC')?cap_first}(${MajorkeyField.codeName?lower_case});
if(ObjectUtils.isEmpty(sub.get${srfcaseformat(keyfield.getCodeName(),'l_u2lC')?cap_first}()))
sub.set${srfcaseformat(keyfield.getCodeName(),'l_u2lC')?cap_first}((${srfjavatype(keyfield.stdDataType)})sub.getDefaultKey(true));
sub.set${srfcaseformat(keyfield.getCodeName(),'l_u2lC')?cap_first}((${srfr7javatype(keyfield.stdDataType)})sub.getDefaultKey(true));
if(delIds.contains(sub.get${srfcaseformat(keyfield.getCodeName(),'l_u2lC')?cap_first}())) {
delIds.remove(sub.get${srfcaseformat(keyfield.getCodeName(),'l_u2lC')?cap_first}());
_update.add(sub);
......@@ -2374,7 +2374,7 @@ public class ${item.getCodeName()}ServiceImpl implements I${de.getCodeName()}Ser
}
<#elseif deaction.getCodeName()?lower_case == 'get'>
public boolean testGet(${srfjavatype(keyfield.stdDataType)} key) {
public boolean testGet(${srfr7javatype(keyfield.stdDataType)} key) {
return true;
}
......@@ -2418,11 +2418,11 @@ public class ${item.getCodeName()}ServiceImpl implements I${de.getCodeName()}Ser
}
<#elseif deaction.getCodeName()?lower_case == "remove">
public boolean testRemove(${srfjavatype(keyfield.stdDataType)} key) {
public boolean testRemove(${srfr7javatype(keyfield.stdDataType)} key) {
return true;
}
public boolean testRemoveBatch(Collection<${srfjavatype(keyfield.stdDataType)}> idList) {
public boolean testRemoveBatch(Collection<${srfr7javatype(keyfield.stdDataType)}> idList) {
return true;
}
......
SLN/%PUBPRJ%-core/src/main/java/%SYS_PKGPATH%/core/extensions/service/%DE%ExService.java.ftl
浏览文件 @ a8f07731
......@@ -88,7 +88,7 @@ public class ${item.codeName}ExService extends ${item.codeName}ServiceImpl {
<#elseif deaction.getCodeName()?lower_case == 'get'>
@Override
public boolean testGet(${srfjavatype(keyfield.stdDataType)} key) {
public boolean testGet(${srfr7javatype(keyfield.stdDataType)} key) {
return super.testGet(key);
}
......@@ -141,12 +141,12 @@ public class ${item.codeName}ExService extends ${item.codeName}ServiceImpl {
<#elseif deaction.getCodeName()?lower_case == "remove">
@Override
public boolean testRemove(${srfjavatype(keyfield.stdDataType)} key) {
public boolean testRemove(${srfr7javatype(keyfield.stdDataType)} key) {
return super.testRemove(key);
}
@Override
public boolean testRemoveBatch(Collection<${srfjavatype(keyfield.stdDataType)}> idList) {
public boolean testRemoveBatch(Collection<${srfr7javatype(keyfield.stdDataType)}> idList) {
return super.testRemoveBatch(idList);
}
......
SLN/%PUBPRJ%-core/src/main/resources/liquibase/h2_table.xml.ftl
浏览文件 @ a8f07731
......@@ -33,7 +33,7 @@ TARGET=PSSYSTEM
<#list de.getAllPSDEFields() as defield>
<#if defield.isPhisicalDEField()==true><#comment>物理属性</#comment>
<#assign dataType="${srfdatatype(defield.getStdDataType())}">
<#assign javaType="${srfjavatype(defield.stdDataType)}">
<#assign javaType="${srfr7javatype(defield.stdDataType)}">
<#comment>varchar需要设置字段长度，若不设置，则liquibase比较时会自动填充，最终恢复到生产库会报错</#comment>
<#if javaType=='String'>
<#if defield.getLength()?? && defield.getLength()?c!='-1'>
......
SLN/%PUBPRJ%-provider/%PUBPRJ%-provider-%SYSAPI_PKGPATH%/src/main/java/%SYS_PKGPATH%/%SYSAPI_PKGPATH%/dto/%ITEM%DTO.java.ftl
浏览文件 @ a8f07731
......@@ -62,7 +62,7 @@ public class ${item.getCodeName()}DTO extends ${dtoBase} implements Serializable
@JSONField(name = "${jsonfield}")
</#if>
@JsonProperty("${jsonfield}")
private ${srfjavatype(apifield.getStdDataType())} ${prvateCodeName};
private ${srfr7javatype(apifield.getStdDataType())} ${prvateCodeName};
</#if>
</#list>
......@@ -81,7 +81,7 @@ public class ${item.getCodeName()}DTO extends ${dtoBase} implements Serializable
/**
* 设置 [${apifield.getName()}]
*/
public void set${publicCodeName}(${srfjavatype(apifield.getStdDataType())} ${prvateCodeName}){
public void set${publicCodeName}(${srfr7javatype(apifield.getStdDataType())} ${prvateCodeName}){
this.${prvateCodeName} = ${prvateCodeName} ;
this.modify("${columnname}",${prvateCodeName});
}
......
SLN/%PUBPRJ%-provider/%PUBPRJ%-provider-%SYSAPI_PKGPATH%/src/main/java/%SYS_PKGPATH%/%SYSAPI_PKGPATH%/rest/%ITEM%Resource.java.ftl
浏览文件 @ a8f07731
......@@ -128,10 +128,10 @@ public class ${itemCodeName}Resource {
<#assign etParamsList = etParamsList + "@RequestBody List<" + itemCodeName + "DTO> " + itemCodeNameLC + "dtos">
<#assign etParams2 = etParams2 + itemCodeName + "DTO " + itemCodeNameLC + "dto">
<#assign etParams3 = etParams3 + itemCodeNameLC + "dto">
<#assign idParams = idParams + "@PathVariable(\"" + itemCodeNameLC + keyCNLC + "\") " + srfjavatype(de.getKeyPSDEField().getStdDataType()) + " " + itemCodeNameLC + keyCNLC >
<#assign idParams2 = idParams2 + " " + srfjavatype(de.getKeyPSDEField().getStdDataType()) + " " + itemCodeNameLC + keyCNLC >
<#assign idParams = idParams + "@PathVariable(\"" + itemCodeNameLC + keyCNLC + "\") " + srfr7javatype(de.getKeyPSDEField().getStdDataType()) + " " + itemCodeNameLC + keyCNLC >
<#assign idParams2 = idParams2 + " " + srfr7javatype(de.getKeyPSDEField().getStdDataType()) + " " + itemCodeNameLC + keyCNLC >
<#assign idParams3 = idParams3 + " " + itemCodeNameLC + keyCNLC >
<#assign id_etParams = id_etParams + "@PathVariable(\"" + itemCodeNameLC + keyCNLC + "\") " + srfjavatype(de.getKeyPSDEField().getStdDataType())+" " + itemCodeNameLC + keyCNLC + ", @RequestBody " + itemCodeName + "DTO " + itemCodeNameLC + "dto" >
<#assign id_etParams = id_etParams + "@PathVariable(\"" + itemCodeNameLC + keyCNLC + "\") " + srfr7javatype(de.getKeyPSDEField().getStdDataType())+" " + itemCodeNameLC + keyCNLC + ", @RequestBody " + itemCodeName + "DTO " + itemCodeNameLC + "dto" >
<#assign id_etParams4 = id_etParams4 + "@RequestBody " + itemCodeName + "DTO " + itemCodeNameLC + "dto" >
<#assign id_etParams4_batch = id_etParams4_batch + "@RequestBody List<" + itemCodeName + "DTO> " + itemCodeNameLC + "dtos" >
<#assign dtoCodeName=itemCodeName + "DTO">
......@@ -218,7 +218,7 @@ public class ${itemCodeName}Resource {
<@SecurityBatchAnnotation deaction/>
@ApiOperation(value = "批量删除${deLogicName}", tags = {"${deLogicName}" }, notes = "批量删除${deLogicName}")
@RequestMapping(method = RequestMethod.DELETE, value = "${fullPath}/batch")
public ResponseEntity<Boolean> removeBatch(@RequestBody List<${srfjavatype(de.getKeyPSDEField().getStdDataType())}> ids) {
public ResponseEntity<Boolean> removeBatch(@RequestBody List<${srfr7javatype(de.getKeyPSDEField().getStdDataType())}> ids) {
${deCodeNameLC}Service.removeBatch(ids);
return ResponseEntity.status(HttpStatus.OK).body(true);
}
......@@ -355,14 +355,14 @@ public class ${itemCodeName}Resource {
<#if rs_index != 0 && parentParams!= "">
<#assign parentParams += ", ">
</#if>
<#assign parentParams += "@PathVariable(\"" + rsMainDeCNLC + keyCNLC + "\") " + srfjavatype(rsMainDePKDataType) + " " + rsMainDeCNLC + keyCNLC >
<#assign parentParams += "@PathVariable(\"" + rsMainDeCNLC + keyCNLC + "\") " + srfr7javatype(rsMainDePKDataType) + " " + rsMainDeCNLC + keyCNLC >
<#assign byParams += rsMainDeCN >
<#assign byTagParams += rsMainDeLogicName >
<#if rs.getPSDER1N()?? && apiRsPathLast.getCodeName() == rs.getCodeName()>
<#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 +");" >
</#if>
<#assign parentParams2 += "" + srfjavatype(rsMainDePKDataType)+" " + rsMainDeCNLC + keyCNLC >
<#assign parentParams2 += "" + srfr7javatype(rsMainDePKDataType)+" " + rsMainDeCNLC + keyCNLC >
<#assign parentParams3 += "" + rsMainDeCNLC + keyCNLC >
</#list>
<#if parentParams != "" >
......@@ -381,10 +381,10 @@ public class ${itemCodeName}Resource {
<#assign etParamsList = etParamsList + "@RequestBody List<" + itemCodeName + "DTO> " + itemCodeNameLC + "dtos">
<#assign etParams2 = etParams2 + itemCodeName + "DTO " + itemCodeNameLC + "dto">
<#assign etParams3 = etParams3 + itemCodeNameLC + "dto">
<#assign idParams = idParams + "@PathVariable(\"" + itemCodeNameLC + keyCNLC + "\") " + srfjavatype(de.getKeyPSDEField().getStdDataType()) + " " + itemCodeNameLC + keyCNLC >
<#assign idParams2 = idParams2 + " " + srfjavatype(de.getKeyPSDEField().getStdDataType()) + " " + itemCodeNameLC + keyCNLC >
<#assign idParams = idParams + "@PathVariable(\"" + itemCodeNameLC + keyCNLC + "\") " + srfr7javatype(de.getKeyPSDEField().getStdDataType()) + " " + itemCodeNameLC + keyCNLC >
<#assign idParams2 = idParams2 + " " + srfr7javatype(de.getKeyPSDEField().getStdDataType()) + " " + itemCodeNameLC + keyCNLC >
<#assign idParams3 = idParams3 + " " + itemCodeNameLC + keyCNLC >
<#assign id_etParams = id_etParams + "@PathVariable(\"" + itemCodeNameLC + keyCNLC + "\") " + srfjavatype(de.getKeyPSDEField().getStdDataType())+" " + itemCodeNameLC + keyCNLC + ", @RequestBody " + itemCodeName + "DTO " + itemCodeNameLC + "dto" >
<#assign id_etParams = id_etParams + "@PathVariable(\"" + itemCodeNameLC + keyCNLC + "\") " + srfr7javatype(de.getKeyPSDEField().getStdDataType())+" " + itemCodeNameLC + keyCNLC + ", @RequestBody " + itemCodeName + "DTO " + itemCodeNameLC + "dto" >
<#assign id_etParams4 = id_etParams4 + "@RequestBody " + itemCodeName + "DTO " + itemCodeNameLC + "dto" >
<#assign id_etParams4_batch = id_etParams4_batch + "@RequestBody List<" + itemCodeName + "DTO> " + itemCodeNameLC + "dtos" >
<#assign fullPath = parentPath + selfPath>
......@@ -449,7 +449,7 @@ public class ${itemCodeName}Resource {
<#assign subDTOs = srfpluralize(deMinApiCN)?lower_case >
List<${deMinApiCN}DTO> ${deMinApiCNLC}dtos = ${itemCodeNameLC}dto.get${subDTOs?cap_first}();
Page<${deapide.getCodeName()}> ${deMinApiCNLC}DOs = ${deapide.getCodeName()?lower_case}Service.selectBy${apider.getPSDER1N().getCodeName()}(${itemCodeNameLC + keyCNLC});
List<${srfjavatype(deapide.getKeyPSDEField().getStdDataType())}> ${deMinApiCNLC}Ids = new ArrayList<${srfjavatype(deapide.getKeyPSDEField().getStdDataType())}>();
List<${srfr7javatype(deapide.getKeyPSDEField().getStdDataType())}> ${deMinApiCNLC}Ids = new ArrayList<${srfr7javatype(deapide.getKeyPSDEField().getStdDataType())}>();
if (${deMinApiCNLC}DOs != null && !${deMinApiCNLC}DOs.isEmpty()) {
for (${deapide.getCodeName()} minorDO : ${deMinApiCNLC}DOs) {
${deMinApiCNLC}Ids.add(minorDO.get${deapide.getKeyPSDEField().getCodeName()?cap_first}());
......@@ -503,7 +503,7 @@ public class ${itemCodeName}Resource {
<@SecurityBatchAnnotation deaction/>
@ApiOperation(value = "${byTagParams}批量删除${deLogicName}", tags = {"${deLogicName}" }, notes = "${byTagParams}批量删除${deLogicName}")
@RequestMapping(method = RequestMethod.DELETE, value = "${fullPath}/batch")
public ResponseEntity<Boolean> removeBatch${byParams}(@RequestBody List<${srfjavatype(de.getKeyPSDEField().getStdDataType())}> ids) {
public ResponseEntity<Boolean> removeBatch${byParams}(@RequestBody List<${srfr7javatype(de.getKeyPSDEField().getStdDataType())}> ids) {
${deCodeNameLC}Service.removeBatch(ids);
return ResponseEntity.status(HttpStatus.OK).body(true);
}
......@@ -789,7 +789,7 @@ public class ${itemCodeName}Resource {
<@SecurityBatchAnnotation deaction/>
@ApiOperation(value = "批量删除${deLogicName}", tags = {"${deLogicName}" }, notes = "批量删除${deLogicName}")
@RequestMapping(method = RequestMethod.DELETE, value = "${fullPath}/batch/test")
public ResponseEntity<Boolean> testRemoveBatch(@RequestBody List<${srfjavatype(de.getKeyPSDEField().getStdDataType())}> ids) {
public ResponseEntity<Boolean> testRemoveBatch(@RequestBody List<${srfr7javatype(de.getKeyPSDEField().getStdDataType())}> ids) {
return ResponseEntity.status(HttpStatus.OK).body(${deCodeNameLC}Service.testRemoveBatch(ids));
}
......@@ -897,7 +897,7 @@ public class ${itemCodeName}Resource {
<@SecurityBatchAnnotation deaction/>
@ApiOperation(value = "${byTagParams}批量删除${deLogicName}", tags = {"${deLogicName}" }, notes = "${byTagParams}批量删除${deLogicName}")
@RequestMapping(method = RequestMethod.DELETE, value = "${fullPath}/batch/test")
public ResponseEntity<Boolean> testRemoveBatch${byParams}(@RequestBody List<${srfjavatype(de.getKeyPSDEField().getStdDataType())}> ids) {
public ResponseEntity<Boolean> testRemoveBatch${byParams}(@RequestBody List<${srfr7javatype(de.getKeyPSDEField().getStdDataType())}> ids) {
return ResponseEntity.status(HttpStatus.OK).body(${deCodeNameLC}Service.testRemoveBatch(ids));
}
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或