!1 代码格式优化

Merge pull request !1 from hjk2008/N/A
This commit is contained in:
hjk2008 2023-05-27 06:57:17 +00:00 committed by Gitee
commit 631e0d5846
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
7 changed files with 12 additions and 12 deletions

View File

@ -57,7 +57,7 @@ public class SysConfigController extends BaseController {
* @param configId 参数ID * @param configId 参数ID
*/ */
@SaCheckPermission("system:config:query") @SaCheckPermission("system:config:query")
@GetMapping(value = "/{configId}") @GetMapping("/{configId}")
public R<SysConfig> getInfo(@PathVariable Long configId) { public R<SysConfig> getInfo(@PathVariable Long configId) {
return R.ok(configService.selectConfigById(configId)); return R.ok(configService.selectConfigById(configId));
} }
@ -67,7 +67,7 @@ public class SysConfigController extends BaseController {
* *
* @param configKey 参数Key * @param configKey 参数Key
*/ */
@GetMapping(value = "/configKey/{configKey}") @GetMapping("/configKey/{configKey}")
public R<Void> getConfigKey(@PathVariable String configKey) { public R<Void> getConfigKey(@PathVariable String configKey) {
return R.ok(configService.selectConfigByKey(configKey)); return R.ok(configService.selectConfigByKey(configKey));
} }

View File

@ -59,7 +59,7 @@ public class SysDeptController extends BaseController {
* @param deptId 部门ID * @param deptId 部门ID
*/ */
@SaCheckPermission("system:dept:query") @SaCheckPermission("system:dept:query")
@GetMapping(value = "/{deptId}") @GetMapping("/{deptId}")
public R<SysDept> getInfo(@PathVariable Long deptId) { public R<SysDept> getInfo(@PathVariable Long deptId) {
deptService.checkDeptDataScope(deptId); deptService.checkDeptDataScope(deptId);
return R.ok(deptService.selectDeptById(deptId)); return R.ok(deptService.selectDeptById(deptId));

View File

@ -60,7 +60,7 @@ public class SysDictDataController extends BaseController {
* @param dictCode 字典code * @param dictCode 字典code
*/ */
@SaCheckPermission("system:dict:query") @SaCheckPermission("system:dict:query")
@GetMapping(value = "/{dictCode}") @GetMapping("/{dictCode}")
public R<SysDictData> getInfo(@PathVariable Long dictCode) { public R<SysDictData> getInfo(@PathVariable Long dictCode) {
return R.ok(dictDataService.selectDictDataById(dictCode)); return R.ok(dictDataService.selectDictDataById(dictCode));
} }
@ -70,7 +70,7 @@ public class SysDictDataController extends BaseController {
* *
* @param dictType 字典类型 * @param dictType 字典类型
*/ */
@GetMapping(value = "/type/{dictType}") @GetMapping("/type/{dictType}")
public R<List<SysDictData>> dictType(@PathVariable String dictType) { public R<List<SysDictData>> dictType(@PathVariable String dictType) {
List<SysDictData> data = dictTypeService.selectDictDataByType(dictType); List<SysDictData> data = dictTypeService.selectDictDataByType(dictType);
if (ObjectUtil.isNull(data)) { if (ObjectUtil.isNull(data)) {

View File

@ -57,7 +57,7 @@ public class SysDictTypeController extends BaseController {
* @param dictId 字典ID * @param dictId 字典ID
*/ */
@SaCheckPermission("system:dict:query") @SaCheckPermission("system:dict:query")
@GetMapping(value = "/{dictId}") @GetMapping("/{dictId}")
public R<SysDictType> getInfo(@PathVariable Long dictId) { public R<SysDictType> getInfo(@PathVariable Long dictId) {
return R.ok(dictTypeService.selectDictTypeById(dictId)); return R.ok(dictTypeService.selectDictTypeById(dictId));
} }

View File

@ -67,7 +67,7 @@ public class SysRoleController extends BaseController {
* @param roleId 角色ID * @param roleId 角色ID
*/ */
@SaCheckPermission("system:role:query") @SaCheckPermission("system:role:query")
@GetMapping(value = "/{roleId}") @GetMapping("/{roleId}")
public R<SysRole> getInfo(@PathVariable Long roleId) { public R<SysRole> getInfo(@PathVariable Long roleId) {
roleService.checkRoleDataScope(roleId); roleService.checkRoleDataScope(roleId);
return R.ok(roleService.selectRoleById(roleId)); return R.ok(roleService.selectRoleById(roleId));
@ -217,7 +217,7 @@ public class SysRoleController extends BaseController {
* @param roleId 角色ID * @param roleId 角色ID
*/ */
@SaCheckPermission("system:role:list") @SaCheckPermission("system:role:list")
@GetMapping(value = "/deptTree/{roleId}") @GetMapping("/deptTree/{roleId}")
public R<Map<String, Object>> roleDeptTreeselect(@PathVariable("roleId") Long roleId) { public R<Map<String, Object>> roleDeptTreeselect(@PathVariable("roleId") Long roleId) {
Map<String, Object> ajax = new HashMap<>(); Map<String, Object> ajax = new HashMap<>();
ajax.put("checkedKeys", deptService.selectDeptListByRoleId(roleId)); ajax.put("checkedKeys", deptService.selectDeptListByRoleId(roleId));

View File

@ -62,7 +62,7 @@ public class IndexController {
return new ModelAndView("login"); return new ModelAndView("login");
} }
@RequestMapping(value = "login", method = RequestMethod.POST) @PostMapping("/login")
@ResponseBody @ResponseBody
@PermissionLimit(limit = false) @PermissionLimit(limit = false)
public ReturnT<String> loginDo(HttpServletRequest request, HttpServletResponse response, String userName, String password, String ifRemember) { public ReturnT<String> loginDo(HttpServletRequest request, HttpServletResponse response, String userName, String password, String ifRemember) {
@ -70,7 +70,7 @@ public class IndexController {
return loginService.login(request, response, userName, password, ifRem); return loginService.login(request, response, userName, password, ifRem);
} }
@RequestMapping(value = "logout", method = RequestMethod.POST) @PostMapping("/logout")
@ResponseBody @ResponseBody
@PermissionLimit(limit = false) @PermissionLimit(limit = false)
public ReturnT<String> logout(HttpServletRequest request, HttpServletResponse response) { public ReturnT<String> logout(HttpServletRequest request, HttpServletResponse response) {

View File

@ -50,7 +50,7 @@ public class GenController extends BaseController {
* @param tableId 表ID * @param tableId 表ID
*/ */
@SaCheckPermission("tool:gen:query") @SaCheckPermission("tool:gen:query")
@GetMapping(value = "/{tableId}") @GetMapping("/{tableId}")
public R<Map<String, Object>> getInfo(@PathVariable Long tableId) { public R<Map<String, Object>> getInfo(@PathVariable Long tableId) {
GenTable table = genTableService.selectGenTableById(tableId); GenTable table = genTableService.selectGenTableById(tableId);
List<GenTable> tables = genTableService.selectGenTableAll(); List<GenTable> tables = genTableService.selectGenTableAll();
@ -77,7 +77,7 @@ public class GenController extends BaseController {
* @param tableId 表ID * @param tableId 表ID
*/ */
@SaCheckPermission("tool:gen:list") @SaCheckPermission("tool:gen:list")
@GetMapping(value = "/column/{tableId}") @GetMapping("/column/{tableId}")
public TableDataInfo<GenTableColumn> columnList(Long tableId) { public TableDataInfo<GenTableColumn> columnList(Long tableId) {
TableDataInfo<GenTableColumn> dataInfo = new TableDataInfo<>(); TableDataInfo<GenTableColumn> dataInfo = new TableDataInfo<>();
List<GenTableColumn> list = genTableService.selectGenTableColumnListByTableId(tableId); List<GenTableColumn> list = genTableService.selectGenTableColumnListByTableId(tableId);