更新学校下拉菜单

ruoyi-admin/src/main/java/org/dromara/web/controller/AuthController.java

@@ -10,6 +10,7 @@ import me.zhyd.oauth.model.AuthResponse;
 import me.zhyd.oauth.model.AuthUser;
 import me.zhyd.oauth.request.AuthRequest;
 import me.zhyd.oauth.utils.AuthStateUtils;
+import org.dromara.common.core.domain.AjaxResult;
 import org.dromara.common.core.domain.R;
 import org.dromara.common.core.domain.model.LoginBody;
 import org.dromara.common.core.domain.model.RegisterBody;
@@ -23,11 +24,14 @@ import org.dromara.common.social.utils.SocialUtils;
 import org.dromara.common.tenant.helper.TenantHelper;
 import org.dromara.system.domain.SysClient;
 import org.dromara.system.domain.bo.SysTenantBo;
+import org.dromara.system.domain.school.bo.SysSchoolNameBo;
+import org.dromara.system.domain.school.vo.SysSchoolNameVo;
 import org.dromara.system.domain.vo.SysTenantVo;
 import org.dromara.system.service.ISysClientService;
 import org.dromara.system.service.ISysConfigService;
 import org.dromara.system.service.ISysSocialService;
 import org.dromara.system.service.ISysTenantService;
+import org.dromara.system.service.school.ISysSchoolNameService;
 import org.dromara.web.domain.vo.LoginTenantVo;
 import org.dromara.web.domain.vo.LoginVo;
 import org.dromara.web.domain.vo.TenantListVo;
@@ -38,7 +42,10 @@ import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import java.net.URL;
+import java.util.Collection;
 import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * 认证
@@ -60,6 +67,7 @@ public class AuthController {
     private final ISysTenantService tenantService;
     private final ISysSocialService socialUserService;
     private final ISysClientService clientService;
+    private final ISysSchoolNameService sysSchoolNameService;
 
 
     /**
@@ -183,4 +191,17 @@ public class AuthController {
         return R.ok(vo);
     }
 
+
+    /**
+     * 注册页获取学校下拉框
+     *
+     * @return 租户列表
+     */
+    @GetMapping("/school/list")
+    public AjaxResult schoolList() {
+        List<SysSchoolNameVo> sysSchoolNameVos = sysSchoolNameService.queryList(new SysSchoolNameBo());
+        Map<String, List<SysSchoolNameVo>> collect = sysSchoolNameVos.parallelStream().collect(Collectors.groupingBy(SysSchoolNameVo::getInitial));
+        return AjaxResult.success(collect);
+    }
+
 }

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/school/SysSchoolNameController.java

@@ -0,0 +1,105 @@
+package org.dromara.system.controller.school;
+
+import java.util.List;
+
+import lombok.RequiredArgsConstructor;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.constraints.*;
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.system.domain.school.bo.SysSchoolNameBo;
+import org.dromara.system.domain.school.vo.SysSchoolNameVo;
+import org.dromara.system.service.school.ISysSchoolNameService;
+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;
+
+/**
+ * 学校名称
+ *
+ * @author boman
+ * @date 2023-08-21
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/system/schoolName")
+public class SysSchoolNameController extends BaseController {
+
+    private final ISysSchoolNameService sysSchoolNameService;
+
+    /**
+     * 查询学校名称列表
+     */
+    @SaCheckPermission("system:schoolName:list")
+    @GetMapping("/list")
+    public TableDataInfo<SysSchoolNameVo> list(SysSchoolNameBo bo, PageQuery pageQuery) {
+        return sysSchoolNameService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 导出学校名称列表
+     */
+    @SaCheckPermission("system:schoolName:export")
+    @Log(title = "学校名称", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(SysSchoolNameBo bo, HttpServletResponse response) {
+        List<SysSchoolNameVo> list = sysSchoolNameService.queryList(bo);
+        ExcelUtil.exportExcel(list, "学校名称", SysSchoolNameVo.class, response);
+    }
+
+    /**
+     * 获取学校名称详细信息
+     *
+     * @param schoolNameId 主键
+     */
+    @SaCheckPermission("system:schoolName:query")
+    @GetMapping("/{schoolNameId}")
+    public R<SysSchoolNameVo> getInfo(@NotNull(message = "主键不能为空")
+                                     @PathVariable Long schoolNameId) {
+        return R.ok(sysSchoolNameService.queryById(schoolNameId));
+    }
+
+    /**
+     * 新增学校名称
+     */
+    @SaCheckPermission("system:schoolName:add")
+    @Log(title = "学校名称", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping()
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody SysSchoolNameBo bo) {
+        return toAjax(sysSchoolNameService.insertByBo(bo));
+    }
+
+    /**
+     * 修改学校名称
+     */
+    @SaCheckPermission("system:schoolName:edit")
+    @Log(title = "学校名称", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PostMapping("/put")
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody SysSchoolNameBo bo) {
+        return toAjax(sysSchoolNameService.updateByBo(bo));
+    }
+
+    /**
+     * 删除学校名称
+     *
+     * @param schoolNameIds 主键串
+     */
+    @SaCheckPermission("system:schoolName:remove")
+    @Log(title = "学校名称", businessType = BusinessType.DELETE)
+    @GetMapping("/delete/{schoolNameIds}")
+    public R<Void> remove(@NotEmpty(message = "主键不能为空")
+                          @PathVariable Long[] schoolNameIds) {
+        return toAjax(sysSchoolNameService.deleteWithValidByIds(List.of(schoolNameIds), true));
+    }
+}

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

@@ -0,0 +1,56 @@
+package org.dromara.system.domain.school;
+
+import org.dromara.common.tenant.core.TenantEntity;
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serial;
+
+/**
+ * 学校名称对象 sys_school_name
+ *
+ * @author boman
+ * @date 2023-08-21
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("sys_school_name")
+public class SysSchoolName extends TenantEntity {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 用户ID
+     */
+    @TableId(value = "school_name_id")
+    private Long schoolNameId;
+
+    /**
+     * 首字母
+     */
+    private String initial;
+
+    /**
+     * 学校名称
+     */
+    private String schoolName;
+
+    /**
+     * 学校联系人
+     */
+    private String schoolContacts;
+
+    /**
+     * 学校联系人手机
+     */
+    private String schoolContactsPhone;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+
+}

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/school/bo/SysSchoolNameBo.java

