From 8ee749f137987de436ccd869adc43f31979286e8 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期五, 04 三月 2022 21:09:46 +0800
Subject: [PATCH] update 初步适配oracle(未完成)
---
ruoyi-generator/src/main/java/com/ruoyi/generator/controller/GenController.java | 80 +++++++++++++++++++--------------------
1 files changed, 39 insertions(+), 41 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 649d1dc..218227a 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
@@ -1,21 +1,20 @@
package com.ruoyi.generator.controller;
+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 lombok.RequiredArgsConstructor;
-import org.apache.commons.io.IOUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
@@ -32,60 +31,59 @@
*/
@Validated
@Api(value = "浠ｇ爜鐢熸垚", tags = {"浠ｇ爜鐢熸垚绠＄悊"})
-@RequiredArgsConstructor(onConstructor_ = @Autowired)
+@RequiredArgsConstructor
@RestController
@RequestMapping("/tool/gen")
public class GenController extends BaseController {
private final IGenTableService genTableService;
- private final IGenTableColumnService genTableColumnService;
/**
* 鏌ヨ浠ｇ爜鐢熸垚鍒楄〃
*/
@ApiOperation("鏌ヨ浠ｇ爜鐢熸垚鍒楄〃")
- @PreAuthorize("@ss.hasPermi('tool:gen:list')")
+ @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);
}
/**
* 淇敼浠ｇ爜鐢熸垚涓氬姟
*/
@ApiOperation("淇敼浠ｇ爜鐢熸垚涓氬姟")
- @PreAuthorize("@ss.hasPermi('tool:gen:query')")
+ @SaCheckPermission("tool:gen:query")
@GetMapping(value = "/{talbleId}")
- public AjaxResult<Map<String, Object>> getInfo(@PathVariable Long talbleId) {
+ public R<Map<String, Object>> getInfo(@PathVariable Long talbleId) {
GenTable table = genTableService.selectGenTableById(talbleId);
List<GenTable> tables = genTableService.selectGenTableAll();
- List<GenTableColumn> list = genTableColumnService.selectGenTableColumnListByTableId(talbleId);
+ List<GenTableColumn> list = genTableService.selectGenTableColumnListByTableId(talbleId);
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("鏌ヨ鏁版嵁搴撳垪琛�")
- @PreAuthorize("@ss.hasPermi('tool:gen:list')")
+ @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);
}
/**
* 鏌ヨ鏁版嵁琛ㄥ瓧娈靛垪琛�
*/
@ApiOperation("鏌ヨ鏁版嵁琛ㄥ瓧娈靛垪琛�")
- @PreAuthorize("@ss.hasPermi('tool:gen:list')")
+ @SaCheckPermission("tool:gen:list")
@GetMapping(value = "/column/{talbleId}")
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;
@@ -95,58 +93,58 @@
* 瀵煎叆琛ㄧ粨鏋勶紙淇濆瓨锛�
*/
@ApiOperation("瀵煎叆琛ㄧ粨鏋勶紙淇濆瓨锛�")
- @PreAuthorize("@ss.hasPermi('tool:gen:import')")
+ @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("淇敼淇濆瓨浠ｇ爜鐢熸垚涓氬姟")
- @PreAuthorize("@ss.hasPermi('tool:gen:edit')")
+ @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();
}
/**
* 鍒犻櫎浠ｇ爜鐢熸垚
*/
@ApiOperation("鍒犻櫎浠ｇ爜鐢熸垚")
- @PreAuthorize("@ss.hasPermi('tool:gen:remove')")
+ @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();
}
/**
* 棰勮浠ｇ爜
*/
@ApiOperation("棰勮浠ｇ爜")
- @PreAuthorize("@ss.hasPermi('tool:gen:preview')")
+ @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);
}
/**
* 鐢熸垚浠ｇ爜锛堜笅杞芥柟寮忥級
*/
@ApiOperation("鐢熸垚浠ｇ爜锛堜笅杞芥柟寮忥級")
- @PreAuthorize("@ss.hasPermi('tool:gen:code')")
+ @SaCheckPermission("tool:gen:code")
@Log(title = "浠ｇ爜鐢熸垚", businessType = BusinessType.GENCODE)
@GetMapping("/download/{tableName}")
public void download(HttpServletResponse response, @PathVariable("tableName") String tableName) throws IOException {
@@ -158,31 +156,31 @@
* 鐢熸垚浠ｇ爜锛堣嚜瀹氫箟璺緞锛�
*/
@ApiOperation("鐢熸垚浠ｇ爜锛堣嚜瀹氫箟璺緞锛�")
- @PreAuthorize("@ss.hasPermi('tool:gen:code')")
+ @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();
}
/**
* 鍚屾鏁版嵁搴�
*/
@ApiOperation("鍚屾鏁版嵁搴�")
- @PreAuthorize("@ss.hasPermi('tool:gen:edit')")
+ @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();
}
/**
* 鎵归噺鐢熸垚浠ｇ爜
*/
@ApiOperation("鎵归噺鐢熸垚浠ｇ爜")
- @PreAuthorize("@ss.hasPermi('tool:gen:code')")
+ @SaCheckPermission("tool:gen:code")
@Log(title = "浠ｇ爜鐢熸垚", businessType = BusinessType.GENCODE)
@GetMapping("/batchGenCode")
public void batchGenCode(HttpServletResponse response, String tables) throws IOException {
@@ -201,6 +199,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);
}
-}
\ No newline at end of file
+}
--
Gitblit v1.9.3