lizi/xinghe-codegen
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

排序降序，包名称限制小写字母和.

Browse Source
This commit is contained in:
zzhuan
2026-01-13 11:32:09 +08:00
parent b0d3f9c60a
commit aaa2d25367
4 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/cczsa/xinghe/codegen/entity/req/funModule/FunModuleSaveUpdateReq.java
View File

@@ -42,10 +42,12 @@ public class FunModuleSaveUpdateReq implements Serializable {
@Schema(description = "描述") @Schema(description = "描述")
private String describe; private String describe;
@Pattern(regexp = "^[a-z]+(\\.[a-z]+)*$", message = "参数包名只能包含小写英文字母和点(.)，如com.cczsa.xinghe.codegen")
@NotBlank(message = "包名称不能为空") @NotBlank(message = "包名称不能为空")
@Schema(description = "包名称") @Schema(description = "包名称")
private String packageName; private String packageName;
@Pattern(regexp = "^[a-z]+(\\.[a-z]+)*$", message = "参数包名只能包含小写英文字母和点(.)，如com.cczsa.xinghe.codegen")
@NotBlank(message = "参数包名不能为空") @NotBlank(message = "参数包名不能为空")
@Schema(description = "参数包名") @Schema(description = "参数包名")
private String apiPackageName; private String apiPackageName;

2
src/main/java/com/cczsa/xinghe/codegen/service/impl/FunItemServiceImpl.java
View File

@@ -49,7 +49,7 @@ public class FunItemServiceImpl implements FunItemService {
.eq(FunItemEntity::getModuleId, req.getModuleId()) .eq(FunItemEntity::getModuleId, req.getModuleId())
.like(FunItemEntity::getItemName, req.getItemName(), StrUtil.isNotBlank(req.getItemName())) .like(FunItemEntity::getItemName, req.getItemName(), StrUtil.isNotBlank(req.getItemName()))
.like(FunItemEntity::getItemCode, req.getItemCode(), StrUtil.isNotBlank(req.getItemCode())) .like(FunItemEntity::getItemCode, req.getItemCode(), StrUtil.isNotBlank(req.getItemCode()))
.orderBy(FunItemEntity::getSortOrder, true); .orderBy(FunItemEntity::getSortOrder, false);
List<FunItemQueryRes> funItemQueryRes = funItemMapper.selectListByQueryAs(queryWrapper, FunItemQueryRes.class); List<FunItemQueryRes> funItemQueryRes = funItemMapper.selectListByQueryAs(queryWrapper, FunItemQueryRes.class);
return XResult.ok(funItemQueryRes); return XResult.ok(funItemQueryRes);
} }

2
src/main/java/com/cczsa/xinghe/codegen/service/impl/FunModuleServiceImpl.java
View File

@@ -54,7 +54,7 @@ public class FunModuleServiceImpl implements FunModuleService {
.from(funModuleDef) .from(funModuleDef)
.like(FunModuleEntity::getModuleName, req.getModuleName(), StrUtil.isNotBlank(req.getModuleName())) .like(FunModuleEntity::getModuleName, req.getModuleName(), StrUtil.isNotBlank(req.getModuleName()))
.like(FunModuleEntity::getModuleCode, req.getModuleCode(), StrUtil.isNotBlank(req.getModuleCode())) .like(FunModuleEntity::getModuleCode, req.getModuleCode(), StrUtil.isNotBlank(req.getModuleCode()))
.orderBy(FunModuleEntity::getSortOrder, true); .orderBy(FunModuleEntity::getSortOrder, false);
List<FunModuleQueryRes> funModuleQueryRes = funModuleMapper.selectListByQueryAs(queryWrapper, FunModuleQueryRes.class); List<FunModuleQueryRes> funModuleQueryRes = funModuleMapper.selectListByQueryAs(queryWrapper, FunModuleQueryRes.class);
return XResult.ok(funModuleQueryRes); return XResult.ok(funModuleQueryRes);
} }

2
src/main/java/com/cczsa/xinghe/codegen/service/impl/FunOperationServiceImpl.java
View File

@@ -48,7 +48,7 @@ public class FunOperationServiceImpl implements FunOperationService {
.eq(FunOperationEntity::getItemId, req.getItemId()) .eq(FunOperationEntity::getItemId, req.getItemId())
.like(FunOperationEntity::getOperationCode, req.getOperationCode(), StrUtil.isNotBlank(req.getOperationCode())) .like(FunOperationEntity::getOperationCode, req.getOperationCode(), StrUtil.isNotBlank(req.getOperationCode()))
.like(FunOperationEntity::getFunName, req.getFunName(), StrUtil.isNotBlank(req.getFunName())) .like(FunOperationEntity::getFunName, req.getFunName(), StrUtil.isNotBlank(req.getFunName()))
.orderBy(FunOperationEntity::getSortOrder, true); .orderBy(FunOperationEntity::getSortOrder, false);
List<FunOperationQueryRes> funOperationQueryRes = funOperationMapper.selectListByQueryAs(queryWrapper, FunOperationQueryRes.class); List<FunOperationQueryRes> funOperationQueryRes = funOperationMapper.selectListByQueryAs(queryWrapper, FunOperationQueryRes.class);
return XResult.ok(funOperationQueryRes); return XResult.ok(funOperationQueryRes);
} }