修改生成模板。

blade-ops/blade-develop/src/test/java/org/springblade/test/CodeGeneratorVer2.java

@@ -30,7 +30,9 @@ import org.springblade.develop.constant.DevelopConstant;
 import org.springblade.develop.support.BladeFastCodeGenerator;
 
 /**
- * .ver2
+ * .ver2 扩展修改。
+ * 对应BladeX-Tool框架中 BladeFastCodeGenerator 有修改。
+ * 仅仅用于代码生成。
  */
 public class CodeGeneratorVer2 {
 
@@ -49,8 +51,8 @@ public class CodeGeneratorVer2 {
     /**
      * 代码生成的包名
      * <p>
-     * basic
-     * quality
+     * basic    基础模块
+     * quality  质量模块
      */
     public static String PACKAGE_NAME = "org.springblade.desk.quality";
     /**
@@ -62,7 +64,7 @@ public class CodeGeneratorVer2 {
     /**
      * 需要生成的表名(两者只能取其一)
      */
-    public static String[] INCLUDE_TABLES = {"QA_CYCLE_TEST_TASK"};
+    public static String[] INCLUDE_TABLES = { "QA_LIQUID_TANK_TASK"};
     /**
      * 需要排除的表名(两者只能取其一)
      */

blade-ops/blade-develop/src/test/resources/templates/api-fast/controller.java.btl

@@ -7,25 +7,32 @@ import io.swagger.v3.oas.annotations.tags.Tag;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
-import lombok.AllArgsConstructor;
+import jakarta.annotation.Resource;
 import jakarta.validation.Valid;
 
+import lombok.Data;
+import lombok.AllArgsConstructor;
+import lombok.EqualsAndHashCode;
+import lombok.extern.slf4j.Slf4j;
 import org.springblade.core.secure.BladeUser;
 import org.springblade.core.secure.annotation.IsAdmin;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
+import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.springblade.desk.basic.util.ExcelExtUtil;
 import ${packageName!}.pojo.entity.${entityKey!};
-import ${packageName!}.pojo.vo.gen.${entityKey!}GenVO;
-import ${packageName!}.excel.gen.${entityKey!}GenExcel;
+import ${packageName!}.pojo.vo.${entityKey!}VO;
+import ${packageName!}.excel.${entityKey!}Excel;
 #if(hasWrapper) {
-import ${packageName!}.wrapper.gen.${entityKey!}GenWrapper;
+import ${packageName!}.wrapper.${entityKey!}Wrapper;
 #}
-import ${packageName!}.service.gen.${table.serviceName!};
+import ${packageName!}.service.${table.serviceName!};
 #if(isNotEmpty(superControllerClassPackage)){
 import ${superControllerClassPackage!};
 #}
@@ -43,12 +50,15 @@ import jakarta.servlet.http.HttpServletResponse;
  * @since ${date!}
  */
 @RestController
-@AllArgsConstructor
 #if(hasServiceName) {
 @RequestMapping("${serviceName!}/${entityKeyPath!}")
 #}else{
 @RequestMapping("/${entityKey!}")
 #}
+@Data
+@AllArgsConstructor
+@EqualsAndHashCode(callSuper = true)
+@Slf4j
 @Tag(name = "${table.comment!}", description = "${table.comment!}接口")
 #if(isNotEmpty(superControllerClass)){
 public class ${table.controllerName!} extends ${superControllerClass!} {
@@ -57,29 +67,35 @@ public class ${table.controllerName!} extends ${superControllerClass!} {
 public class ${table.controllerName!} {
 #}
 
-	private final ${table.serviceName!} ${entityKeyPath!}GenService;
+    @Resource
+	private ${table.serviceName!} service;
 
 #if(hasWrapper){
 	/**
 	 * ${table.comment!} 详情
 	 */
 	@GetMapping("/detail")
-	@ApiOperationSupport(order = 1)
-	@Operation(summary = "详情", description  = "传入${entityKey!}")
-	public R<${entityKey!}GenVO> detail(${entityKey!} ${entityKeyPath!}) {
-		${entityKey!} detail = ${entityKeyPath!}GenService.getOne(Condition.getQueryWrapper(${entityKeyPath!}));
-		return R.data(${entityKey!}GenWrapper.build().entityVO(detail));
+	@ApiOperationSupport(order = 10)
+	@Operation(summary = "详情", description  = "传入${entityKey!} Obj")
+	public R<${entityKey!}VO> detail(${entityKey!} ${entityKeyPath!}) {
+	    QueryWrapper<${entityKey!}> qw = Condition.getQueryWrapper(${entityKeyPath!});
+		${entityKey!} detail = service.getOne(qw);
+		${entityKey!}VO detailVO = ${entityKey!}Wrapper.build().entityVO(detail);
+		return R.data(detailVO);
 	}
 
 	/**
-	 * ${table.comment!} 分页
+	 * ${table.comment!} list分页
 	 */
 	@GetMapping("/list")
-	@ApiOperationSupport(order = 2)
-	@Operation(summary = "分页", description  = "传入${entityKey!}")
-	public R<IPage<${entityKey!}GenVO>> list(@Parameter(hidden = true) @RequestParam Map<String, Object> ${entityKeyPath!}, Query query) {
-		IPage<${entityKey!}> pages = ${entityKeyPath!}GenService.page(Condition.getPage(query), Condition.getQueryWrapper(${entityKeyPath!}, ${entityKey!}.class));
-		return R.data(${entityKey!}GenWrapper.build().pageVO(pages));
+	@ApiOperationSupport(order = 20)
+	@Operation(summary = "list分页", description  = "传入${entityKey!} Obj")
+	public R<IPage<${entityKey!}VO>> list(@Parameter(hidden = true) @RequestParam Map<String, Object> ${entityKeyPath!},
+	                                        Query query) {
+        QueryWrapper<${entityKey!}> qw = Condition.getQueryWrapper(${entityKeyPath!}, ${entityKey!}.class);
+		IPage<${entityKey!}> pages = service.page(Condition.getPage(query), qw);
+		IPage<${entityKey!}VO> pagesVO = ${entityKey!}Wrapper.build().pageVO(pages);
+		return R.data(pagesVO);
 	}
 
 #}else{
@@ -87,103 +103,184 @@ public class ${table.controllerName!} {
 	 * ${table.comment!} 详情
 	 */
 	@GetMapping("/detail")
-	@ApiOperationSupport(order = 1)
-	@Operation(summary = "详情", description  = "传入${entityKey!}")
+	@ApiOperationSupport(order = 10)
+	@Operation(summary = "详情", description  = "传入${entityKey!} Obj")
 	public R<${entityKey!}> detail(${entityKey!} ${entityKeyPath!}) {
-		${entityKey!} detail = ${entityKeyPath!}GenService.getOne(Condition.getQueryWrapper(${entityKeyPath!}));
+	    QueryWrapper<${entityKey!}> qw = Condition.getQueryWrapper(${entityKeyPath!})
+		${entityKey!} detail = service.getOne(qw);
 		return R.data(detail);
 	}
 
 	/**
-	 * ${table.comment!} 分页
+	 * ${table.comment!} list分页
 	 */
 	@GetMapping("/list")
-	@ApiOperationSupport(order = 2)
-	@Operation(summary = "分页", description  = "传入${entityKey!}")
-	public R<IPage<${entityKey!}Entity>> list(@Parameter(hidden = true) @RequestParam Map<String, Object> ${entityKeyPath!}, Query query) {
-		IPage<${entityKey!}Entity> pages = ${entityKeyPath!}GenService.page(Condition.getPage(query), Condition.getQueryWrapper(${entityKeyPath!}, ${entityKey!}Entity.class));
+	@ApiOperationSupport(order = 20)
+	@Operation(summary = "list分页", description  = "传入${entityKey!} Obj")
+	public R<IPage<${entityKey!}Entity>> list(@Parameter(hidden = true) @RequestParam Map<String, Object> ${entityKeyPath!},
+	                                            Query query) {
+        QueryWrapper<${entityKey!}> qw = Condition.getQueryWrapper(${entityKey!}, ${entityKey!}.class);
+		IPage<${entityKey!}> pages = service.page(Condition.getPage(query), qw);
 		return R.data(pages);
 	}
 
 #}
 
 	/**
-	 * ${table.comment!} 自定义分页
+	 * ${table.comment!} page分页
 	 */
 	@GetMapping("/page")
-	@ApiOperationSupport(order = 3)
-	@Operation(summary = "分页", description  = "传入${entityKey!}")
-	public R<IPage<${entityKey!}GenVO>> page(${entityKey!}GenVO ${entityKeyPath!}, Query query) {
-		IPage<${entityKey!}GenVO> pages = ${entityKeyPath!}GenService.select${entityKey!}Page(Condition.getPage(query), ${entityKeyPath!});
-		return R.data(pages);
+	@ApiOperationSupport(order = 21)
+	@Operation(summary = "page分页", description  = "传入${entityKey!} Obj")
+	public R<IPage<${entityKey!}VO>> page(${entityKey!}VO ${entityKeyPath!}, Query query) {
+		IPage<${entityKey!}VO> pagesVO = service.select${entityKey!}Page(
+		    Condition.getPage(query), ${entityKeyPath!}
+		);
+		return R.data(pagesVO);
 	}
 
 	/**
-	 * ${table.comment!} 新增
+     * ${table.comment!} list下拉选择
+     */
+    @GetMapping("/listForSelect")
+    @ApiOperationSupport(order = 22)
+    @Operation(summary = "list下拉选择", description  = "")
+    public R<List<${entityKey!}VO>> listForSelect() {
+         List<${entityKey!}> list = service.list();
+         List<${entityKey!}VO> listVO = ${entityKey!}Wrapper.build().listVO(list);
+         return R.data(listVO);
+    }
+
+	/**
+	 * ${table.comment!} 新增一条
 	 */
 	@PostMapping("/save")
-	@ApiOperationSupport(order = 4)
-	@Operation(summary = "新增", description  = "传入${entityKey!}")
-	public R save(@Valid @RequestBody ${entityKey!} ${entityKeyPath!}) {
-		return R.status(${entityKeyPath!}GenService.save(${entityKeyPath!}));
+	@ApiOperationSupport(order = 30)
+	@Operation(summary = "新增一条", description  = "传入${entityKey!} Obj")
+	public R save(@Valid @RequestBody ${entityKey!} addOne) {
+	    addOne.setId(null);
+		return R.status(service.save(addOne));
 	}
 
 	/**
-	 * ${table.comment!} 修改
+     * ${table.comment!} 新增批量
+     */
+     @PostMapping("/saveBat")
+     @ApiOperationSupport(order = 31)
+     @Operation(summary = "新增批量", description = "传入${entityKey!} List")
+     public R saveBat(@Valid @RequestBody List<${entityKey!}> addList) {
+         addList.forEach(one -> {
+             one.setId(null);
+         });
+         return R.status(service.saveBatch(addList));
+     }
+
+	/**
+	 * ${table.comment!} 修改一条
 	 */
 	@PostMapping("/update")
-	@ApiOperationSupport(order = 5)
-	@Operation(summary = "修改", description  = "传入${entityKey!}")
-	public R update(@Valid @RequestBody ${entityKey!} ${entityKeyPath!}) {
-		return R.status(${entityKeyPath!}GenService.updateById(${entityKeyPath!}));
+	@ApiOperationSupport(order = 40)
+	@Operation(summary = "修改一条", description  = "传入${entityKey!} Obj")
+	public R update(@Valid @RequestBody ${entityKey!} updateOne) {
+		return R.status(service.updateById(updateOne));
 	}
 
+    /**
+     * [工作中心] 修改批量
+     */
+    @PostMapping("/updateBat")
+    @ApiOperationSupport(order = 41)
+    @Operation(summary = "修改批量", description  = "传入${entityKey!} List")
+    public R updateBat(@Valid @RequestBody List<${entityKey!}> updateList) {
+        return R.status(service.updateBatchById(updateList));
+    }
+
 	/**
-	 * ${table.comment!} 新增或修改
+	 * ${table.comment!} 新增或修改一条
 	 */
 	@PostMapping("/submit")
-	@ApiOperationSupport(order = 6)
-	@Operation(summary = "新增或修改", description  = "传入${entityKey!}")
-	public R submit(@Valid @RequestBody ${entityKey!} ${entityKeyPath!}) {
-		return R.status(${entityKeyPath!}GenService.saveOrUpdate(${entityKeyPath!}));
+	@ApiOperationSupport(order = 50)
+	@Operation(summary = "新增或修改一条", description  = "传入${entityKey!} Obj")
+	public R submit(@Valid @RequestBody ${entityKey!} mergeOne) {
+		return R.status(service.saveOrUpdate(mergeOne));
 	}
 
+	/**
+     * ${table.comment!} 新增或修改批量
+     */
+     @PostMapping("/submitBat")
+     @ApiOperationSupport(order = 51)
+     @Operation(summary = "新增或修改批量", description = "传入${entityKey!} List")
+     public R submitBat(@Valid @RequestBody List<${entityKey!}> mergeList) {
+         return R.status(service.saveOrUpdateBatch(mergeList));
+     }
+
 #if(hasSuperEntity){
 	/**
-	 * ${table.comment!} 删除
+	 * ${table.comment!} 逻辑删除
 	 */
 	@PostMapping("/remove")
-	@ApiOperationSupport(order = 7)
+	@ApiOperationSupport(order = 61)
 	@Operation(summary = "逻辑删除", description  = "传入ids")
 	public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) {
-		return R.status(${entityKeyPath!}GenService.deleteLogic(Func.toLongList(ids)));
+		return R.status(service.deleteLogic(Func.toLongList(ids)));
 	}
 #}else{
 	/**
 	 * ${table.comment!} 删除
 	 */
 	@PostMapping("/remove")
-	@ApiOperationSupport(order = 7)
+	@ApiOperationSupport(order = 61)
 	@Operation(summary = "删除", description  = "传入ids")
 	public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) {
-		return R.status(${entityKeyPath!}Service.removeByIds(Func.toLongList(ids)));
+		return R.status(service.removeByIds(Func.toLongList(ids)));
 	}
 #}
 
 	/**
-	 * 导出数据
+	 * ${table.comment!} 导出Excel
 	 */
-	@IsAdmin
-	@GetMapping("/export-excel")
-	@ApiOperationSupport(order = 8)
-	@Operation(summary = "导出数据", description  = "传入${entityKey!}")
-	public void export${entityKey!}(@Parameter(hidden = true) @RequestParam Map<String, Object> ${entityKeyPath!}, BladeUser bladeUser, HttpServletResponse response) {
-		QueryWrapper<${entityKey!}> queryWrapper = Condition.getQueryWrapper(${entityKeyPath!}, ${entityKey!}.class);
+	@GetMapping("/exportExcel")
+	@ApiOperationSupport(order = 70)
+	@Operation(summary = "导出Excel", description  = "传入${entityKey!}")
+	public void exportExcel(@Parameter(hidden = true) @RequestParam Map<String, Object> ${entityKeyPath!},
+	                                BladeUser bladeUser, HttpServletResponse response) {
+		QueryWrapper<${entityKey!}> qw = Condition.getQueryWrapper(${entityKeyPath!}, ${entityKey!}.class);
 		//if (!AuthUtil.isAdministrator()) {
 		//	queryWrapper.lambda().eq(${entity!}::getTenantId, bladeUser.getTenantId());
 		//}
 		//queryWrapper.lambda().eq(${entityKey!}Entity::getIsDeleted, BladeConstant.DB_NOT_DELETED);
-		List<${entityKey!}GenExcel> list = ${entityKeyPath!}GenService.export${entityKey!}(queryWrapper);
-		ExcelUtil.export(response, "${table.comment!}数据" + DateUtil.time(), "${table.comment!}数据表", list, ${entityKey!}GenExcel.class);
+		List<${entityKey!}Excel> list = service.export${entityKey!}(qw);
+		ExcelUtil.export(response, "${table.comment!}数据" + DateUtil.time(),
+		                "${table.comment!}数据表", list, ${entityKey!}Excel.class);
 	}
+
+	/**
+     * ${table.comment!} 下载Excel模板
+     */
+     @GetMapping("/downloadExcelTemplate")
+     @ApiOperationSupport(order = 71)
+     @Operation(summary = "下载Excel模板", description = "")
+     public ResponseEntity<org.springframework.core.io.Resource> downloadExcelTemplate() {
+            return ExcelExtUtil.downloadXlsTemplate(
+                    "Excel/QA/ImportTemplate-CycleTestItem.xls",
+                    "导入模版-周期试验项目.xls");
+     }
+
+     /**
+      * ${table.comment!} 导入Excel
+      */
+      @PostMapping("/importExcel")
+      @ApiOperationSupport(order = 72)
+      @Operation(summary = "导入Excel", description = "MultipartFile")
+      public R importExcel(@RequestParam("file") MultipartFile file) {
+          R checkR = ExcelExtUtil.importExcelCheck(file);
+          if (checkR != null) {
+              return checkR;
+          }
+          List<${entityKey!}> importList = ExcelUtil.read(
+                     file, 0, 1, ${entityKey!}.class
+          );
+          return R.status(service.saveBatch(importList));
+      }
 }

blade-ops/blade-develop/src/test/resources/templates/api-fast/entityDTO.java.btl

@@ -1,7 +1,7 @@
 /**
  * Author: Tom Shuo
  */
-package ${strutil.replace(package.Entity,"entity","dto.gen")};
+package ${strutil.replace(package.Entity,"entity","dto")};
 
 import ${packageName!}.pojo.entity.${entityKey!};
 import lombok.Data;
@@ -16,7 +16,7 @@ import java.io.Serial;
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-public class ${entityKey!}GenDTO extends ${entityKey!} {
+public class ${entityKey!}DTO extends ${entityKey!} {
 	@Serial
 	private static final long serialVersionUID = 1L;
 

blade-ops/blade-develop/src/test/resources/templates/api-fast/entityExcel.java.btl

@@ -1,7 +1,7 @@
 /**
  * Author: Tom Shuo
  */
-package ${strutil.replace(package.Entity,"pojo.entity","excel.gen")};
+package ${strutil.replace(package.Entity,"pojo.entity","excel")};
 
 
 import lombok.Data;
@@ -28,7 +28,7 @@ import java.io.Serial;
 @ColumnWidth(25)
 @HeadRowHeight(20)
 @ContentRowHeight(18)
-public class ${entityKey!}GenExcel implements Serializable {
+public class ${entityKey!}Excel implements Serializable {
 
 	@Serial
 	private static final long serialVersionUID = 1L;

blade-ops/blade-develop/src/test/resources/templates/api-fast/entityVO.java.btl

@@ -1,7 +1,7 @@
 /**
  * Author: Tom Shuo
  */
-package ${strutil.replace(package.Entity,"entity","vo.gen")};
+package ${strutil.replace(package.Entity,"entity","vo")};
 
 import ${packageName!}.pojo.entity.${entityKey!};
 import lombok.Data;
@@ -16,7 +16,7 @@ import java.io.Serial;
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-public class ${entityKey!}GenVO extends ${entityKey!} {
+public class ${entityKey!}VO extends ${entityKey!} {
 	@Serial
 	private static final long serialVersionUID = 1L;
 

blade-ops/blade-develop/src/test/resources/templates/api-fast/mapper.java.btl

@@ -4,8 +4,8 @@
 package ${package.Mapper!};
 
 import ${packageName!}.pojo.entity.${entityKey!};
-import ${packageName!}.pojo.vo.gen.${entityKey!}GenVO;
-import ${packageName!}.excel.gen.${entityKey!}GenExcel;
+import ${packageName!}.pojo.vo.${entityKey!}VO;
+import ${packageName!}.excel.${entityKey!}Excel;
 import ${superMapperClassPackage!};
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -27,7 +27,7 @@ public interface ${table.mapperName!} extends ${superMapperClass!}<${entityKey!}
 	 * @param ${entityKeyPath!} 查询参数
 	 * @return List<${entityKey!}VO>
 	 */
-	List<${entityKey!}GenVO> select${entityKey!}Page(IPage page, ${entityKey!}GenVO ${entityKeyPath!});
+	List<${entityKey!}VO> select${entityKey!}Page(IPage page, ${entityKey!}VO ${entityKeyPath!});
 
 	/**
 	 * 获取导出数据
@@ -35,5 +35,5 @@ public interface ${table.mapperName!} extends ${superMapperClass!}<${entityKey!}
 	 * @param queryWrapper 查询条件
 	 * @return List<${entityKey!}Excel>
 	 */
-	List<${entityKey!}GenExcel> export${entityKey!}(@Param("ew") Wrapper<${entityKey!}> queryWrapper);
+	List<${entityKey!}Excel> export${entityKey!}(@Param("ew") Wrapper<${entityKey!}> queryWrapper);
 }

blade-ops/blade-develop/src/test/resources/templates/api-fast/mapper.xml.btl

@@ -17,8 +17,7 @@
         SELECT * FROM ${table.name} WHERE is_deleted = 0
     </select>
 
-    <select id="export${entityKey!}" resultType="${packageName!}.excel.gen.${entityKey!}GenExcel">
+    <select id="export${entityKey!}" resultType="${packageName!}.excel.${entityKey!}Excel">
         SELECT * FROM ${table.name!} \${ew.customSqlSegment}
     </select>
-
 </mapper>

blade-ops/blade-develop/src/test/resources/templates/api-fast/service.java.btl

@@ -5,8 +5,8 @@ package ${package.Service!};
 
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import ${packageName!}.pojo.entity.${entityKey!};
-import ${packageName!}.pojo.vo.gen.${entityKey!}GenVO;
-import ${packageName!}.excel.gen.${entityKey!}GenExcel;
+import ${packageName!}.pojo.vo.${entityKey!}VO;
+import ${packageName!}.excel.${entityKey!}Excel;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 #if(hasSuperEntity){
 import ${superServiceClassPackage!};
@@ -33,7 +33,7 @@ public interface ${table.serviceName!} extends IService<${entity!}> {
 	 * @param ${entityKeyPath!} 查询参数
 	 * @return IPage<${entityKey!}VO>
 	 */
-	IPage<${entityKey!}GenVO> select${entityKey!}Page(IPage<${entityKey!}GenVO> page, ${entityKey!}GenVO ${entityKeyPath!});
+	IPage<${entityKey!}VO> select${entityKey!}Page(IPage<${entityKey!}VO> page, ${entityKey!}VO ${entityKeyPath!});
 
 	/**
 	 * 导出数据
@@ -41,5 +41,5 @@ public interface ${table.serviceName!} extends IService<${entity!}> {
 	 * @param queryWrapper 查询条件
 	 * @return List<${entityKey!}Excel>
 	 */
-	List<${entityKey!}GenExcel> export${entityKey!}(Wrapper<${entityKey!}> queryWrapper);
+	List<${entityKey!}Excel> export${entityKey!}(Wrapper<${entityKey!}> queryWrapper);
 }

blade-ops/blade-develop/src/test/resources/templates/api-fast/serviceImpl.java.btl

@@ -3,11 +3,16 @@
  */
 package ${package.ServiceImpl!};
 
+import jakarta.annotation.Resource;
+import lombok.Data;
+import lombok.AllArgsConstructor;
+import lombok.EqualsAndHashCode;
+import lombok.extern.slf4j.Slf4j;
 import ${packageName!}.pojo.entity.${entityKey!};
-import ${packageName!}.pojo.vo.gen.${entityKey!}GenVO;
-import ${packageName!}.excel.gen.${entityKey!}GenExcel;
-import ${packageName!}.mapper.gen.${table.mapperName!};
-import ${packageName!}.service.gen.${table.serviceName!};
+import ${packageName!}.pojo.vo.${entityKey!}VO;
+import ${packageName!}.excel.${entityKey!}Excel;
+import ${packageName!}.mapper.${table.mapperName!};
+import ${packageName!}.service.${table.serviceName!};
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -25,6 +30,10 @@ import java.util.List;
  * @since ${date!}
  */
 @Service
+@Data
+@AllArgsConstructor
+@EqualsAndHashCode(callSuper = true)
+@Slf4j
 #if(hasSuperEntity){
 public class ${table.serviceImplName!} extends ${superServiceImplClass!}<${table.mapperName!}, ${entity!}> implements ${table.serviceName!} {
 #}else{
@@ -32,13 +41,13 @@ public class ${table.serviceImplName!} extends ServiceImpl<${table.mapperName!},
 #}
 
 	@Override
-	public IPage<${entityKey!}GenVO> select${entityKey!}Page(IPage<${entityKey!}GenVO> page, ${entityKey!}GenVO ${entityKeyPath!}) {
+	public IPage<${entityKey!}VO> select${entityKey!}Page(IPage<${entityKey!}VO> page, ${entityKey!}VO ${entityKeyPath!}) {
 		return page.setRecords(baseMapper.select${entityKey!}Page(page, ${entityKeyPath!}));
 	}
 
 	@Override
-	public List<${entityKey!}GenExcel> export${entityKey!}(Wrapper<${entityKey!}> queryWrapper) {
-		List<${entityKey!}GenExcel> ${entityKeyPath!}List = baseMapper.export${entityKey!}(queryWrapper);
+	public List<${entityKey!}Excel> export${entityKey!}(Wrapper<${entityKey!}> queryWrapper) {
+		List<${entityKey!}Excel> ${entityKeyPath!}List = baseMapper.export${entityKey!}(queryWrapper);
 		//${entityKeyPath!}List.forEach(${entityKeyPath!} -> {
 		//	${entityKeyPath!}.setTypeName(DictCache.getValue(DictEnum.YES_NO, ${entity!}.getType()));
 		//});

blade-ops/blade-develop/src/test/resources/templates/api-fast/wrapper.java.btl

@@ -1,12 +1,12 @@
 /**
  * Author: Tom Shuo
  */
-package ${strutil.replace(package.Entity,"pojo.entity","wrapper.gen")};
+package ${strutil.replace(package.Entity,"pojo.entity","wrapper")};
 
 import org.springblade.core.mp.support.BaseEntityWrapper;
 import org.springblade.core.tool.utils.BeanUtil;
 import ${packageName!}.pojo.entity.${entityKey!};
-import ${packageName!}.pojo.vo.gen.${entityKey!}GenVO;
+import ${packageName!}.pojo.vo.${entityKey!}VO;
 import java.util.Objects;
 
 /**
@@ -15,21 +15,21 @@ import java.util.Objects;
  * @author ${author!}
  * @since ${date!}
  */
-public class ${entityKey!}GenWrapper extends BaseEntityWrapper<${entityKey!}, ${entityKey!}GenVO>  {
+public class ${entityKey!}Wrapper extends BaseEntityWrapper<${entityKey!}, ${entityKey!}VO>  {
 
-	public static ${entityKey!}GenWrapper build() {
-		return new ${entityKey!}GenWrapper();
+	public static ${entityKey!}Wrapper build() {
+		return new ${entityKey!}Wrapper();
  	}
 
 	@Override
-	public ${entityKey!}GenVO entityVO(${entityKey!} ${entityKeyPath!}) {
-		${entityKey!}GenVO ${entityKeyPath!}VO = Objects.requireNonNull(BeanUtil.copyProperties(${entityKeyPath!}, ${entityKey!}GenVO.class));
+	public ${entityKey!}VO entityVO(${entityKey!} ${entityKeyPath!}) {
+		${entityKey!}VO VO = Objects.requireNonNull(BeanUtil.copyProperties(${entityKeyPath!}, ${entityKey!}VO.class));
 
 		//User createUser = UserCache.getUser(${entityKeyPath!}.getCreateUser());
 		//User updateUser = UserCache.getUser(${entityKeyPath!}.getUpdateUser());
 		//${entityKeyPath!}VO.setCreateUserName(createUser.getName());
 		//${entityKeyPath!}VO.setUpdateUserName(updateUser.getName());
 
-		return ${entityKeyPath!}VO;
+		return VO;
 	}
 }