Skip to content

I
ibztask
提交 55b185a1 编写于 作者: sq3536's avatar sq3536
浏览文件
操作

Merge remote-tracking branch 'origin/master'

上级 c17d639b ab450888
展开全部 显示空白字符变更
内嵌 并排
正在显示 包含 197 行增加 和 208 行删除
app_web/public/assets/json/data-dictionary.json
浏览文件 @ 55b185a1
......@@ -11,7 +11,7 @@
"data":"",
"codename":"Item_0",
"color": "rgba(58, 116, 7, 1)",
"value": "0",
"value": 0,
"disabled": false
}
......@@ -22,7 +22,7 @@
"data":"",
"codename":"Item_1",
"color": "rgba(67, 65, 65, 1)",
"value": "1",
"value": 1,
"disabled": false
}
......
app_web/src/mock/codelist/codelist.ts
浏览文件 @ 55b185a1
......@@ -19,7 +19,7 @@ mock.onGet('./assets/json/data-dictionary.json').reply((config: any) => {
"data":"",
"codename":"Item_0",
"color": "rgba(58, 116, 7, 1)",
value: '0',
value: 0,
disabled: false,
},
......@@ -30,7 +30,7 @@ mock.onGet('./assets/json/data-dictionary.json').reply((config: any) => {
"data":"",
"codename":"Item_1",
"color": "rgba(67, 65, 65, 1)",
value: '1',
value: 1,
disabled: false,
},
......
app_web/src/widgets/jobs-info/main-form/main-form-model.ts
浏览文件 @ 55b185a1
......@@ -31,7 +31,7 @@ export default class MainModel {
{
name: 'srfkey',
prop: 'id',
dataType: 'BIGINT',
dataType: 'TEXT',
},
{
name: 'srfmajortext',
......@@ -53,7 +53,7 @@ export default class MainModel {
{
name: 'id',
prop: 'id',
dataType: 'BIGINT',
dataType: 'TEXT',
},
{
name: 'app',
......@@ -78,12 +78,12 @@ export default class MainModel {
{
name: 'last_time',
prop: 'last_time',
dataType: 'BIGINT',
dataType: 'DATETIME',
},
{
name: 'next_time',
prop: 'next_time',
dataType: 'BIGINT',
dataType: 'DATETIME',
},
{
name: 'timeout',
......@@ -118,12 +118,12 @@ export default class MainModel {
{
name: 'create_time',
prop: 'create_time',
dataType: 'BIGINT',
dataType: 'DATETIME',
},
{
name: 'update_time',
prop: 'update_time',
dataType: 'BIGINT',
dataType: 'DATETIME',
},
{
name: 'jobsinfo',
......
app_web/src/widgets/jobs-info/main-grid/main-grid-base.vue
浏览文件 @ 55b185a1
......@@ -76,7 +76,7 @@
</span>
</template>
<template v-slot="{row,column,$index}">
<span>{{row.last_time}}</span>
<app-format-data format="YYYY-MM-DD hh:mm:ss" :data="row.last_time"></app-format-data>
</template>
</el-table-column>
</template>
......@@ -88,7 +88,7 @@
</span>
</template>
<template v-slot="{row,column,$index}">
<span>{{row.next_time}}</span>
<app-format-data format="YYYY-MM-DD hh:mm:ss" :data="row.next_time"></app-format-data>
</template>
</el-table-column>
</template>
......@@ -126,7 +126,7 @@
</span>
</template>
<template v-slot="{row,column,$index}">
<span>{{row.update_time}}</span>
<app-format-data format="YYYY-MM-DD hh:mm:ss" :data="row.update_time"></app-format-data>
</template>
</el-table-column>
</template>
......
app_web/src/widgets/jobs-info/main-grid/main-grid-model.ts
浏览文件 @ 55b185a1
......@@ -29,7 +29,7 @@ export default class MainModel {
{
name: 'id',
prop: 'id',
dataType: 'BIGINT',
dataType: 'TEXT',
},
{
name: 'cron',
......@@ -44,12 +44,12 @@ export default class MainModel {
{
name: 'next_time',
prop: 'next_time',
dataType: 'BIGINT',
dataType: 'DATETIME',
},
{
name: 'update_time',
prop: 'update_time',
dataType: 'BIGINT',
dataType: 'DATETIME',
},
{
name: 'status',
......@@ -59,7 +59,7 @@ export default class MainModel {
{
name: 'last_time',
prop: 'last_time',
dataType: 'BIGINT',
dataType: 'DATETIME',
},
{
name: 'srfmajortext',
......@@ -69,12 +69,12 @@ export default class MainModel {
{
name: 'srfdataaccaction',
prop: 'id',
dataType: 'BIGINT',
dataType: 'TEXT',
},
{
name: 'srfkey',
prop: 'id',
dataType: 'BIGINT',
dataType: 'TEXT',
},
{
name: 'timeout',
......
app_web/src/widgets/jobs-log/default-searchform/default-searchform-base.vue
浏览文件 @ 55b185a1
......@@ -6,7 +6,7 @@
<row>
<i-col v-show="detailsModel.n_job_id_eq.visible" :style="{}" :sm="{ span: 24, offset: 0 }" :md="{ span: 8, offset: 0 }" :lg="{ span: 8, offset: 0 }" :xl="{ span: 8, offset: 0 }">
<app-form-item name='n_job_id_eq' :itemRules="this.rules.n_job_id_eq" class='' :caption="$t('entities.jobslog.default_searchform.details.n_job_id_eq')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.n_job_id_eq.error" :isEmptyCaption="false" labelPos="LEFT">
<input-box v-model="data.n_job_id_eq" @enter="onEnter($event)" :disabled="detailsModel.n_job_id_eq.disabled" type='number' style=""></input-box>
<input-box v-model="data.n_job_id_eq" @enter="onEnter($event)" :disabled="detailsModel.n_job_id_eq.disabled" type='text' style=""></input-box>
</app-form-item>
</i-col>
......@@ -275,10 +275,10 @@ export default class DefaultBase extends Vue implements ControlInterface {
*/
public rules: any = {
n_job_id_eq: [
{ type: 'number', message: '任务ID(等于(=)) 值必须为数值类型', trigger: 'change' },
{ type: 'number', message: '任务ID(等于(=)) 值必须为数值类型', trigger: 'blur' },
{ required: false, type: 'number', message: '任务ID(等于(=)) 值不能为空', trigger: 'change' },
{ required: false, type: 'number', message: '任务ID(等于(=)) 值不能为空', trigger: 'blur' },
{ type: 'string', message: '任务ID(等于(=)) 值必须为字符串类型', trigger: 'change' },
{ type: 'string', message: '任务ID(等于(=)) 值必须为字符串类型', trigger: 'blur' },
{ required: false, type: 'string', message: '任务ID(等于(=)) 值不能为空', trigger: 'change' },
{ required: false, type: 'string', message: '任务ID(等于(=)) 值不能为空', trigger: 'blur' },
],
n_handler_like: [
{ type: 'string', message: '执行器任务HANDLER(文本包含(%)) 值必须为字符串类型', trigger: 'change' },
......
app_web/src/widgets/jobs-log/default-searchform/default-searchform-model.ts
浏览文件 @ 55b185a1
......@@ -28,7 +28,7 @@ export default class DefaultModel {
{
name: 'n_job_id_eq',
prop: 'job_id',
dataType: 'BIGINT',
dataType: 'TEXT',
},
{
name: 'n_handler_like',
......
app_web/src/widgets/jobs-log/main-form/main-form-base.vue
浏览文件 @ 55b185a1
......@@ -8,13 +8,13 @@
<row>
<i-col v-show="detailsModel.id.visible" :style="{}" :lg="{ span: 24, offset: 0 }">
<app-form-item name='id' :itemRules="this.rules.id" class='' :caption="$t('entities.jobslog.main_form.details.id')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.id.error" :isEmptyCaption="false" labelPos="LEFT">
<input-box v-model="data.id" @enter="onEnter($event)" unit="" :disabled="detailsModel.id.disabled" type='number' style=""></input-box>
<input-box v-model="data.id" @enter="onEnter($event)" unit="" :disabled="detailsModel.id.disabled" type='text' style=""></input-box>
</app-form-item>
</i-col>
<i-col v-show="detailsModel.job_id.visible" :style="{}" :lg="{ span: 24, offset: 0 }">
<app-form-item name='job_id' :itemRules="this.rules.job_id" class='' :caption="$t('entities.jobslog.main_form.details.job_id')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.job_id.error" :isEmptyCaption="false" labelPos="LEFT">
<input-box v-model="data.job_id" @enter="onEnter($event)" unit="" :disabled="detailsModel.job_id.disabled" type='number' style=""></input-box>
<input-box v-model="data.job_id" @enter="onEnter($event)" unit="" :disabled="detailsModel.job_id.disabled" type='text' style=""></input-box>
</app-form-item>
</i-col>
......@@ -64,7 +64,7 @@
</i-col>
<i-col v-show="detailsModel.create_time.visible" :style="{}" :lg="{ span: 24, offset: 0 }">
<app-form-item name='create_time' :itemRules="this.rules.create_time" class='' :caption="$t('entities.jobslog.main_form.details.create_time')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.create_time.error" :isEmptyCaption="false" labelPos="LEFT">
<input-box v-model="data.create_time" @enter="onEnter($event)" unit="" :disabled="detailsModel.create_time.disabled" type='number' style=""></input-box>
<date-picker type="datetime" :transfer="true" format="yyyy-MM-dd HH:mm:ss" placeholder="请选择时间..." :value="data.create_time" :disabled="detailsModel.create_time.disabled" style="min-width: 150px; width:160px;" @on-change="(val1, val2) => { this.data.create_time = val1 }"></date-picker>
</app-form-item>
</i-col>
......@@ -437,10 +437,10 @@ export default class MainBase extends Vue implements ControlInterface {
{ required: false, type: 'string', message: ' 值不能为空', trigger: 'blur' },
],
srfkey: [
{ type: 'number', message: '主键ID 值必须为数值类型', trigger: 'change' },
{ type: 'number', message: '主键ID 值必须为数值类型', trigger: 'blur' },
{ required: false, type: 'number', message: '主键ID 值不能为空', trigger: 'change' },
{ required: false, type: 'number', message: '主键ID 值不能为空', trigger: 'blur' },
{ type: 'string', message: '主键ID 值必须为字符串类型', trigger: 'change' },
{ type: 'string', message: '主键ID 值必须为字符串类型', trigger: 'blur' },
{ required: false, type: 'string', message: '主键ID 值不能为空', trigger: 'change' },
{ required: false, type: 'string', message: '主键ID 值不能为空', trigger: 'blur' },
],
srfmajortext: [
{ type: 'string', message: '执行器任务HANDLER 值必须为字符串类型', trigger: 'change' },
......@@ -473,16 +473,16 @@ export default class MainBase extends Vue implements ControlInterface {
{ required: false, type: 'string', message: ' 值不能为空', trigger: 'blur' },
],
id: [
{ type: 'number', message: '主键ID 值必须为数值类型', trigger: 'change' },
{ type: 'number', message: '主键ID 值必须为数值类型', trigger: 'blur' },
{ required: false, type: 'number', message: '主键ID 值不能为空', trigger: 'change' },
{ required: false, type: 'number', message: '主键ID 值不能为空', trigger: 'blur' },
{ type: 'string', message: '主键ID 值必须为字符串类型', trigger: 'change' },
{ type: 'string', message: '主键ID 值必须为字符串类型', trigger: 'blur' },
{ required: false, type: 'string', message: '主键ID 值不能为空', trigger: 'change' },
{ required: false, type: 'string', message: '主键ID 值不能为空', trigger: 'blur' },
],
job_id: [
{ type: 'number', message: '任务ID 值必须为数值类型', trigger: 'change' },
{ type: 'number', message: '任务ID 值必须为数值类型', trigger: 'blur' },
{ required: true, type: 'number', message: '任务ID 值不能为空', trigger: 'change' },
{ required: true, type: 'number', message: '任务ID 值不能为空', trigger: 'blur' },
{ type: 'string', message: '任务ID 值必须为字符串类型', trigger: 'change' },
{ type: 'string', message: '任务ID 值必须为字符串类型', trigger: 'blur' },
{ required: true, type: 'string', message: '任务ID 值不能为空', trigger: 'change' },
{ required: true, type: 'string', message: '任务ID 值不能为空', trigger: 'blur' },
],
handler: [
{ type: 'string', message: '执行器任务HANDLER 值必须为字符串类型', trigger: 'change' },
......@@ -527,10 +527,10 @@ export default class MainBase extends Vue implements ControlInterface {
{ required: false, type: 'string', message: '执行地址 值不能为空', trigger: 'blur' },
],
create_time: [
{ type: 'number', message: '创建时间 值必须为数值类型', trigger: 'change' },
{ type: 'number', message: '创建时间 值必须为数值类型', trigger: 'blur' },
{ required: true, type: 'number', message: '创建时间 值不能为空', trigger: 'change' },
{ required: true, type: 'number', message: '创建时间 值不能为空', trigger: 'blur' },
{ type: 'string', message: '创建时间 值必须为字符串类型', trigger: 'change' },
{ type: 'string', message: '创建时间 值必须为字符串类型', trigger: 'blur' },
{ required: true, type: 'string', message: '创建时间 值不能为空', trigger: 'change' },
{ required: true, type: 'string', message: '创建时间 值不能为空', trigger: 'blur' },
],
}
......
app_web/src/widgets/jobs-log/main-form/main-form-model.ts
浏览文件 @ 55b185a1
......@@ -31,7 +31,7 @@ export default class MainModel {
{
name: 'srfkey',
prop: 'id',
dataType: 'BIGINT',
dataType: 'TEXT',
},
{
name: 'srfmajortext',
......@@ -53,12 +53,12 @@ export default class MainModel {
{
name: 'id',
prop: 'id',
dataType: 'BIGINT',
dataType: 'TEXT',
},
{
name: 'job_id',
prop: 'job_id',
dataType: 'BIGINT',
dataType: 'TEXT',
},
{
name: 'handler',
......@@ -98,7 +98,7 @@ export default class MainModel {
{
name: 'create_time',
prop: 'create_time',
dataType: 'BIGINT',
dataType: 'DATETIME',
},
{
name: 'jobslog',
......
app_web/src/widgets/jobs-log/main-grid/main-grid-base.vue
浏览文件 @ 55b185a1
......@@ -112,7 +112,7 @@
</span>
</template>
<template v-slot="{row,column,$index}">
<span>{{row.create_time}}</span>
<app-format-data format="YYYY-MM-DD hh:mm:ss" :data="row.create_time"></app-format-data>
</template>
</el-table-column>
</template>
......
app_web/src/widgets/jobs-log/main-grid/main-grid-model.ts
浏览文件 @ 55b185a1
......@@ -29,7 +29,7 @@ export default class MainModel {
{
name: 'id',
prop: 'id',
dataType: 'BIGINT',
dataType: 'TEXT',
},
{
name: 'address',
......@@ -44,7 +44,7 @@ export default class MainModel {
{
name: 'create_time',
prop: 'create_time',
dataType: 'BIGINT',
dataType: 'DATETIME',
},
{
name: 'trigger_type',
......@@ -59,12 +59,12 @@ export default class MainModel {
{
name: 'srfdataaccaction',
prop: 'id',
dataType: 'BIGINT',
dataType: 'TEXT',
},
{
name: 'srfkey',
prop: 'id',
dataType: 'BIGINT',
dataType: 'TEXT',
},
{
name: 'fail_retry_count',
......@@ -79,7 +79,7 @@ export default class MainModel {
{
name: 'job_id',
prop: 'job_id',
dataType: 'BIGINT',
dataType: 'TEXT',
},
{
name: 'jobslog',
......@@ -88,7 +88,7 @@ export default class MainModel {
{
name: 'n_job_id_eq',
prop: 'n_job_id_eq',
dataType: 'BIGINT',
dataType: 'TEXT',
},
{
name: 'n_handler_like',
......
app_web/src/widgets/jobs-registry/main-form/main-form-base.vue
浏览文件 @ 55b185a1
......@@ -8,7 +8,7 @@
<row>
<i-col v-show="detailsModel.id.visible" :style="{}" :lg="{ span: 24, offset: 0 }">
<app-form-item name='id' :itemRules="this.rules.id" class='' :caption="$t('entities.jobsregistry.main_form.details.id')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.id.error" :isEmptyCaption="false" labelPos="LEFT">
<input-box v-model="data.id" @enter="onEnter($event)" unit="" :disabled="detailsModel.id.disabled" type='number' style=""></input-box>
<input-box v-model="data.id" @enter="onEnter($event)" unit="" :disabled="detailsModel.id.disabled" type='text' style=""></input-box>
</app-form-item>
</i-col>
......@@ -405,10 +405,10 @@ export default class MainBase extends Vue implements ControlInterface {
{ required: false, type: 'string', message: ' 值不能为空', trigger: 'blur' },
],
srfkey: [
{ type: 'number', message: '主键ID 值必须为数值类型', trigger: 'change' },
{ type: 'number', message: '主键ID 值必须为数值类型', trigger: 'blur' },
{ required: false, type: 'number', message: '主键ID 值不能为空', trigger: 'change' },
{ required: false, type: 'number', message: '主键ID 值不能为空', trigger: 'blur' },
{ type: 'string', message: '主键ID 值必须为字符串类型', trigger: 'change' },
{ type: 'string', message: '主键ID 值必须为字符串类型', trigger: 'blur' },
{ required: false, type: 'string', message: '主键ID 值不能为空', trigger: 'change' },
{ required: false, type: 'string', message: '主键ID 值不能为空', trigger: 'blur' },
],
srfmajortext: [
{ type: 'string', message: '服务名 值必须为字符串类型', trigger: 'change' },
......@@ -441,10 +441,10 @@ export default class MainBase extends Vue implements ControlInterface {
{ required: false, type: 'string', message: ' 值不能为空', trigger: 'blur' },
],
id: [
{ type: 'number', message: '主键ID 值必须为数值类型', trigger: 'change' },
{ type: 'number', message: '主键ID 值必须为数值类型', trigger: 'blur' },
{ required: false, type: 'number', message: '主键ID 值不能为空', trigger: 'change' },
{ required: false, type: 'number', message: '主键ID 值不能为空', trigger: 'blur' },
{ type: 'string', message: '主键ID 值必须为字符串类型', trigger: 'change' },
{ type: 'string', message: '主键ID 值必须为字符串类型', trigger: 'blur' },
{ required: false, type: 'string', message: '主键ID 值不能为空', trigger: 'change' },
{ required: false, type: 'string', message: '主键ID 值不能为空', trigger: 'blur' },
],
app: [
{ type: 'string', message: '服务名 值必须为字符串类型', trigger: 'change' },
......
app_web/src/widgets/jobs-registry/main-form/main-form-model.ts
浏览文件 @ 55b185a1
......@@ -31,7 +31,7 @@ export default class MainModel {
{
name: 'srfkey',
prop: 'id',
dataType: 'BIGINT',
dataType: 'TEXT',
},
{
name: 'srfmajortext',
......@@ -53,7 +53,7 @@ export default class MainModel {
{
name: 'id',
prop: 'id',
dataType: 'BIGINT',
dataType: 'TEXT',
},
{
name: 'app',
......
app_web/src/widgets/jobs-registry/main-grid/main-grid-model.ts
浏览文件 @ 55b185a1
......@@ -29,7 +29,7 @@ export default class MainModel {
{
name: 'id',
prop: 'id',
dataType: 'BIGINT',
dataType: 'TEXT',
},
{
name: 'app',
......@@ -54,12 +54,12 @@ export default class MainModel {
{
name: 'srfdataaccaction',
prop: 'id',
dataType: 'BIGINT',
dataType: 'TEXT',
},
{
name: 'srfkey',
prop: 'id',
dataType: 'BIGINT',
dataType: 'TEXT',
},
{
name: 'jobsregistry',
......
config.xml
浏览文件 @ 55b185a1
......@@ -37,11 +37,6 @@
git clone -b master $para2 ibztask/
export NODE_OPTIONS=--max-old-space-size=4096
cd ibztask/
mvn clean package -Pweb
cd ibztask-app/ibztask-app-web
mvn -Pweb docker:build
mvn -Pweb docker:push
docker -H $para1 stack deploy --compose-file=src/main/docker/ibztask-app-web.yaml ibzlab-rt --with-registry-auth
</command>
</hudson.tasks.Shell>
</builders>
......
ibztask-app/ibztask-app-web/src/main/docker/Dockerfile
浏览文件 @ 55b185a1
......@@ -9,6 +9,6 @@ CMD echo "The application will start in ${IBIZ_SLEEP}s..." && \
sleep ${IBIZ_SLEEP} && \
java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /ibztask-app-web.jar
EXPOSE 30005
EXPOSE 8080
ADD ibztask-app-web.jar /ibztask-app-web.jar
ibztask-app/ibztask-app-web/src/main/docker/ibztask-app-web.yaml
浏览文件 @ 55b185a1
......@@ -3,22 +3,9 @@ services:
ibztask-app-web:
image: registry.cn-shanghai.aliyuncs.com/ibizsys/ibztask-app-web:latest
ports:
- "30005:30005"
- "8080:8080"
networks:
- agent_network
environment:
- SPRING_CLOUD_NACOS_DISCOVERY_IP=172.16.180.237
- SERVER_PORT=30005
- SPRING_CLOUD_NACOS_DISCOVERY_SERVER-ADDR=172.16.102.211:8848
- SPRING_REDIS_HOST=172.16.100.243
- SPRING_REDIS_PORT=6379
- SPRING_REDIS_DATABASE=0
- SPRING_DATASOURCE_USERNAME=a_A_5d9d78509
- SPRING_DATASOURCE_PASSWORD=@6dEfb3@
- SPRING_DATASOURCE_URL=jdbc:mysql://172.16.180.232:3306/a_A_5d9d78509?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useOldAliasMetadataBehavior=true
- SPRING_DATASOURCE_DRIVER-CLASS-NAME=com.mysql.jdbc.Driver
- SPRING_DATASOURCE_DEFAULTSCHEMA=a_A_5d9d78509
- NACOS=172.16.102.211:8848
deploy:
resources:
limits:
......
ibztask-core/src/main/java/cn/ibizlab/core/task/filter/JobsLogSearchContext.java
浏览文件 @ 55b185a1
......@@ -27,8 +27,8 @@ import cn.ibizlab.core.task.domain.JobsLog;
@Data
public class JobsLogSearchContext extends QueryWrapperContext<JobsLog> {
private BigInteger n_job_id_eq;//[任务ID]
public void setN_job_id_eq(BigInteger n_job_id_eq) {
private String n_job_id_eq;//[任务ID]
public void setN_job_id_eq(String n_job_id_eq) {
this.n_job_id_eq = n_job_id_eq;
if(!ObjectUtils.isEmpty(this.n_job_id_eq)){
this.getSearchCond().eq("job_id", n_job_id_eq);
......
ibztask-core/src/main/java/cn/ibizlab/core/task/service/IJobsInfoService.java
浏览文件 @ 55b185a1
......@@ -33,9 +33,9 @@ public interface IJobsInfoService extends IService<JobsInfo>{
boolean save(JobsInfo et) ;
void saveBatch(List<JobsInfo> list) ;
JobsInfo getDraft(JobsInfo et) ;
boolean remove(BigInteger key) ;
void removeBatch(Collection<BigInteger> idList) ;
JobsInfo get(BigInteger key) ;
boolean remove(String key) ;
void removeBatch(Collection<String> idList) ;
JobsInfo get(String key) ;
boolean create(JobsInfo et) ;
void createBatch(List<JobsInfo> list) ;
JobsInfo stop(JobsInfo et) ;
......
ibztask-core/src/main/java/cn/ibizlab/core/task/service/IJobsLockService.java
浏览文件 @ 55b185a1
......@@ -29,12 +29,12 @@ public interface IJobsLockService extends IService<JobsLock>{
void createBatch(List<JobsLock> list) ;
boolean save(JobsLock et) ;
void saveBatch(List<JobsLock> list) ;
JobsLock get(BigInteger key) ;
JobsLock get(String key) ;
boolean update(JobsLock et) ;
void updateBatch(List<JobsLock> list) ;
boolean checkKey(JobsLock et) ;
boolean remove(BigInteger key) ;
void removeBatch(Collection<BigInteger> idList) ;
boolean remove(String key) ;
void removeBatch(Collection<String> idList) ;
JobsLock getDraft(JobsLock et) ;
Page<JobsLock> searchDefault(JobsLockSearchContext context) ;
/**
......
ibztask-core/src/main/java/cn/ibizlab/core/task/service/IJobsLogService.java
浏览文件 @ 55b185a1
......@@ -33,9 +33,9 @@ public interface IJobsLogService extends IService<JobsLog>{
boolean checkKey(JobsLog et) ;
boolean save(JobsLog et) ;
void saveBatch(List<JobsLog> list) ;
boolean remove(BigInteger key) ;
void removeBatch(Collection<BigInteger> idList) ;
JobsLog get(BigInteger key) ;
boolean remove(String key) ;
void removeBatch(Collection<String> idList) ;
JobsLog get(String key) ;
Page<JobsLog> searchDefault(JobsLogSearchContext context) ;
/**
*自定义查询SQL
......
ibztask-core/src/main/java/cn/ibizlab/core/task/service/IJobsRegistryService.java
浏览文件 @ 55b185a1
......@@ -25,9 +25,9 @@ import com.baomidou.mybatisplus.extension.service.IService;
*/
public interface IJobsRegistryService extends IService<JobsRegistry>{
JobsRegistry get(BigInteger key) ;
boolean remove(BigInteger key) ;
void removeBatch(Collection<BigInteger> idList) ;
JobsRegistry get(String key) ;
boolean remove(String key) ;
void removeBatch(Collection<String> idList) ;
boolean update(JobsRegistry et) ;
void updateBatch(List<JobsRegistry> list) ;
boolean save(JobsRegistry et) ;
......
ibztask-core/src/main/java/cn/ibizlab/core/task/service/impl/JobsInfoServiceImpl.java
浏览文件 @ 55b185a1
......@@ -50,7 +50,7 @@ public class JobsInfoServiceImpl extends ServiceImpl<JobsInfoMapper, JobsInfo> i
@Override
@Transactional
public JobsInfo start(JobsInfo et) {
et.set("Status","1");
et.set("Status","0");
et.set("Last_time","0");
update(et);
return et;
......@@ -118,19 +118,19 @@ public class JobsInfoServiceImpl extends ServiceImpl<JobsInfoMapper, JobsInfo> i
@Override
@Transactional
public boolean remove(BigInteger key) {
public boolean remove(String key) {
boolean result=removeById(key);
return result ;
}
@Override
public void removeBatch(Collection<BigInteger> idList) {
public void removeBatch(Collection<String> idList) {
removeByIds(idList);
}
@Override
@Transactional
public JobsInfo get(BigInteger key) {
public JobsInfo get(String key) {
JobsInfo et = getById(key);
if(et==null){
et=new JobsInfo();
......@@ -160,7 +160,7 @@ public class JobsInfoServiceImpl extends ServiceImpl<JobsInfoMapper, JobsInfo> i
public JobsInfo stop(JobsInfo et) {
et.set("Next_time","0");
et.set("Last_time","0");
et.set("Status","0");
et.set("Status","1");
update(et);
return et;
}
......
ibztask-core/src/main/java/cn/ibizlab/core/task/service/impl/JobsLockServiceImpl.java
浏览文件 @ 55b185a1
......@@ -94,7 +94,7 @@ public class JobsLockServiceImpl extends ServiceImpl<JobsLockMapper, JobsLock> i
@Override
@Transactional
public JobsLock get(BigInteger key) {
public JobsLock get(String key) {
JobsLock et = getById(key);
if(et==null){
et=new JobsLock();
......@@ -125,13 +125,13 @@ public class JobsLockServiceImpl extends ServiceImpl<JobsLockMapper, JobsLock> i
}
@Override
@Transactional
public boolean remove(BigInteger key) {
public boolean remove(String key) {
boolean result=removeById(key);
return result ;
}
@Override
public void removeBatch(Collection<BigInteger> idList) {
public void removeBatch(Collection<String> idList) {
removeByIds(idList);
}
......
ibztask-core/src/main/java/cn/ibizlab/core/task/service/impl/JobsLogServiceImpl.java
浏览文件 @ 55b185a1
......@@ -117,19 +117,19 @@ public class JobsLogServiceImpl extends ServiceImpl<JobsLogMapper, JobsLog> impl
@Override
@Transactional
public boolean remove(BigInteger key) {
public boolean remove(String key) {
boolean result=removeById(key);
return result ;
}
@Override
public void removeBatch(Collection<BigInteger> idList) {
public void removeBatch(Collection<String> idList) {
removeByIds(idList);
}
@Override
@Transactional
public JobsLog get(BigInteger key) {
public JobsLog get(String key) {
JobsLog et = getById(key);
if(et==null){
et=new JobsLog();
......
ibztask-core/src/main/java/cn/ibizlab/core/task/service/impl/JobsRegistryServiceImpl.java
浏览文件 @ 55b185a1
......@@ -49,7 +49,7 @@ public class JobsRegistryServiceImpl extends ServiceImpl<JobsRegistryMapper, Job
@Override
@Transactional
public JobsRegistry get(BigInteger key) {
public JobsRegistry get(String key) {
JobsRegistry et = getById(key);
if(et==null){
et=new JobsRegistry();
......@@ -62,13 +62,13 @@ public class JobsRegistryServiceImpl extends ServiceImpl<JobsRegistryMapper, Job
@Override
@Transactional
public boolean remove(BigInteger key) {
public boolean remove(String key) {
boolean result=removeById(key);
return result ;
}
@Override
public void removeBatch(Collection<BigInteger> idList) {
public void removeBatch(Collection<String> idList) {
removeByIds(idList);
}
......
ibztask-core/src/main/resources/liquibase/h2_table.xml
浏览文件 @ 55b185a1
......@@ -4,9 +4,9 @@
<!--输出实体[JOBS_INFO]数据结构 -->
<changeSet author="a_A_5d9d78509" id="tab-jobs_info-80-1">
<changeSet author="a_A_5d9d78509" id="tab-jobs_info-95-1">
<createTable tableName="JOBS_INFO">
<column name="ID" remarks="" type="BIGINT">
<column name="ID" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_JOBS_INFO_ID"/>
</column>
<column name="TENANT_ID" remarks="" type="VARCHAR(100)">
......@@ -23,9 +23,9 @@
</column>
<column name="FAIL_RETRY_COUNT" remarks="" type="INT">
</column>
<column name="LAST_TIME" remarks="" type="BIGINT">
<column name="LAST_TIME" remarks="" type="DATETIME">
</column>
<column name="NEXT_TIME" remarks="" type="BIGINT">
<column name="NEXT_TIME" remarks="" type="DATETIME">
</column>
<column name="AUTHOR" remarks="" type="VARCHAR(30)">
</column>
......@@ -33,18 +33,18 @@
</column>
<column name="STATUS" remarks="" type="INT">
</column>
<column name="UPDATE_TIME" remarks="" type="BIGINT">
<column name="UPDATE_TIME" remarks="" type="DATETIME">
</column>
<column name="CREATE_TIME" remarks="" type="BIGINT">
<column name="CREATE_TIME" remarks="" type="DATETIME">
</column>
</createTable>
</changeSet>
<!--输出实体[JOBS_REGISTRY]数据结构 -->
<changeSet author="a_A_5d9d78509" id="tab-jobs_registry-31-2">
<changeSet author="a_A_5d9d78509" id="tab-jobs_registry-35-2">
<createTable tableName="JOBS_REGISTRY">
<column name="ID" remarks="" type="BIGINT">
<column name="ID" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_JOBS_REGISTRY_ID"/>
</column>
<column name="APP" remarks="" type="VARCHAR(100)">
......@@ -53,35 +53,35 @@
</column>
<column name="STATUS" remarks="" type="INT">
</column>
<column name="UPDATE_TIME" remarks="" type="BIGINT">
<column name="UPDATE_TIME" remarks="" type="DATETIME">
</column>
</createTable>
</changeSet>
<!--输出实体[JOBS_LOCK]数据结构 -->
<changeSet author="a_A_5d9d78509" id="tab-jobs_lock-16-3">
<changeSet author="a_A_5d9d78509" id="tab-jobs_lock-20-3">
<createTable tableName="JOBS_LOCK">
<column name="ID" remarks="" type="BIGINT">
<column name="ID" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_JOBS_LOCK_ID"/>
</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="DATETIME">
</column>
</createTable>
</changeSet>
<!--输出实体[JOBS_LOG]数据结构 -->
<changeSet author="a_A_5d9d78509" id="tab-jobs_log-48-4">
<changeSet author="a_A_5d9d78509" id="tab-jobs_log-56-4">
<createTable tableName="JOBS_LOG">
<column name="ID" remarks="" type="BIGINT">
<column name="ID" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_JOBS_LOG_ID"/>
</column>
<column name="JOB_ID" remarks="" type="BIGINT">
<column name="JOB_ID" remarks="" type="VARCHAR(100)">
</column>
<column name="ADDRESS" remarks="" type="VARCHAR(255)">
</column>
......@@ -97,7 +97,7 @@
</column>
<column name="TRIGGER_MSG" remarks="" type="TEXT(1048576)">
</column>
<column name="CREATE_TIME" remarks="" type="BIGINT">
<column name="CREATE_TIME" remarks="" type="DATETIME">
</column>
</createTable>
</changeSet>
......
ibztask-provider/ibztask-provider-api/src/main/java/cn/ibizlab/api/dto/JobsInfoDTO.java
浏览文件 @ 55b185a1
......@@ -29,7 +29,7 @@ public class JobsInfoDTO extends DTOBase implements Serializable {
*/
@JSONField(name = "id")
@JsonProperty("id")
private BigInteger id;
private String id;
/**
* 属性 [TENANT_ID]
......@@ -91,17 +91,19 @@ public class JobsInfoDTO extends DTOBase implements Serializable {
* 属性 [LAST_TIME]
*
*/
@JSONField(name = "last_time")
@JsonFormat(pattern="yyyy-MM-dd HH:mm:ss", locale = "zh" , timezone="GMT+8")
@JSONField(name = "last_time" , format="yyyy-MM-dd HH:mm:ss")
@JsonProperty("last_time")
private BigInteger lastTime;
private Timestamp lastTime;
/**
* 属性 [NEXT_TIME]
*
*/
@JSONField(name = "next_time")
@JsonFormat(pattern="yyyy-MM-dd HH:mm:ss", locale = "zh" , timezone="GMT+8")
@JSONField(name = "next_time" , format="yyyy-MM-dd HH:mm:ss")
@JsonProperty("next_time")
private BigInteger nextTime;
private Timestamp nextTime;
/**
* 属性 [AUTHOR]
......@@ -131,17 +133,19 @@ public class JobsInfoDTO extends DTOBase implements Serializable {
* 属性 [UPDATE_TIME]
*
*/
@JSONField(name = "update_time")
@JsonFormat(pattern="yyyy-MM-dd HH:mm:ss", locale = "zh" , timezone="GMT+8")
@JSONField(name = "update_time" , format="yyyy-MM-dd HH:mm:ss")
@JsonProperty("update_time")
private BigInteger updateTime;
private Timestamp updateTime;
/**
* 属性 [CREATE_TIME]
*
*/
@JSONField(name = "create_time")
@JsonFormat(pattern="yyyy-MM-dd HH:mm:ss", locale = "zh" , timezone="GMT+8")
@JSONField(name = "create_time" , format="yyyy-MM-dd HH:mm:ss")
@JsonProperty("create_time")
private BigInteger createTime;
private Timestamp createTime;
/**
......@@ -203,7 +207,7 @@ public class JobsInfoDTO extends DTOBase implements Serializable {
/**
* 设置 [LAST_TIME]
*/
public void setLastTime(BigInteger lastTime){
public void setLastTime(Timestamp lastTime){
this.lastTime = lastTime ;
this.modify("last_time",lastTime);
}
......@@ -211,7 +215,7 @@ public class JobsInfoDTO extends DTOBase implements Serializable {
/**
* 设置 [NEXT_TIME]
*/
public void setNextTime(BigInteger nextTime){
public void setNextTime(Timestamp nextTime){
this.nextTime = nextTime ;
this.modify("next_time",nextTime);
}
......@@ -243,7 +247,7 @@ public class JobsInfoDTO extends DTOBase implements Serializable {
/**
* 设置 [UPDATE_TIME]
*/
public void setUpdateTime(BigInteger updateTime){
public void setUpdateTime(Timestamp updateTime){
this.updateTime = updateTime ;
this.modify("update_time",updateTime);
}
......@@ -251,7 +255,7 @@ public class JobsInfoDTO extends DTOBase implements Serializable {
/**
* 设置 [CREATE_TIME]
*/
public void setCreateTime(BigInteger createTime){
public void setCreateTime(Timestamp createTime){
this.createTime = createTime ;
this.modify("create_time",createTime);
}
......
ibztask-provider/ibztask-provider-api/src/main/java/cn/ibizlab/api/dto/JobsLockDTO.java
浏览文件 @ 55b185a1
......@@ -29,7 +29,7 @@ public class JobsLockDTO extends DTOBase implements Serializable {
*/
@JSONField(name = "id")
@JsonProperty("id")
private BigInteger id;
private String id;
/**
* 属性 [NAME]
......@@ -51,9 +51,10 @@ public class JobsLockDTO extends DTOBase implements Serializable {
* 属性 [CREATE_TIME]
*
*/
@JSONField(name = "create_time")
@JsonFormat(pattern="yyyy-MM-dd HH:mm:ss", locale = "zh" , timezone="GMT+8")
@JSONField(name = "create_time" , format="yyyy-MM-dd HH:mm:ss")
@JsonProperty("create_time")
private BigInteger createTime;
private Timestamp createTime;
/**
......@@ -75,7 +76,7 @@ public class JobsLockDTO extends DTOBase implements Serializable {
/**
* 设置 [CREATE_TIME]
*/
public void setCreateTime(BigInteger createTime){
public void setCreateTime(Timestamp createTime){
this.createTime = createTime ;
this.modify("create_time",createTime);
}
......
ibztask-provider/ibztask-provider-api/src/main/java/cn/ibizlab/api/dto/JobsLogDTO.java
浏览文件 @ 55b185a1
......@@ -29,7 +29,7 @@ public class JobsLogDTO extends DTOBase implements Serializable {
*/
@JSONField(name = "id")
@JsonProperty("id")
private BigInteger id;
private String id;
/**
* 属性 [JOB_ID]
......@@ -37,7 +37,7 @@ public class JobsLogDTO extends DTOBase implements Serializable {
*/
@JSONField(name = "job_id")
@JsonProperty("job_id")
private BigInteger jobId;
private String jobId;
/**
* 属性 [ADDRESS]
......@@ -99,15 +99,16 @@ public class JobsLogDTO extends DTOBase implements Serializable {
* 属性 [CREATE_TIME]
*
*/
@JSONField(name = "create_time")
@JsonFormat(pattern="yyyy-MM-dd HH:mm:ss", locale = "zh" , timezone="GMT+8")
@JSONField(name = "create_time" , format="yyyy-MM-dd HH:mm:ss")
@JsonProperty("create_time")
private BigInteger createTime;
private Timestamp createTime;
/**
* 设置 [JOB_ID]
*/
public void setJobId(BigInteger jobId){
public void setJobId(String jobId){
this.jobId = jobId ;
this.modify("job_id",jobId);
}
......@@ -171,7 +172,7 @@ public class JobsLogDTO extends DTOBase implements Serializable {
/**
* 设置 [CREATE_TIME]
*/
public void setCreateTime(BigInteger createTime){
public void setCreateTime(Timestamp createTime){
this.createTime = createTime ;
this.modify("create_time",createTime);
}
......
ibztask-provider/ibztask-provider-api/src/main/java/cn/ibizlab/api/dto/JobsRegistryDTO.java
浏览文件 @ 55b185a1
......@@ -29,7 +29,7 @@ public class JobsRegistryDTO extends DTOBase implements Serializable {
*/
@JSONField(name = "id")
@JsonProperty("id")
private BigInteger id;
private String id;
/**
* 属性 [APP]
......@@ -59,9 +59,10 @@ public class JobsRegistryDTO extends DTOBase implements Serializable {
* 属性 [UPDATE_TIME]
*
*/
@JSONField(name = "update_time")
@JsonFormat(pattern="yyyy-MM-dd HH:mm:ss", locale = "zh" , timezone="GMT+8")
@JSONField(name = "update_time" , format="yyyy-MM-dd HH:mm:ss")
@JsonProperty("update_time")
private BigInteger updateTime;
private Timestamp updateTime;
/**
......@@ -91,7 +92,7 @@ public class JobsRegistryDTO extends DTOBase implements Serializable {
/**
* 设置 [UPDATE_TIME]
*/
public void setUpdateTime(BigInteger updateTime){
public void setUpdateTime(Timestamp updateTime){
this.updateTime = updateTime ;
this.modify("update_time",updateTime);
}
......
ibztask-provider/ibztask-provider-api/src/main/java/cn/ibizlab/api/rest/JobsInfoResource.java
浏览文件 @ 55b185a1
......@@ -50,7 +50,7 @@ public class JobsInfoResource {
@ApiOperation(value = "开始", tags = {"任务信息" }, notes = "开始")
@RequestMapping(method = RequestMethod.POST, value = "/jobsinfos/{jobsinfo_id}/start")
@Transactional
public ResponseEntity<JobsInfoDTO> start(@PathVariable("jobsinfo_id") BigInteger jobsinfo_id, @RequestBody JobsInfoDTO jobsinfodto) {
public ResponseEntity<JobsInfoDTO> start(@PathVariable("jobsinfo_id") String jobsinfo_id, @RequestBody JobsInfoDTO jobsinfodto) {
JobsInfo jobsinfo = jobsinfoMapping.toDomain(jobsinfodto);
jobsinfo.setId(jobsinfo_id);
jobsinfo = jobsinfoService.start(jobsinfo);
......@@ -62,7 +62,7 @@ public class JobsInfoResource {
@ApiOperation(value = "更新任务信息", tags = {"任务信息" }, notes = "更新任务信息")
@RequestMapping(method = RequestMethod.PUT, value = "/jobsinfos/{jobsinfo_id}")
@Transactional
public ResponseEntity<JobsInfoDTO> update(@PathVariable("jobsinfo_id") BigInteger jobsinfo_id, @RequestBody JobsInfoDTO jobsinfodto) {
public ResponseEntity<JobsInfoDTO> update(@PathVariable("jobsinfo_id") String jobsinfo_id, @RequestBody JobsInfoDTO jobsinfodto) {
JobsInfo domain = jobsinfoMapping.toDomain(jobsinfodto);
domain .setId(jobsinfo_id);
jobsinfoService.update(domain );
......@@ -88,7 +88,7 @@ public class JobsInfoResource {
@ApiOperation(value = "执行", tags = {"任务信息" }, notes = "执行")
@RequestMapping(method = RequestMethod.POST, value = "/jobsinfos/{jobsinfo_id}/execute")
@Transactional
public ResponseEntity<JobsInfoDTO> execute(@PathVariable("jobsinfo_id") BigInteger jobsinfo_id, @RequestBody JobsInfoDTO jobsinfodto) {
public ResponseEntity<JobsInfoDTO> execute(@PathVariable("jobsinfo_id") String jobsinfo_id, @RequestBody JobsInfoDTO jobsinfodto) {
JobsInfo jobsinfo = jobsinfoMapping.toDomain(jobsinfodto);
jobsinfo.setId(jobsinfo_id);
jobsinfo = jobsinfoService.execute(jobsinfo);
......@@ -121,14 +121,14 @@ public class JobsInfoResource {
@ApiOperation(value = "删除任务信息", tags = {"任务信息" }, notes = "删除任务信息")
@RequestMapping(method = RequestMethod.DELETE, value = "/jobsinfos/{jobsinfo_id}")
@Transactional
public ResponseEntity<Boolean> remove(@PathVariable("jobsinfo_id") BigInteger jobsinfo_id) {
public ResponseEntity<Boolean> remove(@PathVariable("jobsinfo_id") String jobsinfo_id) {
return ResponseEntity.status(HttpStatus.OK).body(jobsinfoService.remove(jobsinfo_id));
}
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibztask-JobsInfo-Remove-all')")
@ApiOperation(value = "批量删除任务信息", tags = {"任务信息" }, notes = "批量删除任务信息")
@RequestMapping(method = RequestMethod.DELETE, value = "/jobsinfos/batch")
public ResponseEntity<Boolean> removeBatch(@RequestBody List<BigInteger> ids) {
public ResponseEntity<Boolean> removeBatch(@RequestBody List<String> ids) {
jobsinfoService.removeBatch(ids);
return ResponseEntity.status(HttpStatus.OK).body(true);
}
......@@ -136,7 +136,7 @@ public class JobsInfoResource {
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibztask-JobsInfo-Get-all')")
@ApiOperation(value = "获取任务信息", tags = {"任务信息" }, notes = "获取任务信息")
@RequestMapping(method = RequestMethod.GET, value = "/jobsinfos/{jobsinfo_id}")
public ResponseEntity<JobsInfoDTO> get(@PathVariable("jobsinfo_id") BigInteger jobsinfo_id) {
public ResponseEntity<JobsInfoDTO> get(@PathVariable("jobsinfo_id") String jobsinfo_id) {
JobsInfo domain = jobsinfoService.get(jobsinfo_id);
JobsInfoDTO dto = jobsinfoMapping.toDto(domain);
return ResponseEntity.status(HttpStatus.OK).body(dto);
......@@ -165,7 +165,7 @@ public class JobsInfoResource {
@ApiOperation(value = "停止", tags = {"任务信息" }, notes = "停止")
@RequestMapping(method = RequestMethod.POST, value = "/jobsinfos/{jobsinfo_id}/stop")
@Transactional
public ResponseEntity<JobsInfoDTO> stop(@PathVariable("jobsinfo_id") BigInteger jobsinfo_id, @RequestBody JobsInfoDTO jobsinfodto) {
public ResponseEntity<JobsInfoDTO> stop(@PathVariable("jobsinfo_id") String jobsinfo_id, @RequestBody JobsInfoDTO jobsinfodto) {
JobsInfo jobsinfo = jobsinfoMapping.toDomain(jobsinfodto);
jobsinfo.setId(jobsinfo_id);
jobsinfo = jobsinfoService.stop(jobsinfo);
......
ibztask-provider/ibztask-provider-api/src/main/java/cn/ibizlab/api/rest/JobsLockResource.java
浏览文件 @ 55b185a1
......@@ -83,7 +83,7 @@ public class JobsLockResource {
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibztask-JobsLock-Get-all')")
@ApiOperation(value = "获取任务锁", tags = {"任务锁" }, notes = "获取任务锁")
@RequestMapping(method = RequestMethod.GET, value = "/jobslocks/{jobslock_id}")
public ResponseEntity<JobsLockDTO> get(@PathVariable("jobslock_id") BigInteger jobslock_id) {
public ResponseEntity<JobsLockDTO> get(@PathVariable("jobslock_id") String jobslock_id) {
JobsLock domain = jobslockService.get(jobslock_id);
JobsLockDTO dto = jobslockMapping.toDto(domain);
return ResponseEntity.status(HttpStatus.OK).body(dto);
......@@ -93,7 +93,7 @@ public class JobsLockResource {
@ApiOperation(value = "更新任务锁", tags = {"任务锁" }, notes = "更新任务锁")
@RequestMapping(method = RequestMethod.PUT, value = "/jobslocks/{jobslock_id}")
@Transactional
public ResponseEntity<JobsLockDTO> update(@PathVariable("jobslock_id") BigInteger jobslock_id, @RequestBody JobsLockDTO jobslockdto) {
public ResponseEntity<JobsLockDTO> update(@PathVariable("jobslock_id") String jobslock_id, @RequestBody JobsLockDTO jobslockdto) {
JobsLock domain = jobslockMapping.toDomain(jobslockdto);
domain .setId(jobslock_id);
jobslockService.update(domain );
......@@ -119,14 +119,14 @@ public class JobsLockResource {
@ApiOperation(value = "删除任务锁", tags = {"任务锁" }, notes = "删除任务锁")
@RequestMapping(method = RequestMethod.DELETE, value = "/jobslocks/{jobslock_id}")
@Transactional
public ResponseEntity<Boolean> remove(@PathVariable("jobslock_id") BigInteger jobslock_id) {
public ResponseEntity<Boolean> remove(@PathVariable("jobslock_id") String jobslock_id) {
return ResponseEntity.status(HttpStatus.OK).body(jobslockService.remove(jobslock_id));
}
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibztask-JobsLock-Remove-all')")
@ApiOperation(value = "批量删除任务锁", tags = {"任务锁" }, notes = "批量删除任务锁")
@RequestMapping(method = RequestMethod.DELETE, value = "/jobslocks/batch")
public ResponseEntity<Boolean> removeBatch(@RequestBody List<BigInteger> ids) {
public ResponseEntity<Boolean> removeBatch(@RequestBody List<String> ids) {
jobslockService.removeBatch(ids);
return ResponseEntity.status(HttpStatus.OK).body(true);
}
......
ibztask-provider/ibztask-provider-api/src/main/java/cn/ibizlab/api/rest/JobsLogResource.java
浏览文件 @ 55b185a1
......@@ -56,7 +56,7 @@ public class JobsLogResource {
@ApiOperation(value = "更新任务调度日志", tags = {"任务调度日志" }, notes = "更新任务调度日志")
@RequestMapping(method = RequestMethod.PUT, value = "/jobslogs/{jobslog_id}")
@Transactional
public ResponseEntity<JobsLogDTO> update(@PathVariable("jobslog_id") BigInteger jobslog_id, @RequestBody JobsLogDTO jobslogdto) {
public ResponseEntity<JobsLogDTO> update(@PathVariable("jobslog_id") String jobslog_id, @RequestBody JobsLogDTO jobslogdto) {
JobsLog domain = jobslogMapping.toDomain(jobslogdto);
domain .setId(jobslog_id);
jobslogService.update(domain );
......@@ -116,14 +116,14 @@ public class JobsLogResource {
@ApiOperation(value = "删除任务调度日志", tags = {"任务调度日志" }, notes = "删除任务调度日志")
@RequestMapping(method = RequestMethod.DELETE, value = "/jobslogs/{jobslog_id}")
@Transactional
public ResponseEntity<Boolean> remove(@PathVariable("jobslog_id") BigInteger jobslog_id) {
public ResponseEntity<Boolean> remove(@PathVariable("jobslog_id") String jobslog_id) {
return ResponseEntity.status(HttpStatus.OK).body(jobslogService.remove(jobslog_id));
}
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibztask-JobsLog-Remove-all')")
@ApiOperation(value = "批量删除任务调度日志", tags = {"任务调度日志" }, notes = "批量删除任务调度日志")
@RequestMapping(method = RequestMethod.DELETE, value = "/jobslogs/batch")
public ResponseEntity<Boolean> removeBatch(@RequestBody List<BigInteger> ids) {
public ResponseEntity<Boolean> removeBatch(@RequestBody List<String> ids) {
jobslogService.removeBatch(ids);
return ResponseEntity.status(HttpStatus.OK).body(true);
}
......@@ -131,7 +131,7 @@ public class JobsLogResource {
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibztask-JobsLog-Get-all')")
@ApiOperation(value = "获取任务调度日志", tags = {"任务调度日志" }, notes = "获取任务调度日志")
@RequestMapping(method = RequestMethod.GET, value = "/jobslogs/{jobslog_id}")
public ResponseEntity<JobsLogDTO> get(@PathVariable("jobslog_id") BigInteger jobslog_id) {
public ResponseEntity<JobsLogDTO> get(@PathVariable("jobslog_id") String jobslog_id) {
JobsLog domain = jobslogService.get(jobslog_id);
JobsLogDTO dto = jobslogMapping.toDto(domain);
return ResponseEntity.status(HttpStatus.OK).body(dto);
......
ibztask-provider/ibztask-provider-api/src/main/java/cn/ibizlab/api/rest/JobsRegistryResource.java
浏览文件 @ 55b185a1
......@@ -49,7 +49,7 @@ public class JobsRegistryResource {
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibztask-JobsRegistry-Get-all')")
@ApiOperation(value = "获取任务注册信息", tags = {"任务注册信息" }, notes = "获取任务注册信息")
@RequestMapping(method = RequestMethod.GET, value = "/jobsregistries/{jobsregistry_id}")
public ResponseEntity<JobsRegistryDTO> get(@PathVariable("jobsregistry_id") BigInteger jobsregistry_id) {
public ResponseEntity<JobsRegistryDTO> get(@PathVariable("jobsregistry_id") String jobsregistry_id) {
JobsRegistry domain = jobsregistryService.get(jobsregistry_id);
JobsRegistryDTO dto = jobsregistryMapping.toDto(domain);
return ResponseEntity.status(HttpStatus.OK).body(dto);
......@@ -59,14 +59,14 @@ public class JobsRegistryResource {
@ApiOperation(value = "删除任务注册信息", tags = {"任务注册信息" }, notes = "删除任务注册信息")
@RequestMapping(method = RequestMethod.DELETE, value = "/jobsregistries/{jobsregistry_id}")
@Transactional
public ResponseEntity<Boolean> remove(@PathVariable("jobsregistry_id") BigInteger jobsregistry_id) {
public ResponseEntity<Boolean> remove(@PathVariable("jobsregistry_id") String jobsregistry_id) {
return ResponseEntity.status(HttpStatus.OK).body(jobsregistryService.remove(jobsregistry_id));
}
@PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','ibztask-JobsRegistry-Remove-all')")
@ApiOperation(value = "批量删除任务注册信息", tags = {"任务注册信息" }, notes = "批量删除任务注册信息")
@RequestMapping(method = RequestMethod.DELETE, value = "/jobsregistries/batch")
public ResponseEntity<Boolean> removeBatch(@RequestBody List<BigInteger> ids) {
public ResponseEntity<Boolean> removeBatch(@RequestBody List<String> ids) {
jobsregistryService.removeBatch(ids);
return ResponseEntity.status(HttpStatus.OK).body(true);
}
......@@ -75,7 +75,7 @@ public class JobsRegistryResource {
@ApiOperation(value = "更新任务注册信息", tags = {"任务注册信息" }, notes = "更新任务注册信息")
@RequestMapping(method = RequestMethod.PUT, value = "/jobsregistries/{jobsregistry_id}")
@Transactional
public ResponseEntity<JobsRegistryDTO> update(@PathVariable("jobsregistry_id") BigInteger jobsregistry_id, @RequestBody JobsRegistryDTO jobsregistrydto) {
public ResponseEntity<JobsRegistryDTO> update(@PathVariable("jobsregistry_id") String jobsregistry_id, @RequestBody JobsRegistryDTO jobsregistrydto) {
JobsRegistry domain = jobsregistryMapping.toDomain(jobsregistrydto);
domain .setId(jobsregistry_id);
jobsregistryService.update(domain );
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或