xinyin025/RuoYi-Vue-Plus
1
0
Fork 0
mirror of https://github.com/dromara/RuoYi-Vue-Plus.git synced 2025-09-29 22:56:40 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

add 添加模型分类查询

Browse Source
This commit is contained in:
songgaoshuai 2023-06-30 12:54:05 +08:00
parent b809773773
commit 52bf215b6d
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/ModelBo.java
View File

@ -33,6 +33,12 @@ public class ModelBo extends PageEntity implements Serializable {
@NotBlank(message = "模型标识key不能为空", groups = {AddGroup.class}) @NotBlank(message = "模型标识key不能为空", groups = {AddGroup.class})
private String key; private String key;
/**
* 模型标识key
*/
@NotBlank(message = "模型分类不能为空", groups = {AddGroup.class})
private String categoryCode;
/** /**
* 备注 * 备注
*/ */

4
ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActModelServiceImpl.java
View File

@ -83,6 +83,9 @@ public class ActModelServiceImpl implements IActModelService {
if (StringUtils.isNotEmpty(modelBo.getKey())) { if (StringUtils.isNotEmpty(modelBo.getKey())) {
query.modelKey(modelBo.getKey()); query.modelKey(modelBo.getKey());
} }
if (StringUtils.isNotEmpty(modelBo.getCategoryCode())) {
query.modelCategory(modelBo.getCategoryCode());
}
query.orderByLastUpdateTime().desc(); query.orderByLastUpdateTime().desc();
//创建时间降序排列 //创建时间降序排列
query.orderByCreateTime().desc(); query.orderByCreateTime().desc();
@ -125,6 +128,7 @@ public class ActModelServiceImpl implements IActModelService {
Model model = repositoryService.newModel(); Model model = repositoryService.newModel();
model.setKey(key); model.setKey(key);
model.setName(name); model.setName(name);
model.setCategory(modelBo.getCategoryCode());
model.setVersion(version); model.setVersion(version);
model.setTenantId(TenantHelper.getTenantId()); model.setTenantId(TenantHelper.getTenantId());
ObjectMapper objectMapper = JsonUtils.getObjectMapper(); ObjectMapper objectMapper = JsonUtils.getObjectMapper();