diff --git a/server/like-admin/src/main/java/com/hxkj/admin/controller/article/ArticleCateController.java b/server/like-admin/src/main/java/com/hxkj/admin/controller/article/ArticleCateController.java index 096cd4c1..b4e033f7 100644 --- a/server/like-admin/src/main/java/com/hxkj/admin/controller/article/ArticleCateController.java +++ b/server/like-admin/src/main/java/com/hxkj/admin/controller/article/ArticleCateController.java @@ -45,7 +45,7 @@ public class ArticleCateController { * @param params 搜索参数 * @return Object */ - @GetMapping("/cateList") + @GetMapping("/list") public Object list(@Validated PageParam pageParam, @RequestParam Map params) { PageResult list = iArticleCateService.list(pageParam, params); diff --git a/server/like-generator/src/main/java/com/hxkj/generator/service/impl/GenerateServiceImpl.java b/server/like-generator/src/main/java/com/hxkj/generator/service/impl/GenerateServiceImpl.java index e661c4d0..53e43770 100644 --- a/server/like-generator/src/main/java/com/hxkj/generator/service/impl/GenerateServiceImpl.java +++ b/server/like-generator/src/main/java/com/hxkj/generator/service/impl/GenerateServiceImpl.java @@ -99,7 +99,7 @@ public class GenerateServiceImpl implements IGenerateService { QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.orderByDesc("id"); - queryWrapper.select("id,table_name,table_comment,create_time,update_time"); + queryWrapper.select("id,gen_type,table_name,table_comment,create_time,update_time"); genTableMapper.setSearch(queryWrapper, params, new String[]{ "like:tableName@table_name:str", @@ -152,6 +152,10 @@ public class GenerateServiceImpl implements IGenerateService { gen.put("genPath", genTable.getGenPath()); gen.put("moduleName", genTable.getModuleName()); gen.put("functionName", genTable.getFunctionName()); + gen.put("treePrimary", genTable.getTreePrimary()); + gen.put("treeParent", genTable.getTreeParent()); + gen.put("subTableName", genTable.getSubTableName()); + gen.put("subTableFk", genTable.getSubTableFk()); maps.put("gen", gen); // 字段信息 diff --git a/server/like-generator/src/main/java/com/hxkj/generator/vo/GenTableVo.java b/server/like-generator/src/main/java/com/hxkj/generator/vo/GenTableVo.java index f3cc69c8..d26fa4f8 100644 --- a/server/like-generator/src/main/java/com/hxkj/generator/vo/GenTableVo.java +++ b/server/like-generator/src/main/java/com/hxkj/generator/vo/GenTableVo.java @@ -13,6 +13,7 @@ public class GenTableVo implements Serializable { private static final long serialVersionUID = 1L; private Integer id; // 生成主键 + private Integer genType; // 生成类型: [0=zip压缩包, 1=自定义路径] private String tableName; // 表的名称 private String tableComment; // 表的描述 private String createTime; // 创建时间