From 8c5844500b1c2eb0c6c15b20ce79db49cb829731 Mon Sep 17 00:00:00 2001
From: tianwenbo <tianwenbo@syxysoft.com>
Date: Mon, 6 Mar 2023 14:01:45 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90fix=20sonar=E3=80=91SysGatewayRouteCon?=
 =?UTF-8?q?troller.java=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/SysGatewayRouteController.java | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysGatewayRouteController.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysGatewayRouteController.java
index 7561775a..7edb1c96 100644
--- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysGatewayRouteController.java
+++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysGatewayRouteController.java
@@ -1,5 +1,6 @@
 package com.jero.modules.system.controller;
 
+import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -10,6 +11,7 @@ import com.jero.common.api.vo.Result;
 import com.jero.common.util.oConvertUtils;
 import com.jero.modules.system.entity.SysGatewayRoute;
 import com.jero.modules.system.service.ISysGatewayRouteService;
+import org.apache.poi.ss.formula.functions.T;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -31,23 +33,23 @@ public class SysGatewayRouteController extends JeroController<SysGatewayRoute, I
 	private ISysGatewayRouteService sysGatewayRouteService;
 
     @PostMapping(value = "/updateAll")
-    public Result<?> updateAll(@RequestBody JSONObject json) {
+    public Result<T> updateAll(@RequestBody JSONObject json) {
         sysGatewayRouteService.updateAll(json);
         return Result.OK("操作成功!");
     }
 
 	@GetMapping(value = "/page")
-	public Result<?> queryPageList(SysGatewayRoute sysGatewayRoute) {
+	public Result<JSONArray> queryPageList(SysGatewayRoute sysGatewayRoute) {
 		LambdaQueryWrapper<SysGatewayRoute> query = new LambdaQueryWrapper<>();
 		List<SysGatewayRoute> ls = sysGatewayRouteService.list(query);
 		JSONArray array = new JSONArray();
 		for(SysGatewayRoute rt: ls){
-			JSONObject obj = (JSONObject) JSONObject.toJSON(rt);
+			JSONObject obj = (JSONObject) JSON.toJSON(rt);
 			if(oConvertUtils.isNotEmpty(rt.getPredicates())){
-				obj.put("predicates", JSONArray.parseArray(rt.getPredicates()));
+				obj.put("predicates", JSON.parseArray(rt.getPredicates()));
 			}
 			if(oConvertUtils.isNotEmpty(rt.getFilters())){
-				obj.put("filters", JSONArray.parseArray(rt.getFilters()));
+				obj.put("filters", JSON.parseArray(rt.getFilters()));
 			}
 			array.add(obj);
 		}
@@ -55,7 +57,7 @@ public class SysGatewayRouteController extends JeroController<SysGatewayRoute, I
 	}
 
 	@GetMapping(value = "/clearRedis")
-	public Result<?> clearRedis() {
+	public Result<T> clearRedis() {
 		sysGatewayRouteService.clearRedis();
 		return Result.OK("清除成功！");
 	}
@@ -67,8 +69,9 @@ public class SysGatewayRouteController extends JeroController<SysGatewayRoute, I
      * @return
      */
     //@RequiresRoles({"admin"})
-    @RequestMapping(value = "/delete", method = RequestMethod.DELETE)
-    public Result<?> delete(@RequestParam(name = "id", required = true) String id) {
+//    @RequestMapping(value = "/delete", method = RequestMethod.DELETE)
+	@DeleteMapping("/delete")
+    public Result<T> delete(@RequestParam(name = "id", required = true) String id) {
         sysGatewayRouteService.deleteById(id);
         return Result.OK("删除路由成功");
     }