Merge remote-tracking branch 'origin/dev' into dev

src/main/java/com/xjrsoft/module/asset/controller/WfAssetManageController.java

@@ -219,22 +219,22 @@ public class WfAssetManageController {
 
     }
 
-//    @PostMapping("/select-record-query")
-//    @ApiOperation(value = "选中记录导出")
-//    public ResponseEntity<byte[]> assetManageSelectRecordQuery(@Valid @RequestBody WfAssetManageSelectRecordQueryDto dto) {
-    @GetMapping("/select-record-query")
+    @PostMapping("/select-record-query")
     @ApiOperation(value = "选中记录导出")
-    public ResponseEntity<byte[]> textbookClaimExportQuery(@Valid WfAssetManageSelectRecordQueryDto dto) {
+    public ResponseEntity<byte[]> assetManageSelectRecordQuery(@Valid @RequestBody WfAssetManageSelectRecordQueryDto dto) {
+//    @GetMapping("/select-record-query")
+//    @ApiOperation(value = "选中记录导出")
+//    public ResponseEntity<byte[]> assetManageSelectRecordQuery(@Valid WfAssetManageSelectRecordQueryDto dto) {
         ByteArrayOutputStream bot = wfAssetManageService.listWfAssetManageSelectRecordQuery(dto);
-        return RT.fileStream(bot.toByteArray(), "TextbookClaim" + ExcelTypeEnum.XLSX.getValue());
+        return RT.fileStream(bot.toByteArray(), "WfAssetManage" + ExcelTypeEnum.XLSX.getValue());
     }
 
-//    @PostMapping("/conditional-search-query")
-//    @ApiOperation(value = "条件搜索导出")
-//    public ResponseEntity<byte[]> assetManageConditionalSearchQuery(@Valid @RequestBody WfAssetManageConditionalSearchQueryDto dto) {
-    @GetMapping("/conditional-search-query")
+    @PostMapping("/conditional-search-query")
     @ApiOperation(value = "条件搜索导出")
-    public ResponseEntity<byte[]> textbookClaimExportQuery(@Valid WfAssetManageConditionalSearchQueryDto dto) {
+    public ResponseEntity<byte[]> assetManageConditionalSearchQuery(@Valid @RequestBody WfAssetManageConditionalSearchQueryDto dto) {
+//    @GetMapping("/conditional-search-query")
+//    @ApiOperation(value = "条件搜索导出")
+//    public ResponseEntity<byte[]> textbookClaimExportQuery(@Valid WfAssetManageConditionalSearchQueryDto dto) {
         ByteArrayOutputStream bot = wfAssetManageService.listWfAssetManageConditionalSearchQuery(dto);
         return RT.fileStream(bot.toByteArray(), "WfAssetManage" + ExcelTypeEnum.XLSX.getValue());
     }

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

@@ -0,0 +1,99 @@
+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.baomidou.mybatisplus.extension.plugins.pagination.Page;
+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.evaluate.vo.EvaluateTemplatePageVo;
+import com.xjrsoft.module.system.dto.AddXjrMenuDeptRelationDto;
+import com.xjrsoft.module.system.dto.UpdateXjrMenuDeptRelationDto;
+import cn.dev33.satoken.annotation.SaCheckPermission;
+
+import com.xjrsoft.module.system.dto.XjrMenuDeptRelationPageDto;
+import com.xjrsoft.module.system.entity.XjrMenuDeptRelation;
+import com.xjrsoft.module.system.service.IXjrMenuDeptRelationService;
+import com.xjrsoft.module.system.vo.XjrMenuDeptRelationPageVo;
+
+import com.xjrsoft.module.system.vo.XjrMenuDeptRelationVo;
+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 brealinxx
+* @Date: 2024-04-09
+* @Version 1.0
+*/
+@RestController
+@RequestMapping("/system" + "/xjrMenuDeptRelation")
+@Api(value = "/system"  + "/xjrMenuDeptRelation",tags = "菜单部门关联表代码")
+@AllArgsConstructor
+public class XjrMenuDeptRelationController {
+
+
+    private final IXjrMenuDeptRelationService xjrMenuDeptRelationService;
+
+    @GetMapping(value = "/page")
+    @ApiOperation(value="菜单部门关联表列表(分页)")
+    @SaCheckPermission("xjrmenudeptrelation:detail")
+    public RT<PageOutput<XjrMenuDeptRelationPageVo>> page(@Valid XjrMenuDeptRelationPageDto dto){
+        Page<XjrMenuDeptRelationPageVo> page = xjrMenuDeptRelationService.getPage(new Page<>(dto.getLimit(), dto.getSize()), dto);
+        PageOutput<XjrMenuDeptRelationPageVo> pageOutput = ConventPage.getPageOutput(page, XjrMenuDeptRelationPageVo.class);
+        return RT.ok(pageOutput);
+    }
+
+    @GetMapping(value = "/info")
+    @ApiOperation(value="根据id查询菜单部门关联表信息")
+    @SaCheckPermission("xjrmenudeptrelation:detail")
+    public RT<XjrMenuDeptRelationVo> info(@RequestParam Long id){
+        XjrMenuDeptRelation xjrMenuDeptRelation = xjrMenuDeptRelationService.getById(id);
+        if (xjrMenuDeptRelation == null) {
+           return RT.error("找不到此数据！");
+        }
+        return RT.ok(BeanUtil.toBean(xjrMenuDeptRelation, XjrMenuDeptRelationVo.class));
+    }
+
+
+    @PostMapping
+    @ApiOperation(value = "新增菜单部门关联表")
+    @SaCheckPermission("xjrmenudeptrelation:add")
+    public RT<Boolean> add(@Valid @RequestBody AddXjrMenuDeptRelationDto dto){
+        XjrMenuDeptRelation xjrMenuDeptRelation = BeanUtil.toBean(dto, XjrMenuDeptRelation.class);
+        boolean isSuccess = xjrMenuDeptRelationService.save(xjrMenuDeptRelation);
+    return RT.ok(isSuccess);
+    }
+
+    @PutMapping
+    @ApiOperation(value = "修改菜单部门关联表")
+    @SaCheckPermission("xjrmenudeptrelation:edit")
+    public RT<Boolean> update(@Valid @RequestBody UpdateXjrMenuDeptRelationDto dto){
+
+        XjrMenuDeptRelation xjrMenuDeptRelation = BeanUtil.toBean(dto, XjrMenuDeptRelation.class);
+        return RT.ok(xjrMenuDeptRelationService.updateById(xjrMenuDeptRelation));
+
+    }
+
+    @DeleteMapping
+    @ApiOperation(value = "删除菜单部门关联表")
+    @SaCheckPermission("xjrmenudeptrelation:delete")
+    public RT<Boolean> delete(@Valid @RequestBody List<Long> ids){
+        return RT.ok(xjrMenuDeptRelationService.removeBatchByIds(ids));
+
+    }
+
+}

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

@@ -0,0 +1,38 @@
+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 brealinxx
+* @Date: 2024-04-09
+* @Version 1.0
+*/
+@Data
+public class AddXjrMenuDeptRelationDto implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+    * 菜单id
+    */
+    @ApiModelProperty("菜单id")
+    private Long menuId;
+    /**
+    * 部门id
+    */
+    @ApiModelProperty("部门id")
+    private Long deptId;
+
+}

src/main/java/com/xjrsoft/module/system/dto/UpdateXjrMenuDeptRelationDto.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 brealinxx
+* @Date: 2024-04-09
+* @Version 1.0
+*/
+@Data
+public class UpdateXjrMenuDeptRelationDto extends AddXjrMenuDeptRelationDto {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private Long id;
+}

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

@@ -0,0 +1,26 @@
+package com.xjrsoft.module.system.dto;
+
+import com.xjrsoft.common.page.PageInput;
+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 brealinxx
+* @Date: 2024-04-09
+* @Version 1.0
+*/
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class XjrMenuDeptRelationPageDto extends PageInput {
+    @ApiModelProperty("模版名称")
+    public String depts;
+}

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

@@ -0,0 +1,88 @@
+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 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 brealinxx
+* @Date: 2024-04-09
+* @Version 1.0
+*/
+@Data
+@TableName("xjr_menu_dept_relation")
+@ApiModel(value = "xjr_menu_dept_relation", description = "菜单部门关联表")
+public class XjrMenuDeptRelation 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;
+    /**
+    * 菜单id
+    */
+    @ApiModelProperty("菜单id")
+    private Long menuId;
+    /**
+    * 部门id
+    */
+    @ApiModelProperty("部门id")
+    private Long deptId;
+
+
+}

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

