优化接口

src/main/java/com/cczsa/xinghe/codegen/entity/req/funItem/FunItemQueryReq.java

@@ -1,9 +1,9 @@
 package com.cczsa.xinghe.codegen.entity.req.funItem;
 
 import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotNull;
 import lombok.Getter;
 import lombok.Setter;
+
 import java.io.Serial;
 import java.io.Serializable;
 
@@ -20,7 +20,6 @@ public class FunItemQueryReq implements Serializable {
     @Serial
     private static final long serialVersionUID = 1L;
 
-    @NotNull(message = "模块ID不能为空")
     @Schema(description = "模块ID")
     private Long moduleId;
 

src/main/java/com/cczsa/xinghe/codegen/entity/req/funOperation/FunOperationQueryReq.java

@@ -4,14 +4,10 @@ import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.NotNull;
 import lombok.Getter;
 import lombok.Setter;
+
 import java.io.Serial;
 import java.io.Serializable;
 
-/**
- * 获取操作列表 请求参数
- * @author xia
- * @version 0.0.1
- */
 @Getter
 @Setter
 @Schema(description = "获取操作列表-参数")
@@ -20,6 +16,11 @@ public class FunOperationQueryReq implements Serializable {
     @Serial
     private static final long serialVersionUID = 1L;
 
+    
+    @Schema(description = "模块ID")
+    @NotNull(message = "模块ID不能为空")
+    private Long moduleId;
+
     @Schema(description = "功能ID(表主键ID)")
     private Long itemId;
 
@@ -29,4 +30,4 @@ public class FunOperationQueryReq implements Serializable {
     @Schema(description = "操作编码")
     private String operationCode;
 
-}
+}

src/main/java/com/cczsa/xinghe/codegen/entity/res/funItem/FunItemQueryRes.java

@@ -27,6 +27,9 @@ public class FunItemQueryRes implements Serializable {
     @Schema(description = "模块ID")
     private Long moduleId;
 
+    @Schema(description = "模块名称")
+    private String moduleName;
+
     @Schema(description = "功能名称")
     private String itemName;
 

src/main/java/com/cczsa/xinghe/codegen/entity/res/funOperation/FunOperationQueryRes.java

@@ -6,11 +6,6 @@ import com.cczsa.xinghe.codegen.entity.enums.UsableConfigEnum;
 import com.cczsa.xinghe.codegen.handler.PostgreSQLJsonTypeHandler;
 import com.mybatisflex.annotation.Column;
 import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.Max;
-import jakarta.validation.constraints.Min;
-import jakarta.validation.constraints.NotBlank;
-import jakarta.validation.constraints.NotNull;
-import jakarta.validation.constraints.Pattern;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -38,9 +33,15 @@ public class FunOperationQueryRes implements Serializable {
     @Schema(description = "模块ID(表主键ID)")
     private Long moduleId;
 
+    @Schema(description = "模块名称")
+    private String moduleName;
+
     @Schema(description = "功能ID(表主键ID)")
     private Long itemId;
 
+    @Schema(description = "功能名称")
+    private String itemName;
+
     @Schema(description = "是否直接放行")
     private Boolean isGreenLight;
 

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

@@ -12,10 +12,12 @@ import com.cczsa.xinghe.codegen.mapper.FunItemMapper;
 import com.cczsa.xinghe.codegen.mapper.FunModuleMapper;
 import com.cczsa.xinghe.codegen.mapper.FunOperationMapper;
 import com.cczsa.xinghe.codegen.mapper.def.FunItemDef;
+import com.cczsa.xinghe.codegen.mapper.def.FunModuleDef;
 import com.cczsa.xinghe.codegen.service.FunItemService;
 import com.cczsa.xinghe.codegen.util.XResult;
 import com.github.xiaoymin.knife4j.core.util.StrUtil;
 import com.mybatisflex.core.query.QueryWrapper;
+import com.mybatisflex.core.util.ObjectUtil;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
@@ -43,10 +45,12 @@ public class FunItemServiceImpl implements FunItemService {
     @Override
     public XResult<List<FunItemQueryRes>> query(FunItemQueryReq req) {
         FunItemDef funItemDef = FunItemDef.FUN_ITEM_ENTITY;
+        FunModuleDef funModuleDef = FunModuleDef.FUN_MODULE_ENTITY;
         QueryWrapper queryWrapper = new QueryWrapper();
-        queryWrapper.select(funItemDef.ALL_COLUMNS)
+        queryWrapper.select(funItemDef.ALL_COLUMNS,funModuleDef.MODULE_NAME)
                 .from(funItemDef)
-                .eq(FunItemEntity::getModuleId, req.getModuleId())
+                .join(funModuleDef).on(funItemDef.MODULE_ID.eq(funModuleDef.ID))
+                .eq(FunItemEntity::getModuleId, req.getModuleId(), ObjectUtil.areNotNull(req.getModuleId()))
                 .like(FunItemEntity::getItemName, req.getItemName(), StrUtil.isNotBlank(req.getItemName()))
                 .like(FunItemEntity::getItemCode, req.getItemCode(), StrUtil.isNotBlank(req.getItemCode()))
                 .orderBy(FunItemEntity::getSortOrder, false);

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

@@ -10,6 +10,8 @@ import com.cczsa.xinghe.codegen.entity.res.funOperation.FunOperationQueryRes;
 import com.cczsa.xinghe.codegen.mapper.FunItemMapper;
 import com.cczsa.xinghe.codegen.mapper.FunModuleMapper;
 import com.cczsa.xinghe.codegen.mapper.FunOperationMapper;
+import com.cczsa.xinghe.codegen.mapper.def.FunItemDef;
+import com.cczsa.xinghe.codegen.mapper.def.FunModuleDef;
 import com.cczsa.xinghe.codegen.mapper.def.FunOperationDef;
 import com.cczsa.xinghe.codegen.service.FunOperationService;
 import com.cczsa.xinghe.codegen.util.XResult;
@@ -42,10 +44,15 @@ public class FunOperationServiceImpl implements FunOperationService {
     @Override
     public XResult<List<FunOperationQueryRes>> query(FunOperationQueryReq req) {
         FunOperationDef funOperationDef = FunOperationDef.FUN_OPERATION_ENTITY;
+        FunModuleDef funModuleDef = FunModuleDef.FUN_MODULE_ENTITY;
+        FunItemDef funItemDef = FunItemDef.FUN_ITEM_ENTITY;
         QueryWrapper queryWrapper = new QueryWrapper();
-        queryWrapper.select(funOperationDef.ALL_COLUMNS)
+        queryWrapper.select(funOperationDef.ALL_COLUMNS,funItemDef.ITEM_NAME, funModuleDef.MODULE_NAME)
                 .from(funOperationDef)
-                .eq(FunOperationEntity::getItemId, req.getItemId())
+                .join(funItemDef).on(funOperationDef.ITEM_ID.eq(funItemDef.ID))
+                .join(funModuleDef).on(funOperationDef.MODULE_ID.eq(funModuleDef.ID))
+                .eq(FunOperationEntity::getModuleId, req.getModuleId())
+                .eq(FunOperationEntity::getItemId, req.getItemId(), req.getItemId() != null)
                 .like(FunOperationEntity::getOperationCode, req.getOperationCode(), StrUtil.isNotBlank(req.getOperationCode()))
                 .like(FunOperationEntity::getFunName, req.getFunName(), StrUtil.isNotBlank(req.getFunName()))
                 .orderBy(FunOperationEntity::getSortOrder, false);