Skip to content
项目
群组
代码片段
帮助
当前项目
正在载入...
登录 / 注册
切换导航面板
D
dataease
项目
项目
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
图表
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
图像
聊天
创建新问题
作业
提交
问题看板
Open sidebar
njgzx
dataease
Commits
7666335e
提交
7666335e
authored
11月 19, 2021
作者:
fit2cloud-chenyw
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
feat: 新增定时报告
上级
12c8578d
隐藏空白字符变更
内嵌
并排
正在显示
9 个修改的文件
包含
394 行增加
和
1 行删除
+394
-1
pom.xml
backend/pom.xml
+7
-1
ScheduleManager.java
.../main/java/io/dataease/job/sechedule/ScheduleManager.java
+4
-0
TaskHandler.java
.../java/io/dataease/job/sechedule/strategy/TaskHandler.java
+119
-0
TaskStrategyFactory.java
.../dataease/job/sechedule/strategy/TaskStrategyFactory.java
+23
-0
EmailTaskHandler.java
...ataease/job/sechedule/strategy/impl/EmailTaskHandler.java
+74
-0
GlobalTaskStartListener.java
...in/java/io/dataease/listener/GlobalTaskStartListener.java
+42
-0
XEmailTaskServer.java
...ain/java/io/dataease/plugins/server/XEmailTaskServer.java
+71
-0
ScheduleService.java
...nd/src/main/java/io/dataease/service/ScheduleService.java
+19
-0
index.scss
frontend/src/styles/index.scss
+35
-0
没有找到文件。
backend/pom.xml
浏览文件 @
7666335e
...
@@ -21,6 +21,12 @@
...
@@ -21,6 +21,12 @@
</properties>
</properties>
<dependencies>
<dependencies>
<dependency>
<groupId>
com.google.guava
</groupId>
<artifactId>
guava
</artifactId>
<version>
30.1.1-jre
</version>
</dependency>
<dependency>
<dependency>
<groupId>
org.springframework.boot
</groupId>
<groupId>
org.springframework.boot
</groupId>
<artifactId>
spring-boot-starter-web
</artifactId>
<artifactId>
spring-boot-starter-web
</artifactId>
...
@@ -201,7 +207,7 @@
...
@@ -201,7 +207,7 @@
<dependency>
<dependency>
<groupId>
io.dataease
</groupId>
<groupId>
io.dataease
</groupId>
<artifactId>
dataease-plugin-interface
</artifactId>
<artifactId>
dataease-plugin-interface
</artifactId>
<version>
1.
4
</version>
<version>
1.
5
</version>
</dependency>
</dependency>
<dependency>
<dependency>
<groupId>
cn.hutool
</groupId>
<groupId>
cn.hutool
</groupId>
...
...
backend/src/main/java/io/dataease/job/sechedule/ScheduleManager.java
浏览文件 @
7666335e
...
@@ -436,4 +436,8 @@ public class ScheduleManager {
...
@@ -436,4 +436,8 @@ public class ScheduleManager {
scheduler
.
triggerJob
(
jobKey
);
scheduler
.
triggerJob
(
jobKey
);
}
}
public
void
fireNow
(
JobKey
jobKey
)
throws
SchedulerException
{
scheduler
.
triggerJob
(
jobKey
);
}
}
}
backend/src/main/java/io/dataease/job/sechedule/strategy/TaskHandler.java
0 → 100644
浏览文件 @
7666335e
package
io
.
dataease
.
job
.
sechedule
.
strategy
;
import
io.dataease.job.sechedule.ScheduleManager
;
import
io.dataease.plugins.common.entity.GlobalTaskEntity
;
import
org.apache.commons.lang3.ObjectUtils
;
import
org.quartz.*
;
import
org.springframework.beans.factory.InitializingBean
;
import
java.text.ParseException
;
import
java.text.SimpleDateFormat
;
import
java.util.Calendar
;
import
java.util.Date
;
public
abstract
class
TaskHandler
implements
InitializingBean
{
private
static
final
String
[]
week
=
{
"SUNDAY"
,
"MONDAY"
,
"TUESDAY"
,
"WEDNESDAY"
,
"THURSDAY"
,
"FRIDAY"
,
"SATURDAY"
};
public
void
addTask
(
ScheduleManager
scheduleManager
,
GlobalTaskEntity
taskEntity
)
throws
Exception
{
// 1。首先看看是否过期
Long
endTime
=
taskEntity
.
getEndTime
();
if
(
taskExpire
(
endTime
))
{
// 过期了就删除任务
removeTask
(
scheduleManager
,
taskEntity
);
return
;
}
JobKey
jobKey
=
new
JobKey
(
taskEntity
.
getTaskId
().
toString
());
TriggerKey
triggerKey
=
new
TriggerKey
(
taskEntity
.
getTaskId
().
toString
());
Date
start
=
new
Date
(
taskEntity
.
getStartTime
());
Date
end
=
null
;
if
(
ObjectUtils
.
isNotEmpty
(
taskEntity
.
getEndTime
()))
{
new
Date
(
taskEntity
.
getEndTime
());
}
Class
executor
=
this
.
getClass
();
String
cron
=
cron
(
taskEntity
);
scheduleManager
.
addOrUpdateCronJob
(
jobKey
,
triggerKey
,
executor
,
cron
,
start
,
end
,
jobDataMap
(
taskEntity
));
}
protected
abstract
JobDataMap
jobDataMap
(
GlobalTaskEntity
taskEntity
);
private
String
cron
(
GlobalTaskEntity
taskEntity
)
{
if
(
taskEntity
.
getRateType
()
==
-
1
)
{
return
taskEntity
.
getRateVal
();
}
SimpleDateFormat
sdf
=
new
SimpleDateFormat
(
"yyyy-MM-dd HH:mm:ss"
);
Date
date
=
null
;
try
{
date
=
sdf
.
parse
(
taskEntity
.
getRateVal
());
}
catch
(
ParseException
e
)
{
e
.
printStackTrace
();
}
Calendar
instance
=
Calendar
.
getInstance
();
instance
.
setTime
(
date
);
if
(
taskEntity
.
getRateType
()
==
0
)
{
return
instance
.
get
(
Calendar
.
SECOND
)
+
" "
+
instance
.
get
(
Calendar
.
MINUTE
)
+
" "
+
instance
.
get
(
Calendar
.
HOUR_OF_DAY
)
+
" * * ?"
;
}
if
(
taskEntity
.
getRateType
()
==
1
)
{
return
instance
.
get
(
Calendar
.
SECOND
)
+
" "
+
instance
.
get
(
Calendar
.
MINUTE
)
+
" "
+
instance
.
get
(
Calendar
.
HOUR_OF_DAY
)
+
" ? * "
+
getDayOfWeek
(
instance
);
}
if
(
taskEntity
.
getRateType
()
==
2
)
{
return
instance
.
get
(
Calendar
.
SECOND
)
+
" "
+
instance
.
get
(
Calendar
.
MINUTE
)
+
" "
+
instance
.
get
(
Calendar
.
HOUR_OF_DAY
)
+
" "
+
instance
.
get
(
Calendar
.
DATE
)
+
" * ?"
;
}
return
null
;
}
private
String
getDayOfWeek
(
Calendar
instance
)
{
int
index
=
instance
.
get
(
Calendar
.
DAY_OF_WEEK
)
-
1
;
return
week
[
index
];
}
public
void
removeTask
(
ScheduleManager
scheduleManager
,
GlobalTaskEntity
taskEntity
){
JobKey
jobKey
=
new
JobKey
(
taskEntity
.
getTaskId
().
toString
());
TriggerKey
triggerKey
=
new
TriggerKey
(
taskEntity
.
getTaskId
().
toString
());
scheduleManager
.
removeJob
(
jobKey
,
triggerKey
);
}
public
void
executeTask
(
ScheduleManager
scheduleManager
,
GlobalTaskEntity
taskEntity
)
throws
Exception
{
JobKey
jobKey
=
new
JobKey
(
taskEntity
.
getTaskId
().
toString
());
scheduleManager
.
fireNow
(
jobKey
);
}
//判断任务是否过期
public
Boolean
taskExpire
(
Long
endTime
)
{
if
(
ObjectUtils
.
isEmpty
(
endTime
))
return
false
;
Long
now
=
System
.
currentTimeMillis
();
return
now
>
endTime
;
}
@Override
public
void
afterPropertiesSet
()
throws
Exception
{
String
beanName
=
null
;
String
className
=
this
.
getClass
().
getName
();
className
=
className
.
substring
(
className
.
lastIndexOf
(
"."
)
+
1
);
if
(
className
.
length
()
>
1
)
{
beanName
=
className
.
substring
(
0
,
1
).
toLowerCase
()
+
className
.
substring
(
1
);
}
else
{
beanName
=
className
.
toLowerCase
();
}
TaskStrategyFactory
.
register
(
beanName
,
this
);
}
}
backend/src/main/java/io/dataease/job/sechedule/strategy/TaskStrategyFactory.java
0 → 100644
浏览文件 @
7666335e
package
io
.
dataease
.
job
.
sechedule
.
strategy
;
import
org.apache.commons.lang3.StringUtils
;
import
java.util.Map
;
import
java.util.concurrent.ConcurrentHashMap
;
public
class
TaskStrategyFactory
{
private
static
Map
<
String
,
TaskHandler
>
strategyMap
=
new
ConcurrentHashMap
<>();
public
static
TaskHandler
getInvokeStrategy
(
String
name
)
{
return
strategyMap
.
get
(
name
);
}
public
static
void
register
(
String
name
,
TaskHandler
handler
)
{
if
(
StringUtils
.
isEmpty
(
name
)
||
null
==
handler
)
{
return
;
}
strategyMap
.
put
(
name
,
handler
);
}
}
backend/src/main/java/io/dataease/job/sechedule/strategy/impl/EmailTaskHandler.java
0 → 100644
浏览文件 @
7666335e
package
io
.
dataease
.
job
.
sechedule
.
strategy
.
impl
;
import
io.dataease.auth.service.AuthUserService
;
import
io.dataease.commons.utils.CommonBeanFactory
;
import
io.dataease.job.sechedule.strategy.TaskHandler
;
import
io.dataease.plugins.common.entity.GlobalTaskEntity
;
import
io.dataease.plugins.common.entity.GlobalTaskInstance
;
import
io.dataease.plugins.config.SpringContextUtil
;
import
io.dataease.plugins.xpack.email.service.EmailXpackService
;
import
org.quartz.*
;
import
org.springframework.scheduling.annotation.Async
;
import
org.springframework.stereotype.Service
;
@Service
public
class
EmailTaskHandler
extends
TaskHandler
implements
Job
{
private
static
final
Integer
RUNING
=
0
;
@Override
protected
JobDataMap
jobDataMap
(
GlobalTaskEntity
taskEntity
)
{
JobDataMap
jobDataMap
=
new
JobDataMap
();
jobDataMap
.
put
(
"taskEntity"
,
taskEntity
);
return
jobDataMap
;
}
@Override
public
void
execute
(
JobExecutionContext
context
)
throws
JobExecutionException
{
// 插件没有加载 空转
if
(!
CommonBeanFactory
.
getBean
(
AuthUserService
.
class
).
pluginLoaded
())
return
;
JobDataMap
jobDataMap
=
context
.
getJobDetail
().
getJobDataMap
();
GlobalTaskEntity
taskEntity
=
(
GlobalTaskEntity
)
jobDataMap
.
get
(
"taskEntity"
);
GlobalTaskInstance
taskInstance
=
buildInstance
(
taskEntity
);
Long
instanceId
=
saveInstance
(
taskInstance
);
taskInstance
.
setInstanceId
(
instanceId
);
proxy
().
printImage
(
taskEntity
,
taskInstance
);
}
public
EmailTaskHandler
proxy
()
{
return
CommonBeanFactory
.
getBean
(
EmailTaskHandler
.
class
);
}
public
Long
saveInstance
(
GlobalTaskInstance
taskInstance
){
EmailXpackService
emailXpackService
=
SpringContextUtil
.
getBean
(
EmailXpackService
.
class
);
return
emailXpackService
.
saveInstance
(
taskInstance
);
}
private
GlobalTaskInstance
buildInstance
(
GlobalTaskEntity
taskEntity
)
{
GlobalTaskInstance
taskInstance
=
new
GlobalTaskInstance
();
taskInstance
.
setTaskId
(
taskEntity
.
getTaskId
());
taskInstance
.
setStatus
(
RUNING
);
taskInstance
.
setExecuteTime
(
System
.
currentTimeMillis
());
return
taskInstance
;
}
@Async
public
void
printImage
(
GlobalTaskEntity
taskEntity
,
GlobalTaskInstance
taskInstance
)
{
EmailXpackService
emailXpackService
=
SpringContextUtil
.
getBean
(
EmailXpackService
.
class
);
emailXpackService
.
executeJob
(
taskEntity
,
taskInstance
);
}
}
backend/src/main/java/io/dataease/listener/GlobalTaskStartListener.java
0 → 100644
浏览文件 @
7666335e
package
io
.
dataease
.
listener
;
import
io.dataease.auth.service.AuthUserService
;
import
io.dataease.job.sechedule.ScheduleManager
;
import
io.dataease.job.sechedule.strategy.TaskHandler
;
import
io.dataease.job.sechedule.strategy.TaskStrategyFactory
;
import
io.dataease.plugins.common.entity.GlobalTaskEntity
;
import
io.dataease.plugins.config.SpringContextUtil
;
import
io.dataease.plugins.xpack.email.service.EmailXpackService
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.boot.context.event.ApplicationReadyEvent
;
import
org.springframework.context.ApplicationListener
;
import
org.springframework.stereotype.Component
;
import
java.util.List
;
@Component
public
class
GlobalTaskStartListener
implements
ApplicationListener
<
ApplicationReadyEvent
>
{
@Autowired
private
AuthUserService
authUserService
;
@Autowired
private
ScheduleManager
scheduleManager
;
@Override
public
void
onApplicationEvent
(
ApplicationReadyEvent
event
)
{
if
(
authUserService
.
pluginLoaded
())
{
EmailXpackService
emailXpackService
=
SpringContextUtil
.
getBean
(
EmailXpackService
.
class
);
List
<
GlobalTaskEntity
>
tasks
=
emailXpackService
.
allTask
();
tasks
.
stream
().
forEach
(
task
->
{
TaskHandler
taskHandler
=
TaskStrategyFactory
.
getInvokeStrategy
(
task
.
getTaskType
());
try
{
taskHandler
.
addTask
(
scheduleManager
,
task
);
}
catch
(
Exception
e
)
{
e
.
printStackTrace
();
}
});
}
}
}
backend/src/main/java/io/dataease/plugins/server/XEmailTaskServer.java
0 → 100644
浏览文件 @
7666335e
package
io
.
dataease
.
plugins
.
server
;
import
com.github.pagehelper.Page
;
import
com.github.pagehelper.PageHelper
;
import
io.dataease.commons.utils.BeanUtils
;
import
io.dataease.commons.utils.PageUtils
;
import
io.dataease.commons.utils.Pager
;
import
io.dataease.plugins.common.entity.GlobalTaskEntity
;
import
io.dataease.plugins.common.entity.XpackGridRequest
;
import
io.dataease.plugins.config.SpringContextUtil
;
import
io.dataease.plugins.xpack.email.dto.request.XpackEmailCreate
;
import
io.dataease.plugins.xpack.email.dto.request.XpackEmailTaskRequest
;
import
io.dataease.plugins.xpack.email.dto.response.XpackTaskGridDTO
;
import
io.dataease.plugins.xpack.email.service.EmailXpackService
;
import
io.dataease.service.ScheduleService
;
import
io.swagger.annotations.Api
;
import
org.apache.commons.lang3.ObjectUtils
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.web.bind.annotation.*
;
import
java.util.List
;
@Api
(
tags
=
"xpack:定时报告"
)
@RequestMapping
(
"/plugin/task"
)
@RestController
public
class
XEmailTaskServer
{
@Autowired
private
ScheduleService
scheduleService
;
@PostMapping
(
"/queryTasks/{goPage}/{pageSize}"
)
public
Pager
<
List
<
XpackTaskGridDTO
>>
queryTask
(
@PathVariable
int
goPage
,
@PathVariable
int
pageSize
,
@RequestBody
XpackGridRequest
request
)
{
EmailXpackService
emailXpackService
=
SpringContextUtil
.
getBean
(
EmailXpackService
.
class
);
Page
<
Object
>
page
=
PageHelper
.
startPage
(
goPage
,
pageSize
,
true
);
List
<
XpackTaskGridDTO
>
tasks
=
emailXpackService
.
taskGrid
(
request
);
Pager
<
List
<
XpackTaskGridDTO
>>
listPager
=
PageUtils
.
setPageInfo
(
page
,
tasks
);
return
listPager
;
}
@PostMapping
(
"/save"
)
public
void
save
(
@RequestBody
XpackEmailCreate
param
)
throws
Exception
{
XpackEmailTaskRequest
request
=
param
.
fillContent
();
EmailXpackService
emailXpackService
=
SpringContextUtil
.
getBean
(
EmailXpackService
.
class
);
emailXpackService
.
save
(
request
);
GlobalTaskEntity
globalTask
=
BeanUtils
.
copyBean
(
new
GlobalTaskEntity
(),
request
);
scheduleService
.
addSchedule
(
globalTask
);
}
@PostMapping
(
"/queryForm/{taskId}"
)
public
XpackEmailCreate
queryForm
(
@PathVariable
Long
taskId
)
{
EmailXpackService
emailXpackService
=
SpringContextUtil
.
getBean
(
EmailXpackService
.
class
);
XpackEmailTaskRequest
taskForm
=
emailXpackService
.
taskForm
(
taskId
);
XpackEmailCreate
xpackEmailCreate
=
new
XpackEmailCreate
();
byte
[]
bytes
=
taskForm
.
getContent
();
if
(
ObjectUtils
.
isNotEmpty
(
bytes
))
{
String
emailContent
;
try
{
emailContent
=
new
String
(
bytes
,
"UTF-8"
);
}
catch
(
Exception
e
)
{
throw
new
RuntimeException
(
e
);
}
taskForm
.
setContent
(
null
);
xpackEmailCreate
.
setEmailContent
(
emailContent
);
}
xpackEmailCreate
.
setRequest
(
taskForm
);
return
xpackEmailCreate
;
}
}
backend/src/main/java/io/dataease/service/ScheduleService.java
浏览文件 @
7666335e
...
@@ -4,6 +4,9 @@ import io.dataease.base.domain.DatasetTableTask;
...
@@ -4,6 +4,9 @@ import io.dataease.base.domain.DatasetTableTask;
import
io.dataease.commons.constants.ScheduleType
;
import
io.dataease.commons.constants.ScheduleType
;
import
io.dataease.job.sechedule.ExtractDataJob
;
import
io.dataease.job.sechedule.ExtractDataJob
;
import
io.dataease.job.sechedule.ScheduleManager
;
import
io.dataease.job.sechedule.ScheduleManager
;
import
io.dataease.job.sechedule.strategy.TaskHandler
;
import
io.dataease.job.sechedule.strategy.TaskStrategyFactory
;
import
io.dataease.plugins.common.entity.GlobalTaskEntity
;
import
org.apache.commons.lang3.StringUtils
;
import
org.apache.commons.lang3.StringUtils
;
import
org.quartz.JobKey
;
import
org.quartz.JobKey
;
import
org.quartz.TriggerKey
;
import
org.quartz.TriggerKey
;
...
@@ -59,4 +62,20 @@ public class ScheduleService {
...
@@ -59,4 +62,20 @@ public class ScheduleService {
public
void
fireNow
(
DatasetTableTask
datasetTableTask
)
throws
Exception
{
public
void
fireNow
(
DatasetTableTask
datasetTableTask
)
throws
Exception
{
scheduleManager
.
fireNow
(
datasetTableTask
.
getId
(),
datasetTableTask
.
getTableId
());
scheduleManager
.
fireNow
(
datasetTableTask
.
getId
(),
datasetTableTask
.
getTableId
());
}
}
public
void
addSchedule
(
GlobalTaskEntity
task
)
throws
Exception
{
TaskHandler
taskHandler
=
TaskStrategyFactory
.
getInvokeStrategy
(
task
.
getTaskType
());
taskHandler
.
addTask
(
scheduleManager
,
task
);
}
public
void
deleteSchedule
(
GlobalTaskEntity
task
)
{
TaskHandler
taskHandler
=
TaskStrategyFactory
.
getInvokeStrategy
(
task
.
getTaskType
());
taskHandler
.
removeTask
(
scheduleManager
,
task
);
}
public
void
fireNow
(
GlobalTaskEntity
task
)
throws
Exception
{
TaskHandler
taskHandler
=
TaskStrategyFactory
.
getInvokeStrategy
(
task
.
getTaskType
());
taskHandler
.
executeTask
(
scheduleManager
,
task
);
}
}
}
frontend/src/styles/index.scss
浏览文件 @
7666335e
...
@@ -684,3 +684,38 @@ div:focus {
...
@@ -684,3 +684,38 @@ div:focus {
background
:
linear-gradient
(
to
right
,
#fff
,
rgba
(
255
,
255
,
255
,
0
))
!
important
;
background
:
linear-gradient
(
to
right
,
#fff
,
rgba
(
255
,
255
,
255
,
0
))
!
important
;
}
}
.rate-date-class
>
.el-picker-panel__footer
>
.el-button--text
:first-child
{
display
:
none
;
}
.rate-date-class
>
.el-picker-panel__body-wrapper
>
.el-picker-panel__body
{
>
.el-date-picker__header
{
display
:
none
;
}
>
.el-picker-panel__content
{
>
table
>
tbody
{
>
tr
:first-child
{
display
:
none
;
}
>
tr
>
td
.prev-month
,
td
.next-month
{
display
:
none
;
}
}
}
}
.rate-day-class
>
.el-picker-panel__footer
>
.el-button--text
:first-child
{
display
:
none
;
}
.rate-day-class
>
.el-picker-panel__body-wrapper
>
.el-picker-panel__body
{
>
.el-date-picker__header
{
display
:
none
;
}
>
.el-picker-panel__content
{
>
table
>
tbody
{
>
tr
:not
(
:nth-child
(
3
))
{
display
:
none
;
}
}
}
}
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论