【fix sonar】RestDesformUtil文件
This commit is contained in:
+7
-6
@@ -2,6 +2,7 @@ package com.jero.common.util;
|
|||||||
|
|
||||||
import com.alibaba.fastjson.JSONObject;
|
import com.alibaba.fastjson.JSONObject;
|
||||||
import com.jero.common.api.vo.Result;
|
import com.jero.common.api.vo.Result;
|
||||||
|
import org.apache.poi.ss.formula.functions.T;
|
||||||
import org.springframework.http.HttpHeaders;
|
import org.springframework.http.HttpHeaders;
|
||||||
import org.springframework.http.HttpMethod;
|
import org.springframework.http.HttpMethod;
|
||||||
import org.springframework.http.MediaType;
|
import org.springframework.http.MediaType;
|
||||||
@@ -36,7 +37,7 @@ public class RestDesformUtil {
|
|||||||
* @param token
|
* @param token
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
public static Result queryOne(String desformCode, String dataId, String token) {
|
public static Result<T> queryOne(String desformCode, String dataId, String token) {
|
||||||
String url = getBaseUrl(desformCode, dataId).toString();
|
String url = getBaseUrl(desformCode, dataId).toString();
|
||||||
HttpHeaders headers = getHeaders(token);
|
HttpHeaders headers = getHeaders(token);
|
||||||
ResponseEntity<JSONObject> result = RestUtil.request(url, HttpMethod.GET, headers, null, null, JSONObject.class);
|
ResponseEntity<JSONObject> result = RestUtil.request(url, HttpMethod.GET, headers, null, null, JSONObject.class);
|
||||||
@@ -51,7 +52,7 @@ public class RestDesformUtil {
|
|||||||
* @param token
|
* @param token
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
public static Result addOne(String desformCode, JSONObject formData, String token) {
|
public static Result<T> addOne(String desformCode, JSONObject formData, String token) {
|
||||||
return addOrEditOne(desformCode, formData, token, HttpMethod.POST);
|
return addOrEditOne(desformCode, formData, token, HttpMethod.POST);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -63,11 +64,11 @@ public class RestDesformUtil {
|
|||||||
* @param token
|
* @param token
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
public static Result editOne(String desformCode, JSONObject formData, String token) {
|
public static Result<T> editOne(String desformCode, JSONObject formData, String token) {
|
||||||
return addOrEditOne(desformCode, formData, token, HttpMethod.PUT);
|
return addOrEditOne(desformCode, formData, token, HttpMethod.PUT);
|
||||||
}
|
}
|
||||||
|
|
||||||
private static Result addOrEditOne(String desformCode, JSONObject formData, String token, HttpMethod method) {
|
private static Result<T> addOrEditOne(String desformCode, JSONObject formData, String token, HttpMethod method) {
|
||||||
String url = getBaseUrl(desformCode).toString();
|
String url = getBaseUrl(desformCode).toString();
|
||||||
HttpHeaders headers = getHeaders(token);
|
HttpHeaders headers = getHeaders(token);
|
||||||
ResponseEntity<JSONObject> result = RestUtil.request(url, method, headers, null, formData, JSONObject.class);
|
ResponseEntity<JSONObject> result = RestUtil.request(url, method, headers, null, formData, JSONObject.class);
|
||||||
@@ -82,14 +83,14 @@ public class RestDesformUtil {
|
|||||||
* @param token
|
* @param token
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
public static Result removeOne(String desformCode, String dataId, String token) {
|
public static Result<T> removeOne(String desformCode, String dataId, String token) {
|
||||||
String url = getBaseUrl(desformCode, dataId).toString();
|
String url = getBaseUrl(desformCode, dataId).toString();
|
||||||
HttpHeaders headers = getHeaders(token);
|
HttpHeaders headers = getHeaders(token);
|
||||||
ResponseEntity<JSONObject> result = RestUtil.request(url, HttpMethod.DELETE, headers, null, null, JSONObject.class);
|
ResponseEntity<JSONObject> result = RestUtil.request(url, HttpMethod.DELETE, headers, null, null, JSONObject.class);
|
||||||
return packageReturn(result);
|
return packageReturn(result);
|
||||||
}
|
}
|
||||||
|
|
||||||
private static Result packageReturn(ResponseEntity<JSONObject> result) {
|
private static Result<T> packageReturn(ResponseEntity<JSONObject> result) {
|
||||||
JSONObject json = result.getBody();
|
JSONObject json = result.getBody();
|
||||||
if (!Objects.isNull(json)) {
|
if (!Objects.isNull(json)) {
|
||||||
return json.toJavaObject(Result.class);
|
return json.toJavaObject(Result.class);
|
||||||
|
|||||||
Reference in New Issue
Block a user