menu

src/main/java/com/xjrsoft/common/enums/SystemTypeEnum.java

@@ -0,0 +1,32 @@
+package com.xjrsoft.common.enums;
+
+/**
+ * 系统类型
+ */
+public enum SystemTypeEnum {
+    /**
+     * APP
+     * */
+    SYSTEMAPP("system_app", "app"),
+
+    /**
+     * PC
+     * */
+    SYSTEMPC("system_pc", "pc");
+
+    final String code;
+    final String value;
+
+    public String getCode() {
+        return this.code;
+    }
+
+    public String getValue() {
+        return this.value;
+    }
+
+    SystemTypeEnum(final String code, final String message) {
+        this.code = code;
+        this.value = message;
+    }
+}

src/main/java/com/xjrsoft/module/system/controller/MenuController.java

@@ -112,6 +112,7 @@ public class MenuController {
                 MPJWrappers.<Menu>lambdaJoin()
                         .like(StrUtil.isNotEmpty(dto.getTitle()), Menu::getTitle, dto.getTitle())
                         .like(StrUtil.isNotEmpty(dto.getName()), Menu::getName, dto.getName())
+                        .eq(Menu::getSystemType,dto.getSystemType())
                         .select(Menu::getId)
                         .select(Menu.class, x -> VoToColumnUtil.fieldsToColumns(MenuTreeVo.class).contains(x.getProperty()))
                         .selectAs(Subsystem::getName, MenuTreeVo::getSystemName)

src/main/java/com/xjrsoft/module/system/dto/AddMenuDto.java

@@ -65,6 +65,10 @@ public class AddMenuDto implements Serializable {
     @ApiModelProperty("组件类型")
     private Integer menuType;
 
+    @NotNull(message = "系统类型不能为空!")
+    @ApiModelProperty("系统类型(xjr_dictionary_item[system_type])")
+    private Integer systemType;
+
     @Range(min = 0,max = 1,message = "菜单显示或者隐藏只能是0 或者 1！")
     @ApiModelProperty("菜单显示或者隐藏")
     private Integer display;

src/main/java/com/xjrsoft/module/system/dto/MenuTreeDto.java

@@ -1,8 +1,11 @@
 package com.xjrsoft.module.system.dto;
 
 import lombok.Data;
+import lombok.NonNull;
 import org.hibernate.validator.constraints.Length;
 
+import javax.validation.constraints.NotNull;
+
 /**
  * @title: MenuTreeDto
  * @Author tzx
@@ -12,6 +15,10 @@ import org.hibernate.validator.constraints.Length;
 @Data
 public class MenuTreeDto {
 
+    @Length(max = 20,message = "系统类型！")
+    @NotNull(message = "系统类型code不能为空")
+    private String systemType;
+
     @Length(max = 20,message = "菜单名不能大于20个字符！")
     private String title;
 

src/main/java/com/xjrsoft/module/system/dto/RoleMenuServeListDto.java

@@ -11,4 +11,6 @@ public class RoleMenuServeListDto {
      */
     @NotNull(message = "角色编号不能为空")
     private Long roleId;
+
+
 }

src/main/java/com/xjrsoft/module/system/dto/UpdateMenuDto.java

@@ -68,6 +68,10 @@ public class UpdateMenuDto implements Serializable {
     @ApiModelProperty("组件类型")
     private Integer menuType;
 
+    @NotNull(message = "系统类型不能为空!")
+    @ApiModelProperty("系统类型(xjr_dictionary_item[system_type])")
+    private Integer systemType;
+
     @Range(min = 0,max = 1,message = "菜单显示或者隐藏只能是0 或者 1！")
     @ApiModelProperty("菜单显示或者隐藏")
     private Integer display;

src/main/java/com/xjrsoft/module/system/entity/Menu.java

@@ -65,6 +65,9 @@ public class Menu extends AuditEntity implements Serializable {
     @ApiModelProperty("组件类型")
     private Integer menuType;
 
+    @ApiModelProperty("系统类型(xjr_dictionary_item[system_type])")
+    private Integer systemType;
+
     @ApiModelProperty("菜单显示或者隐藏")
     private Integer display;
 

src/main/java/com/xjrsoft/module/system/vo/MenuVo.java

@@ -46,6 +46,9 @@ public class MenuVo implements Serializable {
     @ApiModelProperty("组件类型 默认组件 0 普通需要注册的组件 1 自定义表单 桌面设计 等已经默认注册进来的组件 ")
     private Integer componentType;
 
+    @ApiModelProperty("系统类型(xjr_dictionary_item[system_type])")
+    private Integer systemType;
+
     @ApiModelProperty("外链地址 ")
     private String iframeSrc;
 

src/main/resources/sqlScript/20231113_sql.sql

@@ -451,6 +451,8 @@ CREATE TABLE base_student_behavior_class_relation
 ) ENGINE=INNODB DEFAULT CHARSET=utf8mb4 COLLATE = utf8mb4_0900_ai_ci COMMENT '学生班级巡查考核-关联班级';
 --------------------------------------------------------------------学生操行--------------------------------------------------------------------
 
+ALTER TABLE xjr_menu ADD COLUMN `system_type` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT 'system_pc' COMMENT '系统类型(xjr_dictionary_item[system_type])' AFTER enabled_mark;
+
 --------------------------------------------------------------------奖学金管理--------------------------------------------------------------------
 
 --------------------------------------------------------------------奖学金管理--------------------------------------------------------------------