修改生成代码工具类

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 + ".web.mng";//Controller所在包
+    public static final String CONTROLLER_PACKAGE = BASE_PACKAGE + ".controller";//Controller所在包
 
     public static final String MAPPER_INTERFACE_REFERENCE = BASE_PACKAGE + ".core.Mapper";//Mapper插件基础接口的完全限定名
     //项目名称

mall-service/src/test/java/CodeGenerator.java

@@ -18,16 +18,16 @@ import static com.txz.mall.core.ProjectConstant.*;
  */
 public class CodeGenerator {
 	// JDBC配置，请修改为你项目的实际配置
-	private static final String JDBC_URL = "jdbc:mysql://106.54.153.203:3306/operating";
-	private static final String JDBC_USERNAME = "htds";
-	private static final String JDBC_PASSWORD = "yw1234";
+	private static final String JDBC_URL = "jdbc:mysql://124.222.152.234:3306/mall?useSSL=false";
+	private static final String JDBC_USERNAME = "root";
+	private static final String JDBC_PASSWORD = "hy123456";
 	private static final String JDBC_DIVER_CLASS_NAME = "com.mysql.jdbc.Driver";
 
-	private static final String APPLICATION = "operating";
+	private static final String APPLICATION = "mall";
 
-	private static final String PROJECT_PATH = System.getProperty("user.dir")+"\\"+APPLICATION+"-service";// 项目在硬盘上的基础路径
-	private static final String PROJECT_INTERFACE_PATH = System.getProperty("user.dir")+"\\"+APPLICATION+"-interface";// 项目在硬盘上的基础路径
-	private static final String PROJECT_API_PATH = System.getProperty("user.dir")+"\\"+APPLICATION+"-api";// 项目在硬盘上的基础路径
+	private static final String PROJECT_PATH = System.getProperty("user.dir")+"/"+APPLICATION+"-service";// 项目在硬盘上的基础路径
+	private static final String PROJECT_INTERFACE_PATH = System.getProperty("user.dir")+"/"+APPLICATION+"-interface";// 项目在硬盘上的基础路径
+	private static final String PROJECT_API_PATH = System.getProperty("user.dir")+"/"+APPLICATION+"-api";// 项目在硬盘上的基础路径
 
 
 	private static final String TEMPLATE_FILE_PATH = PROJECT_PATH + "/src/test/resources/generator/template";// 模板位置
@@ -47,7 +47,7 @@ public class CodeGenerator {
 	public static void main(String[] args) {
 //		genCode("o_lottery","o_lottery_prize","o_lottery_record");
 		// genCode("输入表名","输入自定义Model名称");
-		  genCode("o_app_half_time");
+		  genCode("m_store_product");
 		//genCode("c_member_coupon");
 	}
 
@@ -218,6 +218,14 @@ public class CodeGenerator {
 		tableConfiguration.setTableName(tableName);
 		tableConfiguration.setDomainObjectName(modelName+"DTO");
 		tableConfiguration.setGeneratedKey(new GeneratedKey("id", "Mysql", true, null));
+
+
+		JavaTypeResolverConfiguration javaTypeResolverConfiguration = new JavaTypeResolverConfiguration();
+		javaTypeResolverConfiguration.setConfigurationType("org.mybatis.generator.internal.types.JavaTypeResolverDefaultImpl");
+		javaTypeResolverConfiguration.addProperty("forceBigDecimals", "false");
+		javaTypeResolverConfiguration.addProperty("useJSR310Types", "true");
+		context.setJavaTypeResolverConfiguration(javaTypeResolverConfiguration);
+
 		context.addTableConfiguration(tableConfiguration);
 
 

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

@@ -11,17 +11,17 @@ import java.util.List;
 public interface ${modelNameUpperCamel}ServiceClient {
 
 	@RequestMapping( value = {"${baseRequestMapping}/add"}, method = {RequestMethod.POST} )
-    public Result add(@RequestBody ${modelNameUpperCamel}DPO ${modelNameLowerCamel},@RequestParam("userId") String userId);
+    public Result add(@RequestBody ${modelNameUpperCamel}DPO ${modelNameLowerCamel},@RequestParam("userId") Long userId);
 
 	@RequestMapping( value = {"${baseRequestMapping}/delete"}, method = {RequestMethod.POST} )
-	public Result delete(@RequestParam("id") Integer id,@RequestParam("userId") String userId);
+	public Result delete(@RequestParam("id") Integer id,@RequestParam("userId") Long userId);
 
 	@RequestMapping( value = {"${baseRequestMapping}/update"}, method = {RequestMethod.POST} )
-	public Result update(@RequestBody ${modelNameUpperCamel}DPO ${modelNameLowerCamel},@RequestParam("userId") String userId);
+	public Result update(@RequestBody ${modelNameUpperCamel}DPO ${modelNameLowerCamel},@RequestParam("userId") Long userId);
 
 	@RequestMapping( value = {"${baseRequestMapping}/detail"}, method = {RequestMethod.POST} )
-	public Result<${modelNameUpperCamel}DPO> detail(@RequestParam("id") Integer id,@RequestParam("userId") String userId);
+	public Result<${modelNameUpperCamel}DPO> detail(@RequestParam("id") Integer id,@RequestParam("userId") Long userId);
 
 	@RequestMapping( value = {"${baseRequestMapping}/list"}, method = {RequestMethod.POST} )
-	public Result<List<${modelNameUpperCamel}DPO>> list(@RequestBody ${modelNameUpperCamel}DPO ${modelNameLowerCamel}, @RequestParam("page") Integer page, @RequestParam("size") Integer size,@RequestParam("userId") String userId);
+	public Result<List<${modelNameUpperCamel}DPO>> list(@RequestBody ${modelNameUpperCamel}DPO ${modelNameLowerCamel}, @RequestParam("page") Integer page, @RequestParam("size") Integer size,@RequestParam("userId") Long userId);
 }

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

@@ -1,6 +1,5 @@
-package ${basePackage}.web.mng;
-import com.yiweikeji.project.core.Result;
-import ${basePackage}.core.ResultGenerator;
+package ${basePackage}.controller;
+import com.txz.mall.core.Result;
 import ${basePackage}.model.${modelNameUpperCamel};
 import ${basePackage}.service.${modelNameUpperCamel}Service;
 
@@ -23,7 +22,7 @@ import tk.mybatis.mapper.entity.Example.Criteria;
 
 import javax.annotation.Resource;
 import java.util.List;
-import org.apache.commons.lang.StringUtils;
+import java.util.Date;
 
 /**
 * Created by ${author} on ${date}.
@@ -40,96 +39,94 @@ public class ${modelNameUpperCamel}Controller {
 
     @PostMapping("/add")
 	@ApiOperation(value = "${modelNameLowerCamel}新增",httpMethod = "POST")
-    public Result add(@RequestBody ${modelNameUpperCamel} ${modelNameLowerCamel},String userId) {
+    public Result add(@RequestBody ${modelNameUpperCamel} ${modelNameLowerCamel},Long userId) {
     	if(${modelNameLowerCamel} == null){
-    		return ResultGenerator.genFailResult(ResultCode.OBJECT_IS_NULL);
+    		return Result.fail(ResultCode.OBJECT_IS_NULL);
     	}
-    	if(StringUtils.isBlank(userId)){
-    		return ResultGenerator.genFailResult(ResultCode.USERID_IS_NULL);
+    	if(userId == null){
+    		return Result.fail(ResultCode.USERID_IS_NULL);
     	}
     	try {
-    //		${modelNameLowerCamel}.setCreateTime(new Date());
-    //		${modelNameLowerCamel}.setCreateUserId(userId);
+    		${modelNameLowerCamel}.setCreateTime(new Date());
+    		${modelNameLowerCamel}.setCreateUserId(userId);
     		${modelNameLowerCamel}Service.save(${modelNameLowerCamel});
 		} catch (Exception e) {
 			log.error("新增对象操作异常e:{}",e);
-			return ResultGenerator.genFailResult(ResultCode.INTERNAL_SERVER_ERROR);
+			return Result.fail(ResultCode.INTERNAL_SERVER_ERROR);
 		}
-
-        return ResultGenerator.genSuccessResult();
+        return Result.success();
     }
 
     @PostMapping("/delete")
 	@ApiOperation(value = "${modelNameLowerCamel}删除",httpMethod = "POST")
-    public Result delete(@RequestParam Integer id,String userId) {
+    public Result delete(@RequestParam Long id,Long userId) {
     	if(id == null){
-    		return ResultGenerator.genFailResult(ResultCode.ID_IS_NULL);
+    		return Result.fail(ResultCode.ID_IS_NULL);
     	}
-    	if(StringUtils.isBlank(userId)){
-    		return ResultGenerator.genFailResult(ResultCode.USERID_IS_NULL);
+    	if(userId == null){
+    		return Result.fail(ResultCode.USERID_IS_NULL);
     	}
     	try {
     		${modelNameLowerCamel}Service.deleteById(id);
 		} catch (Exception e) {
 			log.error("删除对象操作异常e:{}",e);
-			return ResultGenerator.genFailResult(ResultCode.INTERNAL_SERVER_ERROR);
+			return Result.fail(ResultCode.INTERNAL_SERVER_ERROR);
 		}
-        return ResultGenerator.genSuccessResult();
+        return Result.success();
     }
 
     @PostMapping("/update")
 	@ApiOperation(value = "${modelNameLowerCamel}更新",httpMethod = "POST")
-    public Result update(@RequestBody ${modelNameUpperCamel} ${modelNameLowerCamel},String userId) {
+    public Result update(@RequestBody ${modelNameUpperCamel} ${modelNameLowerCamel},Long userId) {
     	if(${modelNameLowerCamel} == null){
-    		return ResultGenerator.genFailResult(ResultCode.OBJECT_IS_NULL);
+    		return Result.fail(ResultCode.OBJECT_IS_NULL);
     	}
     	if(${modelNameLowerCamel}.getId() == null){
-    		return ResultGenerator.genFailResult(ResultCode.ID_IS_NULL);
+    		return Result.fail(ResultCode.ID_IS_NULL);
     	}
-    	if(StringUtils.isBlank(userId)){
-    		return ResultGenerator.genFailResult(ResultCode.USERID_IS_NULL);
+    	if(userId == null){
+    		return Result.fail(ResultCode.USERID_IS_NULL);
     	}
     	try {
-    //		${modelNameLowerCamel}.setUpdateTime(new Date());
-    //		${modelNameLowerCamel}.setUpdateUserId(userId);
+    		${modelNameLowerCamel}.setUpdateTime(new Date());
+    		${modelNameLowerCamel}.setUpdateUserId(userId);
     		${modelNameLowerCamel}Service.update(${modelNameLowerCamel});
 		} catch (Exception e) {
 			log.error("更新对象操作异常e:{}",e);
-			return ResultGenerator.genFailResult(ResultCode.INTERNAL_SERVER_ERROR);
+			return Result.fail(ResultCode.INTERNAL_SERVER_ERROR);
 		}
-        return ResultGenerator.genSuccessResult();
+        return Result.success();
     }
 
     @PostMapping("/detail")
 	@ApiOperation(value = "${modelNameLowerCamel}获取详情",httpMethod = "POST")
-    public Result<${modelNameUpperCamel}> detail(@RequestParam Integer id,String userId) {
+    public Result<${modelNameUpperCamel}> detail(@RequestParam Long id,Long userId) {
     	if(id == null){
-    		return ResultGenerator.genFailResult(ResultCode.ID_IS_NULL);
+    		return Result.fail(ResultCode.ID_IS_NULL);
     	}
-    	if(StringUtils.isBlank(userId)){
-    		return ResultGenerator.genFailResult(ResultCode.USERID_IS_NULL);
+    	if(userId == null){
+    		return Result.fail(ResultCode.USERID_IS_NULL);
     	}
     	${modelNameUpperCamel} ${modelNameLowerCamel} = null;
     	try {
     		${modelNameLowerCamel} = ${modelNameLowerCamel}Service.findById(id);
 		} catch (Exception e) {
 			log.error("查询对象操作异常e:{}",e);
-			return ResultGenerator.genFailResult(ResultCode.INTERNAL_SERVER_ERROR);
+			return Result.fail(ResultCode.INTERNAL_SERVER_ERROR);
 		}
-
-        return ResultGenerator.genSuccessResult(${modelNameLowerCamel});
+        return Result.success(${modelNameLowerCamel});
     }
 
     @PostMapping("/list")
 	@ApiOperation(value = "${modelNameLowerCamel}获取列表",httpMethod = "POST")
-    public Result<List<${modelNameUpperCamel}>> list(@RequestBody ${modelNameUpperCamel} ${modelNameLowerCamel}, @RequestParam(defaultValue = "0") Integer page, @RequestParam(defaultValue = "0") Integer size,String userId) {
-        if(StringUtils.isBlank(userId)){
-    		return ResultGenerator.genFailResult(ResultCode.USERID_IS_NULL);
+    public Result<List<${modelNameUpperCamel}>> list(@RequestBody ${modelNameUpperCamel} ${modelNameLowerCamel}, @RequestParam(defaultValue = "0") Integer page, @RequestParam(defaultValue = "0") Integer size,Long userId) {
+        if(userId == null){
+    		return Result.fail(ResultCode.USERID_IS_NULL);
     	}
         PageHelper.startPage(page, size);
 
         Condition condition = new Condition(${modelNameLowerCamel}.getClass());
-        Criteria criteria = condition.createCriteria();
+//        Criteria criteria = condition.createCriteria();
 //        criteria.andEqualTo("name", city.getName());
 		PageInfo pageInfo = null;
 		try {
@@ -137,8 +134,8 @@ public class ${modelNameUpperCamel}Controller {
     		 pageInfo = new PageInfo(list);
 		} catch (Exception e) {
 			log.error("查询对象操作异常e:{}",e);
-			return ResultGenerator.genFailResult(ResultCode.INTERNAL_SERVER_ERROR);
+			return Result.fail(ResultCode.INTERNAL_SERVER_ERROR);
 		}
-        return ResultGenerator.genSuccessResult(pageInfo);
+        return Result.success(pageInfo);
     }
 }

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

@@ -1,9 +1,12 @@
 package ${basePackage}.dto;
 import java.util.*;
+import lombok.Data;
 
 /**
 * Created by ${author} on ${date}.
 */
+
+@Data
 public class ${modelNameUpperCamel}Dto {
 
 }