From 8a48e945a4ad51b3b5b4eb6c8d2aa836aa0a7328 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= <liangqitao@syxysoft.com>
Date: Thu, 9 Mar 2023 17:46:34 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90fix=20sonar=E3=80=91RestDesformUtil?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/jero/common/util/RestDesformUtil.java  | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/util/RestDesformUtil.java b/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/util/RestDesformUtil.java
index a88671f6..ef5e0a22 100644
--- a/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/util/RestDesformUtil.java
+++ b/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/util/RestDesformUtil.java
@@ -2,6 +2,7 @@ package com.jero.common.util;
 
 import com.alibaba.fastjson.JSONObject;
 import com.jero.common.api.vo.Result;
+import org.apache.poi.ss.formula.functions.T;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpMethod;
 import org.springframework.http.MediaType;
@@ -36,7 +37,7 @@ public class RestDesformUtil {
      * @param token
      * @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();
         HttpHeaders headers = getHeaders(token);
         ResponseEntity<JSONObject> result = RestUtil.request(url, HttpMethod.GET, headers, null, null, JSONObject.class);
@@ -51,7 +52,7 @@ public class RestDesformUtil {
      * @param token
      * @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);
     }
 
@@ -63,11 +64,11 @@ public class RestDesformUtil {
      * @param token
      * @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);
     }
 
-    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();
         HttpHeaders headers = getHeaders(token);
         ResponseEntity<JSONObject> result = RestUtil.request(url, method, headers, null, formData, JSONObject.class);
@@ -82,14 +83,14 @@ public class RestDesformUtil {
      * @param token
      * @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();
         HttpHeaders headers = getHeaders(token);
         ResponseEntity<JSONObject> result = RestUtil.request(url, HttpMethod.DELETE, headers, null, null, JSONObject.class);
         return packageReturn(result);
     }
 
-    private static Result packageReturn(ResponseEntity<JSONObject> result) {
+    private static Result<T> packageReturn(ResponseEntity<JSONObject> result) {
         JSONObject json  = result.getBody();
         if (!Objects.isNull(json)) {
             return json.toJavaObject(Result.class);