root/apt
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rev:所有成功状态码都改为200

Browse Source
This commit is contained in:
baoge
2023-05-24 10:48:39 +08:00
parent d4c9d65e8a
commit daf68a76d6
4 changed files with 53 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
nladmin-system/src/main/java/org/nl/common/utils/api/CommonResult.java
View File

@@ -7,24 +7,24 @@ package org.nl.common.utils.api;
* @date 2023-03-02 * @date 2023-03-02
*/ */
public class CommonResult<T> { public class CommonResult<T> {
private long status; private long code;
private String message; private String desc;
private T data; private T result;
public CommonResult() { public CommonResult() {
} }
protected CommonResult(T data) { protected CommonResult(T data) {
this.data = data; this.result = data;
this.message = ResultCode.SUCCESS.getDesc(); this.desc = ResultCode.SUCCESS.getDesc();
this.status = ResultCode.SUCCESS.getCode(); this.code = ResultCode.SUCCESS.getCode();
} }
protected CommonResult(long status, String message, T data) { protected CommonResult(long status, String message, T data) {
this.status = status; this.code = status;
this.message = message; this.desc = message;
this.data = data; this.result = data;
} }
/** /**
@@ -115,27 +115,27 @@ public class CommonResult<T> {
return new CommonResult<>(ResultCode.FORBIDDEN.getCode(), ResultCode.FORBIDDEN.getDesc(), data); return new CommonResult<>(ResultCode.FORBIDDEN.getCode(), ResultCode.FORBIDDEN.getDesc(), data);
} }
public long getStatus() { public long getCode() {
return status; return code;
} }
public void setStatus(long status) { public void setCode(long status) {
this.status = status; this.code = status;
} }
public String getMessage() { public String getDesc() {
return message; return desc;
} }
public void setMessage(String message) { public void setDesc(String message) {
this.message = message; this.desc = message;
} }
public T getData() { public T getResult() {
return data; return result;
} }
public void setData(T data) { public void setResult(T data) {
this.data = data; this.result = data;
} }
} }

40
nladmin-system/src/main/java/org/nl/common/utils/api/RestBusinessTemplate.java
View File

@@ -15,11 +15,11 @@ public class RestBusinessTemplate{
public static <T> CommonResult<T> execute(Callback<T> callback) { public static <T> CommonResult<T> execute(Callback<T> callback) {
CommonResult<T> result = new CommonResult<>(); CommonResult<T> result = new CommonResult<>();
try { try {
result.setStatus(ResultCode.SUCCESS.getCode()); result.setCode(ResultCode.SUCCESS.getCode());
result.setMessage(ResultCode.SUCCESS.getDesc()); result.setDesc(ResultCode.SUCCESS.getDesc());
T object = callback.doExecute(); T object = callback.doExecute();
if(object != null) { if(object != null) {
result.setData(object); result.setResult(object);
} }
} }
catch(BizCoreException e) { catch(BizCoreException e) {
@@ -35,13 +35,13 @@ public class RestBusinessTemplate{
} }
log.error(e.getErrorMsg()); log.error(e.getErrorMsg());
ResultCode code = e.getCode() == null ? ResultCode.FAILED : e.getCode(); ResultCode code = e.getCode() == null ? ResultCode.FAILED : e.getCode();
result.setStatus(code.getCode()); result.setCode(code.getCode());
result.setMessage(errorMsg); result.setDesc(errorMsg);
} }
catch(Exception e) { catch(Exception e) {
log.error("execute error", e); log.error("execute error", e);
result.setStatus(ResultCode.FAILED.getCode()); result.setCode(ResultCode.FAILED.getCode());
result.setMessage(ResultCode.FAILED.getDesc() + ",原因是:" + e.getMessage()); result.setDesc(ResultCode.FAILED.getDesc() + ",原因是:" + e.getMessage());
} }
return result; return result;
} }
@@ -49,10 +49,10 @@ public class RestBusinessTemplate{
public static <T> CommonResult<T> execute(T object) { public static <T> CommonResult<T> execute(T object) {
CommonResult<T> result = new CommonResult<>(); CommonResult<T> result = new CommonResult<>();
try { try {
result.setStatus(ResultCode.SUCCESS.getCode()); result.setCode(ResultCode.SUCCESS.getCode());
result.setMessage(ResultCode.SUCCESS.getDesc()); result.setDesc(ResultCode.SUCCESS.getDesc());
if(object != null) { if(object != null) {
result.setData(object); result.setResult(object);
} }
} }
catch(BizCoreException e) { catch(BizCoreException e) {
@@ -68,13 +68,13 @@ public class RestBusinessTemplate{
} }
log.error(e.getErrorMsg()); log.error(e.getErrorMsg());
ResultCode code = e.getCode() == null ? ResultCode.FAILED : e.getCode(); ResultCode code = e.getCode() == null ? ResultCode.FAILED : e.getCode();
result.setStatus(code.getCode()); result.setCode(code.getCode());
result.setMessage(errorMsg); result.setDesc(errorMsg);
} }
catch(Exception e) { catch(Exception e) {
log.error("execute error", e); log.error("execute error", e);
result.setStatus(ResultCode.FAILED.getCode()); result.setCode(ResultCode.FAILED.getCode());
result.setMessage(ResultCode.FAILED.getDesc() + ",原因是:" + e); result.setDesc(ResultCode.FAILED.getDesc() + ",原因是:" + e);
} }
return result; return result;
} }
@@ -83,19 +83,19 @@ public class RestBusinessTemplate{
CommonResult<Void> result = new CommonResult<>(); CommonResult<Void> result = new CommonResult<>();
try { try {
callback.execute(); callback.execute();
result.setStatus(ResultCode.SUCCESS.getCode()); result.setCode(ResultCode.SUCCESS.getCode());
result.setMessage(ResultCode.SUCCESS.getDesc()); result.setDesc(ResultCode.SUCCESS.getDesc());
} }
catch(BizCoreException e) { catch(BizCoreException e) {
log.error("", e); log.error("", e);
ResultCode code = e.getCode() == null ? ResultCode.FAILED : e.getCode(); ResultCode code = e.getCode() == null ? ResultCode.FAILED : e.getCode();
result.setStatus(code.getCode()); result.setCode(code.getCode());
result.setMessage(StringUtils.isBlank(e.getMessage()) ? code.getDesc() : e.getMessage()); result.setDesc(StringUtils.isBlank(e.getMessage()) ? code.getDesc() : e.getMessage());
} }
catch(Exception e) { catch(Exception e) {
log.error("execute error", e); log.error("execute error", e);
result.setStatus(ResultCode.FAILED.getCode()); result.setCode(ResultCode.FAILED.getCode());
result.setMessage(ResultCode.FAILED.getDesc()); result.setDesc(e.getMessage());
} }
return result; return result;
} }

4
nladmin-system/src/main/java/org/nl/common/utils/api/ResultCode.java
View File

@@ -7,8 +7,8 @@ package org.nl.common.utils.api;
* @date 2023-03-02 * @date 2023-03-02
*/ */
public enum ResultCode implements IErrorCode{ public enum ResultCode implements IErrorCode{
SUCCESS(200, "操作成功"), SUCCESS(1, "操作成功"),
FAILED(400, "操作失败"), FAILED(0, "操作失败"),
UNAUTHORIZED(401, "暂未登录或token已经过期"), UNAUTHORIZED(401, "暂未登录或token已经过期"),
INVALID_PARAMETER(402, "无效参数"), INVALID_PARAMETER(402, "无效参数"),
FORBIDDEN(403, "没有相关权限"), FORBIDDEN(403, "没有相关权限"),

14
nladmin-system/src/main/java/org/nl/system/controller/role/SysRoleController.java
View File

@@ -9,6 +9,7 @@ import org.nl.common.anno.Log;
import org.nl.common.TableDataInfo; import org.nl.common.TableDataInfo;
import org.nl.common.anno.Log; import org.nl.common.anno.Log;
import org.nl.common.domain.query.PageQuery; import org.nl.common.domain.query.PageQuery;
import org.nl.common.utils.api.RestBusinessTemplate;
import org.nl.system.service.menu.dao.SysMenu; import org.nl.system.service.menu.dao.SysMenu;
import org.nl.system.service.role.ISysRoleService; import org.nl.system.service.role.ISysRoleService;
import org.nl.system.service.role.dao.SysRole; import org.nl.system.service.role.dao.SysRole;
@@ -51,8 +52,7 @@ public class SysRoleController{
@PostMapping("/add") @PostMapping("/add")
//@SaCheckPermission("roles:add") //@SaCheckPermission("roles:add")
public ResponseEntity<Object> create(@RequestBody JSONObject param) { public ResponseEntity<Object> create(@RequestBody JSONObject param) {
roleService.create(param); return new ResponseEntity<>(RestBusinessTemplate.execute(() -> roleService.create(param)), HttpStatus.OK);
return new ResponseEntity<>(HttpStatus.CREATED);
} }
@Log("修改角色") @Log("修改角色")
@@ -60,8 +60,14 @@ public class SysRoleController{
@PostMapping("/edit") @PostMapping("/edit")
//@SaCheckPermission("roles:edit") //@SaCheckPermission("roles:edit")
public ResponseEntity<Object> update(@RequestBody JSONObject param) { public ResponseEntity<Object> update(@RequestBody JSONObject param) {
roleService.update(param); //roleService.update(param);
return new ResponseEntity<>(HttpStatus.NO_CONTENT); JSONObject returnjo = new JSONObject();
JSONObject result = new JSONObject();
returnjo.put("result", result);
returnjo.put("code", "1");
returnjo.put("desc", "操作成功");
return new ResponseEntity<>(returnjo, HttpStatus.OK);
} }
@Log("删除角色") @Log("删除角色")