Merge remote-tracking branch 'remotes/upstream/dev-1.1.0' into dev-1.1.0

escheduler-api/src/main/java/cn/escheduler/api/service/DataSourceService.java

@@ -325,7 +325,14 @@ public class DataSourceService extends BaseService{
      */
     public Map<String, Object> queryDataSourceList(User loginUser, Integer type) {
         Map<String, Object> result = new HashMap<>(5);
-        List<DataSource> datasourceList = dataSourceMapper.queryDataSourceByType(loginUser.getId(), type);
+
+        List<DataSource> datasourceList;
+
+        if (isAdmin(loginUser)) {
+            datasourceList = dataSourceMapper.listAllDataSourceByType(type);
+        }else{
+            datasourceList = dataSourceMapper.queryDataSourceByType(loginUser.getId(), type);
+        }
 
         result.put(Constants.DATA_LIST, datasourceList);
         putMsg(result, Status.SUCCESS);

escheduler-dao/src/main/java/cn/escheduler/dao/mapper/DataSourceMapper.java

@@ -216,4 +216,17 @@ public interface DataSourceMapper {
     @SelectProvider(type = DataSourceMapperProvider.class, method = "queryDatasourceExceptUserId")
     List<DataSource> queryDatasourceExceptUserId(@Param("userId") int userId);
 
+    @Results(value = {
+            @Result(property = "id", column = "id", id = true, javaType = Integer.class, jdbcType = JdbcType.INTEGER),
+            @Result(property = "name", column = "name", javaType = String.class, jdbcType = JdbcType.VARCHAR),
+            @Result(property = "note", column = "note", javaType = String.class, jdbcType = JdbcType.VARCHAR),
+            @Result(property = "type", column = "type", typeHandler = EnumOrdinalTypeHandler.class, javaType = DbType.class, jdbcType = JdbcType.INTEGER),
+            @Result(property = "userId", column = "user_id", javaType = Integer.class, jdbcType = JdbcType.INTEGER),
+            @Result(property = "connectionParams", column = "connection_params", javaType = String.class, jdbcType = JdbcType.VARCHAR),
+            @Result(property = "createTime", column = "create_time", javaType = Timestamp.class, jdbcType = JdbcType.DATE),
+            @Result(property = "updateTime", column = "update_time", javaType = Timestamp.class, jdbcType = JdbcType.DATE)
+    })
+    @SelectProvider(type = DataSourceMapperProvider.class, method = "listAllDataSourceByType")
+    List<DataSource> listAllDataSourceByType(@Param("type") Integer type);
+
 }

escheduler-dao/src/main/java/cn/escheduler/dao/mapper/DataSourceMapperProvider.java

@@ -175,8 +175,7 @@ public class DataSourceMapperProvider {
   }
 
   /**
-   * 查询总的数据源数目
-   *
+   * Query the total number of data sources
    * @param parameter
    * @return
    */
@@ -228,4 +227,20 @@ public class DataSourceMapperProvider {
       WHERE("user_id <> #{userId}");
     }}.toString();
   }
+
+
+  /**
+   * list all data source by type
+   *
+   * @param parameter
+   * @return
+   */
+  public String listAllDataSourceByType(Map<String, Object> parameter) {
+    return new SQL() {{
+      SELECT("*");
+      FROM(TABLE_NAME);
+      WHERE("type = #{type}");
+    }}.toString();
+  }
+
 }