大声道撒旦
This commit is contained in:
parent
ef3583f215
commit
7652a9ad27
@ -28,6 +28,6 @@ public class ApplicationQuery extends BaseQuery {
|
|||||||
@QueryField(field = "buildType")
|
@QueryField(field = "buildType")
|
||||||
private String buildType;
|
private String buildType;
|
||||||
|
|
||||||
@QueryField(field = "devLanguage")
|
@QueryField(field = "languageType")
|
||||||
private String devLanguage;
|
private String languageType;
|
||||||
}
|
}
|
||||||
@ -1,7 +1,9 @@
|
|||||||
package com.qqchen.deploy.backend.deploy.query;
|
package com.qqchen.deploy.backend.deploy.query;
|
||||||
|
|
||||||
import com.qqchen.deploy.backend.deploy.enums.BuildTypeEnum;
|
import com.qqchen.deploy.backend.deploy.enums.BuildTypeEnum;
|
||||||
|
import com.qqchen.deploy.backend.deploy.enums.DevelopmentLanguageTypeEnum;
|
||||||
import com.qqchen.deploy.backend.framework.annotation.QueryField;
|
import com.qqchen.deploy.backend.framework.annotation.QueryField;
|
||||||
|
import com.qqchen.deploy.backend.framework.enums.QueryType;
|
||||||
import com.qqchen.deploy.backend.framework.query.BaseQuery;
|
import com.qqchen.deploy.backend.framework.query.BaseQuery;
|
||||||
import io.swagger.v3.oas.annotations.media.Schema;
|
import io.swagger.v3.oas.annotations.media.Schema;
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
@ -26,4 +28,7 @@ public class DeployAppConfigQuery extends BaseQuery {
|
|||||||
@Schema(description = "构建类型")
|
@Schema(description = "构建类型")
|
||||||
@QueryField(field = "buildType")
|
@QueryField(field = "buildType")
|
||||||
private BuildTypeEnum buildType;
|
private BuildTypeEnum buildType;
|
||||||
|
|
||||||
|
@QueryField(field = "languageType", type = QueryType.EQUAL)
|
||||||
|
private DevelopmentLanguageTypeEnum languageType;
|
||||||
}
|
}
|
||||||
@ -47,7 +47,7 @@ public class ApplicationServiceImpl extends BaseServiceImpl<Application, Applica
|
|||||||
List<DevelopmentLanguageTypeDTO> result = new ArrayList<>();
|
List<DevelopmentLanguageTypeDTO> result = new ArrayList<>();
|
||||||
Arrays.stream(DevelopmentLanguageTypeEnum.values()).forEach(developmentLanguageTypeEnum -> {
|
Arrays.stream(DevelopmentLanguageTypeEnum.values()).forEach(developmentLanguageTypeEnum -> {
|
||||||
DevelopmentLanguageTypeDTO dto = new DevelopmentLanguageTypeDTO();
|
DevelopmentLanguageTypeDTO dto = new DevelopmentLanguageTypeDTO();
|
||||||
dto.setCode(developmentLanguageTypeEnum.getCode());
|
dto.setCode(developmentLanguageTypeEnum.name());
|
||||||
dto.setName(developmentLanguageTypeEnum.getCode());
|
dto.setName(developmentLanguageTypeEnum.getCode());
|
||||||
result.add(dto);
|
result.add(dto);
|
||||||
});
|
});
|
||||||
|
|||||||
@ -52,7 +52,9 @@ import com.qqchen.deploy.backend.framework.annotation.ServiceType;
|
|||||||
public abstract class BaseServiceImpl<T extends Entity<ID>, D extends BaseDTO, Q extends BaseQuery, ID extends Serializable> implements IBaseService<T, D, Q, ID> {
|
public abstract class BaseServiceImpl<T extends Entity<ID>, D extends BaseDTO, Q extends BaseQuery, ID extends Serializable> implements IBaseService<T, D, Q, ID> {
|
||||||
|
|
||||||
protected IBaseRepository<T, ID> repository;
|
protected IBaseRepository<T, ID> repository;
|
||||||
|
|
||||||
protected BaseConverter<T, D> converter;
|
protected BaseConverter<T, D> converter;
|
||||||
|
|
||||||
protected EntityPath<T> entityPath;
|
protected EntityPath<T> entityPath;
|
||||||
|
|
||||||
@PersistenceContext
|
@PersistenceContext
|
||||||
@ -199,6 +201,8 @@ public abstract class BaseServiceImpl<T extends Entity<ID>, D extends BaseDTO, Q
|
|||||||
condition = createNumberCondition((NumberPath<?>) path, value, queryType);
|
condition = createNumberCondition((NumberPath<?>) path, value, queryType);
|
||||||
} else if (path instanceof DateTimePath) {
|
} else if (path instanceof DateTimePath) {
|
||||||
condition = createDateCondition((DateTimePath<?>) path, value, queryType);
|
condition = createDateCondition((DateTimePath<?>) path, value, queryType);
|
||||||
|
} else if (path instanceof EnumPath) { // 添加对枚举类型的支持
|
||||||
|
condition = ((EnumPath) path).eq(value);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (condition != null) {
|
if (condition != null) {
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user