@@ -0,0 +1,25 @@
+package com.xjrsoft.module.system.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.github.yulichang.base.MPJBaseMapper;
+import com.xjrsoft.module.evaluate.dto.EvaluateTemplatePageDto;
+import com.xjrsoft.module.evaluate.vo.EvaluateTemplatePageVo;
+import com.xjrsoft.module.system.dto.XjrMenuDeptRelationPageDto;
+import com.xjrsoft.module.system.entity.XjrMenuDeptRelation;
+import com.xjrsoft.module.system.vo.XjrMenuDeptRelationPageVo;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+* @title: 菜单部门关联表
+* @Author brealinxx
+* @Date: 2024-04-09
+* @Version 1.0
+*/
+@Mapper
+public interface XjrMenuDeptRelationMapper extends MPJBaseMapper<XjrMenuDeptRelation> {
+    Page<XjrMenuDeptRelationPageVo> getPage(Page<XjrMenuDeptRelationPageDto> page,  @Param("list")List<String> list);
+}

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

@@ -0,0 +1,24 @@
+package com.xjrsoft.module.system.service;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.github.yulichang.base.MPJBaseService;
+import com.xjrsoft.module.evaluate.dto.EvaluateTemplatePageDto;
+import com.xjrsoft.module.evaluate.vo.EvaluateTemplatePageVo;
+import com.xjrsoft.module.system.dto.AddXjrMenuDeptRelationDto;
+import com.xjrsoft.module.system.dto.XjrMenuDeptRelationPageDto;
+import com.xjrsoft.module.system.entity.XjrMenuDeptRelation;
+import com.xjrsoft.module.system.vo.XjrMenuDeptRelationPageVo;
+import lombok.Data;
+import java.util.List;
+
+/**
+* @title: 菜单部门关联表
+* @Author brealinxx
+* @Date: 2024-04-09
+* @Version 1.0
+*/
+
+public interface IXjrMenuDeptRelationService extends MPJBaseService<XjrMenuDeptRelation> {
+    Page<XjrMenuDeptRelationPageVo> getPage(Page<XjrMenuDeptRelationPageDto> page, XjrMenuDeptRelationPageDto dto);
+}

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

