quick

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

@@ -84,6 +84,18 @@ public class MenuController {
         return R.ok(treeVoList);
     }
 
+    @GetMapping("/quick")
+    @ApiOperation(value = "用户快捷菜单")
+    public RT<List<Menu>> quick() {
+
+        List<Menu> menus = menuService.selectJoinList(Menu.class,
+                MPJWrappers.<Menu>lambdaJoin()
+                        .innerJoin(XjrMenuQuick.class,XjrMenuQuick::getMenuId,Menu::getId)
+                        .selectAs(XjrMenuQuick::getSystemId,Menu::getSystemId)
+                        .select(Menu.class, x -> VoToColumnUtil.fieldsToColumns(MenuListVo.class).contains(x.getProperty())));
+        return RT.ok(menus);
+    }
+
     @GetMapping("/serve")
     @ApiOperation(value = "获取菜单服务")
     public RT<List<MenuServeVo>> menuServe() {

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

@@ -0,0 +1,103 @@
+package com.xjrsoft.module.system.controller;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.xjrsoft.common.constant.GlobalConstant;
+import com.baomidou.mybatisplus.core.toolkit.StringPool;
+import com.xjrsoft.common.page.ConventPage;
+import com.xjrsoft.common.page.PageOutput;
+import com.xjrsoft.common.model.result.RT;
+import com.xjrsoft.common.utils.VoToColumnUtil;
+import com.xjrsoft.module.system.dto.AddXjrMenuQuickDto;
+import com.xjrsoft.module.system.dto.UpdateXjrMenuQuickDto;
+import cn.dev33.satoken.annotation.SaCheckPermission;
+
+import com.xjrsoft.module.system.dto.XjrMenuQuickListDto;
+import com.xjrsoft.module.system.entity.XjrMenuQuick;
+import com.xjrsoft.module.system.service.IXjrMenuQuickService;
+import com.xjrsoft.module.system.vo.XjrMenuQuickListVo;
+
+import com.xjrsoft.module.system.vo.XjrMenuQuickVo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+import javax.validation.constraints.NotNull;
+import java.util.List;
+
+/**
+* @title: 快捷菜单
+* @Author fanxp
+* @Date: 2023-11-11
+* @Version 1.0
+*/
+@RestController
+@RequestMapping("/system" + "/xjrmenuquick")
+@Api(value = "/system"  + "/xjrmenuquick",tags = "快捷菜单代码")
+@AllArgsConstructor
+public class XjrMenuQuickController {
+
+
+    private final IXjrMenuQuickService xjrMenuQuickService;
+
+    @GetMapping(value = "/list")
+    @ApiOperation(value="快捷菜单列表(不分页)")
+    @SaCheckPermission("xjrmenuquick:detail")
+    public RT<List<XjrMenuQuickListVo>> list(@Valid XjrMenuQuickListDto dto){
+
+        LambdaQueryWrapper<XjrMenuQuick> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper
+                    .orderByDesc(XjrMenuQuick::getId)
+                    .select(XjrMenuQuick.class,x -> VoToColumnUtil.fieldsToColumns(XjrMenuQuickListVo.class).contains(x.getProperty()));
+
+        List<XjrMenuQuick> list = xjrMenuQuickService.list(queryWrapper);
+        List<XjrMenuQuickListVo> listVos = BeanUtil.copyToList(list, XjrMenuQuickListVo.class);
+        return RT.ok(listVos);
+    }
+
+    @GetMapping(value = "/info")
+    @ApiOperation(value="根据id查询快捷菜单信息")
+    @SaCheckPermission("xjrmenuquick:detail")
+    public RT<XjrMenuQuickVo> info(@RequestParam Long id){
+        XjrMenuQuick xjrMenuQuick = xjrMenuQuickService.getById(id);
+        if (xjrMenuQuick == null) {
+           return RT.error("找不到此数据！");
+        }
+        return RT.ok(BeanUtil.toBean(xjrMenuQuick, XjrMenuQuickVo.class));
+    }
+
+
+    @PostMapping
+    @ApiOperation(value = "新增快捷菜单")
+    @SaCheckPermission("xjrmenuquick:add")
+    public RT<Boolean> add(@Valid @RequestBody AddXjrMenuQuickDto dto){
+        XjrMenuQuick xjrMenuQuick = BeanUtil.toBean(dto, XjrMenuQuick.class);
+        boolean isSuccess = xjrMenuQuickService.save(xjrMenuQuick);
+    return RT.ok(isSuccess);
+    }
+
+    @PutMapping
+    @ApiOperation(value = "修改快捷菜单")
+    @SaCheckPermission("xjrmenuquick:edit")
+    public RT<Boolean> update(@Valid @RequestBody UpdateXjrMenuQuickDto dto){
+
+        XjrMenuQuick xjrMenuQuick = BeanUtil.toBean(dto, XjrMenuQuick.class);
+        return RT.ok(xjrMenuQuickService.updateById(xjrMenuQuick));
+
+    }
+
+    @DeleteMapping
+    @ApiOperation(value = "删除快捷菜单")
+    @SaCheckPermission("xjrmenuquick:delete")
+    public RT<Boolean> delete(@Valid @RequestBody List<Long> ids){
+        return RT.ok(xjrMenuQuickService.removeBatchByIds(ids));
+
+    }
+
+}

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

@@ -0,0 +1,53 @@
+package com.xjrsoft.module.system.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import java.io.Serializable;
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import java.time.LocalTime;
+import java.time.LocalDateTime;
+import java.math.BigDecimal;
+import java.util.List;
+import java.util.Date;
+
+
+
+/**
+* @title: 快捷菜单
+* @Author fanxp
+* @Date: 2023-11-11
+* @Version 1.0
+*/
+@Data
+public class AddXjrMenuQuickDto implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+    * 序号
+    */
+    @ApiModelProperty("序号")
+    private Integer sortCode;
+    /**
+    * 菜单编号
+    */
+    @ApiModelProperty("菜单编号")
+    private Long menuId;
+    /**
+    * 用户编号
+    */
+    @ApiModelProperty("用户编号")
+    private Long userId;
+    /**
+    * 角色编号
+    */
+    @ApiModelProperty("角色编号")
+    private Long roleId;
+    /**
+    * 系统编号
+    */
+    @ApiModelProperty("系统编号")
+    private Long systemId;
+
+}

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

