diff --git a/src/main/resources/bootstrap.yml b/src/main/resources/bootstrap.yml index 754a321..2eed263 100644 --- a/src/main/resources/bootstrap.yml +++ b/src/main/resources/bootstrap.yml @@ -4,7 +4,7 @@ server: # nacos线上地址 nacos: - addr: 47.116.176.140:8848 + addr: 12.2.0.252:8848 user-name: nacos password: nacos namespace: muyu-cloud diff --git a/src/main/resources/vm/java/controller.java.vm b/src/main/resources/vm/java/controller.java.vm index 1df5be0..4df7f5d 100644 --- a/src/main/resources/vm/java/controller.java.vm +++ b/src/main/resources/vm/java/controller.java.vm @@ -37,80 +37,80 @@ public class ${ClassName}Controller extends BaseController { @Autowired private I${ClassName}Service ${className}Service; - - /** - * 查询${functionName}列表 - */ - @RequiresPermissions("${permissionPrefix}:list") - @GetMapping("/list") -#if($table.crud || $table.sub) - public Result list(${ClassName} ${className}) - { - startPage(); - List<${ClassName}> list = ${className}Service.select${ClassName}List(${className}); - return getDataTable(list); - } -#elseif($table.tree) - public Result list(${ClassName} ${className}) - { - List<${ClassName}> list = ${className}Service.select${ClassName}List(${className}); - return success(list); - } -#end - - /** - * 导出${functionName}列表 - */ - @RequiresPermissions("${permissionPrefix}:export") - @Log(title = "${functionName}", businessType = BusinessType.EXPORT) - @PostMapping("/export") - public void export(HttpServletResponse response, ${ClassName} ${className}) - { - List<${ClassName}> list = ${className}Service.select${ClassName}List(${className}); - ExcelUtil<${ClassName}> util = new ExcelUtil<${ClassName}>(${ClassName}.class); - util.exportExcel(response, list, "${functionName}数据"); - } - - /** - * 获取${functionName}详细信息 - */ - @RequiresPermissions("${permissionPrefix}:query") - @GetMapping(value = "/{${pkColumn.javaField}}") - public Result getInfo(@PathVariable("${pkColumn.javaField}") ${pkColumn.javaType} ${pkColumn.javaField}) - { - return success(${className}Service.select${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaField})); - } - - /** - * 新增${functionName} - */ - @RequiresPermissions("${permissionPrefix}:add") - @Log(title = "${functionName}", businessType = BusinessType.INSERT) - @PostMapping - public Result add(@RequestBody ${ClassName} ${className}) - { - return toAjax(${className}Service.insert${ClassName}(${className})); - } - - /** - * 修改${functionName} - */ - @RequiresPermissions("${permissionPrefix}:edit") - @Log(title = "${functionName}", businessType = BusinessType.UPDATE) - @PutMapping - public Result edit(@RequestBody ${ClassName} ${className}) - { - return toAjax(${className}Service.update${ClassName}(${className})); - } - - /** - * 删除${functionName} - */ - @RequiresPermissions("${permissionPrefix}:remove") - @Log(title = "${functionName}", businessType = BusinessType.DELETE) - @DeleteMapping("/{${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)); - } +## +## /** +## * 查询${functionName}列表 +## */ +## @RequiresPermissions("${permissionPrefix}:list") +## @GetMapping("/list") +###if($table.crud || $table.sub) +## public Result list(${ClassName} ${className}) +## { +## startPage(); +## List<${ClassName}> list = ${className}Service.select${ClassName}List(${className}); +## return getDataTable(list); +## } +###elseif($table.tree) +## public Result list(${ClassName} ${className}) +## { +## List<${ClassName}> list = ${className}Service.select${ClassName}List(${className}); +## return success(list); +## } +###end +## +## /** +## * 导出${functionName}列表 +## */ +## @RequiresPermissions("${permissionPrefix}:export") +## @Log(title = "${functionName}", businessType = BusinessType.EXPORT) +## @PostMapping("/export") +## public void export(HttpServletResponse response, ${ClassName} ${className}) +## { +## List<${ClassName}> list = ${className}Service.select${ClassName}List(${className}); +## ExcelUtil<${ClassName}> util = new ExcelUtil<${ClassName}>(${ClassName}.class); +## util.exportExcel(response, list, "${functionName}数据"); +## } +## +## /** +## * 获取${functionName}详细信息 +## */ +## @RequiresPermissions("${permissionPrefix}:query") +## @GetMapping(value = "/{${pkColumn.javaField}}") +## public Result getInfo(@PathVariable("${pkColumn.javaField}") ${pkColumn.javaType} ${pkColumn.javaField}) +## { +## return success(${className}Service.select${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaField})); +## } +## +## /** +## * 新增${functionName} +## */ +## @RequiresPermissions("${permissionPrefix}:add") +## @Log(title = "${functionName}", businessType = BusinessType.INSERT) +## @PostMapping +## public Result add(@RequestBody ${ClassName} ${className}) +## { +## return toAjax(${className}Service.insert${ClassName}(${className})); +## } +## +## /** +## * 修改${functionName} +## */ +## @RequiresPermissions("${permissionPrefix}:edit") +## @Log(title = "${functionName}", businessType = BusinessType.UPDATE) +## @PutMapping +## public Result edit(@RequestBody ${ClassName} ${className}) +## { +## return toAjax(${className}Service.update${ClassName}(${className})); +## } +## +## /** +## * 删除${functionName} +## */ +## @RequiresPermissions("${permissionPrefix}:remove") +## @Log(title = "${functionName}", businessType = BusinessType.DELETE) +## @DeleteMapping("/{${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)); +## } } diff --git a/src/main/resources/vm/java/domain.java.vm b/src/main/resources/vm/java/domain.java.vm index 1292991..86fab07 100644 --- a/src/main/resources/vm/java/domain.java.vm +++ b/src/main/resources/vm/java/domain.java.vm @@ -1,5 +1,13 @@ package ${packageName}.domain; + + + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; #foreach ($import in $importList) import ${import}; #end @@ -8,6 +16,7 @@ import com.muyu.common.core.annotation.Excel; import com.muyu.common.core.web.domain.BaseEntity; #elseif($table.tree) import com.muyu.common.core.web.domain.TreeEntity; +import lombok.Data; #end /** @@ -21,6 +30,12 @@ import com.muyu.common.core.web.domain.TreeEntity; #elseif($table.tree) #set($Entity="TreeEntity") #end +@EqualsAndHashCode(callSuper = true) +@Data +@SuperBuilder +@NoArgsConstructor +@AllArgsConstructor +@TableName(value = "" ,autoResultMap = true) public class ${ClassName} extends ${Entity} { private static final long serialVersionUID = 1L; diff --git a/src/main/resources/vm/java/mapper.java.vm b/src/main/resources/vm/java/mapper.java.vm index 7e7d7c2..89f5153 100644 --- a/src/main/resources/vm/java/mapper.java.vm +++ b/src/main/resources/vm/java/mapper.java.vm @@ -1,6 +1,7 @@ package ${packageName}.mapper; import java.util.List; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import ${packageName}.domain.${ClassName}; #if($table.sub) import ${packageName}.domain.${subClassName}; @@ -8,84 +9,84 @@ import ${packageName}.domain.${subClassName}; /** * ${functionName}Mapper接口 - * + * * @author ${author} * @date ${datetime} */ -public interface ${ClassName}Mapper +public interface ${ClassName}Mapper extends BaseMapper<${ClassName}> { - /** - * 查询${functionName} - * - * @param ${pkColumn.javaField} ${functionName}主键 - * @return ${functionName} - */ - public ${ClassName} select${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaType} ${pkColumn.javaField}); - - /** - * 查询${functionName}列表 - * - * @param ${className} ${functionName} - * @return ${functionName}集合 - */ - public List<${ClassName}> select${ClassName}List(${ClassName} ${className}); - - /** - * 新增${functionName} - * - * @param ${className} ${functionName} - * @return 结果 - */ - public int insert${ClassName}(${ClassName} ${className}); - - /** - * 修改${functionName} - * - * @param ${className} ${functionName} - * @return 结果 - */ - public int update${ClassName}(${ClassName} ${className}); - - /** - * 删除${functionName} - * - * @param ${pkColumn.javaField} ${functionName}主键 - * @return 结果 - */ - public int delete${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaType} ${pkColumn.javaField}); - - /** - * 批量删除${functionName} - * - * @param ${pkColumn.javaField}s 需要删除的数据主键集合 - * @return 结果 - */ - public int delete${ClassName}By${pkColumn.capJavaField}s(${pkColumn.javaType}[] ${pkColumn.javaField}s); -#if($table.sub) - - /** - * 批量删除${subTable.functionName} - * - * @param ${pkColumn.javaField}s 需要删除的数据主键集合 - * @return 结果 - */ - public int delete${subClassName}By${subTableFkClassName}s(${pkColumn.javaType}[] ${pkColumn.javaField}s); - - /** - * 批量新增${subTable.functionName} - * - * @param ${subclassName}List ${subTable.functionName}列表 - * @return 结果 - */ - public int batch${subClassName}(List<${subClassName}> ${subclassName}List); - - - /** - * 通过${functionName}主键删除${subTable.functionName}信息 - * - * @param ${pkColumn.javaField} ${functionName}ID - * @return 结果 - */ - public int delete${subClassName}By${subTableFkClassName}(${pkColumn.javaType} ${pkColumn.javaField}); -#end +## /** +## * 查询${functionName} +## * +## * @param ${pkColumn.javaField} ${functionName}主键 +## * @return ${functionName} +## */ +## public ${ClassName} select${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaType} ${pkColumn.javaField}); +## +## /** +## * 查询${functionName}列表 +## * +## * @param ${className} ${functionName} +## * @return ${functionName}集合 +## */ +## public List<${ClassName}> select${ClassName}List(${ClassName} ${className}); +## +## /** +## * 新增${functionName} +## * +## * @param ${className} ${functionName} +## * @return 结果 +## */ +## public int insert${ClassName}(${ClassName} ${className}); +## +## /** +## * 修改${functionName} +## * +## * @param ${className} ${functionName} +## * @return 结果 +## */ +## public int update${ClassName}(${ClassName} ${className}); +## +## /** +## * 删除${functionName} +## * +## * @param ${pkColumn.javaField} ${functionName}主键 +## * @return 结果 +## */ +## public int delete${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaType} ${pkColumn.javaField}); +## +## /** +## * 批量删除${functionName} +## * +## * @param ${pkColumn.javaField}s 需要删除的数据主键集合 +## * @return 结果 +## */ +## public int delete${ClassName}By${pkColumn.capJavaField}s(${pkColumn.javaType}[] ${pkColumn.javaField}s); +###if($table.sub) +## +## /** +## * 批量删除${subTable.functionName} +## * +## * @param ${pkColumn.javaField}s 需要删除的数据主键集合 +## * @return 结果 +## */ +## public int delete${subClassName}By${subTableFkClassName}s(${pkColumn.javaType}[] ${pkColumn.javaField}s); +## +## /** +## * 批量新增${subTable.functionName} +## * +## * @param ${subclassName}List ${subTable.functionName}列表 +## * @return 结果 +## */ +## public int batch${subClassName}(List<${subClassName}> ${subclassName}List); +## +## +## /** +## * 通过${functionName}主键删除${subTable.functionName}信息 +## * +## * @param ${pkColumn.javaField} ${functionName}ID +## * @return 结果 +## */ +## public int delete${subClassName}By${subTableFkClassName}(${pkColumn.javaType} ${pkColumn.javaField}); +###end } diff --git a/src/main/resources/vm/java/service.java.vm b/src/main/resources/vm/java/service.java.vm index 264882b..2a85d03 100644 --- a/src/main/resources/vm/java/service.java.vm +++ b/src/main/resources/vm/java/service.java.vm @@ -1,61 +1,62 @@ package ${packageName}.service; import java.util.List; +import com.baomidou.mybatisplus.extension.service.IService; import ${packageName}.domain.${ClassName}; /** * ${functionName}Service接口 - * + * * @author ${author} * @date ${datetime} */ -public interface I${ClassName}Service +public interface I${ClassName}Service extends IService<${ClassName}> { - /** - * 查询${functionName} - * - * @param ${pkColumn.javaField} ${functionName}主键 - * @return ${functionName} - */ - public ${ClassName} select${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaType} ${pkColumn.javaField}); - - /** - * 查询${functionName}列表 - * - * @param ${className} ${functionName} - * @return ${functionName}集合 - */ - public List<${ClassName}> select${ClassName}List(${ClassName} ${className}); - - /** - * 新增${functionName} - * - * @param ${className} ${functionName} - * @return 结果 - */ - public int insert${ClassName}(${ClassName} ${className}); - - /** - * 修改${functionName} - * - * @param ${className} ${functionName} - * @return 结果 - */ - public int update${ClassName}(${ClassName} ${className}); - - /** - * 批量删除${functionName} - * - * @param ${pkColumn.javaField}s 需要删除的${functionName}主键集合 - * @return 结果 - */ - public int delete${ClassName}By${pkColumn.capJavaField}s(${pkColumn.javaType}[] ${pkColumn.javaField}s); - - /** - * 删除${functionName}信息 - * - * @param ${pkColumn.javaField} ${functionName}主键 - * @return 结果 - */ - public int delete${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaType} ${pkColumn.javaField}); +## /** +## * 查询${functionName} +## * +## * @param ${pkColumn.javaField} ${functionName}主键 +## * @return ${functionName} +## */ +## public ${ClassName} select${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaType} ${pkColumn.javaField}); +## +## /** +## * 查询${functionName}列表 +## * +## * @param ${className} ${functionName} +## * @return ${functionName}集合 +## */ +## public List<${ClassName}> select${ClassName}List(${ClassName} ${className}); +## +## /** +## * 新增${functionName} +## * +## * @param ${className} ${functionName} +## * @return 结果 +## */ +## public int insert${ClassName}(${ClassName} ${className}); +## +## /** +## * 修改${functionName} +## * +## * @param ${className} ${functionName} +## * @return 结果 +## */ +## public int update${ClassName}(${ClassName} ${className}); +## +## /** +## * 批量删除${functionName} +## * +## * @param ${pkColumn.javaField}s 需要删除的${functionName}主键集合 +## * @return 结果 +## */ +## public int delete${ClassName}By${pkColumn.capJavaField}s(${pkColumn.javaType}[] ${pkColumn.javaField}s); +## +## /** +## * 删除${functionName}信息 +## * +## * @param ${pkColumn.javaField} ${functionName}主键 +## * @return 结果 +## */ +## public int delete${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaType} ${pkColumn.javaField}); } diff --git a/src/main/resources/vm/java/serviceImpl.java.vm b/src/main/resources/vm/java/serviceImpl.java.vm index 3904af5..e866f95 100644 --- a/src/main/resources/vm/java/serviceImpl.java.vm +++ b/src/main/resources/vm/java/serviceImpl.java.vm @@ -1,5 +1,6 @@ package ${packageName}.service.impl; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import java.util.List; #foreach ($column in $columns) #if($column.javaField == 'createTime' || $column.javaField == 'updateTime') @@ -26,144 +27,144 @@ import ${packageName}.service.I${ClassName}Service; * @date ${datetime} */ @Service -public class ${ClassName}ServiceImpl implements I${ClassName}Service +public class ${ClassName}ServiceImpl extends ServiceImpl<${ClassName}Mapper}, ${ClassName}> implements ${ClassName}Service { @Autowired private ${ClassName}Mapper ${className}Mapper; - /** - * 查询${functionName} - * - * @param ${pkColumn.javaField} ${functionName}主键 - * @return ${functionName} - */ - @Override - public ${ClassName} select${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaType} ${pkColumn.javaField}) - { - return ${className}Mapper.select${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaField}); - } - - /** - * 查询${functionName}列表 - * - * @param ${className} ${functionName} - * @return ${functionName} - */ - @Override - public List<${ClassName}> select${ClassName}List(${ClassName} ${className}) - { - return ${className}Mapper.select${ClassName}List(${className}); - } - - /** - * 新增${functionName} - * - * @param ${className} ${functionName} - * @return 结果 - */ -#if($table.sub) - @Transactional -#end - @Override - public int insert${ClassName}(${ClassName} ${className}) - { -#foreach ($column in $columns) -#if($column.javaField == 'createTime') - ${className}.setCreateTime(DateUtils.getNowDate()); -#end -#end -#if($table.sub) - int rows = ${className}Mapper.insert${ClassName}(${className}); - insert${subClassName}(${className}); - return rows; -#else - return ${className}Mapper.insert${ClassName}(${className}); -#end - } - - /** - * 修改${functionName} - * - * @param ${className} ${functionName} - * @return 结果 - */ -#if($table.sub) - @Transactional -#end - @Override - public int update${ClassName}(${ClassName} ${className}) - { -#foreach ($column in $columns) -#if($column.javaField == 'updateTime') - ${className}.setUpdateTime(DateUtils.getNowDate()); -#end -#end -#if($table.sub) - ${className}Mapper.delete${subClassName}By${subTableFkClassName}(${className}.get${pkColumn.capJavaField}()); - insert${subClassName}(${className}); -#end - return ${className}Mapper.update${ClassName}(${className}); - } - - /** - * 批量删除${functionName} - * - * @param ${pkColumn.javaField}s 需要删除的${functionName}主键 - * @return 结果 - */ -#if($table.sub) - @Transactional -#end - @Override - public int delete${ClassName}By${pkColumn.capJavaField}s(${pkColumn.javaType}[] ${pkColumn.javaField}s) - { -#if($table.sub) - ${className}Mapper.delete${subClassName}By${subTableFkClassName}s(${pkColumn.javaField}s); -#end - return ${className}Mapper.delete${ClassName}By${pkColumn.capJavaField}s(${pkColumn.javaField}s); - } - - /** - * 删除${functionName}信息 - * - * @param ${pkColumn.javaField} ${functionName}主键 - * @return 结果 - */ -#if($table.sub) - @Transactional -#end - @Override - public int delete${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaType} ${pkColumn.javaField}) - { -#if($table.sub) - ${className}Mapper.delete${subClassName}By${subTableFkClassName}(${pkColumn.javaField}); -#end - return ${className}Mapper.delete${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaField}); - } -#if($table.sub) - - /** - * 新增${subTable.functionName}信息 - * - * @param ${className} ${functionName}对象 - */ - public void insert${subClassName}(${ClassName} ${className}) - { - List<${subClassName}> ${subclassName}List = ${className}.get${subClassName}List(); - ${pkColumn.javaType} ${pkColumn.javaField} = ${className}.get${pkColumn.capJavaField}(); - if (StringUtils.isNotNull(${subclassName}List)) - { - List<${subClassName}> list = new ArrayList<${subClassName}>(); - for (${subClassName} ${subclassName} : ${subclassName}List) - { - ${subclassName}.set${subTableFkClassName}(${pkColumn.javaField}); - list.add(${subclassName}); - } - if (list.size() > 0) - { - ${className}Mapper.batch${subClassName}(list); - } - } - } -#end +## /** +## * 查询${functionName} +## * +## * @param ${pkColumn.javaField} ${functionName}主键 +## * @return ${functionName} +## */ +## @Override +## public ${ClassName} select${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaType} ${pkColumn.javaField}) +## { +## return ${className}Mapper.select${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaField}); +## } +## +## /** +## * 查询${functionName}列表 +## * +## * @param ${className} ${functionName} +## * @return ${functionName} +## */ +## @Override +## public List<${ClassName}> select${ClassName}List(${ClassName} ${className}) +## { +## return ${className}Mapper.select${ClassName}List(${className}); +## } +## +## /** +## * 新增${functionName} +## * +## * @param ${className} ${functionName} +## * @return 结果 +## */ +###if($table.sub) +## @Transactional +###end +## @Override +## public int insert${ClassName}(${ClassName} ${className}) +## { +###foreach ($column in $columns) +###if($column.javaField == 'createTime') +## ${className}.setCreateTime(DateUtils.getNowDate()); +###end +###end +###if($table.sub) +## int rows = ${className}Mapper.insert${ClassName}(${className}); +## insert${subClassName}(${className}); +## return rows; +###else +## return ${className}Mapper.insert${ClassName}(${className}); +###end +## } +## +## /** +## * 修改${functionName} +## * +## * @param ${className} ${functionName} +## * @return 结果 +## */ +###if($table.sub) +## @Transactional +###end +## @Override +## public int update${ClassName}(${ClassName} ${className}) +## { +###foreach ($column in $columns) +###if($column.javaField == 'updateTime') +## ${className}.setUpdateTime(DateUtils.getNowDate()); +###end +###end +###if($table.sub) +## ${className}Mapper.delete${subClassName}By${subTableFkClassName}(${className}.get${pkColumn.capJavaField}()); +## insert${subClassName}(${className}); +###end +## return ${className}Mapper.update${ClassName}(${className}); +## } +## +## /** +## * 批量删除${functionName} +## * +## * @param ${pkColumn.javaField}s 需要删除的${functionName}主键 +## * @return 结果 +## */ +###if($table.sub) +## @Transactional +###end +## @Override +## public int delete${ClassName}By${pkColumn.capJavaField}s(${pkColumn.javaType}[] ${pkColumn.javaField}s) +## { +###if($table.sub) +## ${className}Mapper.delete${subClassName}By${subTableFkClassName}s(${pkColumn.javaField}s); +###end +## return ${className}Mapper.delete${ClassName}By${pkColumn.capJavaField}s(${pkColumn.javaField}s); +## } +## +## /** +## * 删除${functionName}信息 +## * +## * @param ${pkColumn.javaField} ${functionName}主键 +## * @return 结果 +## */ +###if($table.sub) +## @Transactional +###end +## @Override +## public int delete${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaType} ${pkColumn.javaField}) +## { +###if($table.sub) +## ${className}Mapper.delete${subClassName}By${subTableFkClassName}(${pkColumn.javaField}); +###end +## return ${className}Mapper.delete${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaField}); +## } +###if($table.sub) +## +## /** +## * 新增${subTable.functionName}信息 +## * +## * @param ${className} ${functionName}对象 +## */ +## public void insert${subClassName}(${ClassName} ${className}) +## { +## List<${subClassName}> ${subclassName}List = ${className}.get${subClassName}List(); +## ${pkColumn.javaType} ${pkColumn.javaField} = ${className}.get${pkColumn.capJavaField}(); +## if (StringUtils.isNotNull(${subclassName}List)) +## { +## List<${subClassName}> list = new ArrayList<${subClassName}>(); +## for (${subClassName} ${subclassName} : ${subclassName}List) +## { +## ${subclassName}.set${subTableFkClassName}(${pkColumn.javaField}); +## list.add(${subclassName}); +## } +## if (list.size() > 0) +## { +## ${className}Mapper.batch${subClassName}(list); +## } +## } +## } +###end }