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
*/
public class CommonResult<T> {
private long status;
private String message;
private T data;
private long code;
private String desc;
private T result;
public CommonResult() {
}
protected CommonResult(T data) {
this.data = data;
this.message = ResultCode.SUCCESS.getDesc();
this.status = ResultCode.SUCCESS.getCode();
this.result = data;
this.desc = ResultCode.SUCCESS.getDesc();
this.code = ResultCode.SUCCESS.getCode();
}
protected CommonResult(long status, String message, T data) {
this.status = status;
this.message = message;
this.data = data;
this.code = status;
this.desc = message;
this.result = data;
}
/**
@@ -115,27 +115,27 @@ public class CommonResult<T> {
return new CommonResult<>(ResultCode.FORBIDDEN.getCode(), ResultCode.FORBIDDEN.getDesc(), data);
}
public long getStatus() {
return status;
public long getCode() {
return code;
}
public void setStatus(long status) {
this.status = status;
public void setCode(long status) {
this.code = status;
}
public String getMessage() {
return message;
public String getDesc() {
return desc;
}
public void setMessage(String message) {
this.message = message;
public void setDesc(String message) {
this.desc = message;
}
public T getData() {
return data;
public T getResult() {
return result;
}
public void setData(T data) {
this.data = data;
public void setResult(T 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) {
CommonResult<T> result = new CommonResult<>();
try {
result.setStatus(ResultCode.SUCCESS.getCode());
result.setMessage(ResultCode.SUCCESS.getDesc());
result.setCode(ResultCode.SUCCESS.getCode());
result.setDesc(ResultCode.SUCCESS.getDesc());
T object = callback.doExecute();
if(object != null) {
result.setData(object);
result.setResult(object);
}
}
catch(BizCoreException e) {
@@ -35,13 +35,13 @@ public class RestBusinessTemplate{
}
log.error(e.getErrorMsg());
ResultCode code = e.getCode() == null ? ResultCode.FAILED : e.getCode();
result.setStatus(code.getCode());
result.setMessage(errorMsg);
result.setCode(code.getCode());
result.setDesc(errorMsg);
}
catch(Exception e) {
log.error("execute error", e);
result.setStatus(ResultCode.FAILED.getCode());
result.setMessage(ResultCode.FAILED.getDesc() + ",原因是:" + e.getMessage());
result.setCode(ResultCode.FAILED.getCode());
result.setDesc(ResultCode.FAILED.getDesc() + ",原因是:" + e.getMessage());
}
return result;
}
@@ -49,10 +49,10 @@ public class RestBusinessTemplate{
public static <T> CommonResult<T> execute(T object) {
CommonResult<T> result = new CommonResult<>();
try {
result.setStatus(ResultCode.SUCCESS.getCode());
result.setMessage(ResultCode.SUCCESS.getDesc());
result.setCode(ResultCode.SUCCESS.getCode());
result.setDesc(ResultCode.SUCCESS.getDesc());
if(object != null) {
result.setData(object);
result.setResult(object);
}
}
catch(BizCoreException e) {
@@ -68,13 +68,13 @@ public class RestBusinessTemplate{
}
log.error(e.getErrorMsg());
ResultCode code = e.getCode() == null ? ResultCode.FAILED : e.getCode();
result.setStatus(code.getCode());
result.setMessage(errorMsg);
result.setCode(code.getCode());
result.setDesc(errorMsg);
}
catch(Exception e) {
log.error("execute error", e);
result.setStatus(ResultCode.FAILED.getCode());
result.setMessage(ResultCode.FAILED.getDesc() + ",原因是:" + e);
result.setCode(ResultCode.FAILED.getCode());
result.setDesc(ResultCode.FAILED.getDesc() + ",原因是:" + e);
}
return result;
}
@@ -83,19 +83,19 @@ public class RestBusinessTemplate{
CommonResult<Void> result = new CommonResult<>();
try {
callback.execute();
result.setStatus(ResultCode.SUCCESS.getCode());
result.setMessage(ResultCode.SUCCESS.getDesc());
result.setCode(ResultCode.SUCCESS.getCode());
result.setDesc(ResultCode.SUCCESS.getDesc());
}
catch(BizCoreException e) {
log.error("", e);
ResultCode code = e.getCode() == null ? ResultCode.FAILED : e.getCode();
result.setStatus(code.getCode());
result.setMessage(StringUtils.isBlank(e.getMessage()) ? code.getDesc() : e.getMessage());
result.setCode(code.getCode());
result.setDesc(StringUtils.isBlank(e.getMessage()) ? code.getDesc() : e.getMessage());
}
catch(Exception e) {
log.error("execute error", e);
result.setStatus(ResultCode.FAILED.getCode());
result.setMessage(ResultCode.FAILED.getDesc());
result.setCode(ResultCode.FAILED.getCode());
result.setDesc(e.getMessage());
}
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
*/
public enum ResultCode implements IErrorCode{
SUCCESS(200, "操作成功"),
FAILED(400, "操作失败"),
SUCCESS(1, "操作成功"),
FAILED(0, "操作失败"),
UNAUTHORIZED(401, "暂未登录或token已经过期"),
INVALID_PARAMETER(402, "无效参数"),
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.anno.Log;
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.role.ISysRoleService;
import org.nl.system.service.role.dao.SysRole;
@@ -51,8 +52,7 @@ public class SysRoleController{
@PostMapping("/add")
//@SaCheckPermission("roles:add")
public ResponseEntity<Object> create(@RequestBody JSONObject param) {
roleService.create(param);
return new ResponseEntity<>(HttpStatus.CREATED);
return new ResponseEntity<>(RestBusinessTemplate.execute(() -> roleService.create(param)), HttpStatus.OK);
}
@Log("修改角色")
@@ -60,8 +60,14 @@ public class SysRoleController{
@PostMapping("/edit")
//@SaCheckPermission("roles:edit")
public ResponseEntity<Object> update(@RequestBody JSONObject param) {
roleService.update(param);
return new ResponseEntity<>(HttpStatus.NO_CONTENT);
//roleService.update(param);
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("删除角色")