add 高校 教师

zhongzheng-admin/src/main/java/com/zhongzheng/controller/course/TeacherController.java

@@ -0,0 +1,116 @@
+package com.zhongzheng.controller.course;
+
+import java.util.List;
+import java.util.Arrays;
+
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import com.zhongzheng.modules.course.bo.TeacherAddBo;
+import com.zhongzheng.modules.course.bo.TeacherEditBo;
+import com.zhongzheng.modules.course.bo.TeacherQueryBo;
+import com.zhongzheng.modules.course.service.ITeacherService;
+import com.zhongzheng.modules.course.vo.TeacherVo;
+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-19
+ */
+@Api(value = "名师控制器", tags = {"名师管理"})
+@RequiredArgsConstructor(onConstructor_ = @Autowired)
+@RestController
+@RequestMapping("/course/teacher")
+public class TeacherController extends BaseController {
+
+    private final ITeacherService iTeacherService;
+
+    /**
+     * 查询名师列表
+     */
+    @ApiOperation("查询名师列表")
+    @PreAuthorize("@ss.hasPermi('course:teacher:list')")
+    @GetMapping("/list")
+    public TableDataInfo<TeacherVo> list(TeacherQueryBo bo) {
+        startPage();
+        List<TeacherVo> list = iTeacherService.queryList(bo);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出名师列表
+     */
+    /*@ApiOperation("导出名师列表")
+    @PreAuthorize("@ss.hasPermi('course:teacher:export')")
+    @Log(title = "名师", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult<TeacherVo> export(TeacherQueryBo bo) {
+        List<TeacherVo> list = iTeacherService.queryList(bo);
+        ExcelUtil<TeacherVo> util = new ExcelUtil<TeacherVo>(TeacherVo.class);
+        return util.exportExcel(list, "名师");
+    }*/
+
+    /**
+     * 获取名师详细信息
+     */
+    @ApiOperation("获取名师详细信息")
+    @PreAuthorize("@ss.hasPermi('course:teacher:query')")
+    @GetMapping("/{teacherId}")
+    public AjaxResult<TeacherVo> getInfo(@PathVariable("teacherId" ) Long teacherId) {
+        return AjaxResult.success(iTeacherService.queryById(teacherId));
+    }
+
+    /**
+     * 新增名师
+     */
+    @ApiOperation("新增名师")
+    @ApiOperationSupport(ignoreParameters = {"updateTime","createTime"})
+    @PreAuthorize("@ss.hasPermi('course:teacher:add')")
+    @Log(title = "名师", businessType = BusinessType.INSERT)
+    @PostMapping()
+    public AjaxResult<Void> add(@Validated  @RequestBody TeacherAddBo bo) {
+        return toAjax(iTeacherService.insertByAddBo(bo) ? 1 : 0);
+    }
+
+    /**
+     * 修改名师
+     */
+    @ApiOperation("修改名师")
+    @ApiOperationSupport(ignoreParameters = {"updateTime","createTime"})
+    @PreAuthorize("@ss.hasPermi('course:teacher:edit')")
+    @Log(title = "名师", businessType = BusinessType.UPDATE)
+    @PostMapping("/edit")
+    public AjaxResult<Void> edit(@Validated @RequestBody TeacherEditBo bo) {
+        return toAjax(iTeacherService.updateByEditBo(bo) ? 1 : 0);
+    }
+
+    /**
+     * 删除名师
+     */
+    /*@ApiOperation("删除名师")
+    @PreAuthorize("@ss.hasPermi('course:teacher:remove')")
+    @Log(title = "名师" , businessType = BusinessType.DELETE)
+    @DeleteMapping("/{teacherIds}")
+    public AjaxResult<Void> remove(@PathVariable Long[] teacherIds) {
+        return toAjax(iTeacherService.deleteWithValidByIds(Arrays.asList(teacherIds), true) ? 1 : 0);
+    }*/
+}

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

@@ -0,0 +1,117 @@
+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.SchoolAddBo;
+import com.zhongzheng.modules.user.bo.SchoolEditBo;
+import com.zhongzheng.modules.user.bo.SchoolQueryBo;
+import com.zhongzheng.modules.user.service.ISchoolService;
+import com.zhongzheng.modules.user.vo.SchoolVo;
+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-19
+ */
+@Api(value = "高校控制器", tags = {"高校管理"})
+@RequiredArgsConstructor(onConstructor_ = @Autowired)
+@RestController
+@RequestMapping("/user/school")
+public class SchoolController extends BaseController {
+
+    private final ISchoolService iSchoolService;
+
+    /**
+     * 查询高校列表
+     */
+    @ApiOperation("查询高校列表")
+    @PreAuthorize("@ss.hasPermi('user:school:list')")
+    @GetMapping("/list")
+    public TableDataInfo<SchoolVo> list(SchoolQueryBo bo) {
+        startPage();
+        List<SchoolVo> list = iSchoolService.queryList(bo);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出高校列表
+     */
+    /*@ApiOperation("导出高校列表")
+    @PreAuthorize("@ss.hasPermi('system:school:export')")
+    @Log(title = "高校", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult<SchoolVo> export(SchoolQueryBo bo) {
+        List<SchoolVo> list = iSchoolService.queryList(bo);
+        ExcelUtil<SchoolVo> util = new ExcelUtil<SchoolVo>(SchoolVo.class);
+        return util.exportExcel(list, "高校");
+    }*/
+
+    /**
+     * 获取高校详细信息
+     */
+    @ApiOperation("获取高校详细信息")
+    @PreAuthorize("@ss.hasPermi('user:school:query')")
+    @GetMapping("/{id}")
+    public AjaxResult<SchoolVo> getInfo(@PathVariable("id" ) Long id) {
+        return AjaxResult.success(iSchoolService.queryById(id));
+    }
+
+    /**
+     * 新增高校
+     */
+    @ApiOperation("新增高校")
+    @ApiOperationSupport(ignoreParameters = {"updateTime","createTime"})
+    @PreAuthorize("@ss.hasPermi('user:school:add')")
+    @Log(title = "高校", businessType = BusinessType.INSERT)
+    @PostMapping()
+    public AjaxResult<Void> add(@Validated @RequestBody SchoolAddBo bo) {
+        return toAjax(iSchoolService.insertByAddBo(bo) ? 1 : 0);
+    }
+
+    /**
+     * 修改高校
+     */
+    @ApiOperation("修改高校")
+    @ApiOperationSupport(ignoreParameters = {"updateTime","createTime"})
+    @PreAuthorize("@ss.hasPermi('user:school:edit')")
+    @Log(title = "高校", businessType = BusinessType.UPDATE)
+    @PostMapping("/edit")
+    public AjaxResult<Void> edit(@Validated @RequestBody SchoolEditBo bo) {
+        return toAjax(iSchoolService.updateByEditBo(bo) ? 1 : 0);
+    }
+
+    /**
+     * 删除高校
+     */
+    /* @ApiOperation("删除高校")
+    @PreAuthorize("@ss.hasPermi('system:school:remove')")
+    @Log(title = "高校" , businessType = BusinessType.DELETE)
+    @PostMapping("/delete")
+    public AjaxResult<Void> remove(@PathVariable Long[] ids) {
+        return toAjax(iSchoolService.deleteWithValidByIds(Arrays.asList(ids), true) ? 1 : 0);
+    }*/
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/bo/TeacherAddBo.java

@@ -0,0 +1,44 @@
+package com.zhongzheng.modules.course.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;
+
+
+
+/**
+ * 名师添加对象 teacher
+ *
+ * @author hjl
+ * @date 2021-05-19
+ */
+@Data
+@ApiModel("名师添加对象")
+public class TeacherAddBo {
+
+    /** 教程名称 */
+    @ApiModelProperty("教师名称")
+    @NotBlank(message = "教师名称不能为空")
+    private String teacherName;
+    /** 介绍 */
+    @ApiModelProperty("介绍")
+    @NotBlank(message = "教师介绍不能为空")
+    private String introduce;
+    /** 头像 */
+    @ApiModelProperty("头像")
+    @NotBlank(message = "教师头像不能为空")
+    private String avatar;
+    /** 状态 0关闭 1开启 */
+    @ApiModelProperty("状态 0关闭 1开启")
+    private Integer status;
+    /** 创建时间 */
+    @ApiModelProperty("创建时间")
+    private Long createTime;
+    /** 更新时间 */
+    @ApiModelProperty("更新时间")
+    private Long updateTime;
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/bo/TeacherEditBo.java

@@ -0,0 +1,49 @@
+package com.zhongzheng.modules.course.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;
+
+
+/**
+ * 名师编辑对象 teacher
+ *
+ * @author hjl
+ * @date 2021-05-19
+ */
+@Data
+@ApiModel("名师编辑对象")
+public class TeacherEditBo {
+
+
+    /** 教师ID */
+    @ApiModelProperty("教师ID")
+    private Long teacherId;
+
+    /** 教程名称 */
+    @ApiModelProperty("教师名称")
+    @NotBlank(message = "教师名称不能为空")
+    private String teacherName;
+
+    /** 介绍 */
+    @ApiModelProperty("介绍")
+    @NotBlank(message = "教师介绍不能为空")
+    private String introduce;
+
+    /** 头像 */
+    @ApiModelProperty("头像")
+    @NotBlank(message = "教师头像不能为空")
+    private String avatar;
+
+    /** 状态 0关闭 1开启 */
+    @ApiModelProperty("状态 0关闭 1开启")
+    private Integer status;
+
+    /** 更新时间 */
+    @ApiModelProperty("更新时间")
+    private Long updateTime;
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/bo/TeacherQueryBo.java

@@ -0,0 +1,52 @@
+package com.zhongzheng.modules.course.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;
+
+/**
+ * 名师分页查询对象 teacher
+ *
+ * @author hjl
+ * @date 2021-05-19
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel("名师分页查询对象")
+public class TeacherQueryBo 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 teacherName;
+	/** 介绍 */
+	@ApiModelProperty("介绍")
+	private String introduce;
+	/** 头像 */
+	@ApiModelProperty("头像")
+	private String avatar;
+	/** 状态 0关闭 1开启 */
+	@ApiModelProperty("状态 0关闭 1开启")
+	private Integer status;
+
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/domain/Teacher.java

@@ -0,0 +1,51 @@
+package com.zhongzheng.modules.course.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;
+
+/**
+ * 名师对象 teacher
+ *
+ * @author hjl
+ * @date 2021-05-19
+ */
+@Data
+@NoArgsConstructor
+@Accessors(chain = true)
+@TableName("teacher")
+public class Teacher implements Serializable {
+
+private static final long serialVersionUID=1L;
+
+
+    /** 教师ID */
+    @TableId(value = "teacher_id")
+    private Long teacherId;
+
+    /** 教师名称 */
+    private String teacherName;
+
+    /** 介绍 */
+    private String introduce;
+
+    /** 头像 */
+    private String avatar;
+
+    /** 状态 0关闭 1开启 */
+    private Integer status;
+
+    /** 创建时间 */
+    @TableField(fill = FieldFill.INSERT)
+    private Long createTime;
+
+    /** 更新时间 */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private Long updateTime;
+
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/mapper/TeacherMapper.java

@@ -0,0 +1,15 @@
+package com.zhongzheng.modules.course.mapper;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zhongzheng.modules.course.domain.Teacher;
+
+/**
+ * 名师Mapper接口
+ *
+ * @author hjl
+ * @date 2021-05-19
+ */
+public interface TeacherMapper extends BaseMapper<Teacher> {
+
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/service/ITeacherService.java

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

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/service/impl/TeacherServiceImpl.java

@@ -0,0 +1,101 @@
+package com.zhongzheng.modules.course.service.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.StrUtil;
+import com.zhongzheng.common.utils.DateUtils;
+import com.zhongzheng.modules.course.bo.TeacherAddBo;
+import com.zhongzheng.modules.course.bo.TeacherEditBo;
+import com.zhongzheng.modules.course.bo.TeacherQueryBo;
+import com.zhongzheng.modules.course.domain.Teacher;
+import com.zhongzheng.modules.course.mapper.TeacherMapper;
+import com.zhongzheng.modules.course.service.ITeacherService;
+import com.zhongzheng.modules.course.vo.TeacherVo;
+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-19
+ */
+@Service
+public class TeacherServiceImpl extends ServiceImpl<TeacherMapper, Teacher> implements ITeacherService {
+
+    @Override
+    public TeacherVo queryById(Long teacherId){
+        Teacher db = this.baseMapper.selectById(teacherId);
+        return BeanUtil.toBean(db, TeacherVo.class);
+    }
+
+    @Override
+    public List<TeacherVo> queryList(TeacherQueryBo bo) {
+        LambdaQueryWrapper<Teacher> lqw = Wrappers.lambdaQuery();
+        lqw.like(StrUtil.isNotBlank(bo.getTeacherName()), Teacher::getTeacherName, bo.getTeacherName());
+        lqw.eq(bo.getStatus() != null, Teacher::getStatus, bo.getStatus());
+        return entity2Vo(this.list(lqw));
+    }
+
+    /**
+    * 实体类转化成视图对象
+    *
+    * @param collection 实体类集合
+    * @return
+    */
+    private List<TeacherVo> entity2Vo(Collection<Teacher> collection) {
+        List<TeacherVo> voList = collection.stream()
+                .map(any -> BeanUtil.toBean(any, TeacherVo.class))
+                .collect(Collectors.toList());
+        if (collection instanceof Page) {
+            Page<Teacher> page = (Page<Teacher>)collection;
+            Page<TeacherVo> pageVo = new Page<>();
+            BeanUtil.copyProperties(page,pageVo);
+            pageVo.addAll(voList);
+            voList = pageVo;
+        }
+        return voList;
+    }
+
+    @Override
+    public Boolean insertByAddBo(TeacherAddBo bo) {
+        Teacher add = BeanUtil.toBean(bo, Teacher.class);
+        validEntityBeforeSave(add);
+        add.setCreateTime(DateUtils.getNowTime());
+        add.setUpdateTime(DateUtils.getNowTime());
+        return this.save(add);
+    }
+
+    @Override
+    public Boolean updateByEditBo(TeacherEditBo bo) {
+        Teacher update = BeanUtil.toBean(bo, Teacher.class);
+        validEntityBeforeSave(update);
+        update.setUpdateTime(DateUtils.getNowTime());
+        return this.updateById(update);
+    }
+
+    /**
+     * 保存前的数据校验
+     *
+     * @param entity 实体类数据
+     */
+    private void validEntityBeforeSave(Teacher entity){
+        //TODO 做一些数据校验,如唯一约束
+    }
+
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if(isValid){
+            //TODO 做一些业务上的校验,判断是否需要校验
+        }
+        return this.removeByIds(ids);
+    }
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/vo/TeacherVo.java

@@ -0,0 +1,44 @@
+package com.zhongzheng.modules.course.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-19
+ */
+@Data
+@ApiModel("名师视图对象")
+public class TeacherVo {
+	private static final long serialVersionUID = 1L;
+
+	/** 教师ID */
+	@ApiModelProperty("教师ID")
+	private Long teacherId;
+
+	/** 教程名称 */
+	@Excel(name = "教程名称")
+	@ApiModelProperty("教程名称")
+	private String teacherName;
+	/** 介绍 */
+	@Excel(name = "介绍")
+	@ApiModelProperty("介绍")
+	private String introduce;
+	/** 头像 */
+	@Excel(name = "头像")
+	@ApiModelProperty("头像")
+	private String avatar;
+	/** 状态 0关闭 1开启 */
+	@Excel(name = "状态 0关闭 1开启")
+	@ApiModelProperty("状态 0关闭 1开启")
+	private Integer status;
+
+}

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

@@ -4,6 +4,9 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
+
+import javax.validation.constraints.Min;
+import javax.validation.constraints.NotBlank;
 import java.util.Date;
 
 
@@ -20,16 +23,18 @@ public class SchoolAddBo {
 
     /** 学校类型 */
     @ApiModelProperty("学校类型")
+    @Min(value = 1, message = "学校类型Id必须为正整数")
     private Integer schoolTypeId;
     /**  高校名称 */
     @ApiModelProperty(" 高校名称")
+    @NotBlank(message = "高校名称不能为空")
     private String schoolName;
-    /** $column.columnComment */
-    @ApiModelProperty("$column.columnComment")
+    /** 状态 */
+    @ApiModelProperty("状态 1正常 0关闭")
     private Integer status;
     /** 创建时间 */
     @ApiModelProperty("创建时间")
-    private Long createtime;
+    private Long createTime;
     /** $column.columnComment */
     @ApiModelProperty("$column.columnComment")
     private Long updateTime;

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

@@ -4,6 +4,9 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
+
+import javax.validation.constraints.Min;
+import javax.validation.constraints.NotBlank;
 import java.util.Date;
 
 
@@ -24,19 +27,21 @@ public class SchoolEditBo {
 
     /** 学校类型 */
     @ApiModelProperty("学校类型")
+    @Min(value = 1, message = "学校类型Id必须为正整数")
     private Integer schoolTypeId;
 
     /**  高校名称 */
     @ApiModelProperty(" 高校名称")
+    @NotBlank(message = "高校名称不能为空")
     private String schoolName;
 
-    /** $column.columnComment */
-    @ApiModelProperty("$column.columnComment")
+    /** 状态 */
+    @ApiModelProperty("状态 1正常 0关闭")
     private Integer status;
 
     /** 创建时间 */
     @ApiModelProperty("创建时间")
-    private Long createtime;
+    private Long createTime;
 
     /** $column.columnComment */
     @ApiModelProperty("$column.columnComment")

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

@@ -38,7 +38,7 @@ private static final long serialVersionUID=1L;
     private Integer status;
 
     /** 创建时间 */
-    private Long createtime;
+    private Long createTime;
 
     /** $column.columnComment */
     @TableField(fill = FieldFill.INSERT_UPDATE)

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

@@ -1,11 +1,15 @@
 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.SchoolAddBo;
 import com.zhongzheng.modules.user.bo.SchoolEditBo;
 import com.zhongzheng.modules.user.bo.SchoolQueryBo;
 import com.zhongzheng.modules.user.domain.School;
+import com.zhongzheng.modules.user.domain.SchoolType;
 import com.zhongzheng.modules.user.mapper.SchoolMapper;
 import com.zhongzheng.modules.user.service.ISchoolService;
 import com.zhongzheng.modules.user.vo.SchoolVo;
@@ -70,6 +74,8 @@ public class SchoolServiceImpl extends ServiceImpl<SchoolMapper, School> impleme
     public Boolean insertByAddBo(SchoolAddBo bo) {
         School add = BeanUtil.toBean(bo, School.class);
         validEntityBeforeSave(add);
+        add.setCreateTime(DateUtils.getNowTime());
+        add.setUpdateTime(DateUtils.getNowTime());
         return this.save(add);
     }
 
@@ -87,6 +93,9 @@ public class SchoolServiceImpl extends ServiceImpl<SchoolMapper, School> impleme
      */
     private void validEntityBeforeSave(School entity){
         //TODO 做一些数据校验,如唯一约束
+        if(checkNameUnique(entity)){
+            throw new CustomException("名称已存在");
+        }
     }
 
     @Override
@@ -96,4 +105,14 @@ public class SchoolServiceImpl extends ServiceImpl<SchoolMapper, School> impleme
         }
         return this.removeByIds(ids);
     }
+
+    private boolean checkNameUnique(School entity) {
+        School info = getOne(new LambdaQueryWrapper<School>()
+                .eq(School::getSchoolName,entity.getSchoolName())
+                .last("limit 1"));
+        if (Validator.isNotNull(info)) {
+            return true;
+        }
+        return false;
+    }
 }

zhongzheng-system/src/main/resources/mapper/modules/course/TeacherMapper.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.course.mapper.TeacherMapper">
+
+    <resultMap type="com.zhongzheng.modules.course.domain.Teacher" id="TeacherResult">
+        <result property="teacherId" column="teacher_id"/>
+        <result property="teacherName" column="teacher_name"/>
+        <result property="introduce" column="introduce"/>
+        <result property="avatar" column="avatar"/>
+        <result property="status" column="status"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateTime" column="update_time"/>
+    </resultMap>
+
+
+</mapper>

zhongzheng-system/src/main/resources/mapper/modules/user/SchoolMapper.xml

@@ -9,7 +9,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="schoolTypeId" column="school_type_id"/>
         <result property="schoolName" column="school_name"/>
         <result property="status" column="status"/>
-        <result property="createtime" column="createtime"/>
+        <result property="createTime" column="create_time"/>
         <result property="updateTime" column="update_time"/>
         <result property="introduction" column="introduction"/>
         <result property="schoolCity" column="school_city"/>