Skip to content
项目
群组
代码片段
帮助
正在加载...
帮助
提交反馈
为 GitLab 提交贡献
登录
切换导航
I
ibztask
项目
项目
详情
动态
版本
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
计划
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
统计图
创建新议题
作业
提交
议题看板
打开侧边栏
ibiz4jteam
ibztask
提交
74849c3f
提交
74849c3f
编写于
6月 17, 2020
作者:
ibizdev
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
ibiz4j 发布系统代码
上级
385910da
变更
10
显示空白字符变更
内嵌
并排
正在显示
10 个修改的文件
包含
90 行增加
和
7 行删除
+90
-7
jobs-lock_en_US.ts
...b/src/locale/lanres/entities/jobs-lock/jobs-lock_en_US.ts
+2
-0
jobs-lock_zh_CN.ts
...b/src/locale/lanres/entities/jobs-lock/jobs-lock_zh_CN.ts
+2
-0
jobs-lock-service-base.ts
app_web/src/service/jobs-lock/jobs-lock-service-base.ts
+1
-1
jobs-log-service-base.ts
app_web/src/service/jobs-log/jobs-log-service-base.ts
+1
-1
JobsLock.java
...e/src/main/java/cn/ibizlab/core/task/domain/JobsLock.java
+30
-0
JobsLockSearchContext.java
...va/cn/ibizlab/core/task/filter/JobsLockSearchContext.java
+10
-0
JobsLogSearchContext.java
...ava/cn/ibizlab/core/task/filter/JobsLogSearchContext.java
+3
-0
h2_table.xml
ibztask-core/src/main/resources/liquibase/h2_table.xml
+6
-2
JobsLockMapper.xml
...rc/main/resources/mapper/task/jobslock/JobsLockMapper.xml
+3
-3
JobsLockDTO.java
...der-api/src/main/java/cn/ibizlab/api/dto/JobsLockDTO.java
+32
-0
未找到文件。
app_web/src/locale/lanres/entities/jobs-lock/jobs-lock_en_US.ts
浏览文件 @
74849c3f
...
@@ -2,6 +2,8 @@
...
@@ -2,6 +2,8 @@
export
default
{
export
default
{
fields
:
{
fields
:
{
id
:
'主键ID'
,
id
:
'主键ID'
,
name
:
'名称'
,
owner
:
'持有者'
,
create_time
:
'创建时间'
,
create_time
:
'创建时间'
,
},
},
};
};
\ No newline at end of file
app_web/src/locale/lanres/entities/jobs-lock/jobs-lock_zh_CN.ts
浏览文件 @
74849c3f
export
default
{
export
default
{
fields
:
{
fields
:
{
id
:
'主键ID'
,
id
:
'主键ID'
,
name
:
'名称'
,
owner
:
'持有者'
,
create_time
:
'创建时间'
,
create_time
:
'创建时间'
,
},
},
};
};
\ No newline at end of file
app_web/src/service/jobs-lock/jobs-lock-service-base.ts
浏览文件 @
74849c3f
...
@@ -31,7 +31,7 @@ export default class JobsLockServiceBase extends EntityService {
...
@@ -31,7 +31,7 @@ export default class JobsLockServiceBase extends EntityService {
this
.
APPLYDEKEY
=
'jobslock'
;
this
.
APPLYDEKEY
=
'jobslock'
;
this
.
APPDEKEY
=
'id'
;
this
.
APPDEKEY
=
'id'
;
this
.
APPDENAME
=
'jobslocks'
;
this
.
APPDENAME
=
'jobslocks'
;
this
.
APPDETEXT
=
''
;
this
.
APPDETEXT
=
'
name
'
;
this
.
APPNAME
=
'web'
;
this
.
APPNAME
=
'web'
;
this
.
SYSTEMNAME
=
'ibztask'
;
this
.
SYSTEMNAME
=
'ibztask'
;
}
}
...
...
app_web/src/service/jobs-log/jobs-log-service-base.ts
浏览文件 @
74849c3f
...
@@ -31,7 +31,7 @@ export default class JobsLogServiceBase extends EntityService {
...
@@ -31,7 +31,7 @@ export default class JobsLogServiceBase extends EntityService {
this
.
APPLYDEKEY
=
'jobslog'
;
this
.
APPLYDEKEY
=
'jobslog'
;
this
.
APPDEKEY
=
'id'
;
this
.
APPDEKEY
=
'id'
;
this
.
APPDENAME
=
'jobslogs'
;
this
.
APPDENAME
=
'jobslogs'
;
this
.
APPDETEXT
=
''
;
this
.
APPDETEXT
=
'
handler
'
;
this
.
APPNAME
=
'web'
;
this
.
APPNAME
=
'web'
;
this
.
SYSTEMNAME
=
'ibztask'
;
this
.
SYSTEMNAME
=
'ibztask'
;
}
}
...
...
ibztask-core/src/main/java/cn/ibizlab/core/task/domain/JobsLock.java
浏览文件 @
74849c3f
...
@@ -47,6 +47,20 @@ public class JobsLock extends EntityMP implements Serializable {
...
@@ -47,6 +47,20 @@ public class JobsLock extends EntityMP implements Serializable {
@JSONField
(
name
=
"id"
)
@JSONField
(
name
=
"id"
)
@JsonProperty
(
"id"
)
@JsonProperty
(
"id"
)
private
BigInteger
id
;
private
BigInteger
id
;
/**
* 名称
*/
@TableField
(
value
=
"name"
)
@JSONField
(
name
=
"name"
)
@JsonProperty
(
"name"
)
private
String
name
;
/**
* 持有者
*/
@TableField
(
value
=
"owner"
)
@JSONField
(
name
=
"owner"
)
@JsonProperty
(
"owner"
)
private
String
owner
;
/**
/**
* 创建时间
* 创建时间
*/
*/
...
@@ -58,6 +72,22 @@ public class JobsLock extends EntityMP implements Serializable {
...
@@ -58,6 +72,22 @@ public class JobsLock extends EntityMP implements Serializable {
/**
* 设置 [名称]
*/
public
void
setName
(
String
name
){
this
.
name
=
name
;
this
.
modify
(
"name"
,
name
);
}
/**
* 设置 [持有者]
*/
public
void
setOwner
(
String
owner
){
this
.
owner
=
owner
;
this
.
modify
(
"owner"
,
owner
);
}
/**
/**
* 设置 [创建时间]
* 设置 [创建时间]
*/
*/
...
...
ibztask-core/src/main/java/cn/ibizlab/core/task/filter/JobsLockSearchContext.java
浏览文件 @
74849c3f
...
@@ -27,6 +27,13 @@ import cn.ibizlab.core.task.domain.JobsLock;
...
@@ -27,6 +27,13 @@ import cn.ibizlab.core.task.domain.JobsLock;
@Data
@Data
public
class
JobsLockSearchContext
extends
QueryWrapperContext
<
JobsLock
>
{
public
class
JobsLockSearchContext
extends
QueryWrapperContext
<
JobsLock
>
{
private
String
n_name_like
;
//[名称]
public
void
setN_name_like
(
String
n_name_like
)
{
this
.
n_name_like
=
n_name_like
;
if
(!
ObjectUtils
.
isEmpty
(
this
.
n_name_like
)){
this
.
getSearchCond
().
like
(
"name"
,
n_name_like
);
}
}
/**
/**
* 启用快速搜索
* 启用快速搜索
...
@@ -35,6 +42,9 @@ public class JobsLockSearchContext extends QueryWrapperContext<JobsLock> {
...
@@ -35,6 +42,9 @@ public class JobsLockSearchContext extends QueryWrapperContext<JobsLock> {
{
{
this
.
query
=
query
;
this
.
query
=
query
;
if
(!
StringUtils
.
isEmpty
(
query
)){
if
(!
StringUtils
.
isEmpty
(
query
)){
this
.
getSearchCond
().
and
(
wrapper
->
wrapper
.
like
(
"name"
,
query
)
);
}
}
}
}
}
}
...
...
ibztask-core/src/main/java/cn/ibizlab/core/task/filter/JobsLogSearchContext.java
浏览文件 @
74849c3f
...
@@ -35,6 +35,9 @@ public class JobsLogSearchContext extends QueryWrapperContext<JobsLog> {
...
@@ -35,6 +35,9 @@ public class JobsLogSearchContext extends QueryWrapperContext<JobsLog> {
{
{
this
.
query
=
query
;
this
.
query
=
query
;
if
(!
StringUtils
.
isEmpty
(
query
)){
if
(!
StringUtils
.
isEmpty
(
query
)){
this
.
getSearchCond
().
and
(
wrapper
->
wrapper
.
like
(
"handler"
,
query
)
);
}
}
}
}
}
}
...
...
ibztask-core/src/main/resources/liquibase/h2_table.xml
浏览文件 @
74849c3f
...
@@ -60,11 +60,15 @@
...
@@ -60,11 +60,15 @@
<!--输出实体[JOBS_LOCK]数据结构 -->
<!--输出实体[JOBS_LOCK]数据结构 -->
<changeSet
author=
"a_A_5d9d78509"
id=
"tab-jobs_lock-1
0
-3"
>
<changeSet
author=
"a_A_5d9d78509"
id=
"tab-jobs_lock-1
3
-3"
>
<createTable
tableName=
"JOBS_LOCK"
>
<createTable
tableName=
"JOBS_LOCK"
>
<column
name=
"ID"
remarks=
""
type=
"BIGINT"
>
<column
name=
"ID"
remarks=
""
type=
"BIGINT"
>
<constraints
primaryKey=
"true"
primaryKeyName=
"PK_JOBS_LOCK_ID"
/>
<constraints
primaryKey=
"true"
primaryKeyName=
"PK_JOBS_LOCK_ID"
/>
</column>
</column>
<column
name=
"NAME"
remarks=
""
type=
"VARCHAR(30)"
>
</column>
<column
name=
"OWNER"
remarks=
""
type=
"VARCHAR(100)"
>
</column>
<column
name=
"CREATE_TIME"
remarks=
""
type=
"BIGINT"
>
<column
name=
"CREATE_TIME"
remarks=
""
type=
"BIGINT"
>
</column>
</column>
</createTable>
</createTable>
...
@@ -72,7 +76,7 @@
...
@@ -72,7 +76,7 @@
<!--输出实体[JOBS_LOG]数据结构 -->
<!--输出实体[JOBS_LOG]数据结构 -->
<changeSet
author=
"a_A_5d9d78509"
id=
"tab-jobs_log-2
8
-4"
>
<changeSet
author=
"a_A_5d9d78509"
id=
"tab-jobs_log-2
9
-4"
>
<createTable
tableName=
"JOBS_LOG"
>
<createTable
tableName=
"JOBS_LOG"
>
<column
name=
"ID"
remarks=
""
type=
"BIGINT"
>
<column
name=
"ID"
remarks=
""
type=
"BIGINT"
>
<constraints
primaryKey=
"true"
primaryKeyName=
"PK_JOBS_LOG_ID"
/>
<constraints
primaryKey=
"true"
primaryKeyName=
"PK_JOBS_LOG_ID"
/>
...
...
ibztask-core/src/main/resources/mapper/task/jobslock/JobsLockMapper.xml
浏览文件 @
74849c3f
...
@@ -5,7 +5,7 @@
...
@@ -5,7 +5,7 @@
<!--该方法用于重写mybatis中selectById方法,以实现查询逻辑属性-->
<!--该方法用于重写mybatis中selectById方法,以实现查询逻辑属性-->
<select
id=
"selectById"
resultMap=
"JobsLockResultMap"
databaseId=
"mysql"
>
<select
id=
"selectById"
resultMap=
"JobsLockResultMap"
databaseId=
"mysql"
>
<![CDATA[select t1.* from (SELECT t1.`CREATE_TIME`, t1.`ID` FROM `JOBS_LOCK` t1 ) t1 where id=#{id}]]>
<![CDATA[select t1.* from (SELECT t1.`CREATE_TIME`, t1.`ID`
, t1.`NAME`, t1.`OWNER`
FROM `JOBS_LOCK` t1 ) t1 where id=#{id}]]>
</select>
</select>
<!--通过mybatis将查询结果注入到entity中,通过配置autoMapping="true"由mybatis自动处理映射关系 -->
<!--通过mybatis将查询结果注入到entity中,通过配置autoMapping="true"由mybatis自动处理映射关系 -->
...
@@ -28,12 +28,12 @@
...
@@ -28,12 +28,12 @@
<!--数据查询[Default]-->
<!--数据查询[Default]-->
<sql
id=
"Default"
databaseId=
"mysql"
>
<sql
id=
"Default"
databaseId=
"mysql"
>
<![CDATA[ SELECT t1.`CREATE_TIME`, t1.`ID` FROM `JOBS_LOCK` t1
<![CDATA[ SELECT t1.`CREATE_TIME`, t1.`ID`
, t1.`NAME`, t1.`OWNER`
FROM `JOBS_LOCK` t1
]]>
]]>
</sql>
</sql>
<!--数据查询[View]-->
<!--数据查询[View]-->
<sql
id=
"View"
databaseId=
"mysql"
>
<sql
id=
"View"
databaseId=
"mysql"
>
<![CDATA[ SELECT t1.`CREATE_TIME`, t1.`ID` FROM `JOBS_LOCK` t1
<![CDATA[ SELECT t1.`CREATE_TIME`, t1.`ID`
, t1.`NAME`, t1.`OWNER`
FROM `JOBS_LOCK` t1
]]>
]]>
</sql>
</sql>
</mapper>
</mapper>
...
...
ibztask-provider/ibztask-provider-api/src/main/java/cn/ibizlab/api/dto/JobsLockDTO.java
浏览文件 @
74849c3f
...
@@ -31,6 +31,22 @@ public class JobsLockDTO extends DTOBase implements Serializable {
...
@@ -31,6 +31,22 @@ public class JobsLockDTO extends DTOBase implements Serializable {
@JsonProperty
(
"id"
)
@JsonProperty
(
"id"
)
private
BigInteger
id
;
private
BigInteger
id
;
/**
* 属性 [NAME]
*
*/
@JSONField
(
name
=
"name"
)
@JsonProperty
(
"name"
)
private
String
name
;
/**
* 属性 [OWNER]
*
*/
@JSONField
(
name
=
"owner"
)
@JsonProperty
(
"owner"
)
private
String
owner
;
/**
/**
* 属性 [CREATE_TIME]
* 属性 [CREATE_TIME]
*
*
...
@@ -40,6 +56,22 @@ public class JobsLockDTO extends DTOBase implements Serializable {
...
@@ -40,6 +56,22 @@ public class JobsLockDTO extends DTOBase implements Serializable {
private
BigInteger
createTime
;
private
BigInteger
createTime
;
/**
* 设置 [NAME]
*/
public
void
setName
(
String
name
){
this
.
name
=
name
;
this
.
modify
(
"name"
,
name
);
}
/**
* 设置 [OWNER]
*/
public
void
setOwner
(
String
owner
){
this
.
owner
=
owner
;
this
.
modify
(
"owner"
,
owner
);
}
/**
/**
* 设置 [CREATE_TIME]
* 设置 [CREATE_TIME]
*/
*/
...
...
编辑
预览
Markdown
格式
0%
请重试
or
添加新附件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
先完成此消息的编辑!
取消
想要评论请
注册
或
登录