Skip to content
项目
群组
代码片段
帮助
正在加载...
帮助
提交反馈
为 GitLab 提交贡献
登录
切换导航
I
ibztask
项目
项目
详情
动态
版本
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
计划
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
统计图
创建新议题
作业
提交
议题看板
打开侧边栏
ibiz4jteam
ibztask
提交
86ea541a
提交
86ea541a
编写于
3年前
作者:
ibizdev
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
ibiz4j 发布系统代码 [ibiz-task,任务调度]
上级
3f4a5bce
master
无相关合并请求
变更
17
显示空白字符变更
内嵌
并排
正在显示
17 个修改的文件
包含
97 行增加
和
18 行删除
+97
-18
package.json
app_web/package.json
+1
-1
app-mpicker.vue
app_web/src/components/app-mpicker/app-mpicker.vue
+1
-1
app-span.vue
app_web/src/components/app-span/app-span.vue
+2
-2
tab-exp-view-engine.ts
app_web/src/engine/view/tab-exp-view-engine.ts
+1
-1
entity-service.ts
app_web/src/service/entity-service.ts
+17
-0
default.less
app_web/src/styles/default.less
+5
-0
http.d.ts
app_web/src/utils/types/http.d.ts
+2
-2
view-tool.ts
app_web/src/utils/view-tool/view-tool.ts
+1
-1
main-grid-model.ts
app_web/src/widgets/jobs-info/main-grid/main-grid-model.ts
+16
-0
main-grid-model.ts
app_web/src/widgets/jobs-log/main-grid/main-grid-model.ts
+16
-0
main-grid-model.ts
...eb/src/widgets/jobs-registry/main-grid/main-grid-model.ts
+16
-0
tsconfig.json
app_web/tsconfig.json
+1
-0
JobsInfoServiceImpl.java
...n/ibizlab/core/task/service/impl/JobsInfoServiceImpl.java
+5
-3
JobsLockServiceImpl.java
...n/ibizlab/core/task/service/impl/JobsLockServiceImpl.java
+3
-1
JobsLogServiceImpl.java
...cn/ibizlab/core/task/service/impl/JobsLogServiceImpl.java
+3
-1
JobsRegistryServiceImpl.java
...izlab/core/task/service/impl/JobsRegistryServiceImpl.java
+3
-1
h2_table.xml
ibztask-core/src/main/resources/liquibase/h2_table.xml
+4
-4
未找到文件。
app_web/package.json
浏览文件 @
86ea541a
...
...
@@ -41,7 +41,7 @@
"vue-amap"
:
"^0.5.10"
,
"vue-class-component"
:
"^7.0.2"
,
"vue-grid-layout"
:
"^2.3.7"
,
"vue-i18n"
:
"^8.
15.3
"
,
"vue-i18n"
:
"^8.
23.0
"
,
"vue-property-decorator"
:
"^9.1.2"
,
"vue-router"
:
"^3.1.3"
,
"vuex"
:
"^3.1.2"
,
...
...
This diff is collapsed.
Click to expand it.
app_web/src/components/app-mpicker/app-mpicker.vue
浏览文件 @
86ea541a
...
...
@@ -159,7 +159,7 @@ export default class AppMpicker extends Vue {
}
});
}
catch
(
error
)
{
if
(
error
.
name
===
'SyntaxError'
){
if
(
(
error
as
any
)
.
name
===
'SyntaxError'
){
let
srfkeys
:
any
=
newVal
.
split
(
','
);
let
srfmajortexts
:
any
=
null
;
if
(
this
.
valueitem
&&
this
.
activeData
[
this
.
valueitem
]){
...
...
This diff is collapsed.
Click to expand it.
app_web/src/components/app-span/app-span.vue
浏览文件 @
86ea541a
...
...
@@ -229,9 +229,9 @@ export default class AppSpan extends Vue {
public
dateFormat
(){
if
(
this
.
valueFormat
){
if
(
this
.
valueFormat
.
indexOf
(
'%1$t'
)
!==
-
1
){
this
.
text
=
moment
(
this
.
data
).
format
(
"YYYY-MM-DD HH:mm:ss"
);
this
.
text
=
moment
(
this
.
value
).
format
(
"YYYY-MM-DD HH:mm:ss"
);
}
else
if
(
this
.
valueFormat
.
indexOf
(
'%1$s'
)
==
-
1
){
this
.
text
=
moment
(
this
.
data
).
format
(
this
.
valueFormat
);
this
.
text
=
moment
(
this
.
value
).
format
(
this
.
valueFormat
);
}
else
{
this
.
text
=
this
.
value
;
}
...
...
This diff is collapsed.
Click to expand it.
app_web/src/engine/view/tab-exp-view-engine.ts
浏览文件 @
86ea541a
...
...
@@ -41,7 +41,7 @@ export default class TabExpViewEngine extends ViewEngine {
if
(
!
Object
.
is
(
_item
.
type
,
'TABEXPPANEL'
))
{
return
;
}
if
(
this
.
view
.
context
&&
this
.
view
.
context
[(
this
.
keyPSDEField
as
string
)]){
if
(
this
.
view
.
context
&&
!
this
.
view
.
context
[(
this
.
keyPSDEField
as
string
)]){
return
;
}
this
.
setViewState2
({
tag
:
_item
.
name
,
action
:
'load'
,
viewdata
:
this
.
view
.
context
});
...
...
This diff is collapsed.
Click to expand it.
app_web/src/service/entity-service.ts
浏览文件 @
86ea541a
...
...
@@ -902,6 +902,23 @@ export default class EntityService {
}
}
/**
* 获取标准工作流版本信息
*
* @param {*} [context={}]
* @param {*} [data={}]
* @param {boolean} [isloading]
* @param {*} [localdata]
* @returns {Promise<any>}
* @memberof EntityService
*/
public
async
getStandWorkflow
(
context
:
any
=
{},
data
:
any
=
{},
isloading
?:
boolean
):
Promise
<
any
>
{
return
Http
.
getInstance
().
get
(
`/wfcore/
${
this
.
SYSTEMNAME
}
-app-
${
this
.
APPNAME
}
/
${
this
.
APPDENAME
}
/process-definitions`
,
isloading
,
);
}
/**
* WFGetProxyData接口方法
*
...
...
This diff is collapsed.
Click to expand it.
app_web/src/styles/default.less
浏览文件 @
86ea541a
...
...
@@ -274,6 +274,11 @@
}
}
// 工作流流程版本选择
.start-workflow-select-wraper {
z-index: 3000 !important;
}
/*** END:多数据视图属性布局 ***/
// 看板视图,卡片模式
...
...
This diff is collapsed.
Click to expand it.
app_web/src/utils/types/http.d.ts
浏览文件 @
86ea541a
...
...
@@ -17,7 +17,7 @@ export declare interface Http {
* @returns {Promise<any>}
* @memberof Http
*/
post
(
url
:
string
,
params
:
any
,
isloading
?:
boolean
,
serialnumber
?:
number
):
Promise
<
any
>
;
post
(
url
:
string
,
params
?
:
any
,
isloading
?:
boolean
,
serialnumber
?:
number
):
Promise
<
any
>
;
/**
* 获取
*
...
...
@@ -27,7 +27,7 @@ export declare interface Http {
* @returns {Promise<any>}
* @memberof Http
*/
get
(
url
:
string
,
isloading
?:
boolean
,
serialnumber
?:
number
):
Promise
<
any
>
;
get
(
url
:
string
,
params
?:
any
,
isloading
?:
boolean
,
serialnumber
?:
number
):
Promise
<
any
>
;
/**
* 删除
*
...
...
This diff is collapsed.
Click to expand it.
app_web/src/utils/view-tool/view-tool.ts
浏览文件 @
86ea541a
...
...
@@ -76,7 +76,7 @@ export class ViewTool {
* @memberof ViewTool
*/
public
static
getIndexRoutePath
(
route
:
Route
):
string
{
const
{
parameters
:
_parameters
}:
{
parameters
:
any
[]
}
=
route
.
meta
;
const
{
parameters
:
_parameters
}:
{
parameters
:
any
[]
}
=
route
.
meta
as
any
;
const
{
pathName
:
_pathName
,
parameterName
:
_parameterName
}:
{
pathName
:
string
,
parameterName
:
string
}
=
_parameters
[
0
];
const
param
=
route
.
params
[
_parameterName
];
if
(
param
&&
!
Object
.
is
(
param
,
''
))
{
...
...
This diff is collapsed.
Click to expand it.
app_web/src/widgets/jobs-info/main-grid/main-grid-model.ts
浏览文件 @
86ea541a
...
...
@@ -148,6 +148,22 @@ export default class MainModel {
prop
:
'srffrontuf'
,
dataType
:
'TEXT'
,
},
// 预置工作流数据字段
{
name
:
'srfprocessdefinitionkey'
,
prop
:
'srfprocessdefinitionkey'
,
dataType
:
'TEXT'
},
{
name
:
'srftaskdefinitionkey'
,
prop
:
'srftaskdefinitionkey'
,
dataType
:
'TEXT'
},
{
name
:
'srftaskid'
,
prop
:
'srftaskid'
,
dataType
:
'TEXT'
}
]
}
}
...
...
This diff is collapsed.
Click to expand it.
app_web/src/widgets/jobs-log/main-grid/main-grid-model.ts
浏览文件 @
86ea541a
...
...
@@ -138,6 +138,22 @@ export default class MainModel {
prop
:
'srffrontuf'
,
dataType
:
'TEXT'
,
},
// 预置工作流数据字段
{
name
:
'srfprocessdefinitionkey'
,
prop
:
'srfprocessdefinitionkey'
,
dataType
:
'TEXT'
},
{
name
:
'srftaskdefinitionkey'
,
prop
:
'srftaskdefinitionkey'
,
dataType
:
'TEXT'
},
{
name
:
'srftaskid'
,
prop
:
'srftaskid'
,
dataType
:
'TEXT'
}
]
}
}
...
...
This diff is collapsed.
Click to expand it.
app_web/src/widgets/jobs-registry/main-grid/main-grid-model.ts
浏览文件 @
86ea541a
...
...
@@ -113,6 +113,22 @@ export default class MainModel {
prop
:
'srffrontuf'
,
dataType
:
'TEXT'
,
},
// 预置工作流数据字段
{
name
:
'srfprocessdefinitionkey'
,
prop
:
'srfprocessdefinitionkey'
,
dataType
:
'TEXT'
},
{
name
:
'srftaskdefinitionkey'
,
prop
:
'srftaskdefinitionkey'
,
dataType
:
'TEXT'
},
{
name
:
'srftaskid'
,
prop
:
'srftaskid'
,
dataType
:
'TEXT'
}
]
}
}
...
...
This diff is collapsed.
Click to expand it.
app_web/tsconfig.json
浏览文件 @
86ea541a
...
...
@@ -9,6 +9,7 @@
"esModuleInterop"
:
true
,
"experimentalDecorators"
:
true
,
"allowSyntheticDefaultImports"
:
true
,
"skipLibCheck"
:
true
,
"sourceMap"
:
true
,
"baseUrl"
:
"."
,
"types"
:
[
...
...
This diff is collapsed.
Click to expand it.
ibztask-core/src/main/java/cn/ibizlab/core/task/service/impl/JobsInfoServiceImpl.java
浏览文件 @
86ea541a
...
...
@@ -31,6 +31,7 @@ import cn.ibizlab.core.task.service.IJobsInfoService;
import
cn.ibizlab.util.helper.CachedBeanCopier
;
import
cn.ibizlab.util.helper.DEFieldCacheMap
;
import
com.alibaba.fastjson.JSONObject
;
import
com.baomidou.mybatisplus.extension.service.impl.ServiceImpl
;
...
...
@@ -38,7 +39,6 @@ import cn.ibizlab.core.task.mapper.JobsInfoMapper;
import
com.baomidou.mybatisplus.core.conditions.query.QueryWrapper
;
import
com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper
;
import
com.baomidou.mybatisplus.core.conditions.Wrapper
;
import
com.alibaba.fastjson.JSONObject
;
import
org.springframework.util.StringUtils
;
/**
...
...
@@ -196,17 +196,17 @@ public class JobsInfoServiceImpl extends ServiceImpl<JobsInfoMapper, JobsInfo> i
@Override
@Transactional
public
JobsInfo
start
(
JobsInfo
et
)
{
et
.
set
(
"Status"
,
"0"
);
et
.
set
(
"Last_time"
,
"0"
);
et
.
set
(
"Status"
,
"0"
);
update
(
et
);
return
et
;
}
@Override
@Transactional
public
JobsInfo
stop
(
JobsInfo
et
)
{
et
.
set
(
"Next_time"
,
"0"
);
et
.
set
(
"Last_time"
,
"0"
);
et
.
set
(
"Status"
,
"1"
);
et
.
set
(
"Next_time"
,
"0"
);
update
(
et
);
return
et
;
}
...
...
@@ -253,6 +253,8 @@ public class JobsInfoServiceImpl extends ServiceImpl<JobsInfoMapper, JobsInfo> i
public
IJobsInfoService
getProxyService
()
{
return
cn
.
ibizlab
.
util
.
security
.
SpringContextHolder
.
getBean
(
this
.
getClass
());
}
...
...
This diff is collapsed.
Click to expand it.
ibztask-core/src/main/java/cn/ibizlab/core/task/service/impl/JobsLockServiceImpl.java
浏览文件 @
86ea541a
...
...
@@ -31,6 +31,7 @@ import cn.ibizlab.core.task.service.IJobsLockService;
import
cn.ibizlab.util.helper.CachedBeanCopier
;
import
cn.ibizlab.util.helper.DEFieldCacheMap
;
import
com.alibaba.fastjson.JSONObject
;
import
com.baomidou.mybatisplus.extension.service.impl.ServiceImpl
;
...
...
@@ -38,7 +39,6 @@ import cn.ibizlab.core.task.mapper.JobsLockMapper;
import
com.baomidou.mybatisplus.core.conditions.query.QueryWrapper
;
import
com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper
;
import
com.baomidou.mybatisplus.core.conditions.Wrapper
;
import
com.alibaba.fastjson.JSONObject
;
import
org.springframework.util.StringUtils
;
/**
...
...
@@ -220,6 +220,8 @@ public class JobsLockServiceImpl extends ServiceImpl<JobsLockMapper, JobsLock> i
public
IJobsLockService
getProxyService
()
{
return
cn
.
ibizlab
.
util
.
security
.
SpringContextHolder
.
getBean
(
this
.
getClass
());
}
...
...
This diff is collapsed.
Click to expand it.
ibztask-core/src/main/java/cn/ibizlab/core/task/service/impl/JobsLogServiceImpl.java
浏览文件 @
86ea541a
...
...
@@ -31,6 +31,7 @@ import cn.ibizlab.core.task.service.IJobsLogService;
import
cn.ibizlab.util.helper.CachedBeanCopier
;
import
cn.ibizlab.util.helper.DEFieldCacheMap
;
import
com.alibaba.fastjson.JSONObject
;
import
com.baomidou.mybatisplus.extension.service.impl.ServiceImpl
;
...
...
@@ -38,7 +39,6 @@ import cn.ibizlab.core.task.mapper.JobsLogMapper;
import
com.baomidou.mybatisplus.core.conditions.query.QueryWrapper
;
import
com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper
;
import
com.baomidou.mybatisplus.core.conditions.Wrapper
;
import
com.alibaba.fastjson.JSONObject
;
import
org.springframework.util.StringUtils
;
/**
...
...
@@ -220,6 +220,8 @@ public class JobsLogServiceImpl extends ServiceImpl<JobsLogMapper, JobsLog> impl
public
IJobsLogService
getProxyService
()
{
return
cn
.
ibizlab
.
util
.
security
.
SpringContextHolder
.
getBean
(
this
.
getClass
());
}
...
...
This diff is collapsed.
Click to expand it.
ibztask-core/src/main/java/cn/ibizlab/core/task/service/impl/JobsRegistryServiceImpl.java
浏览文件 @
86ea541a
...
...
@@ -31,6 +31,7 @@ import cn.ibizlab.core.task.service.IJobsRegistryService;
import
cn.ibizlab.util.helper.CachedBeanCopier
;
import
cn.ibizlab.util.helper.DEFieldCacheMap
;
import
com.alibaba.fastjson.JSONObject
;
import
com.baomidou.mybatisplus.extension.service.impl.ServiceImpl
;
...
...
@@ -38,7 +39,6 @@ import cn.ibizlab.core.task.mapper.JobsRegistryMapper;
import
com.baomidou.mybatisplus.core.conditions.query.QueryWrapper
;
import
com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper
;
import
com.baomidou.mybatisplus.core.conditions.Wrapper
;
import
com.alibaba.fastjson.JSONObject
;
import
org.springframework.util.StringUtils
;
/**
...
...
@@ -220,6 +220,8 @@ public class JobsRegistryServiceImpl extends ServiceImpl<JobsRegistryMapper, Job
public
IJobsRegistryService
getProxyService
()
{
return
cn
.
ibizlab
.
util
.
security
.
SpringContextHolder
.
getBean
(
this
.
getClass
());
}
...
...
This diff is collapsed.
Click to expand it.
ibztask-core/src/main/resources/liquibase/h2_table.xml
浏览文件 @
86ea541a
...
...
@@ -4,7 +4,7 @@
<!--输出实体[JOBS_INFO]数据结构 -->
<changeSet
author=
"
a_A_5d9d78509
"
id=
"tab-jobs_info-5-1"
>
<changeSet
author=
"
root
"
id=
"tab-jobs_info-5-1"
>
<createTable
tableName=
"JOBS_INFO"
>
<column
name=
"ID"
remarks=
""
type=
"VARCHAR(100)"
>
<constraints
primaryKey=
"true"
primaryKeyName=
"PK_JOBS_INFO_ID"
/>
...
...
@@ -42,7 +42,7 @@
<!--输出实体[JOBS_LOCK]数据结构 -->
<changeSet
author=
"
a_A_5d9d78509
"
id=
"tab-jobs_lock-1-2"
>
<changeSet
author=
"
root
"
id=
"tab-jobs_lock-1-2"
>
<createTable
tableName=
"JOBS_LOCK"
>
<column
name=
"ID"
remarks=
""
type=
"VARCHAR(100)"
>
<constraints
primaryKey=
"true"
primaryKeyName=
"PK_JOBS_LOCK_ID"
/>
...
...
@@ -58,7 +58,7 @@
<!--输出实体[JOBS_LOG]数据结构 -->
<changeSet
author=
"
a_A_5d9d78509
"
id=
"tab-jobs_log-1-3"
>
<changeSet
author=
"
root
"
id=
"tab-jobs_log-1-3"
>
<createTable
tableName=
"JOBS_LOG"
>
<column
name=
"ID"
remarks=
""
type=
"VARCHAR(100)"
>
<constraints
primaryKey=
"true"
primaryKeyName=
"PK_JOBS_LOG_ID"
/>
...
...
@@ -86,7 +86,7 @@
<!--输出实体[JOBS_REGISTRY]数据结构 -->
<changeSet
author=
"
a_A_5d9d78509
"
id=
"tab-jobs_registry-1-4"
>
<changeSet
author=
"
root
"
id=
"tab-jobs_registry-1-4"
>
<createTable
tableName=
"JOBS_REGISTRY"
>
<column
name=
"ID"
remarks=
""
type=
"VARCHAR(100)"
>
<constraints
primaryKey=
"true"
primaryKeyName=
"PK_JOBS_REGISTRY_ID"
/>
...
...
This diff is collapsed.
Click to expand it.
编辑
预览
Markdown
格式
0%
请重试
or
添加新附件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
先完成此消息的编辑!
取消
想要评论请
注册
或
登录