cloud
/
cloud-modules-gen
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

aa

master
Cui YongXing 2024-08-23 01:22:14 +08:00
parent ebad9ff44e
commit 1c902d51d6
6 changed files with 356 additions and 338 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/resources/bootstrap.yml
View File

@ -4,7 +4,7 @@ server:
# nacos线上地址 # nacos线上地址
nacos: nacos:
addr: 47.116.176.140:8848 addr: 12.2.0.252:8848
user-name: nacos user-name: nacos
password: nacos password: nacos
namespace: muyu-cloud namespace: muyu-cloud

152
src/main/resources/vm/java/controller.java.vm
View File

@ -37,80 +37,80 @@ public class ${ClassName}Controller extends BaseController
{ {
@Autowired @Autowired
private I${ClassName}Service ${className}Service; private I${ClassName}Service ${className}Service;
##
/** ## /**
* 查询${functionName}列表 ## * 查询${functionName}列表
*/ ## */
@RequiresPermissions("${permissionPrefix}:list") ## @RequiresPermissions("${permissionPrefix}:list")
@GetMapping("/list") ## @GetMapping("/list")
#if($table.crud || $table.sub) ###if($table.crud || $table.sub)
public Result<TableDataInfo> list(${ClassName} ${className}) ## public Result<TableDataInfo> list(${ClassName} ${className})
{ ## {
startPage(); ## startPage();
List<${ClassName}> list = ${className}Service.select${ClassName}List(${className}); ## List<${ClassName}> list = ${className}Service.select${ClassName}List(${className});
return getDataTable(list); ## return getDataTable(list);
} ## }
#elseif($table.tree) ###elseif($table.tree)
public Result list(${ClassName} ${className}) ## public Result list(${ClassName} ${className})
{ ## {
List<${ClassName}> list = ${className}Service.select${ClassName}List(${className}); ## List<${ClassName}> list = ${className}Service.select${ClassName}List(${className});
return success(list); ## return success(list);
} ## }
#end ###end
##
/** ## /**
* 导出${functionName}列表 ## * 导出${functionName}列表
*/ ## */
@RequiresPermissions("${permissionPrefix}:export") ## @RequiresPermissions("${permissionPrefix}:export")
@Log(title = "${functionName}", businessType = BusinessType.EXPORT) ## @Log(title = "${functionName}", businessType = BusinessType.EXPORT)
@PostMapping("/export") ## @PostMapping("/export")
public void export(HttpServletResponse response, ${ClassName} ${className}) ## public void export(HttpServletResponse response, ${ClassName} ${className})
{ ## {
List<${ClassName}> list = ${className}Service.select${ClassName}List(${className}); ## List<${ClassName}> list = ${className}Service.select${ClassName}List(${className});
ExcelUtil<${ClassName}> util = new ExcelUtil<${ClassName}>(${ClassName}.class); ## ExcelUtil<${ClassName}> util = new ExcelUtil<${ClassName}>(${ClassName}.class);
util.exportExcel(response, list, "${functionName}数据"); ## util.exportExcel(response, list, "${functionName}数据");
} ## }
##
/** ## /**
* 获取${functionName}详细信息 ## * 获取${functionName}详细信息
*/ ## */
@RequiresPermissions("${permissionPrefix}:query") ## @RequiresPermissions("${permissionPrefix}:query")
@GetMapping(value = "/{${pkColumn.javaField}}") ## @GetMapping(value = "/{${pkColumn.javaField}}")
public Result getInfo(@PathVariable("${pkColumn.javaField}") ${pkColumn.javaType} ${pkColumn.javaField}) ## public Result getInfo(@PathVariable("${pkColumn.javaField}") ${pkColumn.javaType} ${pkColumn.javaField})
{ ## {
return success(${className}Service.select${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaField})); ## return success(${className}Service.select${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaField}));
} ## }
##
/** ## /**
* 新增${functionName} ## * 新增${functionName}
*/ ## */
@RequiresPermissions("${permissionPrefix}:add") ## @RequiresPermissions("${permissionPrefix}:add")
@Log(title = "${functionName}", businessType = BusinessType.INSERT) ## @Log(title = "${functionName}", businessType = BusinessType.INSERT)
@PostMapping ## @PostMapping
public Result add(@RequestBody ${ClassName} ${className}) ## public Result add(@RequestBody ${ClassName} ${className})
{ ## {
return toAjax(${className}Service.insert${ClassName}(${className})); ## return toAjax(${className}Service.insert${ClassName}(${className}));
} ## }
##
/** ## /**
* 修改${functionName} ## * 修改${functionName}
*/ ## */
@RequiresPermissions("${permissionPrefix}:edit") ## @RequiresPermissions("${permissionPrefix}:edit")
@Log(title = "${functionName}", businessType = BusinessType.UPDATE) ## @Log(title = "${functionName}", businessType = BusinessType.UPDATE)
@PutMapping ## @PutMapping
public Result edit(@RequestBody ${ClassName} ${className}) ## public Result edit(@RequestBody ${ClassName} ${className})
{ ## {
return toAjax(${className}Service.update${ClassName}(${className})); ## return toAjax(${className}Service.update${ClassName}(${className}));
} ## }
##
/** ## /**
* 删除${functionName} ## * 删除${functionName}
*/ ## */
@RequiresPermissions("${permissionPrefix}:remove") ## @RequiresPermissions("${permissionPrefix}:remove")
@Log(title = "${functionName}", businessType = BusinessType.DELETE) ## @Log(title = "${functionName}", businessType = BusinessType.DELETE)
@DeleteMapping("/{${pkColumn.javaField}s}") ## @DeleteMapping("/{${pkColumn.javaField}s}")
public Result remove(@PathVariable("${pkColumn.javaField}s") ${pkColumn.javaType}[] ${pkColumn.javaField}s) ## public Result remove(@PathVariable("${pkColumn.javaField}s") ${pkColumn.javaType}[] ${pkColumn.javaField}s)
{ ## {
return toAjax(${className}Service.delete${ClassName}By${pkColumn.capJavaField}s(${pkColumn.javaField}s)); ## return toAjax(${className}Service.delete${ClassName}By${pkColumn.capJavaField}s(${pkColumn.javaField}s));
} ## }
} }

