From 1d0ea30024f4a7c72ab3d329896dca0a6161c125 Mon Sep 17 00:00:00 2001 From: wangqiong <1322446236@qq.com> Date: Thu, 6 Jun 2024 15:04:23 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=B3=A8=E9=87=8A=E6=8E=89=E6=9D=83?= =?UTF-8?q?=E9=99=90=E9=AA=8C=E8=AF=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../manage/controller/HourRateController.java | 8 ++-- .../qomo/kn/cost/manage/entity/HourRate.java | 8 ++-- .../qomo/kn/cost/manage/ApplicationTests.java | 37 +++++++++---------- 3 files changed, 25 insertions(+), 28 deletions(-) diff --git a/qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/controller/HourRateController.java b/qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/controller/HourRateController.java index cec3269..fbcb855 100644 --- a/qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/controller/HourRateController.java +++ b/qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/controller/HourRateController.java @@ -65,7 +65,7 @@ public class HourRateController extends JeecgController add(@RequestBody HourRate hourRate) { hourRateService.save(hourRate); @@ -80,7 +80,7 @@ public class HourRateController extends JeecgController edit(@RequestBody HourRate hourRate) { hourRateService.updateById(hourRate); @@ -95,7 +95,7 @@ public class HourRateController extends JeecgController delete(@RequestParam(name="id",required=true) String id) { hourRateService.removeById(id); @@ -110,7 +110,7 @@ public class HourRateController extends JeecgController deleteBatch(@RequestParam(name="ids",required=true) String ids) { this.hourRateService.removeByIds(Arrays.asList(ids.split(","))); diff --git a/qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/entity/HourRate.java b/qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/entity/HourRate.java index 9ff5fb2..ad3c13b 100644 --- a/qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/entity/HourRate.java +++ b/qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/entity/HourRate.java @@ -4,10 +4,8 @@ import java.io.Serializable; import java.io.UnsupportedEncodingException; import java.util.Date; import java.math.BigDecimal; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.baomidou.mybatisplus.annotation.TableLogic; + +import com.baomidou.mybatisplus.annotation.*; import lombok.Data; import com.fasterxml.jackson.annotation.JsonFormat; import org.springframework.format.annotation.DateTimeFormat; @@ -87,10 +85,12 @@ public class HourRate implements Serializable { /**预留字段1*/ @Excel(name = "预留字段1", width = 15) @ApiModelProperty(value = "预留字段1") + @TableField(value = "reserve_1") private java.lang.String reserve1; /**预留字段2*/ @Excel(name = "预留字段2", width = 15) @ApiModelProperty(value = "预留字段2") + @TableField(value = "reserve_2") private java.math.BigDecimal reserve2; /**主键*/ @TableId(type = IdType.ASSIGN_ID) diff --git a/qomo-kn-cost-manage/src/test/java/com/zzsmart/qomo/kn/cost/manage/ApplicationTests.java b/qomo-kn-cost-manage/src/test/java/com/zzsmart/qomo/kn/cost/manage/ApplicationTests.java index c8bee52..92f889e 100644 --- a/qomo-kn-cost-manage/src/test/java/com/zzsmart/qomo/kn/cost/manage/ApplicationTests.java +++ b/qomo-kn-cost-manage/src/test/java/com/zzsmart/qomo/kn/cost/manage/ApplicationTests.java @@ -1,14 +1,13 @@ package com.zzsmart.qomo.kn.cost.manage; import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.generator.FastAutoGenerator; import com.baomidou.mybatisplus.generator.config.OutputFile; -import com.baomidou.mybatisplus.generator.config.rules.DbColumnType; import com.baomidou.mybatisplus.generator.config.rules.NamingStrategy; import com.baomidou.mybatisplus.generator.engine.FreemarkerTemplateEngine; import org.junit.Test; import org.springframework.boot.test.context.SpringBootTest; -import com.baomidou.mybatisplus.generator.FastAutoGenerator; -import java.sql.Types; + import java.util.Collections; @SpringBootTest @@ -16,14 +15,14 @@ public class ApplicationTests { /** * 根据表名生成相应结构代码 - * @param databaseName 数据库名 - * @param tableName 表名 +// * @param databaseName 数据库名 +// * @param tableName 表名 */ @Test - public static void Generation(String databaseName,String... tableName){ - FastAutoGenerator.create("jdbc:mysql://localhost:3306/"+databaseName+"?&useSSL=true&useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai","root","wsndqd857857") + public void Generation(){ + FastAutoGenerator.create("jdbc:mysql://121.40.189.20:3306/"+"costmanage"+"?&useSSL=true&useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai","root","YMzc157#") .globalConfig(builder -> { - builder.author("罗添煦") + builder.author(" ") //启用swagger //.enableSwagger() //指定输出目录 @@ -31,19 +30,17 @@ public class ApplicationTests { }) .packageConfig(builder -> { builder.entity("entity")//实体类包名 - .parent("com.ltx.mpcode")//父包名。如果为空，将下面子包名必须写全部， 否则就只需写子包名 + .parent("com.zzsmart.qomo.kn.cost.manage")//父包名。如果为空，将下面子包名必须写全部， 否则就只需写子包名 .controller("controller")//控制层包名 - .mapper("dao")//mapper层包名 + .mapper("mapper")//mapper层包名 //.other("dto")//生成dto目录 可不用 .service("service")//service层包名 .serviceImpl("service.impl")//service实现类包名 //自定义mapper.xml文件输出目录 - .pathInfo(Collections.singletonMap(OutputFile.mapperXml,System.getProperty("user.dir")+"/src/main/resources/mapper")); + .pathInfo(Collections.singletonMap(OutputFile.mapperXml,System.getProperty("user.dir")+"/src/main/java/com/zzsmart/qomo/kn/cost/manage/mapper/xml")); }) .strategyConfig(builder -> { - //设置要生成的表名 - builder.addInclude(tableName) - .addInclude("cp_order_history")// 设置需要生成的表名 + builder.addInclude("7525_replacement_cost")// todo 设置需要生成的表名 //.addTablePrefix("sys_")//设置表前缀过滤 .entityBuilder() .enableLombok() @@ -57,12 +54,12 @@ public class ApplicationTests { .enableBaseResultMap()//启用xml文件中的BaseResultMap 生成 .enableBaseColumnList()//启用xml文件中的BaseColumnList .formatMapperFileName("%sMapper")//格式化Dao类名称 - .formatXmlFileName("%sMapper")//格式化xml文件名称 - .serviceBuilder() - .formatServiceFileName("%sService")//格式化 service 接口文件名称 - .formatServiceImplFileName("%sServiceImpl")//格式化 service 接口文件名称 - .controllerBuilder() - .enableRestStyle(); + .formatXmlFileName("%sMapper");//格式化xml文件名称 +// .serviceBuilder() +// .formatServiceFileName("%sService")//格式化 service 接口文件名称 +// .formatServiceImplFileName("%sServiceImpl")//格式化 service 接口文件名称 +// .controllerBuilder() +// .enableRestStyle(); }) // 使用Freemarker引擎模板，默认的是Velocity引擎模板 .templateEngine(new FreemarkerTemplateEngine()) -- 2.54.0 From 8f6458d80047630be9025d04f0ded4ce2678a844 Mon Sep 17 00:00:00 2001 From: wangqiong <1322446236@qq.com> Date: Thu, 6 Jun 2024 15:52:39 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=87=AA=E5=8A=A8?= =?UTF-8?q?=E7=94=9F=E6=88=90=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../qomo/kn/cost/manage/ApplicationTests.java | 23 +++++++++++++------ 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/qomo-kn-cost-manage/src/test/java/com/zzsmart/qomo/kn/cost/manage/ApplicationTests.java b/qomo-kn-cost-manage/src/test/java/com/zzsmart/qomo/kn/cost/manage/ApplicationTests.java index 92f889e..e35315c 100644 --- a/qomo-kn-cost-manage/src/test/java/com/zzsmart/qomo/kn/cost/manage/ApplicationTests.java +++ b/qomo-kn-cost-manage/src/test/java/com/zzsmart/qomo/kn/cost/manage/ApplicationTests.java @@ -3,6 +3,7 @@ package com.zzsmart.qomo.kn.cost.manage; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.generator.FastAutoGenerator; import com.baomidou.mybatisplus.generator.config.OutputFile; +import com.baomidou.mybatisplus.generator.config.TemplateType; import com.baomidou.mybatisplus.generator.config.rules.NamingStrategy; import com.baomidou.mybatisplus.generator.engine.FreemarkerTemplateEngine; import org.junit.Test; @@ -23,6 +24,7 @@ public class ApplicationTests { FastAutoGenerator.create("jdbc:mysql://121.40.189.20:3306/"+"costmanage"+"?&useSSL=true&useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai","root","YMzc157#") .globalConfig(builder -> { builder.author(" ") + .fileOverride()//是否覆盖 //启用swagger //.enableSwagger() //指定输出目录 @@ -40,7 +42,7 @@ public class ApplicationTests { .pathInfo(Collections.singletonMap(OutputFile.mapperXml,System.getProperty("user.dir")+"/src/main/java/com/zzsmart/qomo/kn/cost/manage/mapper/xml")); }) .strategyConfig(builder -> { - builder.addInclude("7525_replacement_cost")// todo 设置需要生成的表名 + builder.addInclude("authority")// todo 设置需要生成的表名 //.addTablePrefix("sys_")//设置表前缀过滤 .entityBuilder() .enableLombok() @@ -49,19 +51,26 @@ public class ApplicationTests { .columnNaming(NamingStrategy.underline_to_camel)//表字段映射实体属性命名规则：默认null，不指定按照naming执行 .idType(IdType.AUTO)//添加全局主键类型 .formatFileName("%s")//格式化实体名称，%s取消首字母I, + .enableTableFieldAnnotation() + .enableColumnConstant() .mapperBuilder() .enableMapperAnnotation()//开启mapper注解 .enableBaseResultMap()//启用xml文件中的BaseResultMap 生成 .enableBaseColumnList()//启用xml文件中的BaseColumnList .formatMapperFileName("%sMapper")//格式化Dao类名称 - .formatXmlFileName("%sMapper");//格式化xml文件名称 -// .serviceBuilder() -// .formatServiceFileName("%sService")//格式化 service 接口文件名称 -// .formatServiceImplFileName("%sServiceImpl")//格式化 service 接口文件名称 -// .controllerBuilder() -// .enableRestStyle(); + .formatXmlFileName("%sMapper")//格式化xml文件名称 + .serviceBuilder() + .formatServiceFileName("%sService")//格式化 service 接口文件名称 + .formatServiceImplFileName("%sServiceImpl")//格式化 service 接口文件名称 + .controllerBuilder() + .enableRestStyle(); }) // 使用Freemarker引擎模板，默认的是Velocity引擎模板 + .templateConfig(builder -> { + builder.disable(TemplateType.CONTROLLER) + .disable(TemplateType.SERVICE) + .disable(TemplateType.SERVICEIMPL); + }) .templateEngine(new FreemarkerTemplateEngine()) .execute(); -- 2.54.0