@@ -0,0 +1,32 @@
+package com.xjrsoft.module.system.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import java.io.Serializable;
+
+import java.time.LocalTime;
+import java.time.LocalDateTime;
+import java.math.BigDecimal;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import java.util.List;
+import java.util.Date;
+
+
+
+/**
+* @title: 快捷菜单
+* @Author fanxp
+* @Date: 2023-11-11
+* @Version 1.0
+*/
+@Data
+public class UpdateXjrMenuQuickDto extends AddXjrMenuQuickDto {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+    * 主键编号
+    */
+    @ApiModelProperty("主键编号")
+    private Long id;
+}

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

@@ -0,0 +1,26 @@
+package com.xjrsoft.module.system.dto;
+
+import com.xjrsoft.common.page.ListInput;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.time.LocalTime;
+import java.time.LocalDateTime;
+import java.math.BigDecimal;
+import java.util.Date;
+
+
+/**
+* @title: 快捷菜单列表查询入参
+* @Author fanxp
+* @Date: 2023-11-11
+* @Version 1.0
+*/
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class XjrMenuQuickListDto extends ListInput {
+
+
+}

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

@@ -0,0 +1,104 @@
+package com.xjrsoft.module.system.entity;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.github.yulichang.annotation.EntityMapping;
+import com.xjrsoft.common.model.base.AuditEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import java.io.Serializable;
+import java.time.LocalTime;
+import java.time.LocalDateTime;
+import java.math.BigDecimal;
+import java.util.List;
+import java.util.Date;
+
+
+/**
+* @title: 快捷菜单
+* @Author fanxp
+* @Date: 2023-11-11
+* @Version 1.0
+*/
+@Data
+@TableName("xjr_menu_quick")
+@ApiModel(value = "快捷菜单对象", description = "快捷菜单")
+public class XjrMenuQuick implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+    * 主键编号
+    */
+    @ApiModelProperty("主键编号")
+    @TableId
+    private Long id;
+    /**
+    * 创建人
+    */
+    @ApiModelProperty("创建人")
+    @TableField(fill = FieldFill.INSERT)
+    private Long createUserId;
+    /**
+    * 创建时间
+    */
+    @ApiModelProperty("创建时间")
+    @TableField(fill = FieldFill.INSERT)
+    private Date createDate;
+    /**
+    * 修改人
+    */
+    @ApiModelProperty("修改人")
+    @TableField(fill = FieldFill.UPDATE)
+    private Long modifyUserId;
+    /**
+    * 修改时间
+    */
+    @ApiModelProperty("修改时间")
+    @TableField(fill = FieldFill.UPDATE)
+    private Date modifyDate;
+    /**
+    * 删除标记
+    */
+    @ApiModelProperty("删除标记")
+    @TableField(fill = FieldFill.INSERT)
+    @TableLogic
+    private Integer deleteMark;
+    /**
+    * 有效标志
+    */
+    @ApiModelProperty("有效标志")
+    @TableField(fill = FieldFill.INSERT)
+    private Integer enabledMark;
+    /**
+    * 序号
+    */
+    @ApiModelProperty("序号")
+    private Integer sortCode;
+    /**
+    * 菜单编号
+    */
+    @ApiModelProperty("菜单编号")
+    private Long menuId;
+    /**
+    * 用户编号
+    */
+    @ApiModelProperty("用户编号")
+    private Long userId;
+    /**
+    * 角色编号
+    */
+    @ApiModelProperty("角色编号")
+    private Long roleId;
+    /**
+    * 系统编号
+    */
+    @ApiModelProperty("系统编号")
+    private Long systemId;
+
+
+}

