Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
淡淡忧伤的程序员
DolphinScheduler
提交
f0758a3a
DolphinScheduler
项目概览
淡淡忧伤的程序员
/
DolphinScheduler
与 Fork 源项目一致
Fork自
apache / DolphinScheduler
通知
48
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
DolphinScheduler
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
f0758a3a
编写于
5月 13, 2019
作者:
L
ligang
浏览文件
操作
浏览文件
下载
差异文件
Merge remote-tracking branch 'remotes/upstream/branch-1.0.2' into branch-1.0.2
上级
43819559
c96a56c1
变更
9
隐藏空白更改
内联
并排
Showing
9 changed file
with
14 addition
and
9 deletion
+14
-9
escheduler-dao/src/main/java/cn/escheduler/dao/mapper/DataSourceMapperProvider.java
...va/cn/escheduler/dao/mapper/DataSourceMapperProvider.java
+1
-1
escheduler-dao/src/main/java/cn/escheduler/dao/mapper/ProcessDefinitionMapperProvider.java
...scheduler/dao/mapper/ProcessDefinitionMapperProvider.java
+1
-1
escheduler-dao/src/main/java/cn/escheduler/dao/mapper/ProcessInstanceMapper.java
.../java/cn/escheduler/dao/mapper/ProcessInstanceMapper.java
+1
-0
escheduler-dao/src/main/java/cn/escheduler/dao/mapper/ProcessInstanceMapperProvider.java
.../escheduler/dao/mapper/ProcessInstanceMapperProvider.java
+1
-1
escheduler-dao/src/main/java/cn/escheduler/dao/mapper/ProjectMapper.java
...src/main/java/cn/escheduler/dao/mapper/ProjectMapper.java
+2
-0
escheduler-dao/src/main/java/cn/escheduler/dao/mapper/ProjectMapperProvider.java
.../java/cn/escheduler/dao/mapper/ProjectMapperProvider.java
+2
-2
escheduler-dao/src/main/java/cn/escheduler/dao/mapper/TenantMapperProvider.java
...n/java/cn/escheduler/dao/mapper/TenantMapperProvider.java
+1
-1
escheduler-dao/src/main/java/cn/escheduler/dao/mapper/UserMapper.java
...ao/src/main/java/cn/escheduler/dao/mapper/UserMapper.java
+2
-0
escheduler-dao/src/main/java/cn/escheduler/dao/mapper/UserMapperProvider.java
...ain/java/cn/escheduler/dao/mapper/UserMapperProvider.java
+3
-3
未找到文件。
escheduler-dao/src/main/java/cn/escheduler/dao/mapper/DataSourceMapperProvider.java
浏览文件 @
f0758a3a
...
...
@@ -111,7 +111,7 @@ public class DataSourceMapperProvider {
*/
public
String
queryById
(
Map
<
String
,
Object
>
parameter
)
{
return
new
SQL
()
{{
SELECT
(
"r.*,u.user_name
as userName
"
);
SELECT
(
"r.*,u.user_name"
);
FROM
(
TABLE_NAME
+
" r"
);
...
...
escheduler-dao/src/main/java/cn/escheduler/dao/mapper/ProcessDefinitionMapperProvider.java
浏览文件 @
f0758a3a
...
...
@@ -134,7 +134,7 @@ public class ProcessDefinitionMapperProvider {
public
String
queryByDefineId
(
Map
<
String
,
Object
>
parameter
)
{
return
new
SQL
()
{
{
SELECT
(
"pd.*,u.user_name,p.name as project
N
ame"
);
SELECT
(
"pd.*,u.user_name,p.name as project
_n
ame"
);
FROM
(
TABLE_NAME
+
" pd"
);
JOIN
(
"t_escheduler_user u ON pd.user_id = u.id"
);
...
...
escheduler-dao/src/main/java/cn/escheduler/dao/mapper/ProcessInstanceMapper.java
浏览文件 @
f0758a3a
...
...
@@ -94,6 +94,7 @@ public interface ProcessInstanceMapper {
@Result
(
property
=
"dependenceScheduleTimes"
,
column
=
"dependence_schedule_times"
,
javaType
=
String
.
class
,
jdbcType
=
JdbcType
.
VARCHAR
),
@Result
(
property
=
"duration"
,
column
=
"duration"
,
javaType
=
Long
.
class
,
jdbcType
=
JdbcType
.
BIGINT
),
@Result
(
property
=
"tenantCode"
,
column
=
"tenant_code"
,
javaType
=
String
.
class
,
jdbcType
=
JdbcType
.
VARCHAR
),
@Result
(
property
=
"queue"
,
column
=
"queue"
,
javaType
=
String
.
class
,
jdbcType
=
JdbcType
.
VARCHAR
),
@Result
(
property
=
"workerGroupId"
,
column
=
"worker_group_id"
,
javaType
=
Integer
.
class
,
jdbcType
=
JdbcType
.
INTEGER
),
@Result
(
property
=
"timeout"
,
column
=
"timeout"
,
javaType
=
Integer
.
class
,
jdbcType
=
JdbcType
.
INTEGER
),
@Result
(
property
=
"processInstancePriority"
,
column
=
"process_instance_priority"
,
javaType
=
Priority
.
class
,
typeHandler
=
EnumOrdinalTypeHandler
.
class
,
jdbcType
=
JdbcType
.
TINYINT
)
...
...
escheduler-dao/src/main/java/cn/escheduler/dao/mapper/ProcessInstanceMapperProvider.java
浏览文件 @
f0758a3a
...
...
@@ -220,7 +220,7 @@ public class ProcessInstanceMapperProvider {
public
String
queryDetailById
(
Map
<
String
,
Object
>
parameter
)
{
return
new
SQL
()
{
{
SELECT
(
"inst.*,q.queue_name as queue,t.tenant_code
as tenantCode
,UNIX_TIMESTAMP(inst.end_time)-UNIX_TIMESTAMP(inst.start_time) as duration"
);
SELECT
(
"inst.*,q.queue_name as queue,t.tenant_code,UNIX_TIMESTAMP(inst.end_time)-UNIX_TIMESTAMP(inst.start_time) as duration"
);
FROM
(
TABLE_NAME
+
" inst, t_escheduler_user u,t_escheduler_tenant t,t_escheduler_queue q"
);
...
...
escheduler-dao/src/main/java/cn/escheduler/dao/mapper/ProjectMapper.java
浏览文件 @
f0758a3a
...
...
@@ -67,6 +67,7 @@ public interface ProjectMapper {
@Result
(
property
=
"userId"
,
column
=
"user_id"
,
javaType
=
Integer
.
class
,
jdbcType
=
JdbcType
.
INTEGER
),
@Result
(
property
=
"name"
,
column
=
"name"
,
javaType
=
String
.
class
,
jdbcType
=
JdbcType
.
VARCHAR
),
@Result
(
property
=
"desc"
,
column
=
"desc"
,
javaType
=
String
.
class
,
jdbcType
=
JdbcType
.
VARCHAR
),
@Result
(
property
=
"userName"
,
column
=
"user_name"
,
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
),
})
...
...
@@ -82,6 +83,7 @@ public interface ProjectMapper {
@Result
(
property
=
"userId"
,
column
=
"user_id"
,
javaType
=
Integer
.
class
,
jdbcType
=
JdbcType
.
INTEGER
),
@Result
(
property
=
"name"
,
column
=
"name"
,
javaType
=
String
.
class
,
jdbcType
=
JdbcType
.
VARCHAR
),
@Result
(
property
=
"desc"
,
column
=
"desc"
,
javaType
=
String
.
class
,
jdbcType
=
JdbcType
.
VARCHAR
),
@Result
(
property
=
"userName"
,
column
=
"user_name"
,
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
),
})
...
...
escheduler-dao/src/main/java/cn/escheduler/dao/mapper/ProjectMapperProvider.java
浏览文件 @
f0758a3a
...
...
@@ -93,7 +93,7 @@ public class ProjectMapperProvider {
public
String
queryById
(
Map
<
String
,
Object
>
parameter
)
{
return
new
SQL
()
{{
SELECT
(
"p.user_id"
);
SELECT
(
"u.user_name
as userName
"
);
SELECT
(
"u.user_name"
);
SELECT
(
"p.*"
);
FROM
(
TABLE_NAME
+
" p"
);
...
...
@@ -114,7 +114,7 @@ public class ProjectMapperProvider {
public
String
queryByName
(
Map
<
String
,
Object
>
parameter
)
{
return
new
SQL
()
{{
SELECT
(
"p.user_id"
);
SELECT
(
"u.user_name
as userName
"
);
SELECT
(
"u.user_name"
);
SELECT
(
"p.*"
);
FROM
(
TABLE_NAME
+
" p"
);
...
...
escheduler-dao/src/main/java/cn/escheduler/dao/mapper/TenantMapperProvider.java
浏览文件 @
f0758a3a
...
...
@@ -150,7 +150,7 @@ public class TenantMapperProvider {
public
String
queryTenantPaging
(
Map
<
String
,
Object
>
parameter
)
{
return
new
SQL
()
{
{
SELECT
(
"t.*,q.queue_name
as queueName
"
);
SELECT
(
"t.*,q.queue_name"
);
FROM
(
TABLE_NAME
+
" t,t_escheduler_queue q"
);
WHERE
(
" t.queue_id = q.id"
);
Object
searchVal
=
parameter
.
get
(
"searchVal"
);
...
...
escheduler-dao/src/main/java/cn/escheduler/dao/mapper/UserMapper.java
浏览文件 @
f0758a3a
...
...
@@ -175,6 +175,8 @@ public interface UserMapper {
@Result
(
property
=
"phone"
,
column
=
"phone"
,
javaType
=
String
.
class
,
jdbcType
=
JdbcType
.
VARCHAR
),
@Result
(
property
=
"userType"
,
column
=
"user_type"
,
typeHandler
=
EnumOrdinalTypeHandler
.
class
,
javaType
=
UserType
.
class
,
jdbcType
=
JdbcType
.
TINYINT
),
@Result
(
property
=
"tenantId"
,
column
=
"tenant_id"
,
javaType
=
Integer
.
class
,
jdbcType
=
JdbcType
.
INTEGER
),
@Result
(
property
=
"tenantName"
,
column
=
"tenant_name"
,
javaType
=
String
.
class
,
jdbcType
=
JdbcType
.
VARCHAR
),
@Result
(
property
=
"queueName"
,
column
=
"queue_name"
,
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
)
})
...
...
escheduler-dao/src/main/java/cn/escheduler/dao/mapper/UserMapperProvider.java
浏览文件 @
f0758a3a
...
...
@@ -203,7 +203,7 @@ public class UserMapperProvider {
public
String
queryUserPaging
(
Map
<
String
,
Object
>
parameter
)
{
return
new
SQL
()
{
{
SELECT
(
"u.*,t.tenant_name
as tenantName,q.queue_name as queueN
ame"
);
SELECT
(
"u.*,t.tenant_name
,q.queue_n
ame"
);
FROM
(
TABLE_NAME
+
" u "
);
LEFT_OUTER_JOIN
(
"t_escheduler_tenant t on u.tenant_id = t.id"
);
LEFT_OUTER_JOIN
(
"t_escheduler_queue q on t.queue_id = q.id"
);
...
...
@@ -228,7 +228,7 @@ public class UserMapperProvider {
public
String
queryDetailsById
(
Map
<
String
,
Object
>
parameter
)
{
return
new
SQL
()
{
{
SELECT
(
"u.*,q.queue_name
as queueName,t.tenant_name as tenantN
ame"
);
SELECT
(
"u.*,q.queue_name
,t.tenant_n
ame"
);
FROM
(
TABLE_NAME
+
" u,t_escheduler_tenant t,t_escheduler_queue q"
);
...
...
@@ -262,7 +262,7 @@ public class UserMapperProvider {
public
String
queryTenantCodeByUserId
(
Map
<
String
,
Object
>
parameter
)
{
return
new
SQL
()
{
{
SELECT
(
"u.*,t.tenant_code
as tenantCode
"
);
SELECT
(
"u.*,t.tenant_code"
);
FROM
(
TABLE_NAME
+
" u,t_escheduler_tenant t"
);
WHERE
(
"u.tenant_id = t.id AND u.id = #{userId}"
);
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录