From 347909bae241fff128b628ea6d12992d7e5b4b10 Mon Sep 17 00:00:00 2001
From: xin <1099200748@qq.com>
Date: Fri, 30 May 2025 18:35:43 +0800
Subject: [PATCH] 响应信息主体
---
oying-generator/src/main/java/com/oying/rest/GeneratorController.java | 42 ++++++++++++++++++++++++------------------
1 files changed, 24 insertions(+), 18 deletions(-)
diff --git a/oying-generator/src/main/java/com/oying/rest/GeneratorController.java b/oying-generator/src/main/java/com/oying/rest/GeneratorController.java
index 6435ace..a693983 100644
--- a/oying-generator/src/main/java/com/oying/rest/GeneratorController.java
+++ b/oying-generator/src/main/java/com/oying/rest/GeneratorController.java
@@ -5,6 +5,7 @@
import com.oying.domain.dto.TableInfo;
import com.oying.service.GenConfigService;
import com.oying.service.GeneratorService;
+import com.oying.utils.R;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
@@ -15,6 +16,7 @@
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.*;
+
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.util.List;
@@ -37,50 +39,54 @@
@ApiOperation("查询数据库数据")
@GetMapping(value = "/tables")
- public ResponseEntity<PageResult<TableInfo>> queryTables(@RequestParam(defaultValue = "") String name, @RequestParam(defaultValue = "1") Integer page, @RequestParam(defaultValue = "10") Integer size){
- return new ResponseEntity<>(generatorService.getTables(name, new Page<>(page, size)), HttpStatus.OK);
+ public ResponseEntity<Object> queryTables(@RequestParam(defaultValue = "") String name, @RequestParam(defaultValue = "1") Integer page, @RequestParam(defaultValue = "10") Integer size) {
+ return new ResponseEntity<>(R.success(generatorService.getTables(name, new Page<>(page, size))), HttpStatus.OK);
}
@ApiOperation("查询字段数据")
@GetMapping(value = "/columns")
- public ResponseEntity<PageResult<ColumnInfo>> queryColumns(@RequestParam String tableName){
+ public ResponseEntity<Object> queryColumns(@RequestParam String tableName) {
List<ColumnInfo> columnInfos = generatorService.getColumns(tableName);
- return new ResponseEntity<>(PageUtil.toPage(columnInfos), HttpStatus.OK);
+ return new ResponseEntity<>(R.success(PageUtil.toPage(columnInfos)), HttpStatus.OK);
}
@ApiOperation("保存字段数据")
@PutMapping
- public ResponseEntity<HttpStatus> saveColumn(@RequestBody List<ColumnInfo> columnInfos){
+ public ResponseEntity<Object> saveColumn(@RequestBody List<ColumnInfo> columnInfos) {
generatorService.save(columnInfos);
- return new ResponseEntity<>(HttpStatus.OK);
+ return new ResponseEntity<>(R.success(), HttpStatus.OK);
}
@ApiOperation("同步字段数据")
@PostMapping(value = "sync")
- public ResponseEntity<HttpStatus> syncColumn(@RequestBody List<String> tables){
+ public ResponseEntity<Object> syncColumn(@RequestBody List<String> tables) {
for (String table : tables) {
generatorService.sync(generatorService.getColumns(table), generatorService.query(table));
}
- return new ResponseEntity<>(HttpStatus.OK);
+ return new ResponseEntity<>(R.success(), HttpStatus.OK);
}
@ApiOperation("生成代码")
@PostMapping(value = "/{tableName}/{type}")
- public ResponseEntity<Object> generatorCode(@PathVariable String tableName, @PathVariable Integer type, HttpServletRequest request, HttpServletResponse response){
- if(!generatorEnabled && type == 0){
+ public ResponseEntity<Object> generatorCode(@PathVariable String tableName, @PathVariable Integer type, HttpServletRequest request, HttpServletResponse response) {
+ if (!generatorEnabled && type == 0) {
throw new BadRequestException("此环境不允许生成代码，请选择预览或者下载查看！");
}
- switch (type){
+ switch (type) {
// 生成代码
- case 0: generatorService.generator(genConfigService.find(tableName), generatorService.getColumns(tableName));
- break;
+ case 0:
+ generatorService.generator(genConfigService.find(tableName), generatorService.getColumns(tableName));
+ break;
// 预览
- case 1: return generatorService.preview(genConfigService.find(tableName), generatorService.getColumns(tableName));
+ case 1:
+ return generatorService.preview(genConfigService.find(tableName), generatorService.getColumns(tableName));
// 打包
- case 2: generatorService.download(genConfigService.find(tableName), generatorService.getColumns(tableName), request, response);
- break;
- default: throw new BadRequestException("没有这个选项");
+ case 2:
+ generatorService.download(genConfigService.find(tableName), generatorService.getColumns(tableName), request, response);
+ break;
+ default:
+ throw new BadRequestException("没有这个选项");
}
- return new ResponseEntity<>(HttpStatus.OK);
+ return new ResponseEntity<>(R.success(), HttpStatus.OK);
}
}
--
Gitblit v1.9.3