优化代码

ruoyi-admin/src/main/java/com/ruoyi/web/dataBase/DatabaseConnectionMap.java

@@ -9,7 +9,6 @@ import org.springframework.jdbc.datasource.DriverManagerDataSource;
 import org.springframework.stereotype.Component;
 
 import javax.annotation.PostConstruct;
-import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -19,9 +18,9 @@ import java.util.concurrent.ConcurrentHashMap;
 public class DatabaseConnectionMap {
 
 
-    private static ConcurrentHashMap<Long, Map<String, JdbcTemplate>> databaseConnectionMap = new ConcurrentHashMap<>();
+    private static ConcurrentHashMap<Long, Map<String, JdbcTemplate>> DATA_BASE_CONNECTION_MAP = new ConcurrentHashMap<>();
 
-    private JdbcTemplate iotDataBast;
+    private JdbcTemplate IOT_DATA_BAST;
 
 
 
@@ -42,7 +41,7 @@ public class DatabaseConnectionMap {
         dataSource.setUrl("jdbc:mysql://47.94.195.4:3525/iot?useUnicode=true&useSSL=false&characterEncoding=utf8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai");
         dataSource.setUsername("wdy_iot");
         dataSource.setPassword("DF5!Oe^NJj7$f2vY");
-        iotDataBast = new JdbcTemplate(dataSource);
+        IOT_DATA_BAST = new JdbcTemplate(dataSource);
     }
 
     /**
@@ -53,16 +52,16 @@ public class DatabaseConnectionMap {
         if (standingId != null) {
             sql += " and standing_id = " + standingId;
         }
-        List<UserEnterpriseRelation> query = iotDataBast.query(sql, new BeanPropertyRowMapper<>(UserEnterpriseRelation.class));
+        List<UserEnterpriseRelation> query = IOT_DATA_BAST.query(sql, new BeanPropertyRowMapper<>(UserEnterpriseRelation.class));
         for (UserEnterpriseRelation userEnterpriseRelation : query) {
             Map<String, JdbcTemplate> map = new HashMap<>();
             for (UserEnterpriseRelation enterpriseRelation : query) {
                 if (userEnterpriseRelation.getStandingId() == enterpriseRelation.getStandingId()) {
                     map.put(enterpriseRelation.getEnterpriseDatabaseUrl(), connectDatabases(enterpriseRelation));
-                };
+                }
             }
             // map中存值
-            databaseConnectionMap.put(userEnterpriseRelation.getStandingId(), map);
+            DATA_BASE_CONNECTION_MAP.put(userEnterpriseRelation.getStandingId(), map);
         }
     }
 
@@ -89,12 +88,12 @@ public class DatabaseConnectionMap {
      */
     public Map<String, JdbcTemplate> getJdbcTemplate() {
         SysUser user = SecurityUtils.getLoginUser().getUser();
-        Map<String, JdbcTemplate> map = databaseConnectionMap.get(user.getDeptId());
+        Map<String, JdbcTemplate> map = DATA_BASE_CONNECTION_MAP.get(user.getDeptId());
 
         // 连接不存在则连接数据库
         if (map == null) {
             connectToAllDatabase(user.getDeptId());
-            map = databaseConnectionMap.get(user.getDeptId());
+            map = DATA_BASE_CONNECTION_MAP.get(user.getDeptId());
         }
 
         return map;