ContiNew/continew-admin
1
1
Fork 0
mirror of https://github.com/continew-org/continew-admin.git synced 2025-09-12 16:57:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

refactor: 优化接口文档枚举参数显示效果

Browse Source
This commit is contained in:
Charles7c
2024-07-24 22:25:55 +08:00
parent 00c33226c8
commit 770fda3882
49 changed files with 144 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
continew-admin-plugins/continew-admin-generator/src/main/java/top/continew/admin/generator/enums/FormTypeEnum.java
View File

@@ -88,4 +88,9 @@ public enum FormTypeEnum implements IBaseEnum<Integer> {
private final Integer value;
private final String description;
@Override
public String toString() {
return "%s: %s".formatted(this.value, this.description);
}
}

5
continew-admin-plugins/continew-admin-generator/src/main/java/top/continew/admin/generator/enums/QueryTypeEnum.java
View File

@@ -103,4 +103,9 @@ public enum QueryTypeEnum implements IBaseEnum<Integer> {
private final Integer value;
private final String description;
@Override
public String toString() {
return "%s: %s".formatted(this.value, this.description);
}
}

5
continew-admin-plugins/continew-admin-generator/src/main/java/top/continew/admin/generator/model/entity/FieldConfigDO.java
View File

@@ -132,14 +132,13 @@ public class FieldConfigDO implements Serializable {
/**
* 表单类型
*/
@Schema(description = "表单类型", type = "Integer", allowableValues = {"1", "2", "3", "4", "5", "6"}, example = "1")
@Schema(description = "表单类型", example = "1")
private FormTypeEnum formType;
/**
* 查询方式
*/
@Schema(description = "查询方式", type = "Integer", allowableValues = {"1", "2", "3", "4", "5", "6", "7", "8", "9",
"10", "11", "12", "13", "14"}, example = "1")
@Schema(description = "查询方式", example = "1")
private QueryTypeEnum queryType;
/**

5
continew-admin-plugins/continew-admin-job/src/main/java/top/continew/admin/job/enums/JobBlockStrategyEnum.java
View File

@@ -47,4 +47,9 @@ public enum JobBlockStrategyEnum implements IBaseEnum<Integer> {
private final Integer value;
private final String description;
@Override
public String toString() {
return "%s: %s".formatted(this.value, this.description);
}
}

5
continew-admin-plugins/continew-admin-job/src/main/java/top/continew/admin/job/enums/JobExecuteReasonEnum.java
View File

@@ -132,4 +132,9 @@ public enum JobExecuteReasonEnum implements IBaseEnum<Integer> {
private final Integer value;
private final String description;
@Override
public String toString() {
return "%s: %s".formatted(this.value, this.description);
}
}

5
continew-admin-plugins/continew-admin-job/src/main/java/top/continew/admin/job/enums/JobExecuteStatusEnum.java
View File

@@ -64,4 +64,9 @@ public enum JobExecuteStatusEnum implements IBaseEnum<Integer> {
private final Integer value;
private final String description;
private final String color;
@Override
public String toString() {
return "%s: %s".formatted(this.value, this.description);
}
}

5
continew-admin-plugins/continew-admin-job/src/main/java/top/continew/admin/job/enums/JobRouteStrategyEnum.java
View File

@@ -52,4 +52,9 @@ public enum JobRouteStrategyEnum implements IBaseEnum<Integer> {
private final Integer value;
private final String description;
@Override
public String toString() {
return "%s: %s".formatted(this.value, this.description);
}
}

5
continew-admin-plugins/continew-admin-job/src/main/java/top/continew/admin/job/enums/JobStatusEnum.java
View File

@@ -44,4 +44,9 @@ public enum JobStatusEnum implements IBaseEnum<Integer> {
private final Integer value;
private final String description;
private final String color;
@Override
public String toString() {
return "%s: %s".formatted(this.value, this.description);
}
}

5
continew-admin-plugins/continew-admin-job/src/main/java/top/continew/admin/job/enums/JobTaskTypeEnum.java
View File

@@ -49,4 +49,9 @@ public enum JobTaskTypeEnum implements IBaseEnum<Integer> {
private final Integer value;
private final String description;
private final String color;
@Override
public String toString() {
return "%s: %s".formatted(this.value, this.description);
}
}

5
continew-admin-plugins/continew-admin-job/src/main/java/top/continew/admin/job/enums/JobTriggerTypeEnum.java
View File

@@ -42,4 +42,9 @@ public enum JobTriggerTypeEnum implements IBaseEnum<Integer> {
private final Integer value;
private final String description;
@Override
public String toString() {
return "%s: %s".formatted(this.value, this.description);
}
}

3
continew-admin-plugins/continew-admin-job/src/main/java/top/continew/admin/job/model/query/JobLogQuery.java
View File

@@ -23,6 +23,7 @@ import jakarta.validation.constraints.Size;
import lombok.Data;
import org.hibernate.validator.constraints.Range;
import org.springframework.format.annotation.DateTimeFormat;
import top.continew.admin.job.enums.JobExecuteStatusEnum;
import java.io.Serial;
import java.io.Serializable;
@@ -63,7 +64,7 @@ public class JobLogQuery implements Serializable {
* 任务批次状态
*/
@Schema(description = "任务批次状态", example = "1")
private Integer taskBatchStatus;
private JobExecuteStatusEnum taskBatchStatus;
/**
* 创建时间

3
continew-admin-plugins/continew-admin-job/src/main/java/top/continew/admin/job/model/query/JobQuery.java
View File

@@ -20,6 +20,7 @@ import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.Min;
import lombok.Data;
import org.hibernate.validator.constraints.Range;
import top.continew.admin.job.enums.JobStatusEnum;
import java.io.Serial;
import java.io.Serializable;
@@ -53,7 +54,7 @@ public class JobQuery implements Serializable {
* 任务状态
*/
@Schema(description = "任务状态", example = "1")
private Integer jobStatus;
private JobStatusEnum jobStatus;
/**
* 页码

3
continew-admin-plugins/continew-admin-job/src/main/java/top/continew/admin/job/service/impl/JobLogServiceImpl.java
View File

@@ -49,7 +49,8 @@ public class JobLogServiceImpl implements JobLogService {
@Override
public PageResp<JobLogResp> page(JobLogQuery query) {
return jobClient.requestPage(() -> jobBatchApi.page(query.getJobId(), query.getJobName(), query
.getGroupName(), query.getTaskBatchStatus(), query.getDatetimeRange(), query.getPage(), query.getSize()));
.getGroupName(), query.getTaskBatchStatus().getValue(), query.getDatetimeRange(), query.getPage(), query
.getSize()));
}
@Override

4
continew-admin-plugins/continew-admin-job/src/main/java/top/continew/admin/job/service/impl/JobServiceImpl.java
View File

@@ -45,8 +45,8 @@ public class JobServiceImpl implements JobService {
@Override
public PageResp<JobResp> page(JobQuery query) {
return jobClient.requestPage(() -> jobApi.page(query.getGroupName(), query.getJobName(), query
.getJobStatus(), query.getPage(), query.getSize()));
return jobClient.requestPage(() -> jobApi.page(query.getGroupName(), query.getJobName(), query.getJobStatus()
.getValue(), query.getPage(), query.getSize()));
}
@Override