15
src/main/resources/vm/java/domain.java.vm
View File

@ -1,5 +1,13 @@
package ${packageName}.domain; package ${packageName}.domain;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
import lombok.experimental.SuperBuilder;
#foreach ($import in $importList) #foreach ($import in $importList)
import ${import}; import ${import};
#end #end
@ -8,6 +16,7 @@ import com.muyu.common.core.annotation.Excel;
import com.muyu.common.core.web.domain.BaseEntity; import com.muyu.common.core.web.domain.BaseEntity;
#elseif($table.tree) #elseif($table.tree)
import com.muyu.common.core.web.domain.TreeEntity; import com.muyu.common.core.web.domain.TreeEntity;
import lombok.Data;
#end #end
/** /**
@ -21,6 +30,12 @@ import com.muyu.common.core.web.domain.TreeEntity;
#elseif($table.tree) #elseif($table.tree)
#set($Entity="TreeEntity") #set($Entity="TreeEntity")
#end #end
@EqualsAndHashCode(callSuper = true)
@Data
@SuperBuilder
@NoArgsConstructor
@AllArgsConstructor
@TableName(value = "" ,autoResultMap = true)
public class ${ClassName} extends ${Entity} public class ${ClassName} extends ${Entity}
{ {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;

151
src/main/resources/vm/java/mapper.java.vm
View File

@ -1,6 +1,7 @@
package ${packageName}.mapper; package ${packageName}.mapper;
import java.util.List; import java.util.List;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import ${packageName}.domain.${ClassName}; import ${packageName}.domain.${ClassName};
#if($table.sub) #if($table.sub)
import ${packageName}.domain.${subClassName}; import ${packageName}.domain.${subClassName};
@ -12,80 +13,80 @@ import ${packageName}.domain.${subClassName};
* @author ${author} * @author ${author}
* @date ${datetime} * @date ${datetime}
*/ */
public interface ${ClassName}Mapper public interface ${ClassName}Mapper extends BaseMapper<${ClassName}>
{ {
/** ## /**
* 查询${functionName} ## * 查询${functionName}
* ## *
* @param ${pkColumn.javaField} ${functionName}主键 ## * @param ${pkColumn.javaField} ${functionName}主键
* @return ${functionName} ## * @return ${functionName}
*/ ## */
public ${ClassName} select${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaType} ${pkColumn.javaField}); ## public ${ClassName} select${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaType} ${pkColumn.javaField});
##
/** ## /**
* 查询${functionName}列表 ## * 查询${functionName}列表
* ## *
* @param ${className} ${functionName} ## * @param ${className} ${functionName}
* @return ${functionName}集合 ## * @return ${functionName}集合
*/ ## */
public List<${ClassName}> select${ClassName}List(${ClassName} ${className}); ## public List<${ClassName}> select${ClassName}List(${ClassName} ${className});
##
/** ## /**
* 新增${functionName} ## * 新增${functionName}
* ## *
* @param ${className} ${functionName} ## * @param ${className} ${functionName}
* @return 结果 ## * @return 结果
*/ ## */
public int insert${ClassName}(${ClassName} ${className}); ## public int insert${ClassName}(${ClassName} ${className});
##
/** ## /**
* 修改${functionName} ## * 修改${functionName}
* ## *
* @param ${className} ${functionName} ## * @param ${className} ${functionName}
* @return 结果 ## * @return 结果
*/ ## */
public int update${ClassName}(${ClassName} ${className}); ## public int update${ClassName}(${ClassName} ${className});
##
/** ## /**
* 删除${functionName} ## * 删除${functionName}
* ## *
* @param ${pkColumn.javaField} ${functionName}主键 ## * @param ${pkColumn.javaField} ${functionName}主键
* @return 结果 ## * @return 结果
*/ ## */
public int delete${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaType} ${pkColumn.javaField}); ## public int delete${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaType} ${pkColumn.javaField});
##
/** ## /**
* 批量删除${functionName} ## * 批量删除${functionName}
* ## *
* @param ${pkColumn.javaField}s 需要删除的数据主键集合 ## * @param ${pkColumn.javaField}s 需要删除的数据主键集合
* @return 结果 ## * @return 结果
*/ ## */
public int delete${ClassName}By${pkColumn.capJavaField}s(${pkColumn.javaType}[] ${pkColumn.javaField}s); ## public int delete${ClassName}By${pkColumn.capJavaField}s(${pkColumn.javaType}[] ${pkColumn.javaField}s);
#if($table.sub) ###if($table.sub)
##
/** ## /**
* 批量删除${subTable.functionName} ## * 批量删除${subTable.functionName}
* ## *
* @param ${pkColumn.javaField}s 需要删除的数据主键集合 ## * @param ${pkColumn.javaField}s 需要删除的数据主键集合
* @return 结果 ## * @return 结果
*/ ## */
public int delete${subClassName}By${subTableFkClassName}s(${pkColumn.javaType}[] ${pkColumn.javaField}s); ## public int delete${subClassName}By${subTableFkClassName}s(${pkColumn.javaType}[] ${pkColumn.javaField}s);
##
/** ## /**
* 批量新增${subTable.functionName} ## * 批量新增${subTable.functionName}
* ## *
* @param ${subclassName}List ${subTable.functionName}列表 ## * @param ${subclassName}List ${subTable.functionName}列表
* @return 结果 ## * @return 结果
*/ ## */
public int batch${subClassName}(List<${subClassName}> ${subclassName}List); ## public int batch${subClassName}(List<${subClassName}> ${subclassName}List);
##
##
/** ## /**
* 通过${functionName}主键删除${subTable.functionName}信息 ## * 通过${functionName}主键删除${subTable.functionName}信息
* ## *
* @param ${pkColumn.javaField} ${functionName}ID ## * @param ${pkColumn.javaField} ${functionName}ID
* @return 结果 ## * @return 结果
*/ ## */
public int delete${subClassName}By${subTableFkClassName}(${pkColumn.javaType} ${pkColumn.javaField}); ## public int delete${subClassName}By${subTableFkClassName}(${pkColumn.javaType} ${pkColumn.javaField});
#end ###end
} }

