From dd25573ebce3450d90d0012a30b12a5185bc7310 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期五, 08 七月 2022 15:49:15 +0800
Subject: [PATCH] update 使用 @param 注释替换 @Parameter 注解 fix 修复 token 无法传递 与 无法持久化问题
---
ruoyi-generator/src/main/java/com/ruoyi/generator/controller/GenController.java | 93 ++++++++++++++++++++++++----------------------
1 files changed, 48 insertions(+), 45 deletions(-)
diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/controller/GenController.java b/ruoyi-generator/src/main/java/com/ruoyi/generator/controller/GenController.java
index 55c93d8..7a20df1 100644
--- a/ruoyi-generator/src/main/java/com/ruoyi/generator/controller/GenController.java
+++ b/ruoyi-generator/src/main/java/com/ruoyi/generator/controller/GenController.java
@@ -2,20 +2,18 @@
import cn.dev33.satoken.annotation.SaCheckPermission;
import cn.hutool.core.convert.Convert;
+import cn.hutool.core.io.IoUtil;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.domain.PageQuery;
+import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.generator.domain.GenTable;
import com.ruoyi.generator.domain.GenTableColumn;
-import com.ruoyi.generator.service.IGenTableColumnService;
import com.ruoyi.generator.service.IGenTableService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.RequiredArgsConstructor;
-import org.apache.commons.io.IOUtils;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
@@ -31,61 +29,60 @@
* @author Lion Li
*/
@Validated
-@Api(value = "浠ｇ爜鐢熸垚", tags = {"浠ｇ爜鐢熸垚绠＄悊"})
-@RequiredArgsConstructor(onConstructor_ = @Autowired)
+@Tag(name = "浠ｇ爜鐢熸垚", description = "浠ｇ爜鐢熸垚绠＄悊")
+@RequiredArgsConstructor
@RestController
@RequestMapping("/tool/gen")
public class GenController extends BaseController {
private final IGenTableService genTableService;
- private final IGenTableColumnService genTableColumnService;
/**
* 鏌ヨ浠ｇ爜鐢熸垚鍒楄〃
*/
- @ApiOperation("鏌ヨ浠ｇ爜鐢熸垚鍒楄〃")
@SaCheckPermission("tool:gen:list")
@GetMapping("/list")
- public TableDataInfo<GenTable> genList(GenTable genTable) {
- return genTableService.selectPageGenTableList(genTable);
+ public TableDataInfo<GenTable> genList(GenTable genTable, PageQuery pageQuery) {
+ return genTableService.selectPageGenTableList(genTable, pageQuery);
}
/**
* 淇敼浠ｇ爜鐢熸垚涓氬姟
+ *
+ * @param tableId 琛↖D
*/
- @ApiOperation("淇敼浠ｇ爜鐢熸垚涓氬姟")
@SaCheckPermission("tool:gen:query")
- @GetMapping(value = "/{talbleId}")
- public AjaxResult<Map<String, Object>> getInfo(@PathVariable Long talbleId) {
- GenTable table = genTableService.selectGenTableById(talbleId);
+ @GetMapping(value = "/{tableId}")
+ public R<Map<String, Object>> getInfo(@PathVariable Long tableId) {
+ GenTable table = genTableService.selectGenTableById(tableId);
List<GenTable> tables = genTableService.selectGenTableAll();
- List<GenTableColumn> list = genTableColumnService.selectGenTableColumnListByTableId(talbleId);
+ List<GenTableColumn> list = genTableService.selectGenTableColumnListByTableId(tableId);
Map<String, Object> map = new HashMap<String, Object>();
map.put("info", table);
map.put("rows", list);
map.put("tables", tables);
- return AjaxResult.success(map);
+ return R.ok(map);
}
/**
* 鏌ヨ鏁版嵁搴撳垪琛�
*/
- @ApiOperation("鏌ヨ鏁版嵁搴撳垪琛�")
@SaCheckPermission("tool:gen:list")
@GetMapping("/db/list")
- public TableDataInfo<GenTable> dataList(GenTable genTable) {
- return genTableService.selectPageDbTableList(genTable);
+ public TableDataInfo<GenTable> dataList(GenTable genTable, PageQuery pageQuery) {
+ return genTableService.selectPageDbTableList(genTable, pageQuery);
}
/**
* 鏌ヨ鏁版嵁琛ㄥ瓧娈靛垪琛�
+ *
+ * @param tableId 琛↖D
*/
- @ApiOperation("鏌ヨ鏁版嵁琛ㄥ瓧娈靛垪琛�")
@SaCheckPermission("tool:gen:list")
- @GetMapping(value = "/column/{talbleId}")
+ @GetMapping(value = "/column/{tableId}")
public TableDataInfo<GenTableColumn> columnList(Long tableId) {
TableDataInfo<GenTableColumn> dataInfo = new TableDataInfo<>();
- List<GenTableColumn> list = genTableColumnService.selectGenTableColumnListByTableId(tableId);
+ List<GenTableColumn> list = genTableService.selectGenTableColumnListByTableId(tableId);
dataInfo.setRows(list);
dataInfo.setTotal(list.size());
return dataInfo;
@@ -93,59 +90,62 @@
/**
* 瀵煎叆琛ㄧ粨鏋勶紙淇濆瓨锛�
+ *
+ * @param tables 琛ㄥ悕涓�
*/
- @ApiOperation("瀵煎叆琛ㄧ粨鏋勶紙淇濆瓨锛�")
@SaCheckPermission("tool:gen:import")
@Log(title = "浠ｇ爜鐢熸垚", businessType = BusinessType.IMPORT)
@PostMapping("/importTable")
- public AjaxResult<Void> importTableSave(String tables) {
+ public R<Void> importTableSave(String tables) {
String[] tableNames = Convert.toStrArray(tables);
// 鏌ヨ琛ㄤ俊鎭�
List<GenTable> tableList = genTableService.selectDbTableListByNames(tableNames);
genTableService.importGenTable(tableList);
- return AjaxResult.success();
+ return R.ok();
}
/**
* 淇敼淇濆瓨浠ｇ爜鐢熸垚涓氬姟
*/
- @ApiOperation("淇敼淇濆瓨浠ｇ爜鐢熸垚涓氬姟")
@SaCheckPermission("tool:gen:edit")
@Log(title = "浠ｇ爜鐢熸垚", businessType = BusinessType.UPDATE)
@PutMapping
- public AjaxResult<Void> editSave(@Validated @RequestBody GenTable genTable) {
+ public R<Void> editSave(@Validated @RequestBody GenTable genTable) {
genTableService.validateEdit(genTable);
genTableService.updateGenTable(genTable);
- return AjaxResult.success();
+ return R.ok();
}
/**
* 鍒犻櫎浠ｇ爜鐢熸垚
+ *
+ * @param tableIds 琛↖D涓�
*/
- @ApiOperation("鍒犻櫎浠ｇ爜鐢熸垚")
@SaCheckPermission("tool:gen:remove")
@Log(title = "浠ｇ爜鐢熸垚", businessType = BusinessType.DELETE)
@DeleteMapping("/{tableIds}")
- public AjaxResult<Void> remove(@PathVariable Long[] tableIds) {
+ public R<Void> remove(@PathVariable Long[] tableIds) {
genTableService.deleteGenTableByIds(tableIds);
- return AjaxResult.success();
+ return R.ok();
}
/**
* 棰勮浠ｇ爜
+ *
+ * @param tableId 琛↖D
*/
- @ApiOperation("棰勮浠ｇ爜")
@SaCheckPermission("tool:gen:preview")
@GetMapping("/preview/{tableId}")
- public AjaxResult<Map<String, String>> preview(@PathVariable("tableId") Long tableId) throws IOException {
+ public R<Map<String, String>> preview(@PathVariable("tableId") Long tableId) throws IOException {
Map<String, String> dataMap = genTableService.previewCode(tableId);
- return AjaxResult.success(dataMap);
+ return R.ok(dataMap);
}
/**
* 鐢熸垚浠ｇ爜锛堜笅杞芥柟寮忥級
+ *
+ * @param tableName 琛ㄥ悕
*/
- @ApiOperation("鐢熸垚浠ｇ爜锛堜笅杞芥柟寮忥級")
@SaCheckPermission("tool:gen:code")
@Log(title = "浠ｇ爜鐢熸垚", businessType = BusinessType.GENCODE)
@GetMapping("/download/{tableName}")
@@ -156,32 +156,35 @@
/**
* 鐢熸垚浠ｇ爜锛堣嚜瀹氫箟璺緞锛�
+ *
+ * @param tableName 琛ㄥ悕
*/
- @ApiOperation("鐢熸垚浠ｇ爜锛堣嚜瀹氫箟璺緞锛�")
@SaCheckPermission("tool:gen:code")
@Log(title = "浠ｇ爜鐢熸垚", businessType = BusinessType.GENCODE)
@GetMapping("/genCode/{tableName}")
- public AjaxResult<Void> genCode(@PathVariable("tableName") String tableName) {
+ public R<Void> genCode(@PathVariable("tableName") String tableName) {
genTableService.generatorCode(tableName);
- return AjaxResult.success();
+ return R.ok();
}
/**
* 鍚屾鏁版嵁搴�
+ *
+ * @param tableName 琛ㄥ悕
*/
- @ApiOperation("鍚屾鏁版嵁搴�")
@SaCheckPermission("tool:gen:edit")
@Log(title = "浠ｇ爜鐢熸垚", businessType = BusinessType.UPDATE)
@GetMapping("/synchDb/{tableName}")
- public AjaxResult<Void> synchDb(@PathVariable("tableName") String tableName) {
+ public R<Void> synchDb(@PathVariable("tableName") String tableName) {
genTableService.synchDb(tableName);
- return AjaxResult.success();
+ return R.ok();
}
/**
* 鎵归噺鐢熸垚浠ｇ爜
+ *
+ * @param tables 琛ㄥ悕涓�
*/
- @ApiOperation("鎵归噺鐢熸垚浠ｇ爜")
@SaCheckPermission("tool:gen:code")
@Log(title = "浠ｇ爜鐢熸垚", businessType = BusinessType.GENCODE)
@GetMapping("/batchGenCode")
@@ -201,6 +204,6 @@
response.setHeader("Content-Disposition", "attachment; filename=\"ruoyi.zip\"");
response.addHeader("Content-Length", "" + data.length);
response.setContentType("application/octet-stream; charset=UTF-8");
- IOUtils.write(data, response.getOutputStream());
+ IoUtil.write(response.getOutputStream(), false, data);
}
}
--
Gitblit v1.9.3