src/main/java/com/xjrsoft/module/system/mapper/XjrMenuQuickMapper.java

@@ -0,0 +1,17 @@
+package com.xjrsoft.module.system.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.github.yulichang.base.MPJBaseMapper;
+import com.xjrsoft.module.system.entity.XjrMenuQuick;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+* @title: 快捷菜单
+* @Author fanxp
+* @Date: 2023-11-11
+* @Version 1.0
+*/
+@Mapper
+public interface XjrMenuQuickMapper extends BaseMapper<XjrMenuQuick> {
+
+}

src/main/java/com/xjrsoft/module/system/service/IXjrMenuQuickService.java

@@ -0,0 +1,17 @@
+package com.xjrsoft.module.system.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.github.yulichang.base.MPJBaseService;
+import com.xjrsoft.module.system.entity.XjrMenuQuick;
+import lombok.Data;
+import java.util.List;
+
+/**
+* @title: 快捷菜单
+* @Author fanxp
+* @Date: 2023-11-11
+* @Version 1.0
+*/
+
+public interface IXjrMenuQuickService extends IService<XjrMenuQuick> {
+}

src/main/java/com/xjrsoft/module/system/service/impl/MenuServiceImpl.java

@@ -118,10 +118,6 @@ public class MenuServiceImpl extends MPJBaseServiceImpl<MenuMapper, Menu> implem
                         });
             }
         });
-//        Map<Long, MenuVo> menuVoMap = new HashMap<>();
-//        notParents.forEach((node) -> {
-//
-//        });
         return new ArrayList<>(menuVoMap.values());
     }
 }

src/main/java/com/xjrsoft/module/system/service/impl/XjrMenuQuickServiceImpl.java

@@ -0,0 +1,25 @@
+package com.xjrsoft.module.system.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.github.yulichang.base.MPJBaseServiceImpl;
+import com.xjrsoft.module.system.entity.XjrMenuQuick;
+import com.xjrsoft.module.system.mapper.XjrMenuQuickMapper;
+import com.xjrsoft.module.system.service.IXjrMenuQuickService;
+import lombok.AllArgsConstructor;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import java.util.List;
+import java.util.Objects;
+import java.util.stream.Collectors;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+
+/**
+* @title: 快捷菜单
+* @Author fanxp
+* @Date: 2023-11-11
+* @Version 1.0
+*/
+@Service
+@AllArgsConstructor
+public class XjrMenuQuickServiceImpl extends ServiceImpl<XjrMenuQuickMapper, XjrMenuQuick> implements IXjrMenuQuickService {
+}

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

@@ -0,0 +1,84 @@
+package com.xjrsoft.module.system.vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import com.xjrsoft.common.annotation.Trans;
+import com.xjrsoft.common.enums.TransType;
+import java.time.LocalTime;
+import java.time.LocalDateTime;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+* @title: 快捷菜单列表列表入参
+* @Author fanxp
+* @Date: 2023-11-11
+* @Version 1.0
+*/
+@Data
+public class XjrMenuQuickListVo {
+
+    /**
+    * 主键编号
+    */
+    @ApiModelProperty("主键编号")
+    private String id;
+    /**
+    * 创建人
+    */
+    @ApiModelProperty("创建人")
+    private Long createUserId;
+    /**
+    * 创建时间
+    */
+    @ApiModelProperty("创建时间")
+    private Date createDate;
+    /**
+    * 修改人
+    */
+    @ApiModelProperty("修改人")
+    private Long modifyUserId;
+    /**
+    * 修改时间
+    */
+    @ApiModelProperty("修改时间")
+    private Date modifyDate;
+    /**
+    * 删除标记
+    */
+    @ApiModelProperty("删除标记")
+    private Integer deleteMark;
+    /**
+    * 有效标志
+    */
+    @ApiModelProperty("有效标志")
+    private Integer enabledMark;
+    /**
+    * 序号
+    */
+    @ApiModelProperty("序号")
+    private Integer sortCode;
+    /**
+    * 菜单编号
+    */
+    @ApiModelProperty("菜单编号")
+    private Long menuId;
+    /**
+    * 用户编号
+    */
+    @ApiModelProperty("用户编号")
+    private Long userId;
+    /**
+    * 角色编号
+    */
+    @ApiModelProperty("角色编号")
+    private Long roleId;
+    /**
+    * 系统编号
+    */
+    @ApiModelProperty("系统编号")
+    private Long systemId;
+
+}

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

