From 7b6fdb3a893275ff82ba5c868287a1e12dcd75f1 Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: Sun, 27 Apr 2025 11:56:21 +0800
Subject: [PATCH] remove all semicolons
---
ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/controller/GenController.java | 23 ++++++++++++++---------
1 files changed, 14 insertions(+), 9 deletions(-)
diff --git a/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/controller/GenController.java b/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/controller/GenController.java
index 82d1540..fe07f59 100644
--- a/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/controller/GenController.java
+++ b/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/controller/GenController.java
@@ -23,6 +23,7 @@
import com.ruoyi.common.log.annotation.Log;
import com.ruoyi.common.log.enums.BusinessType;
import com.ruoyi.common.security.annotation.RequiresPermissions;
+import com.ruoyi.gen.config.GenConfig;
import com.ruoyi.gen.domain.GenTable;
import com.ruoyi.gen.domain.GenTableColumn;
import com.ruoyi.gen.service.IGenTableColumnService;
@@ -56,7 +57,7 @@
}
/**
- * 修改代码生成业务
+ * 获取代码生成信息
*/
@RequiresPermissions("tool:gen:query")
@GetMapping(value = "/{tableId}")
@@ -69,7 +70,7 @@
map.put("info", table);
map.put("rows", list);
map.put("tables", tables);
- return AjaxResult.success(map);
+ return success(map);
}
/**
@@ -87,7 +88,7 @@
/**
* 查询数据表字段列表
*/
- @GetMapping(value = "/column/{talbleId}")
+ @GetMapping(value = "/column/{tableId}")
public TableDataInfo columnList(Long tableId)
{
TableDataInfo dataInfo = new TableDataInfo();
@@ -109,7 +110,7 @@
// 查询表信息
List<GenTable> tableList = genTableService.selectDbTableListByNames(tableNames);
genTableService.importGenTable(tableList);
- return AjaxResult.success();
+ return success();
}
/**
@@ -122,7 +123,7 @@
{
genTableService.validateEdit(genTable);
genTableService.updateGenTable(genTable);
- return AjaxResult.success();
+ return success();
}
/**
@@ -134,7 +135,7 @@
public AjaxResult remove(@PathVariable Long[] tableIds)
{
genTableService.deleteGenTableByIds(tableIds);
- return AjaxResult.success();
+ return success();
}
/**
@@ -145,7 +146,7 @@
public AjaxResult preview(@PathVariable("tableId") Long tableId) throws IOException
{
Map<String, String> dataMap = genTableService.previewCode(tableId);
- return AjaxResult.success(dataMap);
+ return success(dataMap);
}
/**
@@ -168,8 +169,12 @@
@GetMapping("/genCode/{tableName}")
public AjaxResult genCode(@PathVariable("tableName") String tableName)
{
+ if (!GenConfig.isAllowOverwrite())
+ {
+ return AjaxResult.error("【系统预设】不允许生成文件覆盖到本地");
+ }
genTableService.generatorCode(tableName);
- return AjaxResult.success();
+ return success();
}
/**
@@ -181,7 +186,7 @@
public AjaxResult synchDb(@PathVariable("tableName") String tableName)
{
genTableService.synchDb(tableName);
- return AjaxResult.success();
+ return success();
}
/**
--
Gitblit v1.9.3