97
src/main/resources/vm/java/service.java.vm
View File

@ -1,6 +1,7 @@
package ${packageName}.service; package ${packageName}.service;
import java.util.List; import java.util.List;
import com.baomidou.mybatisplus.extension.service.IService;
import ${packageName}.domain.${ClassName}; import ${packageName}.domain.${ClassName};
/** /**
@ -9,53 +10,53 @@ import ${packageName}.domain.${ClassName};
* @author ${author} * @author ${author}
* @date ${datetime} * @date ${datetime}
*/ */
public interface I${ClassName}Service public interface I${ClassName}Service extends IService<${ClassName}>
{ {
/** ## /**
* 查询${functionName} ## * 查询${functionName}
* ## *
* @param ${pkColumn.javaField} ${functionName}主键 ## * @param ${pkColumn.javaField} ${functionName}主键
* @return ${functionName} ## * @return ${functionName}
*/ ## */
public ${ClassName} select${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaType} ${pkColumn.javaField}); ## public ${ClassName} select${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaType} ${pkColumn.javaField});
##
/** ## /**
* 查询${functionName}列表 ## * 查询${functionName}列表
* ## *
* @param ${className} ${functionName} ## * @param ${className} ${functionName}
* @return ${functionName}集合 ## * @return ${functionName}集合
*/ ## */
public List<${ClassName}> select${ClassName}List(${ClassName} ${className}); ## public List<${ClassName}> select${ClassName}List(${ClassName} ${className});
##
/** ## /**
* 新增${functionName} ## * 新增${functionName}
* ## *
* @param ${className} ${functionName} ## * @param ${className} ${functionName}
* @return 结果 ## * @return 结果
*/ ## */
public int insert${ClassName}(${ClassName} ${className}); ## public int insert${ClassName}(${ClassName} ${className});
##
/** ## /**
* 修改${functionName} ## * 修改${functionName}
* ## *
* @param ${className} ${functionName} ## * @param ${className} ${functionName}
* @return 结果 ## * @return 结果
*/ ## */
public int update${ClassName}(${ClassName} ${className}); ## public int update${ClassName}(${ClassName} ${className});
##
/** ## /**
* 批量删除${functionName} ## * 批量删除${functionName}
* ## *
* @param ${pkColumn.javaField}s 需要删除的${functionName}主键集合 ## * @param ${pkColumn.javaField}s 需要删除的${functionName}主键集合
* @return 结果 ## * @return 结果
*/ ## */
public int delete${ClassName}By${pkColumn.capJavaField}s(${pkColumn.javaType}[] ${pkColumn.javaField}s); ## public int delete${ClassName}By${pkColumn.capJavaField}s(${pkColumn.javaType}[] ${pkColumn.javaField}s);
##
/** ## /**
* 删除${functionName}信息 ## * 删除${functionName}信息
* ## *
* @param ${pkColumn.javaField} ${functionName}主键 ## * @param ${pkColumn.javaField} ${functionName}主键
* @return 结果 ## * @return 结果
*/ ## */
public int delete${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaType} ${pkColumn.javaField}); ## public int delete${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaType} ${pkColumn.javaField});
} }

