功能增加参数

src/main/java/com/cczsa/xinghe/codegen/entity/FunItemEntity.java

@@ -71,4 +71,24 @@ public class FunItemEntity extends BaseEntity implements Serializable {
      */
     private Long itemId;
 
+    /**
+     * 是否需要请求参数
+     */
+    private Boolean isReqParams;
+
+    /**
+     * 是否需要响应参数
+     */
+    private Boolean isResParams;
+
+    /**
+     * 是否分页
+     */
+    private Boolean isPage;
+
+    /**
+     * 路径参数（与请求参数true互斥）
+     */
+    private String pathParams;
+
 }

src/main/java/com/cczsa/xinghe/codegen/entity/FunModuleEntity.java

@@ -66,24 +66,4 @@ public class FunModuleEntity extends BaseEntity implements Serializable {
      */
     private Integer sortOrder;
 
-    /**
-     * 是否需要请求参数
-     */
-    private Boolean isReqParams;
-
-    /**
-     * 是否需要响应参数
-     */
-    private Boolean isResParams;
-
-    /**
-     * 是否分页
-     */
-    private Boolean isPage;
-
-    /**
-     * 路径参数（与请求参数true互斥）
-     */
-    private String pathParams;
-
 }

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

@@ -61,4 +61,20 @@ public class FunItemSaveUpdateReq implements Serializable {
     @Max(value = 99, message = "功能ID必须大于等于10小于等于99")
     private Long itemId;
 
+    @NotNull(message = "是否需要请求参数不能为空")
+    @Schema(description = "是否需要请求参数")
+    private Boolean isReqParams;
+
+    @NotNull(message = "是否需要响应参数不能为空")
+    @Schema(description = "是否需要响应参数")
+    private Boolean isResParams;
+
+    @NotNull(message = "是否分页不能为空")
+    @Schema(description = "是否分页")
+    private Boolean isPage;
+
+    @Pattern(regexp = "^[a-zA-Z]*$", message = "路径参数只能包含英文字符")
+    @Schema(description = "路径参数")
+    private String pathParams;
+
 }

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

@@ -55,20 +55,4 @@ public class FunModuleSaveUpdateReq implements Serializable {
     @Schema(description = "排序")
     private Integer sortOrder;
 
-    @NotNull(message = "是否需要请求参数不能为空")
-    @Schema(description = "是否需要请求参数")
-    private Boolean isReqParams;
-
-    @NotNull(message = "是否需要响应参数不能为空")
-    @Schema(description = "是否需要响应参数")
-    private Boolean isResParams;
-
-    @NotNull(message = "是否分页不能为空")
-    @Schema(description = "是否分页")
-    private Boolean isPage;
-
-    @Pattern(regexp = "^[a-zA-Z]*$", message = "路径参数只能包含英文字符")
-    @Schema(description = "路径参数")
-    private String pathParams;
-
 }

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

@@ -48,4 +48,16 @@ public class FunItemQueryRes implements Serializable {
     @Schema(description = "功能ID")
     private Long itemId;
 
+    @Schema(description = "是否需要请求参数")
+    private Boolean isReqParams;
+
+    @Schema(description = "是否需要响应参数")
+    private Boolean isResParams;
+
+    @Schema(description = "是否分页")
+    private Boolean isPage;
+
+    @Schema(description = "路径参数")
+    private String pathParams;
+
 }

src/main/java/com/cczsa/xinghe/codegen/entity/res/funModule/FunModuleQueryRes.java

@@ -43,16 +43,4 @@ public class FunModuleQueryRes implements Serializable {
     @Schema(description = "排序")
     private Integer sortOrder;
 
-    @Schema(description = "是否需要请求参数")
-    private Boolean isReqParams;
-
-    @Schema(description = "是否需要响应参数")
-    private Boolean isResParams;
-
-    @Schema(description = "是否分页")
-    private Boolean isPage;
-
-    @Schema(description = "路径参数")
-    private String pathParams;
-
 }

