diff --git a/src/main/java/com/fc/v2/common/base/BaseController.java b/src/main/java/com/fc/v2/common/base/BaseController.java index 84af2f78e3d588217633f11caa2f1909dddbfdaf..31e0d4e7832206d470c1e34e25516866e9ee7f2e 100644 --- a/src/main/java/com/fc/v2/common/base/BaseController.java +++ b/src/main/java/com/fc/v2/common/base/BaseController.java @@ -3,7 +3,7 @@ package com.fc.v2.common.base; import cn.hutool.core.util.StrUtil; import com.fc.v2.common.conf.V2Config; import com.fc.v2.common.domain.AjaxResult; -import com.fc.v2.common.domain.ResuTree; +import com.fc.v2.common.domain.ResultTree; import com.fc.v2.common.domain.ResultTable; import com.fc.v2.service.*; import org.springframework.beans.factory.annotation.Autowired; @@ -140,10 +140,10 @@ public class BaseController * Param data * Return Tree数据 * */ - protected static ResuTree dataTree(Object data){ - ResuTree resuTree = new ResuTree(); - resuTree.setData(data); - return resuTree; + protected static ResultTree dataTree(Object data){ + ResultTree resultTree = new ResultTree(); + resultTree.setData(data); + return resultTree; } /** * Describe: 返回数据表格数据 分页 diff --git a/src/main/java/com/fc/v2/common/domain/ResuTree.java b/src/main/java/com/fc/v2/common/domain/ResultTree.java similarity index 92% rename from src/main/java/com/fc/v2/common/domain/ResuTree.java rename to src/main/java/com/fc/v2/common/domain/ResultTree.java index a0927c09da7a9f7b27d1f46f6b5d2675670cf030..615856c4477a591019f78e801c33b61847e21557 100644 --- a/src/main/java/com/fc/v2/common/domain/ResuTree.java +++ b/src/main/java/com/fc/v2/common/domain/ResultTree.java @@ -6,7 +6,7 @@ package com.fc.v2.common.domain; * CreateTime: 2019/10/23 * */ -public class ResuTree { +public class ResultTree { /** * 状态信息 @@ -69,10 +69,10 @@ public class ResuTree { this.data = data; } - public ResuTree() { + public ResultTree() { } - public ResuTree(Status status, Object data) { + public ResultTree(Status status, Object data) { this.status = status; this.data = data; } diff --git a/src/main/java/com/fc/v2/controller/admin/AutoCodeController.java b/src/main/java/com/fc/v2/controller/admin/AutoCodeController.java index 81a83114bc09c0c799060222240e29544005766f..3786e4145454afc619fddaaf04463a1d3c8842d8 100644 --- a/src/main/java/com/fc/v2/controller/admin/AutoCodeController.java +++ b/src/main/java/com/fc/v2/controller/admin/AutoCodeController.java @@ -21,7 +21,7 @@ import org.springframework.web.bind.annotation.ResponseBody; import com.fc.v2.common.base.BaseController; import com.fc.v2.common.domain.AjaxResult; -import com.fc.v2.common.domain.ResuTree; +import com.fc.v2.common.domain.ResultTree; import com.fc.v2.common.domain.ResultTable; import com.fc.v2.model.custom.TsysTables; import com.fc.v2.model.custom.TsysTablesVo; @@ -92,7 +92,7 @@ public class AutoCodeController extends BaseController { */ @GetMapping("/selectTables") @ResponseBody - public ResuTree selectTables() { + public ResultTree selectTables() { List list = generatorService.queryList(null); List TreeList = new ArrayList(); for (int i = 0; i < list.size(); i++) { diff --git a/src/main/java/com/fc/v2/controller/admin/PermissionController.java b/src/main/java/com/fc/v2/controller/admin/PermissionController.java index 2228456b62486178ed696b69f68c471f4dacfcce..8897694b4e74efc00c074132c2e1d6aae1bb523f 100644 --- a/src/main/java/com/fc/v2/controller/admin/PermissionController.java +++ b/src/main/java/com/fc/v2/controller/admin/PermissionController.java @@ -16,7 +16,7 @@ import org.springframework.web.bind.annotation.ResponseBody; import com.fc.v2.common.base.BaseController; import com.fc.v2.common.domain.AjaxResult; -import com.fc.v2.common.domain.ResuTree; +import com.fc.v2.common.domain.ResultTree; import com.fc.v2.common.domain.ResultTable; import com.fc.v2.model.auto.TsysPermission; import com.fc.v2.model.custom.Tablepar; @@ -218,7 +218,7 @@ public class PermissionController extends BaseController{ @ApiOperation(value = "根据角色id获取所有打勾权限", notes = "根据角色id获取 所有打勾权限") @GetMapping("/getCheckPrem") @ResponseBody - public ResuTree getCheckPrem(String roleId){ + public ResultTree getCheckPrem(String roleId){ return dataTree(sysPermissionService.getRolePower(roleId)); } @@ -260,7 +260,7 @@ public class PermissionController extends BaseController{ @GetMapping("/selectParent") @ResponseBody - public ResuTree selectParent(){ + public ResultTree selectParent(){ List list = sysPermissionService.getall(null); TsysPermission basePower = new TsysPermission(); basePower.setName("顶级权限"); diff --git a/src/main/java/com/fc/v2/controller/admin/SysDepartmentController.java b/src/main/java/com/fc/v2/controller/admin/SysDepartmentController.java index dbc89ac1d6fe6d4d2d36326d8a2464cbf3c14399..eab7a8ba8c719cf1ab495fc8b80d68119f71ccc6 100644 --- a/src/main/java/com/fc/v2/controller/admin/SysDepartmentController.java +++ b/src/main/java/com/fc/v2/controller/admin/SysDepartmentController.java @@ -7,7 +7,7 @@ import com.fc.v2.model.auto.SysDepartment; import com.fc.v2.model.auto.SysDepartmentExample; import com.fc.v2.model.custom.Tablepar; import com.fc.v2.service.SysDepartmentService; -import com.fc.v2.common.domain.ResuTree; +import com.fc.v2.common.domain.ResultTree; import com.github.pagehelper.PageInfo; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -161,7 +161,7 @@ public class SysDepartmentController extends BaseController{ @GetMapping("/selectParent") @ResponseBody - public ResuTree selectParent(){ + public ResultTree selectParent(){ List list = sysDepartmentService.selectByExample(new SysDepartmentExample()); return dataTree(list); } @@ -186,7 +186,7 @@ public class SysDepartmentController extends BaseController{ @GetMapping("tree") @ApiOperation(value = "获取部门树状数据结构", notes = "获取部门树状数据结构") @ResponseBody - public ResuTree tree(){ + public ResultTree tree(){ List data = sysDepartmentService.selectByExample(new SysDepartmentExample()); return dataTree(data); }