add 学校类型

zhongzheng-admin/src/main/java/com/zhongzheng/controller/user/SchoolTypeController.java

@@ -0,0 +1,116 @@
+package com.zhongzheng.controller.user;
+
+import java.util.List;
+import java.util.Arrays;
+
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import com.zhongzheng.modules.user.bo.SchoolTypeAddBo;
+import com.zhongzheng.modules.user.bo.SchoolTypeEditBo;
+import com.zhongzheng.modules.user.bo.SchoolTypeQueryBo;
+import com.zhongzheng.modules.user.service.ISchoolTypeService;
+import com.zhongzheng.modules.user.vo.SchoolTypeVo;
+import lombok.RequiredArgsConstructor;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.zhongzheng.common.annotation.Log;
+import com.zhongzheng.common.core.controller.BaseController;
+import com.zhongzheng.common.core.domain.AjaxResult;
+import com.zhongzheng.common.enums.BusinessType;
+import com.zhongzheng.common.utils.poi.ExcelUtil;
+import com.zhongzheng.common.core.page.TableDataInfo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+
+/**
+ * 高校类型Controller
+ *
+ * @author hjl
+ * @date 2021-05-18
+ */
+@Api(value = "高校类型控制器", tags = {"高校类型管理"})
+@RequiredArgsConstructor(onConstructor_ = @Autowired)
+@RestController
+@RequestMapping("/system/type")
+public class SchoolTypeController extends BaseController {
+
+    private final ISchoolTypeService iSchoolTypeService;
+
+    /**
+     * 查询高校类型列表
+     */
+    @ApiOperation("查询高校类型列表")
+    @PreAuthorize("@ss.hasPermi('system:type:list')")
+    @GetMapping("/list")
+    public TableDataInfo<SchoolTypeVo> list(SchoolTypeQueryBo bo) {
+        startPage();
+        List<SchoolTypeVo> list = iSchoolTypeService.queryList(bo);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出高校类型列表
+     */
+  /*  @ApiOperation("导出高校类型列表")
+    @PreAuthorize("@ss.hasPermi('system:type:export')")
+    @Log(title = "高校类型", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult<SchoolTypeVo> export(SchoolTypeQueryBo bo) {
+        List<SchoolTypeVo> list = iSchoolTypeService.queryList(bo);
+        ExcelUtil<SchoolTypeVo> util = new ExcelUtil<SchoolTypeVo>(SchoolTypeVo.class);
+        return util.exportExcel(list, "高校类型");
+    }*/
+
+    /**
+     * 获取高校类型详细信息
+     */
+    @ApiOperation("获取高校类型详细信息")
+    @PreAuthorize("@ss.hasPermi('system:type:query')")
+    @GetMapping("/{id}")
+    public AjaxResult<SchoolTypeVo> getInfo(@PathVariable("id" ) Long id) {
+        return AjaxResult.success(iSchoolTypeService.queryById(id));
+    }
+
+    /**
+     * 新增高校类型
+     */
+    @ApiOperation("新增高校类型")
+    @ApiOperationSupport(ignoreParameters = {"updateTime","createTime"})
+    @PreAuthorize("@ss.hasPermi('system:type:add')")
+    @Log(title = "高校类型", businessType = BusinessType.INSERT)
+    @PostMapping()
+    public AjaxResult<Void> add(@Validated  @RequestBody SchoolTypeAddBo bo) {
+        return toAjax(iSchoolTypeService.insertByAddBo(bo) ? 1 : 0);
+    }
+
+    /**
+     * 修改高校类型
+     */
+    @ApiOperation("修改高校类型")
+    @ApiOperationSupport(ignoreParameters = {"updateTime","createTime"})
+    @PreAuthorize("@ss.hasPermi('system:type:edit')")
+    @Log(title = "高校类型", businessType = BusinessType.UPDATE)
+    @PostMapping("/edit")
+    public AjaxResult<Void> edit(@Validated @RequestBody SchoolTypeEditBo bo) {
+        return toAjax(iSchoolTypeService.updateByEditBo(bo) ? 1 : 0);
+    }
+
+    /**
+     * 删除高校类型
+     */
+    @ApiOperation("删除高校类型")
+    @PreAuthorize("@ss.hasPermi('system:type:remove')")
+    @Log(title = "高校类型" , businessType = BusinessType.DELETE)
+    @PostMapping("/delete/{ids}")
+    public AjaxResult<Void> remove(@PathVariable Long[] ids) {
+        return toAjax(iSchoolTypeService.deleteWithValidByIds(Arrays.asList(ids), true) ? 1 : 0);
+    }
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/bo/SchoolTypeAddBo.java

@@ -0,0 +1,42 @@
+package com.zhongzheng.modules.user.bo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.util.Date;
+
+
+
+/**
+ * 高校类型添加对象 school_type
+ *
+ * @author hjl
+ * @date 2021-05-18
+ */
+@Data
+@ApiModel("高校类型添加对象")
+public class SchoolTypeAddBo {
+
+    /** 学校类型名称 */
+    @ApiModelProperty(value ="学校类型名称",required = true)
+    @NotBlank(message = "学校类型名称不能为空")
+    private String typeName;
+    /** 显示顺序 */
+    @ApiModelProperty("显示顺序")
+    private Long orderNum;
+    /** 状态 0关闭 1开启 */
+    @ApiModelProperty("状态 0关闭 1开启")
+    private Integer status;
+    /** 介绍 */
+    @ApiModelProperty("介绍")
+    private String introduce;
+    /** 创建时间 */
+    @ApiModelProperty("创建时间")
+    private Long createTime;
+    /** 更新时间 */
+    @ApiModelProperty("更新时间")
+    private Long updateTime;
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/bo/SchoolTypeEditBo.java

@@ -0,0 +1,47 @@
+package com.zhongzheng.modules.user.bo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.util.Date;
+
+
+/**
+ * 高校类型编辑对象 school_type
+ *
+ * @author hjl
+ * @date 2021-05-18
+ */
+@Data
+@ApiModel("高校类型编辑对象")
+public class SchoolTypeEditBo {
+
+
+    /** $column.columnComment */
+    @ApiModelProperty("$column.columnComment")
+    private Long id;
+
+    /** 学校类型名称 */
+    @ApiModelProperty(value ="学校类型名称",required = true)
+    @NotBlank(message = "学校类型名称不能为空")
+    private String typeName;
+
+    /** 显示顺序 */
+    @ApiModelProperty("显示顺序")
+    private Long orderNum;
+
+    /** 状态 0关闭 1开启 */
+    @ApiModelProperty("状态 0关闭 1开启")
+    private Integer status;
+
+    /** 介绍 */
+    @ApiModelProperty("介绍")
+    private String introduce;
+
+    /** 更新时间 */
+    @ApiModelProperty("更新时间")
+    private Long updateTime;
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/bo/SchoolTypeQueryBo.java

@@ -0,0 +1,52 @@
+package com.zhongzheng.modules.user.bo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+import java.util.Map;
+import java.util.HashMap;
+
+import com.zhongzheng.common.core.domain.BaseEntity;
+
+/**
+ * 高校类型分页查询对象 school_type
+ *
+ * @author hjl
+ * @date 2021-05-18
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel("高校类型分页查询对象")
+public class SchoolTypeQueryBo extends BaseEntity {
+
+	/** 分页大小 */
+	@ApiModelProperty("分页大小")
+	private Integer pageSize;
+	/** 当前页数 */
+	@ApiModelProperty("当前页数")
+	private Integer pageNum;
+	/** 排序列 */
+	@ApiModelProperty("排序列")
+	private String orderByColumn;
+	/** 排序的方向desc或者asc */
+	@ApiModelProperty(value = "排序的方向", example = "asc,desc")
+	private String isAsc;
+
+
+	/** 学校类型名称 */
+	@ApiModelProperty("学校类型名称")
+	private String typeName;
+	/** 显示顺序 */
+	@ApiModelProperty("显示顺序")
+	private Long orderNum;
+	/** 状态 0关闭 1开启 */
+	@ApiModelProperty("状态 0关闭 1开启")
+	private Integer status;
+	/** 介绍 */
+	@ApiModelProperty("介绍")
+	private String introduce;
+
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/domain/SchoolType.java

@@ -0,0 +1,51 @@
+package com.zhongzheng.modules.user.domain;
+
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+import java.io.Serializable;
+import java.util.Date;
+import java.math.BigDecimal;
+import com.zhongzheng.common.annotation.Excel;
+
+/**
+ * 高校类型对象 school_type
+ *
+ * @author ruoyi
+ * @date 2021-05-18
+ */
+@Data
+@NoArgsConstructor
+@Accessors(chain = true)
+@TableName("school_type")
+public class SchoolType implements Serializable {
+
+private static final long serialVersionUID=1L;
+
+
+    /** $column.columnComment */
+    @TableId(value = "id")
+    private Long id;
+
+    /** 学校类型名称 */
+    private String typeName;
+
+    /** 显示顺序 */
+    private Long orderNum;
+
+    /** 状态 0关闭 1开启 */
+    private Integer status;
+
+    /** 介绍 */
+    private String introduce;
+
+    /** 创建时间 */
+    @TableField(fill = FieldFill.INSERT)
+    private Long createTime;
+
+    /** 更新时间 */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private Long updateTime;
+
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/mapper/SchoolTypeMapper.java

@@ -0,0 +1,15 @@
+package com.zhongzheng.modules.user.mapper;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zhongzheng.modules.user.domain.SchoolType;
+
+/**
+ * 高校类型Mapper接口
+ *
+ * @author hjl
+ * @date 2021-05-18
+ */
+public interface SchoolTypeMapper extends BaseMapper<SchoolType> {
+
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/service/ISchoolTypeService.java

@@ -0,0 +1,53 @@
+package com.zhongzheng.modules.user.service;
+
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.zhongzheng.modules.user.bo.SchoolTypeAddBo;
+import com.zhongzheng.modules.user.bo.SchoolTypeEditBo;
+import com.zhongzheng.modules.user.bo.SchoolTypeQueryBo;
+import com.zhongzheng.modules.user.domain.SchoolType;
+import com.zhongzheng.modules.user.vo.SchoolTypeVo;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 高校类型Service接口
+ *
+ * @author hjl
+ * @date 2021-05-18
+ */
+public interface ISchoolTypeService extends IService<SchoolType> {
+	/**
+	 * 查询单个
+	 * @return
+	 */
+	SchoolTypeVo queryById(Long id);
+
+	/**
+	 * 查询列表
+	 */
+	List<SchoolTypeVo> queryList(SchoolTypeQueryBo bo);
+
+	/**
+	 * 根据新增业务对象插入高校类型
+	 * @param bo 高校类型新增业务对象
+	 * @return
+	 */
+	Boolean insertByAddBo(SchoolTypeAddBo bo);
+
+	/**
+	 * 根据编辑业务对象修改高校类型
+	 * @param bo 高校类型编辑业务对象
+	 * @return
+	 */
+	Boolean updateByEditBo(SchoolTypeEditBo bo);
+
+	/**
+	 * 校验并删除数据
+	 * @param ids 主键集合
+	 * @param isValid 是否校验,true-删除前校验,false-不校验
+	 * @return
+	 */
+	Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/service/impl/SchoolTypeServiceImpl.java

@@ -0,0 +1,118 @@
+package com.zhongzheng.modules.user.service.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.lang.Validator;
+import cn.hutool.core.util.StrUtil;
+import com.zhongzheng.common.exception.CustomException;
+import com.zhongzheng.common.utils.DateUtils;
+import com.zhongzheng.modules.user.bo.SchoolTypeAddBo;
+import com.zhongzheng.modules.user.bo.SchoolTypeEditBo;
+import com.zhongzheng.modules.user.bo.SchoolTypeQueryBo;
+import com.zhongzheng.modules.user.domain.SchoolType;
+import com.zhongzheng.modules.user.mapper.SchoolTypeMapper;
+import com.zhongzheng.modules.user.service.ISchoolTypeService;
+import com.zhongzheng.modules.user.vo.SchoolTypeVo;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.github.pagehelper.Page;
+
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * 高校类型Service业务层处理
+ *
+ * @author hjl
+ * @date 2021-05-18
+ */
+@Service
+public class SchoolTypeServiceImpl extends ServiceImpl<SchoolTypeMapper, SchoolType> implements ISchoolTypeService {
+
+    @Override
+    public SchoolTypeVo queryById(Long id){
+        SchoolType db = this.baseMapper.selectById(id);
+        return BeanUtil.toBean(db, SchoolTypeVo.class);
+    }
+
+    @Override
+    public List<SchoolTypeVo> queryList(SchoolTypeQueryBo bo) {
+        LambdaQueryWrapper<SchoolType> lqw = Wrappers.lambdaQuery();
+        lqw.like(StrUtil.isNotBlank(bo.getTypeName()), SchoolType::getTypeName, bo.getTypeName());
+        lqw.eq(bo.getOrderNum() != null, SchoolType::getOrderNum, bo.getOrderNum());
+        lqw.eq(bo.getStatus() != null, SchoolType::getStatus, bo.getStatus());
+        lqw.eq(StrUtil.isNotBlank(bo.getIntroduce()), SchoolType::getIntroduce, bo.getIntroduce());
+        return entity2Vo(this.list(lqw));
+    }
+
+    /**
+    * 实体类转化成视图对象
+    *
+    * @param collection 实体类集合
+    * @return
+    */
+    private List<SchoolTypeVo> entity2Vo(Collection<SchoolType> collection) {
+        List<SchoolTypeVo> voList = collection.stream()
+                .map(any -> BeanUtil.toBean(any, SchoolTypeVo.class))
+                .collect(Collectors.toList());
+        if (collection instanceof Page) {
+            Page<SchoolType> page = (Page<SchoolType>)collection;
+            Page<SchoolTypeVo> pageVo = new Page<>();
+            BeanUtil.copyProperties(page,pageVo);
+            pageVo.addAll(voList);
+            voList = pageVo;
+        }
+        return voList;
+    }
+
+    @Override
+    public Boolean insertByAddBo(SchoolTypeAddBo bo) {
+        SchoolType add = BeanUtil.toBean(bo, SchoolType.class);
+        validEntityBeforeSave(add);
+        add.setCreateTime(DateUtils.getNowTime());
+        add.setUpdateTime(DateUtils.getNowTime());
+        return this.save(add);
+    }
+
+    @Override
+    public Boolean updateByEditBo(SchoolTypeEditBo bo) {
+        SchoolType update = BeanUtil.toBean(bo, SchoolType.class);
+        validEntityBeforeSave(update);
+        update.setUpdateTime(DateUtils.getNowTime());
+        return this.updateById(update);
+    }
+
+    /**
+     * 保存前的数据校验
+     *
+     * @param entity 实体类数据
+     */
+    private void validEntityBeforeSave(SchoolType entity){
+        //TODO 做一些数据校验,如唯一约束
+        if(checkNameUnique(entity)){
+            throw new CustomException("分类名已存在");
+        }
+    }
+
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if(isValid){
+            //TODO 做一些业务上的校验,判断是否需要校验
+        }
+        return this.removeByIds(ids);
+    }
+
+    private boolean checkNameUnique(SchoolType entity) {
+        SchoolType info = getOne(new LambdaQueryWrapper<SchoolType>()
+                .eq(SchoolType::getTypeName,entity.getTypeName())
+                .last("limit 1"));
+        if (Validator.isNotNull(info)) {
+            return true;
+        }
+        return false;
+    }
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/vo/SchoolTypeVo.java

@@ -0,0 +1,44 @@
+package com.zhongzheng.modules.user.vo;
+
+import com.zhongzheng.common.annotation.Excel;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import java.util.Date;
+
+
+
+/**
+ * 高校类型视图对象 mall_package
+ *
+ * @author ruoyi
+ * @date 2021-05-18
+ */
+@Data
+@ApiModel("高校类型视图对象")
+public class SchoolTypeVo {
+	private static final long serialVersionUID = 1L;
+
+	/** $pkColumn.columnComment */
+	@ApiModelProperty("$pkColumn.columnComment")
+	private Long id;
+
+	/** 学校类型名称 */
+	@Excel(name = "学校类型名称")
+	@ApiModelProperty("学校类型名称")
+	private String typeName;
+	/** 显示顺序 */
+	@Excel(name = "显示顺序")
+	@ApiModelProperty("显示顺序")
+	private Long orderNum;
+	/** 状态 0关闭 1开启 */
+	@Excel(name = "状态 0关闭 1开启")
+	@ApiModelProperty("状态 0关闭 1开启")
+	private Integer status;
+	/** 介绍 */
+	@Excel(name = "介绍")
+	@ApiModelProperty("介绍")
+	private String introduce;
+
+}

zhongzheng-system/src/main/resources/mapper/modules/user/SchoolTypeMapper.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.zhongzheng.modules.user.mapper.SchoolTypeMapper">
+
+    <resultMap type="com.zhongzheng.modules.user.domain.SchoolType" id="SchoolTypeResult">
+        <result property="id" column="id"/>
+        <result property="typeName" column="type_name"/>
+        <result property="orderNum" column="order_num"/>
+        <result property="status" column="status"/>
+        <result property="introduce" column="introduce"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateTime" column="update_time"/>
+    </resultMap>
+
+
+</mapper>