refactor(controller): 将控制器响应结果统一为R类型并继承BaseController

liyong

6 天以前 9a30a3a8d3862a9b2ce898535b7cb51c3ddac816

 src/main/java/com/ruoyi/project/tool/gen/controller/GenController.java

@@ -11,7 +11,7 @@
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;

import com.ruoyi.framework.config.GenConfig;

import com.ruoyi.framework.web.controller.BaseController;

import com.ruoyi.framework.web.domain.AjaxResult;

import com.ruoyi.framework.web.domain.R;
import com.ruoyi.framework.web.page.TableDataInfo;

import com.ruoyi.project.tool.gen.domain.GenTable;

import com.ruoyi.project.tool.gen.domain.GenTableColumn;

@@ -60,7 +60,7 @@
     */

    @PreAuthorize("@ss.hasPermi('tool:gen:query')")

    @GetMapping(value = "/{talbleId}")

    public AjaxResult getInfo(@PathVariable Long talbleId)

    public R<?> getInfo(@PathVariable Long talbleId)
    {

        GenTable table = genTableService.selectGenTableById(talbleId);

        List<GenTable> tables = genTableService.selectGenTableAll();

@@ -69,7 +69,7 @@
        map.put("info", table);

        map.put("rows", list);

        map.put("tables", tables);

        return success(map);

        return R.ok(map);
    }



    /**

@@ -104,13 +104,13 @@
    @PreAuthorize("@ss.hasPermi('tool:gen:import')")

    @Log(title = "代码生成", businessType = BusinessType.IMPORT)

    @PostMapping("/importTable")

    public AjaxResult importTableSave(String tables)

    public R<?> importTableSave(String tables)
    {

        String[] tableNames = Convert.toStrArray(tables);

        // 查询表信息

        List<GenTable> tableList = genTableService.selectDbTableListByNames(tableNames);

        genTableService.importGenTable(tableList, SecurityUtils.getUsername());

        return success();

        return R.ok();
    }



    /**

@@ -119,7 +119,7 @@
    @PreAuthorize("@ss.hasRole('admin')")

    @Log(title = "创建表", businessType = BusinessType.OTHER)

    @PostMapping("/createTable")

    public AjaxResult createTableSave(String sql)

    public R<?> createTableSave(String sql)
    {

        try

        {

@@ -141,12 +141,12 @@
            List<GenTable> tableList = genTableService.selectDbTableListByNames(tableNames.toArray(new String[tableNames.size()]));

            String operName = SecurityUtils.getUsername();

            genTableService.importGenTable(tableList, operName);

            return AjaxResult.success();

            return R.ok();
        }

        catch (Exception e)

        {

            logger.error(e.getMessage(), e);

            return AjaxResult.error("创建表结构异常");

            return R.fail("创建表结构异常");
        }

    }



@@ -156,11 +156,11 @@
    @PreAuthorize("@ss.hasPermi('tool:gen:edit')")

    @Log(title = "代码生成", businessType = BusinessType.UPDATE)

    @PutMapping

    public AjaxResult editSave(@Validated @RequestBody GenTable genTable)

    public R<?> editSave(@Validated @RequestBody GenTable genTable)
    {

        genTableService.validateEdit(genTable);

        genTableService.updateGenTable(genTable);

        return success();

        return R.ok();
    }



    /**

@@ -169,10 +169,10 @@
    @PreAuthorize("@ss.hasPermi('tool:gen:remove')")

    @Log(title = "代码生成", businessType = BusinessType.DELETE)

    @DeleteMapping("/{tableIds}")

    public AjaxResult remove(@PathVariable Long[] tableIds)

    public R<?> remove(@PathVariable Long[] tableIds)
    {

        genTableService.deleteGenTableByIds(tableIds);

        return success();

        return R.ok();
    }



    /**

@@ -180,10 +180,10 @@
     */

    @PreAuthorize("@ss.hasPermi('tool:gen:preview')")

    @GetMapping("/preview/{tableId}")

    public AjaxResult preview(@PathVariable("tableId") Long tableId) throws IOException

    public R<?> preview(@PathVariable("tableId") Long tableId) throws IOException
    {

        Map<String, String> dataMap = genTableService.previewCode(tableId);

        return success(dataMap);

        return R.ok(dataMap);
    }



    /**

@@ -204,14 +204,14 @@
    @PreAuthorize("@ss.hasPermi('tool:gen:code')")

    @Log(title = "代码生成", businessType = BusinessType.GENCODE)

    @GetMapping("/genCode/{tableName}")

    public AjaxResult genCode(@PathVariable("tableName") String tableName)

    public R<?> genCode(@PathVariable("tableName") String tableName)
    {

        if (!GenConfig.isAllowOverwrite())

        {

            return AjaxResult.error("【系统预设】不允许生成文件覆盖到本地");

            return R.fail("【系统预设】不允许生成文件覆盖到本地");
        }

        genTableService.generatorCode(tableName);

        return success();

        return R.ok();
    }



    /**

@@ -220,10 +220,10 @@
    @PreAuthorize("@ss.hasPermi('tool:gen:edit')")

    @Log(title = "代码生成", businessType = BusinessType.UPDATE)

    @GetMapping("/synchDb/{tableName}")

    public AjaxResult synchDb(@PathVariable("tableName") String tableName)

    public R<?> synchDb(@PathVariable("tableName") String tableName)
    {

        genTableService.synchDb(tableName);

        return success();

        return R.ok();
    }



    /**