代码生成还原

mall-service/src/main/java/com/txz/mall/core/ProjectConstant.java

@@ -11,7 +11,7 @@ public final class ProjectConstant {
     public static final String SERVICE_PACKAGE = BASE_PACKAGE + ".service";//Service所在包
     public static final String SERVICE_IMPL_PACKAGE = SERVICE_PACKAGE + ".impl";//ServiceImpl所在包
     public static final String SERVICE_DTO_PACKAGE = BASE_PACKAGE + ".dto";//dto所在包
-    public static final String CONTROLLER_PACKAGE = BASE_PACKAGE + ".controller";//Controller所在包
+    public static final String CONTROLLER_PACKAGE = BASE_PACKAGE + ".web.mng";//Controller所在包
 
     public static final String MAPPER_INTERFACE_REFERENCE = BASE_PACKAGE + ".core.Mapper";//Mapper插件基础接口的完全限定名
     //项目名称

mall-service/src/test/resources/generator/template/controller.ftl

@@ -1,4 +1,4 @@
-package ${basePackage}.controller;
+package ${basePackage}.web.mng;
 import com.txz.mall.core.Result;
 import ${basePackage}.model.${modelNameUpperCamel};
 import ${basePackage}.service.${modelNameUpperCamel}Service;
@@ -16,10 +16,10 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-
 import tk.mybatis.mapper.entity.Condition;
 import tk.mybatis.mapper.entity.Example.Criteria;
-
+import org.springframework.web.bind.annotation.*;
+import org.springframework.validation.annotation.Validated;
 import javax.annotation.Resource;
 import java.util.List;
 import java.util.Date;
@@ -54,7 +54,7 @@ public class ${modelNameUpperCamel}Controller {
         return Result.success();
     }
 
-    @PostMapping("/delete")
+    @GetMapping("/delete")
 	@ApiOperation(value = "${modelNameLowerCamel}删除")
 	public Result delete(@RequestParam Long id) {
     	if(id == null){
@@ -92,7 +92,7 @@ public class ${modelNameUpperCamel}Controller {
         return Result.success();
     }
 
-    @PostMapping("/detail")
+    @GetMapping("/detail")
 	@ApiOperation(value = "${modelNameLowerCamel}获取详情")
 	public Result<${modelNameUpperCamel}> detail(@RequestParam Long id) {
     	if(id == null){
@@ -110,10 +110,10 @@ public class ${modelNameUpperCamel}Controller {
 
     @PostMapping("/list")
 	@ApiOperation(value = "${modelNameLowerCamel}获取列表")
-	public Result<List<${modelNameUpperCamel}>> list(@RequestBody ${modelNameUpperCamel} ${modelNameLowerCamel}, @RequestParam(defaultValue = "1") Integer page, @RequestParam(defaultValue = "10") Integer size) {
-        PageHelper.startPage(page, size);
+	public Result<List<${modelNameUpperCamel}>> list(@Validated @RequestBody ${modelNameUpperCamel}DTO dto) {
+        PageHelper.startPage(dto.getPage(), dto.getSize());
 
-        Condition condition = new Condition(${modelNameLowerCamel}.getClass());
+        Condition condition = new Condition(${modelNameUpperCamel}.class);
         Criteria criteria = condition.createCriteria();
 		criteria.andEqualTo("isDelete", 0);
 		condition.setOrderByClause("create_time DESC");

mall-service/src/test/resources/generator/template/dto.ftl

@@ -1,13 +1,14 @@
 package ${basePackage}.dto;
 import java.util.*;
 import lombok.Data;
+import com.txz.mall.util.QueryUtil;
 
 /**
 * Created by ${author} on ${date}.
 */
 
 @Data
-public class ${modelNameUpperCamel}Dto {
+public class ${modelNameUpperCamel}Dto extends QueryUtil{
 
 }