@@ -0,0 +1,45 @@
+package com.xjrsoft.module.system.service.impl;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.github.yulichang.base.MPJBaseServiceImpl;
+import com.xjrsoft.module.evaluate.mapper.EvaluateTemplateMapper;
+import com.xjrsoft.module.evaluate.vo.EvaluateTemplatePageVo;
+import com.xjrsoft.module.system.dto.AddXjrMenuDeptRelationDto;
+import com.xjrsoft.module.system.dto.XjrMenuDeptRelationPageDto;
+import com.xjrsoft.module.system.entity.XjrMenuDeptRelation;
+import com.xjrsoft.module.system.mapper.XjrMenuDeptRelationMapper;
+import com.xjrsoft.module.system.service.IXjrMenuDeptRelationService;
+import com.xjrsoft.module.system.vo.XjrMenuDeptRelationPageVo;
+import lombok.AllArgsConstructor;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Objects;
+import java.util.stream.Collectors;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+
+/**
+* @title: 菜单部门关联表
+* @Author brealinxx
+* @Date: 2024-04-09
+* @Version 1.0
+*/
+@Service
+@AllArgsConstructor
+public class XjrMenuDeptRelationServiceImpl extends MPJBaseServiceImpl<XjrMenuDeptRelationMapper, XjrMenuDeptRelation> implements IXjrMenuDeptRelationService {
+    private final XjrMenuDeptRelationMapper xjrMenuDeptRelationMapper;
+
+    @Override
+    public Page<XjrMenuDeptRelationPageVo> getPage(Page<XjrMenuDeptRelationPageDto> page, XjrMenuDeptRelationPageDto dto) {
+        List<String> deptIds = new ArrayList<>();
+        if (dto.getDepts() != null && !dto.getDepts().isEmpty()) {
+            deptIds = Arrays.asList(dto.getDepts().split(","));
+        }
+
+        return xjrMenuDeptRelationMapper.getPage(page, deptIds);
+    }
+}

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

@@ -0,0 +1,75 @@
+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 brealinxx
+* @Date: 2024-04-09
+* @Version 1.0
+*/
+@Data
+public class XjrMenuDeptRelationPageVo {
+
+    /**
+    * 
+    */
+    @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;
+    /**
+    * 菜单id
+    */
+    @ApiModelProperty("菜单id")
+    private Long menuId;
+    /**
+    * 部门id
+    */
+    @ApiModelProperty("部门id")
+    private Long deptId;
+
+    @ApiModelProperty("菜单中文")
+    private String menuName;
+
+    @ApiModelProperty("部门中文")
+    private String deptName;
+
+}

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

