添加教职工基础信息；优化目录分页查询

ruoyi-modules/ruoyi-file/pom.xml

@@ -67,6 +67,12 @@
             <groupId>org.dromara</groupId>
             <artifactId>ruoyi-common-translation</artifactId>
         </dependency>
+
+        <!-- excel-->
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-excel</artifactId>
+        </dependency>
     </dependencies>
 
 </project>

ruoyi-modules/ruoyi-file/src/main/java/org/dromara/file/controller/SysTeacherController.java

@@ -0,0 +1,106 @@
+package org.dromara.file.controller;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;
+import lombok.RequiredArgsConstructor;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+import org.dromara.common.excel.utils.ExcelUtil;
+import org.dromara.common.idempotent.annotation.RepeatSubmit;
+import org.dromara.common.log.annotation.Log;
+import org.dromara.common.log.enums.BusinessType;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.web.core.BaseController;
+import org.dromara.file.domain.bo.SysTeacherBo;
+import org.dromara.file.domain.vo.SysTeacherVo;
+import org.dromara.file.service.ISysTeacherService;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * 教职工信息
+ *
+ * @author cjw
+ * @date 2024-05-30
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/file/teacher")
+public class SysTeacherController extends BaseController {
+
+    private final ISysTeacherService sysTeacherService;
+
+    /**
+     * 查询教职工信息列表
+     */
+    @SaCheckPermission("file:teacher:list")
+    @GetMapping("/list")
+    public TableDataInfo<SysTeacherVo> list(SysTeacherBo bo, PageQuery pageQuery) {
+        return sysTeacherService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 导出教职工信息列表
+     */
+    @SaCheckPermission("file:teacher:export")
+    @Log(title = "教职工信息", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(SysTeacherBo bo, HttpServletResponse response) {
+        List<SysTeacherVo> list = sysTeacherService.queryList(bo);
+        ExcelUtil.exportExcel(list, "教职工信息", SysTeacherVo.class, response);
+    }
+
+    /**
+     * 获取教职工信息详细信息
+     *
+     * @param teacherId 主键
+     */
+    @SaCheckPermission("file:teacher:query")
+    @GetMapping("/{teacherId}")
+    public R<SysTeacherVo> getInfo(@NotNull(message = "主键不能为空")
+                                     @PathVariable Long teacherId) {
+        return R.ok(sysTeacherService.queryById(teacherId));
+    }
+
+    /**
+     * 新增教职工信息
+     */
+    @SaCheckPermission("file:teacher:add")
+    @Log(title = "教职工信息", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping()
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody SysTeacherBo bo) {
+        return toAjax(sysTeacherService.insertByBo(bo));
+    }
+
+    /**
+     * 修改教职工信息
+     */
+    @SaCheckPermission("file:teacher:edit")
+    @Log(title = "教职工信息", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PutMapping()
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody SysTeacherBo bo) {
+        return toAjax(sysTeacherService.updateByBo(bo));
+    }
+
+    /**
+     * 删除教职工信息
+     *
+     * @param teacherIds 主键串
+     */
+    @SaCheckPermission("file:teacher:remove")
+    @Log(title = "教职工信息", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{teacherIds}")
+    public R<Void> remove(@NotEmpty(message = "主键不能为空")
+                          @PathVariable Long[] teacherIds) {
+        return toAjax(sysTeacherService.deleteWithValidByIds(List.of(teacherIds), true));
+    }
+}

ruoyi-modules/ruoyi-file/src/main/java/org/dromara/file/domain/SysTeacher.java

@@ -0,0 +1,96 @@
+package org.dromara.file.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.dromara.common.tenant.core.TenantEntity;
+
+import java.io.Serial;
+import java.util.Date;
+
+/**
+ * 教职工信息对象 sys_teacher
+ *
+ * @author cjw
+ * @date 2024-05-30
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("sys_teacher")
+public class SysTeacher extends TenantEntity {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 教职工
+     */
+    @TableId(value = "teacher_id",type = IdType.AUTO)
+    private Long teacherId;
+
+    /**
+     * 部门ID
+     */
+    private Long deptId;
+
+    /**
+     * 教职工姓名
+     */
+    private String teacherName;
+
+    /**
+     * 手机号码
+     */
+    private String phonenumber;
+
+    /**
+     * 工作号码
+     */
+    private String telephone;
+
+    /**
+     * 用户邮箱
+     */
+    private String email;
+
+    /**
+     * 学历
+     */
+    private String educationCode;
+
+    /**
+     * 学位
+     */
+    private String degreeCode;
+
+    /**
+     * 学科
+     */
+    private String subjectCode;
+
+    /**
+     * 职务
+     */
+    private String post;
+
+    /**
+     * 用户性别（0男 1女 2未知）
+     */
+    private String sex;
+
+    /**
+     * 出生日期
+     */
+    private Date birthday;
+
+    /**
+     * 删除标志（0代表存在 2代表删除）
+     */
+    @TableLogic
+    private String delFlag;
+
+
+}

ruoyi-modules/ruoyi-file/src/main/java/org/dromara/file/domain/bo/SysTeacherBo.java

@@ -0,0 +1,98 @@
+package org.dromara.file.domain.bo;
+
+import org.dromara.file.domain.SysTeacher;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+import org.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import jakarta.validation.constraints.*;
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+/**
+ * 教职工信息业务对象 sys_teacher
+ *
+ * @author cjw
+ * @date 2024-05-30
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = SysTeacher.class, reverseConvertGenerate = false)
+public class SysTeacherBo extends BaseEntity {
+
+    /**
+     * 教职工
+     */
+    @NotNull(message = "教职工不能为空", groups = { EditGroup.class })
+    private Long teacherId;
+
+    /**
+     * 部门ID
+     */
+    @NotNull(message = "部门ID不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Long deptId;
+
+    /**
+     * 教职工姓名
+     */
+    @NotBlank(message = "教职工姓名不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String teacherName;
+
+    /**
+     * 手机号码
+     */
+    @NotBlank(message = "手机号码不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String phonenumber;
+
+    /**
+     * 工作号码
+     */
+    @NotBlank(message = "工作号码不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String telephone;
+
+    /**
+     * 用户邮箱
+     */
+    @NotBlank(message = "用户邮箱不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String email;
+
+    /**
+     * 学历
+     */
+    @NotBlank(message = "学历不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String educationCode;
+
+    /**
+     * 学位
+     */
+    @NotBlank(message = "学位不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String degreeCode;
+
+    /**
+     * 学科
+     */
+    @NotBlank(message = "学科不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String subjectCode;
+
+    /**
+     * 职务
+     */
+    @NotBlank(message = "职务不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String post;
+
+    /**
+     * 用户性别（0男 1女 2未知）
+     */
+    @NotBlank(message = "用户性别（0男 1女 2未知）不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String sex;
+
+    /**
+     * 出生日期
+     */
+    @NotNull(message = "出生日期不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Date birthday;
+
+
+}

ruoyi-modules/ruoyi-file/src/main/java/org/dromara/file/domain/vo/SysTeacherVo.java

@@ -0,0 +1,107 @@
+package org.dromara.file.domain.vo;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.dromara.file.domain.SysTeacher;
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import org.dromara.common.excel.annotation.ExcelDictFormat;
+import org.dromara.common.excel.convert.ExcelDictConvert;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.Date;
+
+
+
+/**
+ * 教职工信息视图对象 sys_teacher
+ *
+ * @author cjw
+ * @date 2024-05-30
+ */
+@Data
+@ExcelIgnoreUnannotated
+@AutoMapper(target = SysTeacher.class)
+public class SysTeacherVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 教职工
+     */
+    @ExcelProperty(value = "教职工")
+    private Long teacherId;
+
+    /**
+     * 部门ID
+     */
+    @ExcelProperty(value = "部门ID")
+    private Long deptId;
+
+    /**
+     * 教职工姓名
+     */
+    @ExcelProperty(value = "教职工姓名")
+    private String teacherName;
+
+    /**
+     * 手机号码
+     */
+    @ExcelProperty(value = "手机号码")
+    private String phonenumber;
+
+    /**
+     * 工作号码
+     */
+    @ExcelProperty(value = "工作号码")
+    private String telephone;
+
+    /**
+     * 用户邮箱
+     */
+    @ExcelProperty(value = "用户邮箱")
+    private String email;
+
+    /**
+     * 学历
+     */
+    @ExcelProperty(value = "学历")
+    private String educationCode;
+
+    /**
+     * 学位
+     */
+    @ExcelProperty(value = "学位")
+    private String degreeCode;
+
+    /**
+     * 学科
+     */
+    @ExcelProperty(value = "学科")
+    private String subjectCode;
+
+    /**
+     * 职务
+     */
+    @ExcelProperty(value = "职务")
+    private String post;
+
+    /**
+     * 用户性别（0男 1女 2未知）
+     */
+    @ExcelProperty(value = "用户性别", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(readConverterExp = "0=男,1=女,2=未知")
+    private String sex;
+
+    /**
+     * 出生日期
+     */
+    @ExcelProperty(value = "出生日期")
+    private Date birthday;
+
+
+}

ruoyi-modules/ruoyi-file/src/main/java/org/dromara/file/mapper/SysTeacherMapper.java

@@ -0,0 +1,15 @@
+package org.dromara.file.mapper;
+
+import org.dromara.file.domain.SysTeacher;
+import org.dromara.file.domain.vo.SysTeacherVo;
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+
+/**
+ * 教职工信息Mapper接口
+ *
+ * @author cjw
+ * @date 2024-05-30
+ */
+public interface SysTeacherMapper extends BaseMapperPlus<SysTeacher, SysTeacherVo> {
+
+}

ruoyi-modules/ruoyi-file/src/main/java/org/dromara/file/service/ISysTeacherService.java

@@ -0,0 +1,68 @@
+package org.dromara.file.service;
+
+import org.dromara.file.domain.vo.SysTeacherVo;
+import org.dromara.file.domain.bo.SysTeacherBo;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.mybatis.core.page.PageQuery;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 教职工信息Service接口
+ *
+ * @author cjw
+ * @date 2024-05-30
+ */
+public interface ISysTeacherService {
+
+    /**
+     * 查询教职工信息
+     *
+     * @param teacherId 主键
+     * @return 教职工信息
+     */
+    SysTeacherVo queryById(Long teacherId);
+
+    /**
+     * 分页查询教职工信息列表
+     *
+     * @param bo        查询条件
+     * @param pageQuery 分页参数
+     * @return 教职工信息分页列表
+     */
+    TableDataInfo<SysTeacherVo> queryPageList(SysTeacherBo bo, PageQuery pageQuery);
+
+    /**
+     * 查询符合条件的教职工信息列表
+     *
+     * @param bo 查询条件
+     * @return 教职工信息列表
+     */
+    List<SysTeacherVo> queryList(SysTeacherBo bo);
+
+    /**
+     * 新增教职工信息
+     *
+     * @param bo 教职工信息
+     * @return 是否新增成功
+     */
+    Boolean insertByBo(SysTeacherBo bo);
+
+    /**
+     * 修改教职工信息
+     *
+     * @param bo 教职工信息
+     * @return 是否修改成功
+     */
+    Boolean updateByBo(SysTeacherBo bo);
+
+    /**
+     * 校验并批量删除教职工信息信息
+     *
+     * @param ids     待删除的主键集合
+     * @param isValid 是否进行有效性校验
+     * @return 是否删除成功
+     */
+    Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+}

ruoyi-modules/ruoyi-file/src/main/java/org/dromara/file/service/impl/SysTeacherServiceImpl.java

@@ -0,0 +1,139 @@
+package org.dromara.file.service.impl;
+
+import org.dromara.common.core.utils.MapstructUtils;
+import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+import org.dromara.file.domain.bo.SysTeacherBo;
+import org.dromara.file.domain.vo.SysTeacherVo;
+import org.dromara.file.domain.SysTeacher;
+import org.dromara.file.mapper.SysTeacherMapper;
+import org.dromara.file.service.ISysTeacherService;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Collection;
+
+/**
+ * 教职工信息Service业务层处理
+ *
+ * @author cjw
+ * @date 2024-05-30
+ */
+@RequiredArgsConstructor
+@Service
+public class SysTeacherServiceImpl implements ISysTeacherService {
+
+    private final SysTeacherMapper baseMapper;
+
+    /**
+     * 查询教职工信息
+     *
+     * @param teacherId 主键
+     * @return 教职工信息
+     */
+    @Override
+    public SysTeacherVo queryById(Long teacherId){
+        return baseMapper.selectVoById(teacherId);
+    }
+
+    /**
+     * 分页查询教职工信息列表
+     *
+     * @param bo        查询条件
+     * @param pageQuery 分页参数
+     * @return 教职工信息分页列表
+     */
+    @Override
+    public TableDataInfo<SysTeacherVo> queryPageList(SysTeacherBo bo, PageQuery pageQuery) {
+        LambdaQueryWrapper<SysTeacher> lqw = buildQueryWrapper(bo);
+        Page<SysTeacherVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        return TableDataInfo.build(result);
+    }
+
+    /**
+     * 查询符合条件的教职工信息列表
+     *
+     * @param bo 查询条件
+     * @return 教职工信息列表
+     */
+    @Override
+    public List<SysTeacherVo> queryList(SysTeacherBo bo) {
+        LambdaQueryWrapper<SysTeacher> lqw = buildQueryWrapper(bo);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    private LambdaQueryWrapper<SysTeacher> buildQueryWrapper(SysTeacherBo bo) {
+        Map<String, Object> params = bo.getParams();
+        LambdaQueryWrapper<SysTeacher> lqw = Wrappers.lambdaQuery();
+        lqw.eq(bo.getDeptId() != null, SysTeacher::getDeptId, bo.getDeptId());
+        lqw.like(StringUtils.isNotBlank(bo.getTeacherName()), SysTeacher::getTeacherName, bo.getTeacherName());
+        lqw.eq(StringUtils.isNotBlank(bo.getPhonenumber()), SysTeacher::getPhonenumber, bo.getPhonenumber());
+        lqw.eq(StringUtils.isNotBlank(bo.getTelephone()), SysTeacher::getTelephone, bo.getTelephone());
+        lqw.eq(StringUtils.isNotBlank(bo.getEmail()), SysTeacher::getEmail, bo.getEmail());
+        lqw.eq(StringUtils.isNotBlank(bo.getEducationCode()), SysTeacher::getEducationCode, bo.getEducationCode());
+        lqw.eq(StringUtils.isNotBlank(bo.getDegreeCode()), SysTeacher::getDegreeCode, bo.getDegreeCode());
+        lqw.eq(StringUtils.isNotBlank(bo.getSubjectCode()), SysTeacher::getSubjectCode, bo.getSubjectCode());
+        lqw.eq(StringUtils.isNotBlank(bo.getPost()), SysTeacher::getPost, bo.getPost());
+        lqw.eq(StringUtils.isNotBlank(bo.getSex()), SysTeacher::getSex, bo.getSex());
+        lqw.eq(bo.getBirthday() != null, SysTeacher::getBirthday, bo.getBirthday());
+        return lqw;
+    }
+
+    /**
+     * 新增教职工信息
+     *
+     * @param bo 教职工信息
+     * @return 是否新增成功
+     */
+    @Override
+    public Boolean insertByBo(SysTeacherBo bo) {
+        SysTeacher add = MapstructUtils.convert(bo, SysTeacher.class);
+        validEntityBeforeSave(add);
+        boolean flag = baseMapper.insert(add) > 0;
+        if (flag) {
+            bo.setTeacherId(add.getTeacherId());
+        }
+        return flag;
+    }
+
+    /**
+     * 修改教职工信息
+     *
+     * @param bo 教职工信息
+     * @return 是否修改成功
+     */
+    @Override
+    public Boolean updateByBo(SysTeacherBo bo) {
+        SysTeacher update = MapstructUtils.convert(bo, SysTeacher.class);
+        validEntityBeforeSave(update);
+        return baseMapper.updateById(update) > 0;
+    }
+
+    /**
+     * 保存前的数据校验
+     */
+    private void validEntityBeforeSave(SysTeacher entity){
+        //TODO 做一些数据校验,如唯一约束
+    }
+
+    /**
+     * 校验并批量删除教职工信息信息
+     *
+     * @param ids     待删除的主键集合
+     * @param isValid 是否进行有效性校验
+     * @return 是否删除成功
+     */
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if(isValid){
+            //TODO 做一些业务上的校验,判断是否需要校验
+        }
+        return baseMapper.deleteBatchIds(ids) > 0;
+    }
+}

ruoyi-modules/ruoyi-file/src/main/resources/mapper/file/SysCatalogResourceMapper.xml

@@ -5,11 +5,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 <mapper namespace="org.dromara.file.mapper.SysCatalogResourceMapper">
 
     <select id="selectPageUserList" resultType="org.dromara.file.domain.vo.SysCatalogResourceVo">
-        select cr.catalog_id, cr.catalog_name, cr.order_num, count(sor.oss_id) as `resourceNum`
+        select cr.catalog_id,cr.parent_id, cr.catalog_name, cr.order_num, count(sor.oss_id) as `resourceNum`
         from sys_catalog_resource cr
                  left join sys_oss_resource sor on sor.catalog_id = cr.catalog_id
         where FIND_IN_SET(#{catalogId}, cr.ancestors)
         group by cr.catalog_id
+        having cr.parent_id
         order by cr.order_num
     </select>
 </mapper>

ruoyi-modules/ruoyi-file/src/main/resources/mapper/file/SysCatalogTextbookMapper.xml

@@ -4,11 +4,12 @@
     "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="org.dromara.file.mapper.SysCatalogTextbookMapper">
     <select id="selectPageUserList" resultType="org.dromara.file.domain.vo.SysCatalogTextbookVo">
-        select ct.catalog_id, ct.catalog_name, ct.type, ct.order_num, count(ot.oss_id) as `resourceNum`
+        select ct.catalog_id,ct.parent_id, ct.catalog_name, ct.type, ct.order_num, count(ot.oss_id) as `resourceNum`
         from sys_catalog_textbook ct
                  left join sys_oss_textbook ot on ot.catalog_id = ct.catalog_id
         where FIND_IN_SET(#{catalogId}, ct.ancestors)
         group by ct.catalog_id
+        having ct.parent_id
         order by ct.order_num
     </select>
 </mapper>

ruoyi-modules/ruoyi-file/src/main/resources/mapper/file/SysTeacherMapper.xml

@@ -0,0 +1,7 @@
+<?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="org.dromara.file.mapper.SysTeacherMapper">
+
+</mapper>

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysOssConfig.java

@@ -1,5 +1,6 @@
 package org.dromara.system.domain;
 
+import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
@@ -19,7 +20,7 @@ public class SysOssConfig extends BaseEntity {
     /**
      * 主键
      */
-    @TableId(value = "oss_config_id")
+    @TableId(value = "oss_config_id",type = IdType.AUTO)
     private Long ossConfigId;
 
     /**