diff --git a/src/main/resources/vm/java/controller.java.vm b/src/main/resources/vm/java/controller.java.vm
index 17489e66f17707dd85b79fa663343c3bc4bc0ce4..d58b754b8b8c4368d8022437b8f272a00c02f059 100644
--- a/src/main/resources/vm/java/controller.java.vm
+++ b/src/main/resources/vm/java/controller.java.vm
@@ -8,7 +8,6 @@ import com.pearadmin.common.web.base.BaseController;
import com.pearadmin.common.web.domain.request.PageDomain;
import com.pearadmin.common.web.domain.response.Result;
import com.pearadmin.common.web.domain.response.module.ResultTable;
-import com.pearadmin.modules.sys.domain.SysUser;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.ui.ModelMap;
@@ -66,7 +65,7 @@ public class ${ClassName}Controller extends BaseController {
@PostMapping("/save")
@PreAuthorize("hasPermission('/${moduleName}/${businessName}/add','${permissionPrefix}:add')")
public Result save(@RequestBody ${ClassName} ${className}) {
- return decide(${className}Service.insert${ClassName}(${className}));
+ return decide(${className}Service.save(${className}));
}
/**
@@ -75,7 +74,7 @@ public class ${ClassName}Controller extends BaseController {
@GetMapping("/edit")
@PreAuthorize("hasPermission('/${moduleName}/${businessName}/edit','${permissionPrefix}:edit')")
public ModelAndView edit(${pkColumn.javaType} ${pkColumn.javaField}, ModelMap mmap) {
- ${ClassName} ${className} =${className}Service.select${ClassName}ById(${pkColumn.javaField});
+ ${ClassName} ${className} =${className}Service.getById(${pkColumn.javaField});
mmap.put("${className}", ${className});
return jumpPage(prefix + "/edit");
}
@@ -87,7 +86,7 @@ public class ${ClassName}Controller extends BaseController {
@PutMapping("/update")
@PreAuthorize("hasPermission('/${moduleName}/${businessName}/edit','${permissionPrefix}:edit')")
public Result update(@RequestBody ${ClassName} ${className}) {
- return decide(${className}Service.update${ClassName}(${className}));
+ return decide(${className}Service.updateById(${className}));
}
/**
@@ -107,6 +106,6 @@ public class ${ClassName}Controller extends BaseController {
@DeleteMapping("/remove/{${pkColumn.javaField}}")
@PreAuthorize("hasPermission('/${moduleName}/${businessName}/remove','${permissionPrefix}:remove')")
public Result remove(@PathVariable("${pkColumn.javaField}") ${pkColumn.javaType} ${pkColumn.javaField}) {
- return decide(${className}Service.delete${ClassName}ById(${pkColumn.javaField}));
+ return decide(${className}Service.removeById(${pkColumn.javaField}));
}
}
diff --git a/src/main/resources/vm/java/mapper.java.vm b/src/main/resources/vm/java/mapper.java.vm
index 64ca5af3384b1f7d97d1f4fb76586f4b68ff5ac5..d0e4aa3f440215370a93a5126e698dd3aaf190f8 100644
--- a/src/main/resources/vm/java/mapper.java.vm
+++ b/src/main/resources/vm/java/mapper.java.vm
@@ -3,6 +3,7 @@ package ${packageName}.mapper;
import org.apache.ibatis.annotations.Mapper;
import java.util.List;
import ${packageName}.domain.${ClassName};
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
* ${functionName}Mapper接口
@@ -11,16 +12,7 @@ import ${packageName}.domain.${ClassName};
* @date ${datetime}
*/
@Mapper
-public interface ${ClassName}Mapper {
-
- /**
- * 查询${functionName}
- *
- * @param ${pkColumn.javaField} ${functionName}ID
- * @return ${functionName}
- */
- ${ClassName} select${ClassName}ById(${pkColumn.javaType} ${pkColumn.javaField});
-
+public interface ${ClassName}Mapper extends BaseMapper<${ClassName}> {
/**
* 查询${functionName}列表
*
@@ -29,36 +21,4 @@ public interface ${ClassName}Mapper {
*/
List<${ClassName}> select${ClassName}List(${ClassName} ${className});
- /**
- * 新增${functionName}
- *
- * @param ${className} ${functionName}
- * @return 结果
- */
- int insert${ClassName}(${ClassName} ${className});
-
- /**
- * 修改${functionName}
- *
- * @param ${className} ${functionName}
- * @return 结果
- */
- int update${ClassName}(${ClassName} ${className});
-
- /**
- * 删除${functionName}
- *
- * @param ${pkColumn.javaField} ${functionName}ID
- * @return 结果
- */
- int delete${ClassName}ById(${pkColumn.javaType} ${pkColumn.javaField});
-
- /**
- * 批量删除${functionName}
- *
- * @param ${pkColumn.javaField}s 需要删除的数据ID
- * @return 结果
- */
- int delete${ClassName}ByIds(String[] ${pkColumn.javaField}s);
-
}
diff --git a/src/main/resources/vm/java/service.java.vm b/src/main/resources/vm/java/service.java.vm
index 61055bf6e486131f4bf0b4048f1762b86121ad09..c9bb0f5e2246990ce2ed66208f92997d16cb485e 100644
--- a/src/main/resources/vm/java/service.java.vm
+++ b/src/main/resources/vm/java/service.java.vm
@@ -4,6 +4,7 @@ import java.util.List;
import com.github.pagehelper.PageInfo;
import com.pearadmin.common.web.domain.request.PageDomain;
import ${packageName}.domain.${ClassName};
+import com.baomidou.mybatisplus.extension.service.IService;
/**
* ${functionName}Service接口
@@ -11,47 +12,16 @@ import ${packageName}.domain.${ClassName};
* @author ${author}
* @date ${datetime}
*/
-public interface I${ClassName}Service {
+public interface I${ClassName}Service extends IService<${ClassName}> {
/**
* 查询${functionName}
- *
- * @param ${pkColumn.javaField} ${functionName}ID
- * @return ${functionName}
- */
- ${ClassName} select${ClassName}ById(${pkColumn.javaType} ${pkColumn.javaField});
-
- /**
- * 查询${functionName}
- * @param ${classsName} ${functionName}
+ * @param ${className} ${functionName}
* @param pageDomain
* @return ${functionName} 分页集合
* */
PageInfo<${ClassName}> select${ClassName}Page(${ClassName} ${className}, PageDomain pageDomain);
- /**
- * 查询${functionName}列表
- *
- * @param ${className} ${functionName}
- * @return ${functionName}集合
- */
- List<${ClassName}> select${ClassName}List(${ClassName} ${className});
-
- /**
- * 新增${functionName}
- *
- * @param ${className} ${functionName}
- * @return 结果
- */
- int insert${ClassName}(${ClassName} ${className});
-
- /**
- * 修改${functionName}
- *
- * @param ${className} ${functionName}
- * @return 结果
- */
- int update${ClassName}(${ClassName} ${className});
/**
* 批量删除${functionName}
@@ -60,13 +30,4 @@ public interface I${ClassName}Service {
* @return 结果
*/
int delete${ClassName}ByIds(String[] ids);
-
- /**
- * 删除${functionName}信息
- *
- * @param ${pkColumn.javaField} ${functionName}ID
- * @return 结果
- */
- int delete${ClassName}ById(${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 37b06e3ea8aadf7aa9da05d4e9bf22851bdbbb5b..8a59c8dfb721a67cb911b39c2c391abae2ddd1ca 100644
--- a/src/main/resources/vm/java/serviceImpl.java.vm
+++ b/src/main/resources/vm/java/serviceImpl.java.vm
@@ -10,7 +10,10 @@ import org.springframework.stereotype.Service;
import ${packageName}.mapper.${ClassName}Mapper;
import ${packageName}.domain.${ClassName};
import ${packageName}.service.I${ClassName}Service;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import java.util.Arrays;
/**
* ${functionName}Service业务层处理
*
@@ -18,32 +21,8 @@ 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 I${ClassName}Service {
- @Autowired
- private ${ClassName}Mapper ${className}Mapper;
-
- /**
- * 查询${functionName}
- *
- * @param ${pkColumn.javaField} ${functionName}ID
- * @return ${functionName}
- */
- @Override
- public ${ClassName} select${ClassName}ById(${pkColumn.javaType} ${pkColumn.javaField}) {
- return ${className}Mapper.select${ClassName}ById(${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}
@@ -54,33 +33,10 @@ public class ${ClassName}ServiceImpl implements I${ClassName}Service {
@Override
public PageInfo<${ClassName}> select${ClassName}Page(${ClassName} ${className}, PageDomain pageDomain) {
PageHelper.startPage(pageDomain.getPage(), pageDomain.getLimit());
- List<${ClassName}> data = ${className}Mapper.select${ClassName}List(${className});
+ List<${ClassName}> data = baseMapper.select${ClassName}List(${className});
return new PageInfo<>(data);
}
- /**
- * 新增${functionName}
- *
- * @param ${className} ${functionName}
- * @return 结果
- */
-
- @Override
- public int insert${ClassName}(${ClassName} ${className}) {
- return ${className}Mapper.insert${ClassName}(${className});
- }
-
- /**
- * 修改${functionName}
- *
- * @param ${className} ${functionName}
- * @return 结果
- */
- @Override
- public int update${ClassName}(${ClassName} ${className}) {
- return ${className}Mapper.update${ClassName}(${className});
- }
-
/**
* 删除${functionName}对象
*
@@ -89,18 +45,7 @@ public class ${ClassName}ServiceImpl implements I${ClassName}Service {
*/
@Override
public int delete${ClassName}ByIds(String[] ids) {
- return ${className}Mapper.delete${ClassName}ByIds(ids);
- }
-
- /**
- * 删除${functionName}信息
- *
- * @param ${pkColumn.javaField} ${functionName}ID
- * @return 结果
- */
- @Override
- public int delete${ClassName}ById(${pkColumn.javaType} ${pkColumn.javaField}) {
- return ${className}Mapper.delete${ClassName}ById(${pkColumn.javaField});
+ return baseMapper.deleteBatchIds(Arrays.asList(ids));
}
}
diff --git a/src/main/resources/vm/xml/mapper.xml.vm b/src/main/resources/vm/xml/mapper.xml.vm
index 64ef12cb9a24123da912f37b62b70ce37074864b..37bba1aa5275dc64bef5933af53c03ee6af203b9 100644
--- a/src/main/resources/vm/xml/mapper.xml.vm
+++ b/src/main/resources/vm/xml/mapper.xml.vm
@@ -32,125 +32,36 @@
-
-
-
- insert into `${tableName}`
-
-#foreach($column in $columns)
-#if($column.columnName != $pkColumn.columnName || !$pkColumn.increment)
- `$column.columnName`,
-
-#end
-#end
-
-
-#foreach($column in $columns)
-#if($column.columnName != $pkColumn.columnName || !$pkColumn.increment)
- #{$column.javaField},
-
-#end
-#end
-
-
-
-
- update `${tableName}`
-
-#foreach($column in $columns)
-#if($column.columnName != $pkColumn.columnName)
- `$column.columnName` = #{$column.javaField},
-
-#end
-#end
-
- where `${pkColumn.columnName}` = #{${pkColumn.javaField}}
-
-
-
- delete from `${tableName}` where `${pkColumn.columnName}` = #{${pkColumn.javaField}}
-
-
-
- delete from `${tableName}` where `${pkColumn.columnName}` in
-
- #{${pkColumn.javaField}}
-
-
-
-#if($table.sub)
-
- delete from `${subTableName}` where `${subTableFkName}` in
-
- #{${subTableFkclassName}}
-
-
-
-
- delete from `${subTableName}` where `${subTableFkName}` = #{${subTableFkclassName}}
-
-
-
- insert into ${subTableName}
- (#foreach($column in $subTable.columns) $column.columnName#if($velocityCount != $subTable.columns.size()),#end#end) values
- (#foreach($column in $subTable.columns)
- #{item.$column.javaField}#if($velocityCount != $subTable.columns.size()),#end#end)
-
-
-#end
-