@@ -0,0 +1,39 @@
+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 brealinxx
+* @Date: 2024-04-09
+* @Version 1.0
+*/
+@Data
+public class XjrMenuDeptRelationVo {
+
+    /**
+    * 
+    */
+    @ApiModelProperty("")
+    private Long id;
+    /**
+    * 菜单id
+    */
+    @ApiModelProperty("菜单id")
+    private Long menuId;
+    /**
+    * 部门id
+    */
+    @ApiModelProperty("部门id")
+    private Long deptId;
+
+
+
+}

src/main/java/com/xjrsoft/module/textbook/service/impl/TextbookServiceImpl.java

@@ -40,10 +40,7 @@ import com.xjrsoft.module.teacher.entity.XjrUser;
 import com.xjrsoft.module.textbook.dto.*;
 import com.xjrsoft.module.textbook.entity.*;
 import com.xjrsoft.module.textbook.mapper.*;
-import com.xjrsoft.module.textbook.service.ITextbookService;
-import com.xjrsoft.module.textbook.service.ITextbookWarehouseRecordService;
-import com.xjrsoft.module.textbook.service.IWfExerciseBookService;
-import com.xjrsoft.module.textbook.service.IWfTextbookSubscriptionService;
+import com.xjrsoft.module.textbook.service.*;
 import com.xjrsoft.module.textbook.vo.*;
 import lombok.AllArgsConstructor;
 import org.apache.poi.ss.usermodel.BorderStyle;
@@ -96,6 +93,7 @@ public class TextbookServiceImpl extends MPJBaseServiceImpl<TextbookMapper, Text
 
     private final BaseSemesterMapper baseSemesterMapper;
 
+    private final ITextbookCoreAttributeService textbookCoreAttributeService;
 
     @Override
     @Transactional(rollbackFor = Exception.class)
@@ -836,7 +834,6 @@ public class TextbookServiceImpl extends MPJBaseServiceImpl<TextbookMapper, Text
             TextbookCoreAttribute textbookCoreAttribute = new TextbookCoreAttribute();
             BeanUtils.copyProperties(textbookImportDto, textbookCoreAttribute);
 
-
             Textbook textbook = new Textbook();
             BeanUtils.copyProperties(textbookImportDto, textbook);
 
@@ -902,6 +899,8 @@ public class TextbookServiceImpl extends MPJBaseServiceImpl<TextbookMapper, Text
 
             Textbook oldTextbook = this.getOne(textbookLambdaQueryWrapper);
 
+
+
             // 已经存在，更新数据
             if (oldTextbook != null) {
                 // 更新教材数据
@@ -923,6 +922,9 @@ public class TextbookServiceImpl extends MPJBaseServiceImpl<TextbookMapper, Text
                     }});
                 }
             } else {
+                textbookCoreAttributeService.save(textbookCoreAttribute);
+
+                textbook.setTextbookCoreAttributeId(textbookCoreAttribute.getId());
                 // 插入教材数据
                 textbookTextbookMapper.insert(textbook);
 

src/main/resources/mapper/asset/XjrMenuDeptRelationMapper.xml

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.xjrsoft.module.system.mapper.XjrMenuDeptRelationMapper">
+    <select id="getPage" resultType="com.xjrsoft.module.system.vo.XjrMenuDeptRelationPageVo">
+        SELECT *, t1.name as menuName, t2.name as deptName FROM xjr_menu_dept_relation t
+        LEFT JOIN xjr_menu t1 ON t1.id = t.menu_id
+        LEFT JOIN xjr_department t2 on t2.id = t.dept_id
+        WHERE t.delete_mark = 0
+        <if test="list != null and list.size() > 0">
+            AND dept_id IN
+            <foreach item="deptId" index="index" collection="list" open="(" separator="," close=")">
+                #{deptId}
+            </foreach>
+        </if>
+    </select>
+</mapper>

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

@@ -2749,4 +2749,29 @@ public class FreeMarkerGeneratorTest {
 
         apiGeneratorService.generateCodes(params);
     }
+
+    @Test
+    public void gcXjrMenuDeptRelation() throws IOException {
+        List<TableConfig> tableConfigs = new ArrayList<>();
+        TableConfig mainTable = new TableConfig();
+        mainTable.setTableName("xjr_menu_dept_relation");//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("brealinxx");//作者名称
+        params.setPackageName("system");//包名
+        params.setTableConfigs(tableConfigs);
+        params.setPage(true);//是否生成分页接口
+        params.setImport(false);//是否生成导入接口
+        params.setExport(false);//是否生成导出接口
+        params.setOutMainDir(true);//是否生成在主目录，前期测试可设置成false
+        params.setDs(ds);
+
+        IApiGeneratorService apiGeneratorService = new ApiGeneratorServiceImpl();
+
+        apiGeneratorService.generateCodes(params);
+    }
 }