From 0b40dcd5976911105d27336a03f8c56e6dd211a0 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 12:02:48 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90fix=20sonar=E3=80=91DynamicDBUtil?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/util/dynamic/db/DynamicDBUtil.java | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/util/dynamic/db/DynamicDBUtil.java b/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/util/dynamic/db/DynamicDBUtil.java
index 25281d8d..0db47ab7 100644
--- a/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/util/dynamic/db/DynamicDBUtil.java
+++ b/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/util/dynamic/db/DynamicDBUtil.java
@@ -11,9 +11,9 @@ import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate;
 
 import java.sql.SQLException;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 
 /**
  * Spring JDBC 实时数据库访问
@@ -138,12 +138,12 @@ public class DynamicDBUtil {
      * @param data  sql语法中需要判断的数据及sql拼接注入中需要的数据
      * @return
      */
-    public static int updateByHash(final String dbKey, String sql, HashMap<String, Object> data) {
+    public static int updateByHash(final String dbKey, String sql, Map<String, Object> data) {
         int effectCount;
         JdbcTemplate jdbcTemplate = getJdbcTemplate(dbKey);
         //根据模板获取sql
         sql = FreemarkerParseFactory.parseTemplateContent(sql, data);
-        NamedParameterJdbcTemplate namedParameterJdbcTemplate = new NamedParameterJdbcTemplate(jdbcTemplate.getDataSource());
+        NamedParameterJdbcTemplate namedParameterJdbcTemplate = new NamedParameterJdbcTemplate(Objects.requireNonNull(jdbcTemplate.getDataSource()));
         effectCount = namedParameterJdbcTemplate.update(sql, data);
         return effectCount;
     }
@@ -169,7 +169,7 @@ public class DynamicDBUtil {
      * @param data  sql语法中需要判断的数据及sql拼接注入中需要的数据
      * @return
      */
-    public static Object findOneByHash(final String dbKey, String sql, HashMap<String, Object> data) {
+    public static Object findOneByHash(final String dbKey, String sql, Map<String, Object> data) {
         List<Map<String, Object>> list;
         list = findListByHash(dbKey, sql, data);
         if (oConvertUtils.listIsEmpty(list)) {
@@ -206,7 +206,7 @@ public class DynamicDBUtil {
      * @return
      */
     @SuppressWarnings("unchecked")
-    public static <T> Object findOneByHash(final String dbKey, String sql, Class<T> clazz, HashMap<String, Object> data) {
+    public static <T> Object findOneByHash(final String dbKey, String sql, Class<T> clazz, Map<String, Object> data) {
         Map<String, Object> map = (Map<String, Object>) findOneByHash(dbKey, sql, data);
         return ReflectHelper.setAll(clazz, map);
     }
@@ -231,12 +231,12 @@ public class DynamicDBUtil {
      * @param data  sql语法中需要判断的数据及sql拼接注入中需要的数据
      * @return
      */
-    public static List<Map<String, Object>> findListByHash(final String dbKey, String sql, HashMap<String, Object> data) {
+    public static List<Map<String, Object>> findListByHash(final String dbKey, String sql, Map<String, Object> data) {
         List<Map<String, Object>> list;
         JdbcTemplate jdbcTemplate = getJdbcTemplate(dbKey);
         //根据模板获取sql
         sql = FreemarkerParseFactory.parseTemplateContent(sql, data);
-        NamedParameterJdbcTemplate namedParameterJdbcTemplate = new NamedParameterJdbcTemplate(jdbcTemplate.getDataSource());
+        NamedParameterJdbcTemplate namedParameterJdbcTemplate = new NamedParameterJdbcTemplate(Objects.requireNonNull(jdbcTemplate.getDataSource()));
         list = namedParameterJdbcTemplate.queryForList(sql, data);
         return list;
     }
@@ -263,12 +263,12 @@ public class DynamicDBUtil {
      * @param data  sql语法中需要判断的数据及sql拼接注入中需要的数据
      * @return
      */
-    public static <T> List<T> findListByHash(final String dbKey, String sql, Class<T> clazz, HashMap<String, Object> data) {
+    public static <T> List<T> findListByHash(final String dbKey, String sql, Class<T> clazz, Map<String, Object> data) {
         List<T> list;
         JdbcTemplate jdbcTemplate = getJdbcTemplate(dbKey);
         //根据模板获取sql
         sql = FreemarkerParseFactory.parseTemplateContent(sql, data);
-        NamedParameterJdbcTemplate namedParameterJdbcTemplate = new NamedParameterJdbcTemplate(jdbcTemplate.getDataSource());
+        NamedParameterJdbcTemplate namedParameterJdbcTemplate = new NamedParameterJdbcTemplate(Objects.requireNonNull(jdbcTemplate.getDataSource()));
         list = namedParameterJdbcTemplate.queryForList(sql, data, clazz);
         return list;
     }
@@ -296,7 +296,7 @@ public class DynamicDBUtil {
      * @param data  sql语法中需要判断的数据及sql拼接注入中需要的数据
      * @return
      */
-    public static <T> List<T> findListEntitiesByHash(final String dbKey, String sql, Class<T> clazz, HashMap<String, Object> data) {
+    public static <T> List<T> findListEntitiesByHash(final String dbKey, String sql, Class<T> clazz, Map<String, Object> data) {
         List<Map<String, Object>> queryList = findListByHash(dbKey, sql, data);
         return ReflectHelper.transList2Entrys(queryList, clazz);
     }