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

---
 .../service/impl/RedisServiceImpl.java        | 25 ++++++-------------
 1 file changed, 8 insertions(+), 17 deletions(-)

diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/monitor/service/impl/RedisServiceImpl.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/monitor/service/impl/RedisServiceImpl.java
index 6ffa6014..80de1087 100644
--- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/monitor/service/impl/RedisServiceImpl.java
+++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/monitor/service/impl/RedisServiceImpl.java
@@ -1,26 +1,19 @@
 package com.jero.modules.monitor.service.impl;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Properties;
-
-import javax.annotation.Resource;
-
 import cn.hutool.core.date.DateUtil;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
-import com.google.common.collect.Maps;
 import com.jero.common.util.oConvertUtils;
 import com.jero.modules.monitor.domain.RedisInfo;
 import com.jero.modules.monitor.exception.RedisConnectException;
 import com.jero.modules.monitor.service.RedisService;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.cglib.beans.BeanMap;
 import org.springframework.data.redis.connection.RedisConnectionFactory;
 import org.springframework.stereotype.Service;
 
-import lombok.extern.slf4j.Slf4j;
+import javax.annotation.Resource;
+import java.util.*;
 
 /**
  * Redis 监控信息获取
@@ -42,8 +35,9 @@ public class RedisServiceImpl implements RedisService {
 	@Override
 	public List<RedisInfo> getRedisInfo() throws RedisConnectException {
 		Properties info = redisConnectionFactory.getConnection().info();
-		if(info==null)
+		if(info==null) {
 			return new ArrayList<>();
+		}
 		List<RedisInfo> infoList = new ArrayList<>();
 		RedisInfo redisInfo = null;
 		for (Map.Entry<Object, Object> entry : info.entrySet()) {
@@ -70,8 +64,9 @@ public class RedisServiceImpl implements RedisService {
 	public Map<String, Object> getMemoryInfo() throws RedisConnectException {
 		Map<String, Object> map = null;
 		Properties info = redisConnectionFactory.getConnection().info();
-		if(info==null)
+		if(info==null) {
 			return new HashMap<>();
+		}
 		for (Map.Entry<Object, Object> entry : info.entrySet()) {
 			String key = oConvertUtils.getString(entry.getKey());
 			if (USER_MEMORY.equals(key)) {
@@ -97,12 +92,8 @@ public class RedisServiceImpl implements RedisService {
 		if("3".equals(type)){
 			List<RedisInfo> redisInfo = getRedisInfo();
 			for(RedisInfo info:redisInfo){
-				Map<String, Object> map= Maps.newHashMap();
 				BeanMap beanMap = BeanMap.create(info);
-				for (Object key : beanMap.keySet()) {
-					map.put(key+"", beanMap.get(key));
-				}
-				json.add(map);
+				json.add(beanMap);
 			}
 			mapJson.put("data",json);
 			return mapJson;