From 5f3260c586068c9dd1a2db5712b55ac657edd79c Mon Sep 17 00:00:00 2001 From: TinyAnts Date: Fri, 30 Dec 2022 11:11:36 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=A0=B9=E6=8D=AE=E8=A1=A8?= =?UTF-8?q?=E5=90=8D=E8=8E=B7=E5=8F=96=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../generator/controller/GenController.java | 37 +++++++++++++------ .../generator/service/IGenerateService.java | 9 +++++ .../service/impl/GenerateServiceImpl.java | 23 ++++++++++++ .../java/com/mdd/generator/vo/DbColumnVo.java | 16 ++++++++ 4 files changed, 73 insertions(+), 12 deletions(-) create mode 100644 server/like-generator/src/main/java/com/mdd/generator/vo/DbColumnVo.java diff --git a/server/like-generator/src/main/java/com/mdd/generator/controller/GenController.java b/server/like-generator/src/main/java/com/mdd/generator/controller/GenController.java index bdc56079..9301048f 100644 --- a/server/like-generator/src/main/java/com/mdd/generator/controller/GenController.java +++ b/server/like-generator/src/main/java/com/mdd/generator/controller/GenController.java @@ -10,6 +10,7 @@ import com.mdd.common.validator.annotation.IDMust; import com.mdd.generator.service.IGenerateService; import com.mdd.generator.validate.GenParam; import com.mdd.generator.validate.PageParam; +import com.mdd.generator.vo.DbColumnVo; import com.mdd.generator.vo.DbTableVo; import com.mdd.generator.vo.GenTableVo; import org.apache.commons.io.IOUtils; @@ -38,8 +39,8 @@ public class GenController { * @return Object */ @GetMapping("/db") - public Object db(@Validated PageParam pageParam, - @RequestParam Map params) { + public AjaxResult> db(@Validated PageParam pageParam, + @RequestParam Map params) { PageResult list = iGenerateService.db(pageParam, params); return AjaxResult.success(list); } @@ -52,11 +53,23 @@ public class GenController { * @return Object */ @GetMapping("/dbAll") - public Object dbAll(@RequestParam Map params) { + public AjaxResult> dbAll(@RequestParam Map params) { List list = iGenerateService.dbAll(params); return AjaxResult.success(list); } + /** + * 根据表名查字段 + * + * @param tableName 表名 + * @return List + */ + @GetMapping("/dbColumn") + public AjaxResult> dbColumn(@RequestParam String tableName) { + List list = iGenerateService.dbColumn(tableName); + return AjaxResult.success(list); + } + /** * 生成列表 * @@ -66,8 +79,8 @@ public class GenController { * @return Object */ @GetMapping("/list") - public Object list(@Validated PageParam pageParam, - @RequestParam Map params) { + public AjaxResult> list(@Validated PageParam pageParam, + @RequestParam Map params) { PageResult list = iGenerateService.list(pageParam, params); return AjaxResult.success(list); } @@ -80,7 +93,7 @@ public class GenController { * @return Object */ @GetMapping("/detail") - public Object detail(@Validated @IDMust() @RequestParam("id") Integer id) { + public AjaxResult> detail(@Validated @IDMust() @RequestParam("id") Integer id) { Map maps = iGenerateService.detail(id); return AjaxResult.success(maps); } @@ -92,7 +105,7 @@ public class GenController { * @return Object */ @PostMapping("/importTable") - public Object importTable(String tables) { + public AjaxResult importTable(String tables) { Assert.notNull(tables, "请选择要导入的表"); String[] tableNames = tables.split(","); iGenerateService.importTable(tableNames); @@ -107,7 +120,7 @@ public class GenController { * @return Object */ @PostMapping("/editTable") - public Object editTable(@Validated() @RequestBody GenParam genParam) { + public AjaxResult editTable(@Validated() @RequestBody GenParam genParam) { iGenerateService.editTable(genParam); return AjaxResult.success(); } @@ -120,7 +133,7 @@ public class GenController { * @return Object */ @PostMapping("/delTable") - public Object deleteTable(@Validated(value = GenParam.delete.class) @RequestBody GenParam genParam) { + public AjaxResult deleteTable(@Validated(value = GenParam.delete.class) @RequestBody GenParam genParam) { iGenerateService.deleteTable(genParam.getIds()); return AjaxResult.success(); } @@ -133,7 +146,7 @@ public class GenController { * @return Object */ @PostMapping("/syncTable") - public Object syncTable(@Validated @IDMust() @RequestParam("id") Integer id) { + public AjaxResult syncTable(@Validated @IDMust() @RequestParam("id") Integer id) { iGenerateService.syncTable(id); return AjaxResult.success(); } @@ -146,7 +159,7 @@ public class GenController { * @return Object */ @GetMapping("/previewCode") - public Object previewCode(@Validated @IDMust() @RequestParam("id") Integer id) { + public AjaxResult> previewCode(@Validated @IDMust() @RequestParam("id") Integer id) { Map map = iGenerateService.previewCode(id); return AjaxResult.success(map); } @@ -158,7 +171,7 @@ public class GenController { * @param tables 表名 */ @GetMapping("/genCode") - public Object genCode(String tables) { + public AjaxResult genCode(String tables) { String production = YmlUtils.get("like.production"); if (StringUtils.isNotEmpty(production) && production.equals("true")) { throw new OperateException("抱歉,演示环境不允许操作！"); diff --git a/server/like-generator/src/main/java/com/mdd/generator/service/IGenerateService.java b/server/like-generator/src/main/java/com/mdd/generator/service/IGenerateService.java index 2438b465..eff00a5b 100644 --- a/server/like-generator/src/main/java/com/mdd/generator/service/IGenerateService.java +++ b/server/like-generator/src/main/java/com/mdd/generator/service/IGenerateService.java @@ -3,6 +3,7 @@ package com.mdd.generator.service; import com.mdd.common.core.PageResult; import com.mdd.generator.validate.GenParam; import com.mdd.generator.validate.PageParam; +import com.mdd.generator.vo.DbColumnVo; import com.mdd.generator.vo.DbTableVo; import com.mdd.generator.vo.GenTableVo; @@ -33,6 +34,14 @@ public interface IGenerateService { */ List dbAll(Map params); + /** + * 根据表名查字段 + * + * @param tableName 表名 + * @return List + */ + List dbColumn(String tableName); + /** * 生成列表 * diff --git a/server/like-generator/src/main/java/com/mdd/generator/service/impl/GenerateServiceImpl.java b/server/like-generator/src/main/java/com/mdd/generator/service/impl/GenerateServiceImpl.java index 1ac233d9..7be3bfb6 100644 --- a/server/like-generator/src/main/java/com/mdd/generator/service/impl/GenerateServiceImpl.java +++ b/server/like-generator/src/main/java/com/mdd/generator/service/impl/GenerateServiceImpl.java @@ -21,6 +21,7 @@ import com.mdd.generator.util.GenUtil; import com.mdd.generator.util.VelocityUtil; import com.mdd.generator.validate.GenParam; import com.mdd.generator.validate.PageParam; +import com.mdd.generator.vo.DbColumnVo; import com.mdd.generator.vo.DbTableVo; import com.mdd.generator.vo.GenColumnVo; import com.mdd.generator.vo.GenTableVo; @@ -104,6 +105,28 @@ public class GenerateServiceImpl implements IGenerateService { return tables; } + /** + * 根据表名查字段 + * + * @param tableName 表名 + * @return List + */ + @Override + public List dbColumn(String tableName) { + List columns = genTableMapper.selectDbTableColumnsByName(tableName); + + List list = new LinkedList<>(); + for (GenTableColumn col : columns) { + DbColumnVo vo = new DbColumnVo(); + vo.setColumnName(col.getColumnName()); + vo.setColumnType(col.getColumnType()); + vo.setColumnComment(col.getColumnComment()); + list.add(vo); + } + + return list; + } + /** * 生成列表 * diff --git a/server/like-generator/src/main/java/com/mdd/generator/vo/DbColumnVo.java b/server/like-generator/src/main/java/com/mdd/generator/vo/DbColumnVo.java new file mode 100644 index 00000000..dc6a7201 --- /dev/null +++ b/server/like-generator/src/main/java/com/mdd/generator/vo/DbColumnVo.java @@ -0,0 +1,16 @@ +package com.mdd.generator.vo; + +import lombok.Data; + +import java.io.Serializable; + +@Data +public class DbColumnVo implements Serializable { + + private static final long serialVersionUID = 1L; + + private String columnName; // 字段名称 + private String columnComment; // 字段描述 + private String columnType; // 字段类型 + +}