273
src/main/resources/vm/java/serviceImpl.java.vm
View File

@ -1,5 +1,6 @@
package ${packageName}.service.impl; package ${packageName}.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import java.util.List; import java.util.List;
#foreach ($column in $columns) #foreach ($column in $columns)
#if($column.javaField == 'createTime' || $column.javaField == 'updateTime') #if($column.javaField == 'createTime' || $column.javaField == 'updateTime')
@ -26,144 +27,144 @@ import ${packageName}.service.I${ClassName}Service;
* @date ${datetime} * @date ${datetime}
*/ */
@Service @Service
public class ${ClassName}ServiceImpl implements I${ClassName}Service public class ${ClassName}ServiceImpl extends ServiceImpl<${ClassName}Mapper}, ${ClassName}> implements ${ClassName}Service
{ {
@Autowired @Autowired
private ${ClassName}Mapper ${className}Mapper; private ${ClassName}Mapper ${className}Mapper;
/** ## /**
* 查询${functionName} ## * 查询${functionName}
* ## *
* @param ${pkColumn.javaField} ${functionName}主键 ## * @param ${pkColumn.javaField} ${functionName}主键
* @return ${functionName} ## * @return ${functionName}
*/ ## */
@Override ## @Override
public ${ClassName} select${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaType} ${pkColumn.javaField}) ## public ${ClassName} select${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaType} ${pkColumn.javaField})
{ ## {
return ${className}Mapper.select${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaField}); ## return ${className}Mapper.select${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaField});
} ## }
##
/** ## /**
* 查询${functionName}列表 ## * 查询${functionName}列表
* ## *
* @param ${className} ${functionName} ## * @param ${className} ${functionName}
* @return ${functionName} ## * @return ${functionName}
*/ ## */
@Override ## @Override
public List<${ClassName}> select${ClassName}List(${ClassName} ${className}) ## public List<${ClassName}> select${ClassName}List(${ClassName} ${className})
{ ## {
return ${className}Mapper.select${ClassName}List(${className}); ## return ${className}Mapper.select${ClassName}List(${className});
} ## }
##
/** ## /**
* 新增${functionName} ## * 新增${functionName}
* ## *
* @param ${className} ${functionName} ## * @param ${className} ${functionName}
* @return 结果 ## * @return 结果
*/ ## */
#if($table.sub) ###if($table.sub)
@Transactional ## @Transactional
#end ###end
@Override ## @Override
public int insert${ClassName}(${ClassName} ${className}) ## public int insert${ClassName}(${ClassName} ${className})
{ ## {
#foreach ($column in $columns) ###foreach ($column in $columns)
#if($column.javaField == 'createTime') ###if($column.javaField == 'createTime')
${className}.setCreateTime(DateUtils.getNowDate()); ## ${className}.setCreateTime(DateUtils.getNowDate());
#end ###end
#end ###end
#if($table.sub) ###if($table.sub)
int rows = ${className}Mapper.insert${ClassName}(${className}); ## int rows = ${className}Mapper.insert${ClassName}(${className});
insert${subClassName}(${className}); ## insert${subClassName}(${className});
return rows; ## return rows;
#else ###else
return ${className}Mapper.insert${ClassName}(${className}); ## return ${className}Mapper.insert${ClassName}(${className});
#end ###end
} ## }
##
/** ## /**
* 修改${functionName} ## * 修改${functionName}
* ## *
* @param ${className} ${functionName} ## * @param ${className} ${functionName}
* @return 结果 ## * @return 结果
*/ ## */
#if($table.sub) ###if($table.sub)
@Transactional ## @Transactional
#end ###end
@Override ## @Override
public int update${ClassName}(${ClassName} ${className}) ## public int update${ClassName}(${ClassName} ${className})
{ ## {
#foreach ($column in $columns) ###foreach ($column in $columns)
#if($column.javaField == 'updateTime') ###if($column.javaField == 'updateTime')
${className}.setUpdateTime(DateUtils.getNowDate()); ## ${className}.setUpdateTime(DateUtils.getNowDate());
#end ###end
#end ###end
#if($table.sub) ###if($table.sub)
${className}Mapper.delete${subClassName}By${subTableFkClassName}(${className}.get${pkColumn.capJavaField}()); ## ${className}Mapper.delete${subClassName}By${subTableFkClassName}(${className}.get${pkColumn.capJavaField}());
insert${subClassName}(${className}); ## insert${subClassName}(${className});
#end ###end
return ${className}Mapper.update${ClassName}(${className}); ## return ${className}Mapper.update${ClassName}(${className});
} ## }
##
/** ## /**
* 批量删除${functionName} ## * 批量删除${functionName}
* ## *
* @param ${pkColumn.javaField}s 需要删除的${functionName}主键 ## * @param ${pkColumn.javaField}s 需要删除的${functionName}主键
* @return 结果 ## * @return 结果
*/ ## */
#if($table.sub) ###if($table.sub)
@Transactional ## @Transactional
#end ###end
@Override ## @Override
public int delete${ClassName}By${pkColumn.capJavaField}s(${pkColumn.javaType}[] ${pkColumn.javaField}s) ## public int delete${ClassName}By${pkColumn.capJavaField}s(${pkColumn.javaType}[] ${pkColumn.javaField}s)
{ ## {
#if($table.sub) ###if($table.sub)
${className}Mapper.delete${subClassName}By${subTableFkClassName}s(${pkColumn.javaField}s); ## ${className}Mapper.delete${subClassName}By${subTableFkClassName}s(${pkColumn.javaField}s);
#end ###end
return ${className}Mapper.delete${ClassName}By${pkColumn.capJavaField}s(${pkColumn.javaField}s); ## return ${className}Mapper.delete${ClassName}By${pkColumn.capJavaField}s(${pkColumn.javaField}s);
} ## }
##
/** ## /**
* 删除${functionName}信息 ## * 删除${functionName}信息
* ## *
* @param ${pkColumn.javaField} ${functionName}主键 ## * @param ${pkColumn.javaField} ${functionName}主键
* @return 结果 ## * @return 结果
*/ ## */
#if($table.sub) ###if($table.sub)
@Transactional ## @Transactional
#end ###end
@Override ## @Override
public int delete${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaType} ${pkColumn.javaField}) ## public int delete${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaType} ${pkColumn.javaField})
{ ## {
#if($table.sub) ###if($table.sub)
${className}Mapper.delete${subClassName}By${subTableFkClassName}(${pkColumn.javaField}); ## ${className}Mapper.delete${subClassName}By${subTableFkClassName}(${pkColumn.javaField});
#end ###end
return ${className}Mapper.delete${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaField}); ## return ${className}Mapper.delete${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaField});
} ## }
#if($table.sub) ###if($table.sub)
##
/** ## /**
* 新增${subTable.functionName}信息 ## * 新增${subTable.functionName}信息
* ## *
* @param ${className} ${functionName}对象 ## * @param ${className} ${functionName}对象
*/ ## */
public void insert${subClassName}(${ClassName} ${className}) ## public void insert${subClassName}(${ClassName} ${className})
{ ## {
List<${subClassName}> ${subclassName}List = ${className}.get${subClassName}List(); ## List<${subClassName}> ${subclassName}List = ${className}.get${subClassName}List();
${pkColumn.javaType} ${pkColumn.javaField} = ${className}.get${pkColumn.capJavaField}(); ## ${pkColumn.javaType} ${pkColumn.javaField} = ${className}.get${pkColumn.capJavaField}();
if (StringUtils.isNotNull(${subclassName}List)) ## if (StringUtils.isNotNull(${subclassName}List))
{ ## {
List<${subClassName}> list = new ArrayList<${subClassName}>(); ## List<${subClassName}> list = new ArrayList<${subClassName}>();
for (${subClassName} ${subclassName} : ${subclassName}List) ## for (${subClassName} ${subclassName} : ${subclassName}List)
{ ## {
${subclassName}.set${subTableFkClassName}(${pkColumn.javaField}); ## ${subclassName}.set${subTableFkClassName}(${pkColumn.javaField});
list.add(${subclassName}); ## list.add(${subclassName});
} ## }
if (list.size() > 0) ## if (list.size() > 0)
{ ## {
${className}Mapper.batch${subClassName}(list); ## ${className}Mapper.batch${subClassName}(list);
} ## }
} ## }
} ## }
#end ###end
} }