Merge branch 'bgy' of kn-cost/cost-backend into dev

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<HourRate, IHourRateServi
 	 */
 	@AutoLog(value = "hour_rate-添加")
 	@ApiOperation(value="hour_rate-添加", notes="hour_rate-添加")
-	@RequiresPermissions(":hour_rate:add")
+//	@RequiresPermissions(":hour_rate:add")
 	@PostMapping(value = "/add")
 	public Result<String> add(@RequestBody HourRate hourRate) {
 		hourRateService.save(hourRate);
@@ -80,7 +80,7 @@ public class HourRateController extends JeecgController<HourRate, IHourRateServi
 	 */
 	@AutoLog(value = "hour_rate-编辑")
 	@ApiOperation(value="hour_rate-编辑", notes="hour_rate-编辑")
-	@RequiresPermissions(":hour_rate:edit")
+//	@RequiresPermissions(":hour_rate:edit")
 	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
 	public Result<String> edit(@RequestBody HourRate hourRate) {
 		hourRateService.updateById(hourRate);
@@ -95,7 +95,7 @@ public class HourRateController extends JeecgController<HourRate, IHourRateServi
 	 */
 	@AutoLog(value = "hour_rate-通过id删除")
 	@ApiOperation(value="hour_rate-通过id删除", notes="hour_rate-通过id删除")
-	@RequiresPermissions(":hour_rate:delete")
+//	@RequiresPermissions(":hour_rate:delete")
 	@DeleteMapping(value = "/delete")
 	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
 		hourRateService.removeById(id);
@@ -110,7 +110,7 @@ public class HourRateController extends JeecgController<HourRate, IHourRateServi
 	 */
 	@AutoLog(value = "hour_rate-批量删除")
 	@ApiOperation(value="hour_rate-批量删除", notes="hour_rate-批量删除")
-	@RequiresPermissions(":hour_rate:deleteBatch")
+//	@RequiresPermissions(":hour_rate:deleteBatch")
 	@DeleteMapping(value = "/deleteBatch")
 	public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
 		this.hourRateService.removeByIds(Arrays.asList(ids.split(",")));

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.*;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.TableLogic;
 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)

qomo-kn-cost-manage/src/test/java/com/zzsmart/qomo/kn/cost/manage/ApplicationTests.java

@@ -1,14 +1,14 @@
 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.TemplateType;
 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 +16,15 @@ public class ApplicationTests {
 
     /**
      * 根据表名生成相应结构代码
-     * @param databaseName 数据库名
+//     * @param databaseName 数据库名
-     * @param tableName 表名
+//     * @param tableName 表名
      */
     @Test
-    public static void Generation(String databaseName,String... tableName){
+    public  void Generation(){
-        FastAutoGenerator.create("jdbc:mysql://localhost:3306/"+databaseName+"?&useSSL=true&useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai","root","wsndqd857857")
+        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(" ")
+                            .fileOverride()//是否覆盖
                             //启用swagger
                             //.enableSwagger()
                             //指定输出目录
@@ -31,19 +32,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("authority")// todo 设置需要生成的表名
-                    builder.addInclude(tableName)
-                            .addInclude("cp_order_history")// 设置需要生成的表名
                             //.addTablePrefix("sys_")//设置表前缀过滤
                             .entityBuilder()
                             .enableLombok()
@@ -52,6 +51,8 @@ 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 生成
@@ -65,6 +66,11 @@ public class ApplicationTests {
                             .enableRestStyle();
                 })
                 // 使用Freemarker引擎模板，默认的是Velocity引擎模板
+                .templateConfig(builder -> {
+                    builder.disable(TemplateType.CONTROLLER)
+                            .disable(TemplateType.SERVICE)
+                            .disable(TemplateType.SERVICEIMPL);
+                })
                 .templateEngine(new FreemarkerTemplateEngine())
                 .execute();