src/main/java/com/cczsa/xinghe/codegen/mapper/def/FunItemDef.java

@@ -6,7 +6,7 @@ import com.mybatisflex.core.table.TableDef;
 import java.io.Serial;
 
 /**
- * 功能 表定义层。
+ * 功能项配置表 表定义层。
  *
  * @author My
  * @since 0.0.1
@@ -17,15 +17,20 @@ public class FunItemDef extends TableDef {
     private static final long serialVersionUID = 1L;
 
     /**
-     * 功能
+     * 功能项配置表
      */
     public static final FunItemDef FUN_ITEM_ENTITY = new FunItemDef();
 
     /**
-     * id
+     * 主键ID
      */
     public final QueryColumn ID = new QueryColumn(this, "id");
 
+    /**
+     * 是否分页
+     */
+    public final QueryColumn IS_PAGE = new QueryColumn(this, "is_page");
+
     /**
      * 功能ID
      */
@@ -61,6 +66,21 @@ public class FunItemDef extends TableDef {
      */
     public final QueryColumn SORT_ORDER = new QueryColumn(this, "sort_order");
 
+    /**
+     * 路径参数（与请求参数true互斥）
+     */
+    public final QueryColumn PATH_PARAMS = new QueryColumn(this, "path_params");
+
+    /**
+     * 是否需要请求参数
+     */
+    public final QueryColumn IS_REQ_PARAMS = new QueryColumn(this, "is_req_params");
+
+    /**
+     * 是否需要响应参数
+     */
+    public final QueryColumn IS_RES_PARAMS = new QueryColumn(this, "is_res_params");
+
     /**
      * 所有字段。
      */
@@ -69,7 +89,7 @@ public class FunItemDef extends TableDef {
     /**
      * 默认字段，不包含逻辑删除或者 large 等字段。
      */
-    public final QueryColumn[] DEFAULT_COLUMNS = new QueryColumn[]{ID, MODULE_ID, ITEM_NAME, ITEM_CODE, IS_TENANT, DESCRIBE, SORT_ORDER, ITEM_ID};
+    public final QueryColumn[] DEFAULT_COLUMNS = new QueryColumn[]{ID, MODULE_ID, ITEM_NAME, ITEM_CODE, ITEM_ID, IS_TENANT, DESCRIBE, SORT_ORDER, IS_REQ_PARAMS, IS_RES_PARAMS, IS_PAGE, PATH_PARAMS};
 
     public FunItemDef() {
         super("", "cg_fun_item");

src/main/java/com/cczsa/xinghe/codegen/mapper/def/MenuDef.java

@@ -17,7 +17,7 @@ public class MenuDef extends TableDef {
     private static final long serialVersionUID = 1L;
 
     /**
-     * 功能模块配置表
+     * 菜单
      */
     public static final MenuDef MENU_ENTITY = new MenuDef();
 
@@ -27,54 +27,42 @@ public class MenuDef extends TableDef {
     public final QueryColumn ID = new QueryColumn(this, "id");
 
     /**
-     * 是否分页
+     * 菜单图标
      */
-    public final QueryColumn IS_PAGE = new QueryColumn(this, "is_page");
+    public final QueryColumn ICON = new QueryColumn(this, "icon");
 
     /**
-     * 描述
+     * 路由路径
      */
-    public final QueryColumn DESCRIBE = new QueryColumn(this, "describe");
+    public final QueryColumn PATH = new QueryColumn(this, "path");
 
     /**
-     * 排序
+     * 是否隐藏
      */
+    public final QueryColumn IS_HIDE = new QueryColumn(this, "is_hide");
+
+    /**
+     * 是否租户
+     */
+    public final QueryColumn IS_TENANT = new QueryColumn(this, "is_tenant");
+
+    /**
+     * 菜单名称
+     */
+    public final QueryColumn MENU_NAME = new QueryColumn(this, "menu_name");
+
+    /**
+     * 父菜单ID
+     */
+    public final QueryColumn PARENT_ID = new QueryColumn(this, "parent_id");
+
+
     public final QueryColumn SORT_ORDER = new QueryColumn(this, "sort_order");
 
     /**
-     * 模块编码
+     * 客户端类型：0 PC端，1 小程序端，2 H5端
      */
-    public final QueryColumn MODULE_CODE = new QueryColumn(this, "module_code");
+    public final QueryColumn CLIENT_TYPE = new QueryColumn(this, "client_type");
-
-    /**
-     * 模块名称
-     */
-    public final QueryColumn MODULE_NAME = new QueryColumn(this, "module_name");
-
-    /**
-     * 路径参数（与请求参数true互斥）
-     */
-    public final QueryColumn PATH_PARAMS = new QueryColumn(this, "path_params");
-
-    /**
-     * 是否需要请求参数
-     */
-    public final QueryColumn IS_REQ_PARAMS = new QueryColumn(this, "is_req_params");
-
-    /**
-     * 是否需要响应参数
-     */
-    public final QueryColumn IS_RES_PARAMS = new QueryColumn(this, "is_res_params");
-
-    /**
-     * 包名称
-     */
-    public final QueryColumn PACKAGE_NAME = new QueryColumn(this, "package_name");
-
-    /**
-     * 参数包名
-     */
-    public final QueryColumn API_PACKAGE_NAME = new QueryColumn(this, "api_package_name");
 
     /**
      * 所有字段。
@@ -84,10 +72,10 @@ public class MenuDef extends TableDef {
     /**
      * 默认字段，不包含逻辑删除或者 large 等字段。
      */
-    public final QueryColumn[] DEFAULT_COLUMNS = new QueryColumn[]{ID, MODULE_NAME, MODULE_CODE, DESCRIBE, PACKAGE_NAME, API_PACKAGE_NAME, SORT_ORDER, IS_REQ_PARAMS, IS_RES_PARAMS, IS_PAGE, PATH_PARAMS};
+    public final QueryColumn[] DEFAULT_COLUMNS = new QueryColumn[]{ID, CLIENT_TYPE, MENU_NAME, PARENT_ID, PATH, ICON, IS_TENANT, IS_HIDE, SORT_ORDER};
 
     public MenuDef() {
-        super("", "cg_fun_module");
+        super("", "cg_menu");
     }
 
     private MenuDef(String schema, String name, String alisa) {
@@ -96,8 +84,7 @@ public class MenuDef extends TableDef {
 
     public MenuDef as(String alias) {
         String key = getNameWithSchema() + "." + alias;
-        return getCache(key, k -> new MenuDef("", "cg_fun_module", alias));
+        return getCache(key, k -> new MenuDef("", "cg_menu", alias));
     }
 
-
 }

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

@@ -64,6 +64,9 @@ public class FunItemServiceImpl implements FunItemService {
     @Transactional
     @Override
     public XResult<Void> saveUpdate(FunItemSaveUpdateReq req) {
+        if (req.getIsReqParams() && StrUtil.isNotBlank(req.getPathParams())) {
+            return XResult.failed("请求参数和路径参数冲突");
+        }
         Long id = req.getId();
         if (id != null) {
             // 删除原数据

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

@@ -65,9 +65,6 @@ public class FunModuleServiceImpl implements FunModuleService {
     @Transactional
     @Override
     public XResult<Void> saveUpdate(FunModuleSaveUpdateReq req) {
-        if (req.getIsReqParams() && StrUtil.isNotBlank(req.getPathParams())) {
-            return XResult.failed("请求参数和路径参数冲突");
-        }
         // 模块编码不能重复
         QueryWrapper queryWrapper = new QueryWrapper();
         queryWrapper.eq(FunModuleEntity::getModuleCode, req.getModuleCode());