@@ -0,0 +1,60 @@
+package org.dromara.system.domain.school.bo;
+
+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 org.dromara.system.domain.school.SysSchoolName;
+
+/**
+ * 学校名称业务对象 sys_school_name
+ *
+ * @author boman
+ * @date 2023-08-21
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = SysSchoolName.class, reverseConvertGenerate = false)
+public class SysSchoolNameBo extends BaseEntity {
+
+    /**
+     * 用户ID
+     */
+    @NotNull(message = "用户ID不能为空", groups = { EditGroup.class })
+    private Long schoolNameId;
+
+    /**
+     * 首字母
+     */
+    @NotBlank(message = "首字母不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String initial;
+
+    /**
+     * 学校名称
+     */
+    @NotBlank(message = "学校名称不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String schoolName;
+
+    /**
+     * 学校联系人
+     */
+    @NotBlank(message = "学校联系人不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String schoolContacts;
+
+    /**
+     * 学校联系人手机
+     */
+    @NotBlank(message = "学校联系人手机不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String schoolContactsPhone;
+
+    /**
+     * 备注
+     */
+    @NotBlank(message = "备注不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String remark;
+
+
+}

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/school/vo/SysSchoolNameVo.java

@@ -0,0 +1,64 @@
+package org.dromara.system.domain.school.vo;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import org.dromara.system.domain.school.SysSchoolName;
+import java.io.Serial;
+import java.io.Serializable;
+
+
+
+/**
+ * 学校名称视图对象 sys_school_name
+ *
+ * @author boman
+ * @date 2023-08-21
+ */
+@Data
+@ExcelIgnoreUnannotated
+@AutoMapper(target = SysSchoolName.class)
+public class SysSchoolNameVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 用户ID
+     */
+    @ExcelProperty(value = "用户ID")
+    private Long schoolNameId;
+
+    /**
+     * 首字母
+     */
+    @ExcelProperty(value = "首字母")
+    private String initial;
+
+    /**
+     * 学校名称
+     */
+    @ExcelProperty(value = "学校名称")
+    private String schoolName;
+
+    /**
+     * 学校联系人
+     */
+    @ExcelProperty(value = "学校联系人")
+    private String schoolContacts;
+
+    /**
+     * 学校联系人手机
+     */
+    @ExcelProperty(value = "学校联系人手机")
+    private String schoolContactsPhone;
+
+    /**
+     * 备注
+     */
+    @ExcelProperty(value = "备注")
+    private String remark;
+
+
+}

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/school/SysSchoolNameMapper.java

@@ -0,0 +1,16 @@
+package org.dromara.system.mapper.school;
+
+
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+import org.dromara.system.domain.school.SysSchoolName;
+import org.dromara.system.domain.school.vo.SysSchoolNameVo;
+
+/**
+ * 学校名称Mapper接口
+ *
+ * @author boman
+ * @date 2023-08-21
+ */
+public interface SysSchoolNameMapper extends BaseMapperPlus<SysSchoolName, SysSchoolNameVo> {
+
+}

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/school/SysSchoolNameServiceImpl.java

@@ -0,0 +1,112 @@
+package org.dromara.system.service.impl.school;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+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.core.toolkit.Wrappers;
+import lombok.RequiredArgsConstructor;
+import org.dromara.system.domain.school.SysSchoolName;
+import org.dromara.system.domain.school.bo.SysSchoolNameBo;
+import org.dromara.system.domain.school.vo.SysSchoolNameVo;
+import org.dromara.system.mapper.school.SysSchoolNameMapper;
+import org.dromara.system.service.school.ISysSchoolNameService;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Collection;
+
+/**
+ * 学校名称Service业务层处理
+ *
+ * @author boman
+ * @date 2023-08-21
+ */
+@RequiredArgsConstructor
+@Service
+public class SysSchoolNameServiceImpl implements ISysSchoolNameService {
+
+    private final SysSchoolNameMapper baseMapper;
+
+    /**
+     * 查询学校名称
+     */
+    @Override
+    public SysSchoolNameVo queryById(Long schoolNameId){
+        return baseMapper.selectVoById(schoolNameId);
+    }
+
+    /**
+     * 查询学校名称列表
+     */
+    @Override
+    public TableDataInfo<SysSchoolNameVo> queryPageList(SysSchoolNameBo bo, PageQuery pageQuery) {
+        LambdaQueryWrapper<SysSchoolName> lqw = buildQueryWrapper(bo);
+        Page<SysSchoolNameVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        return TableDataInfo.build(result);
+    }
+
+    /**
+     * 查询学校名称列表
+     */
+    @Override
+    public List<SysSchoolNameVo> queryList(SysSchoolNameBo bo) {
+        LambdaQueryWrapper<SysSchoolName> lqw = buildQueryWrapper(bo);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    private LambdaQueryWrapper<SysSchoolName> buildQueryWrapper(SysSchoolNameBo bo) {
+        Map<String, Object> params = bo.getParams();
+        LambdaQueryWrapper<SysSchoolName> lqw = Wrappers.lambdaQuery();
+        lqw.eq(StringUtils.isNotBlank(bo.getInitial()), SysSchoolName::getInitial, bo.getInitial());
+        lqw.like(StringUtils.isNotBlank(bo.getSchoolName()), SysSchoolName::getSchoolName, bo.getSchoolName());
+        lqw.eq(StringUtils.isNotBlank(bo.getSchoolContacts()), SysSchoolName::getSchoolContacts, bo.getSchoolContacts());
+        lqw.eq(StringUtils.isNotBlank(bo.getSchoolContactsPhone()), SysSchoolName::getSchoolContactsPhone, bo.getSchoolContactsPhone());
+        return lqw;
+    }
+
+    /**
+     * 新增学校名称
+     */
+    @Override
+    public Boolean insertByBo(SysSchoolNameBo bo) {
+        SysSchoolName add = MapstructUtils.convert(bo, SysSchoolName.class);
+        validEntityBeforeSave(add);
+        boolean flag = baseMapper.insert(add) > 0;
+        if (flag) {
+            bo.setSchoolNameId(add.getSchoolNameId());
+        }
+        return flag;
+    }
+
+    /**
+     * 修改学校名称
+     */
+    @Override
+    public Boolean updateByBo(SysSchoolNameBo bo) {
+        SysSchoolName update = MapstructUtils.convert(bo, SysSchoolName.class);
+        validEntityBeforeSave(update);
+        return baseMapper.updateById(update) > 0;
+    }
+
+    /**
+     * 保存前的数据校验
+     */
+    private void validEntityBeforeSave(SysSchoolName entity){
+        //TODO 做一些数据校验,如唯一约束
+    }
+
+    /**
+     * 批量删除学校名称
+     */
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if(isValid){
+            //TODO 做一些业务上的校验,判断是否需要校验
+        }
+        return baseMapper.deleteBatchIds(ids) > 0;
+    }
+}

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/school/ISysSchoolNameService.java

@@ -0,0 +1,48 @@
+package org.dromara.system.service.school;
+
+
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.system.domain.school.bo.SysSchoolNameBo;
+import org.dromara.system.domain.school.vo.SysSchoolNameVo;
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 学校名称Service接口
+ *
+ * @author boman
+ * @date 2023-08-21
+ */
+public interface ISysSchoolNameService {
+
+    /**
+     * 查询学校名称
+     */
+    SysSchoolNameVo queryById(Long schoolNameId);
+
+    /**
+     * 查询学校名称列表
+     */
+    TableDataInfo<SysSchoolNameVo> queryPageList(SysSchoolNameBo bo, PageQuery pageQuery);
+
+    /**
+     * 查询学校名称列表
+     */
+    List<SysSchoolNameVo> queryList(SysSchoolNameBo bo);
+
+    /**
+     * 新增学校名称
+     */
+    Boolean insertByBo(SysSchoolNameBo bo);
+
+    /**
+     * 修改学校名称
+     */
+    Boolean updateByBo(SysSchoolNameBo bo);
+
+    /**
+     * 校验并批量删除学校名称信息
+     */
+    Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+}

ruoyi-modules/ruoyi-system/src/main/resources/mapper/school/SysSchoolNameMapper.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.system.mapper.school.SysSchoolNameMapper">
+
+</mapper>