Merge remote-tracking branch 'origin/master'

ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/basics/controller/PtCampusController.java

@@ -0,0 +1,106 @@
+package org.dromara.backstage.basics.controller;
+
+import java.util.List;
+
+import lombok.RequiredArgsConstructor;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.constraints.*;
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.validation.annotation.Validated;
+import org.dromara.common.idempotent.annotation.RepeatSubmit;
+import org.dromara.common.log.annotation.Log;
+import org.dromara.common.web.core.BaseController;
+import org.dromara.common.mybatis.core.page.PageQuery;
+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.log.enums.BusinessType;
+import org.dromara.common.excel.utils.ExcelUtil;
+import org.dromara.backstage.basics.domain.vo.PtCampusVo;
+import org.dromara.backstage.basics.domain.bo.PtCampusBo;
+import org.dromara.backstage.basics.service.IPtCampusService;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+
+/**
+ * 校区信息
+ * 前端访问路由地址为:/customer/ptCampus
+ *
+ * @author Yz
+ * @date 2024-08-07
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/customer/ptCampus")
+public class PtCampusController extends BaseController {
+
+    private final IPtCampusService ptCampusService;
+
+    /**
+     * 查询校区信息列表
+     */
+    @SaCheckPermission("customer:ptCampus:list")
+    @GetMapping("/list")
+    public TableDataInfo<PtCampusVo> list(PtCampusBo bo, PageQuery pageQuery) {
+        return ptCampusService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 导出校区信息列表
+     */
+    @SaCheckPermission("customer:ptCampus:export")
+    @Log(title = "校区信息", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(PtCampusBo bo, HttpServletResponse response) {
+        List<PtCampusVo> list = ptCampusService.queryList(bo);
+        ExcelUtil.exportExcel(list, "校区信息", PtCampusVo.class, response);
+    }
+
+    /**
+     * 获取校区信息详细信息
+     *
+     * @param campusId 主键
+     */
+    @SaCheckPermission("customer:ptCampus:query")
+    @GetMapping("/{campusId}")
+    public R<PtCampusVo> getInfo(@NotNull(message = "主键不能为空")
+                                     @PathVariable Long campusId) {
+        return R.ok(ptCampusService.queryById(campusId));
+    }
+
+    /**
+     * 新增校区信息
+     */
+    @SaCheckPermission("customer:ptCampus:add")
+    @Log(title = "校区信息", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping()
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody PtCampusBo bo) {
+        return toAjax(ptCampusService.insertByBo(bo));
+    }
+
+    /**
+     * 修改校区信息
+     */
+    @SaCheckPermission("customer:ptCampus:edit")
+    @Log(title = "校区信息", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PutMapping()
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody PtCampusBo bo) {
+        return toAjax(ptCampusService.updateByBo(bo));
+    }
+
+    /**
+     * 删除校区信息
+     *
+     * @param campusIds 主键串
+     */
+    @SaCheckPermission("customer:ptCampus:remove")
+    @Log(title = "校区信息", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{campusIds}")
+    public R<Void> remove(@NotEmpty(message = "主键不能为空")
+                          @PathVariable Long[] campusIds) {
+        return toAjax(ptCampusService.deleteWithValidByIds(List.of(campusIds), true));
+    }
+}

ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/basics/domain/PtCampus.java

@@ -0,0 +1,92 @@
+package org.dromara.backstage.basics.domain;
+
+import org.dromara.common.tenant.core.TenantEntity;
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serial;
+
+/**
+ * 校区信息对象 t_pt_campus
+ *
+ * @author Yz
+ * @date 2024-08-07
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("t_pt_campus")
+public class PtCampus extends TenantEntity {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 学校Id,主键
+     */
+    @TableId(value = "campus_id")
+    private Long campusId;
+
+    /**
+     * 所属学校Id
+     */
+    private Long schoolId;
+
+    /**
+     * 校区名称
+     */
+    private String campusName;
+
+    /**
+     * 校区代码
+     */
+    private String campusCode;
+
+    /**
+     * 校区地址
+     */
+    private String address;
+
+    /**
+     * 邮政编码
+     */
+    private String postCode;
+
+    /**
+     * 联系电话
+     */
+    private String telephone;
+
+    /**
+     * 传真
+     */
+    private String fax;
+
+    /**
+     * 邮箱
+     */
+    private String email;
+
+    /**
+     * 历史沿革
+     */
+    private String principal;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 删除标志(0-未删除 2-已删除)
+     */
+    @TableLogic
+    private String delFlag;
+
+    /**
+     * 负责人
+     */
+    private String chargePerson;
+
+
+}

ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/basics/domain/bo/PtCampusBo.java

@@ -0,0 +1,87 @@
+package org.dromara.backstage.basics.domain.bo;
+
+import org.dromara.backstage.basics.domain.PtCampus;
+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.*;
+
+/**
+ * 校区信息业务对象 t_pt_campus
+ *
+ * @author Yz
+ * @date 2024-08-07
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = PtCampus.class, reverseConvertGenerate = false)
+public class PtCampusBo extends BaseEntity {
+
+    /**
+     * ID
+     */
+    @NotNull(message = "ID不能为空", groups = { EditGroup.class })
+    private Long campusId;
+
+    /**
+     * 学校名称
+     */
+    @NotNull(message = "学校名称不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Long schoolId;
+
+    /**
+     * 校区名称
+     */
+    @NotBlank(message = "校区名称不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String campusName;
+
+    /**
+     * 校区代码
+     */
+    private String campusCode;
+
+    /**
+     * 校区地址
+     */
+    private String address;
+
+    /**
+     * 邮政编码
+     */
+    private String postCode;
+
+    /**
+     * 联系电话
+     */
+    private String telephone;
+
+    /**
+     * 传真
+     */
+    private String fax;
+
+    /**
+     * 邮箱
+     */
+    private String email;
+
+    /**
+     * 历史沿革
+     */
+    private String principal;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 负责人
+     */
+    private String chargePerson;
+
+
+}

ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/basics/domain/vo/PtCampusVo.java

@@ -0,0 +1,104 @@
+package org.dromara.backstage.basics.domain.vo;
+
+import org.dromara.backstage.basics.domain.PtCampus;
+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;
+
+
+
+/**
+ * 校区信息视图对象 t_pt_campus
+ *
+ * @author Yz
+ * @date 2024-08-07
+ */
+@Data
+@ExcelIgnoreUnannotated
+@AutoMapper(target = PtCampus.class)
+public class PtCampusVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 学校Id,主键
+     */
+    @ExcelProperty(value = "学校Id,主键")
+    private Long campusId;
+
+    /**
+     * 所属学校Id
+     */
+    @ExcelProperty(value = "所属学校Id")
+    private Long schoolId;
+
+    /**
+     * 校区名称
+     */
+    @ExcelProperty(value = "校区名称")
+    private String campusName;
+
+    /**
+     * 校区代码
+     */
+    @ExcelProperty(value = "校区代码")
+    private String campusCode;
+
+    /**
+     * 校区地址
+     */
+    @ExcelProperty(value = "校区地址")
+    private String address;
+
+    /**
+     * 邮政编码
+     */
+    @ExcelProperty(value = "邮政编码")
+    private String postCode;
+
+    /**
+     * 联系电话
+     */
+    @ExcelProperty(value = "联系电话")
+    private String telephone;
+
+    /**
+     * 传真
+     */
+    @ExcelProperty(value = "传真")
+    private String fax;
+
+    /**
+     * 邮箱
+     */
+    @ExcelProperty(value = "邮箱")
+    private String email;
+
+    /**
+     * 历史沿革
+     */
+    @ExcelProperty(value = "历史沿革")
+    private String principal;
+
+    /**
+     * 备注
+     */
+    @ExcelProperty(value = "备注")
+    private String remark;
+
+    /**
+     * 负责人
+     */
+    @ExcelProperty(value = "负责人")
+    private String chargePerson;
+
+
+}

ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/basics/mapper/PtCampusMapper.java

@@ -0,0 +1,15 @@
+package org.dromara.backstage.basics.mapper;
+
+import org.dromara.backstage.basics.domain.PtCampus;
+import org.dromara.backstage.basics.domain.vo.PtCampusVo;
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+
+/**
+ * 校区信息Mapper接口
+ *
+ * @author Yz
+ * @date 2024-08-07
+ */
+public interface PtCampusMapper extends BaseMapperPlus<PtCampus, PtCampusVo> {
+
+}

ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/basics/service/IPtCampusService.java

@@ -0,0 +1,69 @@
+package org.dromara.backstage.basics.service;
+
+import org.dromara.backstage.basics.domain.PtCampus;
+import org.dromara.backstage.basics.domain.vo.PtCampusVo;
+import org.dromara.backstage.basics.domain.bo.PtCampusBo;
+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 Yz
+ * @date 2024-08-07
+ */
+public interface IPtCampusService {
+
+    /**
+     * 查询校区信息
+     *
+     * @param campusId 主键
+     * @return 校区信息
+     */
+    PtCampusVo queryById(Long campusId);
+
+    /**
+     * 分页查询校区信息列表
+     *
+     * @param bo        查询条件
+     * @param pageQuery 分页参数
+     * @return 校区信息分页列表
+     */
+    TableDataInfo<PtCampusVo> queryPageList(PtCampusBo bo, PageQuery pageQuery);
+
+    /**
+     * 查询符合条件的校区信息列表
+     *
+     * @param bo 查询条件
+     * @return 校区信息列表
+     */
+    List<PtCampusVo> queryList(PtCampusBo bo);
+
+    /**
+     * 新增校区信息
+     *
+     * @param bo 校区信息
+     * @return 是否新增成功
+     */
+    Boolean insertByBo(PtCampusBo bo);
+
+    /**
+     * 修改校区信息
+     *
+     * @param bo 校区信息
+     * @return 是否修改成功
+     */
+    Boolean updateByBo(PtCampusBo bo);
+
+    /**
+     * 校验并批量删除校区信息信息
+     *
+     * @param ids     待删除的主键集合
+     * @param isValid 是否进行有效性校验
+     * @return 是否删除成功
+     */
+    Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+}

ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/basics/service/impl/PtCampusServiceImpl.java

@@ -0,0 +1,130 @@
+package org.dromara.backstage.basics.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.backstage.basics.domain.bo.PtCampusBo;
+import org.dromara.backstage.basics.domain.vo.PtCampusVo;
+import org.dromara.backstage.basics.domain.PtCampus;
+import org.dromara.backstage.basics.mapper.PtCampusMapper;
+import org.dromara.backstage.basics.service.IPtCampusService;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Collection;
+
+/**
+ * 校区信息Service业务层处理
+ *
+ * @author Yz
+ * @date 2024-08-07
+ */
+@RequiredArgsConstructor
+@Service
+public class PtCampusServiceImpl implements IPtCampusService {
+
+    private final PtCampusMapper baseMapper;
+
+    /**
+     * 查询校区信息
+     *
+     * @param campusId 主键
+     * @return 校区信息
+     */
+    @Override
+    public PtCampusVo queryById(Long campusId){
+        return baseMapper.selectVoById(campusId);
+    }
+
+    /**
+     * 分页查询校区信息列表
+     *
+     * @param bo        查询条件
+     * @param pageQuery 分页参数
+     * @return 校区信息分页列表
+     */
+    @Override
+    public TableDataInfo<PtCampusVo> queryPageList(PtCampusBo bo, PageQuery pageQuery) {
+        LambdaQueryWrapper<PtCampus> lqw = buildQueryWrapper(bo);
+        Page<PtCampusVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        return TableDataInfo.build(result);
+    }
+
+    /**
+     * 查询符合条件的校区信息列表
+     *
+     * @param bo 查询条件
+     * @return 校区信息列表
+     */
+    @Override
+    public List<PtCampusVo> queryList(PtCampusBo bo) {
+        LambdaQueryWrapper<PtCampus> lqw = buildQueryWrapper(bo);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    private LambdaQueryWrapper<PtCampus> buildQueryWrapper(PtCampusBo bo) {
+        Map<String, Object> params = bo.getParams();
+        LambdaQueryWrapper<PtCampus> lqw = Wrappers.lambdaQuery();
+        lqw.eq(bo.getSchoolId() != null, PtCampus::getSchoolId, bo.getSchoolId());
+        lqw.like(StringUtils.isNotBlank(bo.getCampusName()), PtCampus::getCampusName, bo.getCampusName());
+        return lqw;
+    }
+
+    /**
+     * 新增校区信息
+     *
+     * @param bo 校区信息
+     * @return 是否新增成功
+     */
+    @Override
+    public Boolean insertByBo(PtCampusBo bo) {
+        PtCampus add = MapstructUtils.convert(bo, PtCampus.class);
+        validEntityBeforeSave(add);
+        boolean flag = baseMapper.insert(add) > 0;
+        if (flag) {
+            bo.setCampusId(add.getCampusId());
+        }
+        return flag;
+    }
+
+    /**
+     * 修改校区信息
+     *
+     * @param bo 校区信息
+     * @return 是否修改成功
+     */
+    @Override
+    public Boolean updateByBo(PtCampusBo bo) {
+        PtCampus update = MapstructUtils.convert(bo, PtCampus.class);
+        validEntityBeforeSave(update);
+        return baseMapper.updateById(update) > 0;
+    }
+
+    /**
+     * 保存前的数据校验
+     */
+    private void validEntityBeforeSave(PtCampus entity){
+        //TODO 做一些数据校验,如唯一约束
+    }
+
+    /**
+     * 校验并批量删除校区信息信息
+     *
+     * @param ids     待删除的主键集合
+     * @param isValid 是否进行有效性校验
+     * @return 是否删除成功
+     */
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if(isValid){
+            //TODO 做一些业务上的校验,判断是否需要校验
+        }
+        return baseMapper.deleteByIds(ids) > 0;
+    }
+}

ruoyi-modules/ruoyi-backstage/src/main/resources/mapper/basics/customer/PtCampusMapper.xml

@@ -0,0 +1,28 @@
+<?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.backstage.basics.mapper.PtCampusMapper">
+
+    <resultMap type="org.dromara.backstage.basics.domain.PtCampus" id="PtCampusResult">
+            <result property="campusId"    column="campus_id"    />
+            <result property="tenantId"    column="tenant_id"    />
+            <result property="schoolId"    column="school_id"    />
+            <result property="campusName"    column="campus_name"    />
+            <result property="campusCode"    column="campus_code"    />
+            <result property="address"    column="address"    />
+            <result property="postCode"    column="post_code"    />
+            <result property="telephone"    column="telephone"    />
+            <result property="fax"    column="fax"    />
+            <result property="email"    column="email"    />
+            <result property="principal"    column="principal"    />
+            <result property="remark"    column="remark"    />
+            <result property="delFlag"    column="del_flag"    />
+            <result property="createDept"    column="create_dept"    />
+            <result property="createBy"    column="create_by"    />
+            <result property="createTime"    column="create_time"    />
+            <result property="updateBy"    column="update_by"    />
+            <result property="updateTime"    column="update_time"    />
+            <result property="chargePerson"    column="charge_person"    />
+    </resultMap>
+</mapper>