@@ -0,0 +1,54 @@
+package com.xjrsoft.module.system.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.time.LocalTime;
+import java.time.LocalDateTime;
+import java.math.BigDecimal;
+import java.util.List;
+import java.util.Date;
+
+/**
+* @title: 快捷菜单表单出参
+* @Author fanxp
+* @Date: 2023-11-11
+* @Version 1.0
+*/
+@Data
+public class XjrMenuQuickVo {
+
+    /**
+    * 主键编号
+    */
+    @ApiModelProperty("主键编号")
+    private Long id;
+    /**
+    * 序号
+    */
+    @ApiModelProperty("序号")
+    private Integer sortCode;
+    /**
+    * 菜单编号
+    */
+    @ApiModelProperty("菜单编号")
+    private Long menuId;
+    /**
+    * 用户编号
+    */
+    @ApiModelProperty("用户编号")
+    private Long userId;
+    /**
+    * 角色编号
+    */
+    @ApiModelProperty("角色编号")
+    private Long roleId;
+    /**
+    * 系统编号
+    */
+    @ApiModelProperty("系统编号")
+    private Long systemId;
+
+
+
+}

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

@@ -155,3 +155,25 @@ CREATE TABLE base_student_class_cadre
     PRIMARY KEY (`id`)
 ) ENGINE=INNODB DEFAULT CHARSET=utf8mb4 COLLATE = utf8mb4_0900_ai_ci COMMENT '学生班级干部管理';
 
+
+-- ----------------------------
+-- 快捷菜单
+-- ----------------------------
+DROP TABLE IF EXISTS xjr_menu_quick;
+CREATE TABLE xjr_menu_quick
+(
+    id BIGINT NOT NULL COMMENT '主键编号',
+    `create_user_id` BIGINT NULL DEFAULT NULL COMMENT '创建人',
+    `create_date` DATE NULL DEFAULT NULL COMMENT '创建时间',
+    `modify_user_id` BIGINT NULL DEFAULT NULL COMMENT '修改人',
+    `modify_date` DATE NULL DEFAULT NULL COMMENT '修改时间',
+    `delete_mark` INT NOT NULL COMMENT '删除标记',
+    `enabled_mark` INT NOT NULL COMMENT '有效标志',
+    `sort_code` INT NULL DEFAULT NULL COMMENT '序号',
+    `menu_id` BIGINT NULL DEFAULT NULL COMMENT '菜单编号',
+    `user_id` BIGINT NULL DEFAULT NULL COMMENT '用户编号',
+    `role_id` BIGINT NULL DEFAULT NULL COMMENT '角色编号',
+    `system_id` BIGINT NULL DEFAULT NULL COMMENT '系统编号',
+    PRIMARY KEY (`id`)
+) ENGINE=INNODB DEFAULT CHARSET=utf8mb4 COLLATE = utf8mb4_0900_ai_ci COMMENT '快捷菜单';
+

src/test/java/com/xjrsoft/xjrsoftboot/FreeMarkerGeneratorTest.java

@@ -464,4 +464,34 @@ public class FreeMarkerGeneratorTest {
         apiGeneratorService.generateCodes(params);
     }
 
+    /**
+     * 快捷菜单
+     */
+    @Test
+    public void gcXjrMenuQuick() throws IOException {
+        List<TableConfig> tableConfigs = new ArrayList<>();
+        TableConfig mainTable = new TableConfig();
+        mainTable.setTableName("xjr_menu_quick");//init_sql中的表名
+        mainTable.setIsMain(true);//是否是主表，一般默认为true
+        mainTable.setPkField(GlobalConstant.DEFAULT_PK);//设置主键
+        mainTable.setPkType(GlobalConstant.DEFAULT_PK_TYPE);//设置主键类型
+
+        tableConfigs.add(mainTable);
+
+
+        ApiGenerateCodesDto params = new ApiGenerateCodesDto();
+        params.setAuthor("fanxp");//作者名称
+        params.setPackageName("system");//包名
+        params.setTableConfigs(tableConfigs);
+        params.setPage(false);//是否生成分页接口
+        params.setImport(false);//是否生成导入接口
+        params.setExport(false);//是否生成导出接口
+        params.setOutMainDir(true);//是否生成在主目录，前期测试可设置成false
+        params.setDs(ds);
+
+
+        IApiGeneratorService apiGeneratorService = new ApiGeneratorServiceImpl();
+
+        apiGeneratorService.generateCodes(params);
+    }
 }