diff --git a/pom.xml b/pom.xml index a407a1d..1597636 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ - 4.0.0 + 4.0.0 com.muyu ruoyi @@ -177,12 +177,28 @@ ${ruoyi.version} + + + com.muyu + ruoyi-modules + ${ruoyi.version} + + + + + + com.muyu + ruoyi-clazz + ${ruoyi.version} + + ruoyi-application ruoyi-basic + ruoyi-modules pom diff --git a/ruoyi-application/pom.xml b/ruoyi-application/pom.xml index 8e1a3ed..cc267f5 100644 --- a/ruoyi-application/pom.xml +++ b/ruoyi-application/pom.xml @@ -80,6 +80,12 @@ org.springframework.boot spring-boot-starter-test + + + + com.muyu + ruoyi-clazz + diff --git a/ruoyi-application/src/main/java/com/ruoyi/RuoYiApplication.java b/ruoyi-application/src/main/java/com/ruoyi/RuoYiApplication.java index bc47b1e..5f974cb 100644 --- a/ruoyi-application/src/main/java/com/ruoyi/RuoYiApplication.java +++ b/ruoyi-application/src/main/java/com/ruoyi/RuoYiApplication.java @@ -11,6 +11,7 @@ import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration; * @author ruoyi */ @SpringBootApplication(exclude = {DataSourceAutoConfiguration.class}) +@MapperScan(basePackages = {"com.ruoyi.clazz.mapper"}) public class RuoYiApplication { public static void main (String[] args) { SpringApplication.run(RuoYiApplication.class, args); diff --git a/ruoyi-application/src/main/java/com/ruoyi/web/controller/clazz/ClazzController.java b/ruoyi-application/src/main/java/com/ruoyi/web/controller/clazz/ClazzController.java new file mode 100644 index 0000000..5ba925d --- /dev/null +++ b/ruoyi-application/src/main/java/com/ruoyi/web/controller/clazz/ClazzController.java @@ -0,0 +1,111 @@ +package com.ruoyi.web.controller.clazz; + +import java.util.List; +import javax.servlet.http.HttpServletResponse; + +import io.swagger.annotations.*; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.beans.factory.annotation.Autowired; +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.ruoyi.common.annotation.Log; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.Result; +import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.clazz.domain.Clazz; +import com.ruoyi.clazz.domain.req.ClazzQueryReq; +import com.ruoyi.clazz.domain.req.ClazzSaveReq; +import com.ruoyi.clazz.domain.req.ClazzEditReq; +import com.ruoyi.clazz.service.ClazzService; +import com.ruoyi.common.utils.poi.ExcelUtil; +import com.ruoyi.common.core.page.TableDataInfo; + +/** + * 班级管理Controller + * + * @author seer + * @date 2024-04-22 + */ +@Api(tags = "班级管理") +@RestController +@RequestMapping("/data/clazz") +public class ClazzController extends BaseController { + @Autowired + private ClazzService clazzService; + + /** + * 查询班级管理列表 + */ + @ApiOperation("获取班级管理列表") + @PreAuthorize("@ss.hasPermi('data:clazz:list')") + @GetMapping("/list") + public Result> list(ClazzQueryReq clazzQueryReq) { + startPage(); + List list = clazzService.list(Clazz.queryBuild(clazzQueryReq)); + return getDataTable(list); + } + + /** + * 导出班级管理列表 + */ + @ApiOperation("导出班级管理列表") + @PreAuthorize("@ss.hasPermi('data:clazz:export')") + @Log(title = "班级管理", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, Clazz clazz) { + List list = clazzService.list(clazz); + ExcelUtil util = new ExcelUtil(Clazz.class); + util.exportExcel(response, list, "班级管理数据"); + } + + /** + * 获取班级管理详细信息 + */ + @ApiOperation("获取班级管理详细信息") + @PreAuthorize("@ss.hasPermi('data:clazz:query')") + @GetMapping(value = "/{clazzId}") + @ApiImplicitParam(name = "clazzId", value = "clazzId", required = true, dataType = "Long", paramType = "path", dataTypeClass = Long.class) + public Result getInfo(@PathVariable("clazzId") Long clazzId) { + return Result.success(clazzService.getById(clazzId)); + } + + /** + * 新增班级管理 + */ + @PreAuthorize("@ss.hasPermi('data:clazz:add')") + @Log(title = "班级管理", businessType = BusinessType.INSERT) + @PostMapping + @ApiOperation("新增班级管理") + public Result add(@RequestBody ClazzSaveReq clazzSaveReq) { + return toAjax(clazzService.save(Clazz.saveBuild(clazzSaveReq))); + } + + /** + * 修改班级管理 + */ + @PreAuthorize("@ss.hasPermi('data:clazz:edit')") + @Log(title = "班级管理", businessType = BusinessType.UPDATE) + @PutMapping("/{clazzId}") + @ApiOperation("修改班级管理") + public Result edit(@PathVariable Long clazzId, @RequestBody ClazzEditReq clazzEditReq) { + return toAjax(clazzService.updateById(Clazz.editBuild(clazzId,clazzEditReq))); + } + + /** + * 删除班级管理 + */ + @PreAuthorize("@ss.hasPermi('data:clazz:remove')") + @Log(title = "班级管理", businessType = BusinessType.DELETE) + @DeleteMapping("/{clazzIds}") + @ApiOperation("删除班级管理") + @ApiImplicitParam(name = "clazzId", value = "clazzId", required = true, dataType = "Long", paramType = "path", dataTypeClass = String.class, example = "1,2,3,4") + public Result remove(@PathVariable List clazzIds) { + return toAjax(clazzService.removeBatchByIds(clazzIds)); + } +} diff --git a/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseEntity.java b/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseEntity.java index f24180a..eda92fb 100644 --- a/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseEntity.java +++ b/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseEntity.java @@ -67,6 +67,10 @@ public class BaseEntity implements Serializable { @ApiModelProperty(hidden=true) private Date updateTime; + /** 备注 */ + private String remark; + + /** * 请求参数 */ diff --git a/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictData.java b/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictData.java index f83f4e4..d512e50 100644 --- a/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictData.java +++ b/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictData.java @@ -80,10 +80,10 @@ public class SysDictData extends BaseEntity { @Excel(name = "状态", readConverterExp = "0=正常,1=停用") private String status; - /** - * 备注 - */ - private String remark; +// /** +// * 备注 +// */ +// private String remark; @NotBlank(message = "字典标签不能为空") @Size(min = 0, max = 100, message = "字典标签长度不能超过100个字符") diff --git a/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictType.java b/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictType.java index d6c408f..f444fc0 100644 --- a/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictType.java +++ b/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictType.java @@ -52,10 +52,10 @@ public class SysDictType extends BaseEntity { @Excel(name = "状态", readConverterExp = "0=正常,1=停用") private String status; - /** - * 备注 - */ - private String remark; +// /** +// * 备注 +// */ +// private String remark; @NotBlank(message = "字典名称不能为空") diff --git a/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysMenu.java b/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysMenu.java index c8b8348..a2f163e 100644 --- a/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysMenu.java +++ b/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysMenu.java @@ -108,10 +108,10 @@ public class SysMenu extends BaseEntity { */ private List children = new ArrayList(); - /** - * 备注 - */ - private String remark; +// /** +// * 备注 +// */ +// private String remark; @NotBlank(message = "菜单名称不能为空") diff --git a/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysRole.java b/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysRole.java index 8c9ce58..57478fa 100644 --- a/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysRole.java +++ b/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysRole.java @@ -99,10 +99,10 @@ public class SysRole extends BaseEntity { */ private Set permissions; - /** - * 备注 - */ - private String remark; +// /** +// * 备注 +// */ +// private String remark; public SysRole () { diff --git a/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java b/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java index 5e58fb8..5b09c26 100644 --- a/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java +++ b/ruoyi-basic/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java @@ -136,10 +136,10 @@ public class SysUser extends BaseEntity { */ private Long roleId; - /** - * 备注 - */ - private String remark; +// /** +// * 备注 +// */ +// private String remark; public SysUser () { diff --git a/ruoyi-basic/ruoyi-plugin/ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTable.java b/ruoyi-basic/ruoyi-plugin/ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTable.java index fec91b4..8d8bb9e 100644 --- a/ruoyi-basic/ruoyi-plugin/ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTable.java +++ b/ruoyi-basic/ruoyi-plugin/ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTable.java @@ -147,10 +147,10 @@ public class GenTable extends BaseEntity { */ private String parentMenuName; - /** - * 备注 - */ - private String remark; +// /** +// * 备注 +// */ +// private String remark; public static boolean isTree (String tplCategory) { diff --git a/ruoyi-basic/ruoyi-plugin/ruoyi-quartz/src/main/java/com/ruoyi/quartz/domain/SysJob.java b/ruoyi-basic/ruoyi-plugin/ruoyi-quartz/src/main/java/com/ruoyi/quartz/domain/SysJob.java index 4daa6be..8cbf85e 100644 --- a/ruoyi-basic/ruoyi-plugin/ruoyi-quartz/src/main/java/com/ruoyi/quartz/domain/SysJob.java +++ b/ruoyi-basic/ruoyi-plugin/ruoyi-quartz/src/main/java/com/ruoyi/quartz/domain/SysJob.java @@ -80,10 +80,10 @@ public class SysJob extends BaseEntity { @Excel(name = "任务状态", readConverterExp = "0=正常,1=暂停") private String status; - /** - * 备注 - */ - private String remark; +// /** +// * 备注 +// */ +// private String remark; @NotBlank(message = "任务名称不能为空") @Size(min = 0, max = 64, message = "任务名称不能超过64个字符") diff --git a/ruoyi-basic/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysConfig.java b/ruoyi-basic/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysConfig.java index 218e473..cac2c55 100644 --- a/ruoyi-basic/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysConfig.java +++ b/ruoyi-basic/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysConfig.java @@ -57,10 +57,6 @@ public class SysConfig extends BaseEntity { @Excel(name = "系统内置", readConverterExp = "Y=是,N=否") private String configType; - /** - * 备注 - */ - private String remark; @NotBlank(message = "参数名称不能为空") @Size(min = 0, max = 100, message = "参数名称不能超过100个字符") diff --git a/ruoyi-basic/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysNotice.java b/ruoyi-basic/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysNotice.java index cc89fc9..b61782e 100644 --- a/ruoyi-basic/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysNotice.java +++ b/ruoyi-basic/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysNotice.java @@ -51,10 +51,10 @@ public class SysNotice extends BaseEntity { */ private String status; - /** - * 备注 - */ - private String remark; +// /** +// * 备注 +// */ +// private String remark; @Xss(message = "公告标题不能包含脚本字符") @NotBlank(message = "公告标题不能为空") diff --git a/ruoyi-basic/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysPost.java b/ruoyi-basic/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysPost.java index 5a2ec0b..a1bff6e 100644 --- a/ruoyi-basic/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysPost.java +++ b/ruoyi-basic/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysPost.java @@ -63,10 +63,10 @@ public class SysPost extends BaseEntity { */ private boolean flag = false; - /** - * 备注 - */ - private String remark; +// /** +// * 备注 +// */ +// private String remark; @NotBlank(message = "岗位编码不能为空") @Size(min = 0, max = 64, message = "岗位编码长度不能超过64个字符") diff --git a/ruoyi-modules/pom.xml b/ruoyi-modules/pom.xml new file mode 100644 index 0000000..2a7fa59 --- /dev/null +++ b/ruoyi-modules/pom.xml @@ -0,0 +1,24 @@ + + + 4.0.0 + + com.muyu + ruoyi + 3.8.6 + + + ruoyi-modules + pom + + ruoyi-clazz + + + + 17 + 17 + UTF-8 + + + \ No newline at end of file diff --git a/ruoyi-modules/ruoyi-clazz/pom.xml b/ruoyi-modules/ruoyi-clazz/pom.xml new file mode 100644 index 0000000..f4d53ed --- /dev/null +++ b/ruoyi-modules/ruoyi-clazz/pom.xml @@ -0,0 +1,27 @@ + + + 4.0.0 + + com.muyu + ruoyi-modules + 3.8.6 + + + ruoyi-clazz + + + 17 + 17 + UTF-8 + + + + + com.muyu + ruoyi-framework + + + + \ No newline at end of file diff --git a/ruoyi-modules/ruoyi-clazz/src/main/java/com/ruoyi/clazz/domain/Clazz.java b/ruoyi-modules/ruoyi-clazz/src/main/java/com/ruoyi/clazz/domain/Clazz.java new file mode 100644 index 0000000..a8ab10b --- /dev/null +++ b/ruoyi-modules/ruoyi-clazz/src/main/java/com/ruoyi/clazz/domain/Clazz.java @@ -0,0 +1,87 @@ +package com.ruoyi.clazz.domain; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import lombok.AllArgsConstructor; +import lombok.experimental.SuperBuilder; +import io.swagger.annotations.*; +import com.ruoyi.common.annotation.Excel; +import com.ruoyi.clazz.domain.req.ClazzQueryReq; +import com.ruoyi.clazz.domain.req.ClazzSaveReq; +import com.ruoyi.clazz.domain.req.ClazzEditReq; +import com.ruoyi.common.core.domain.BaseEntity; + +/** + * 班级管理对象 clazz + * + * @author seer + * @date 2024-04-22 + */ +@Data +@SuperBuilder +@NoArgsConstructor +@AllArgsConstructor +@TableName("clazz") +@EqualsAndHashCode(callSuper = true) +@ApiModel(value = "Clazz", description = "班级管理") +public class Clazz extends BaseEntity { + + private static final long serialVersionUID = 1L; + + /** 班级ID */ + @Excel(name = "班级ID") + @TableId(value = "clazz_id",type = IdType.AUTO) + @ApiModelProperty(name = "班级ID", value = "班级ID") + private Long clazzId; + + /** 班级名称 */ + @Excel(name = "班级名称") + @ApiModelProperty(name = "班级名称", value = "班级名称") + private String clazzName; + + /** 班级状态 0-停用 1-启用 */ + @Excel(name = "班级状态 0-停用 1-启用") + @ApiModelProperty(name = "班级状态 0-停用 1-启用", value = "班级状态 0-停用 1-启用", required = true) + private Long clazzStatus; + +// private String remark; + + /** + * 查询构造器 + */ + public static Clazz queryBuild( ClazzQueryReq clazzQueryReq){ + return Clazz.builder() + .clazzId(clazzQueryReq.getClazzId()) + .clazzName(clazzQueryReq.getClazzName()) + .clazzStatus(clazzQueryReq.getClazzStatus()) + .build(); + } + + /** + * 添加构造器 + */ + public static Clazz saveBuild(ClazzSaveReq clazzSaveReq){ + return Clazz.builder() + .clazzName(clazzSaveReq.getClazzName()) + .clazzStatus(clazzSaveReq.getClazzStatus()) + .remark(clazzSaveReq.getRemark()) + .build(); + } + + /** + * 修改构造器 + */ + public static Clazz editBuild(Long clazzId, ClazzEditReq clazzEditReq){ + return Clazz.builder() + .clazzId(clazzId) + .clazzName(clazzEditReq.getClazzName()) + .clazzStatus(clazzEditReq.getClazzStatus()) + .remark(clazzEditReq.getRemark()) + .build(); + } + +} diff --git a/ruoyi-modules/ruoyi-clazz/src/main/java/com/ruoyi/clazz/domain/req/ClazzEditReq.java b/ruoyi-modules/ruoyi-clazz/src/main/java/com/ruoyi/clazz/domain/req/ClazzEditReq.java new file mode 100644 index 0000000..c8e5d1f --- /dev/null +++ b/ruoyi-modules/ruoyi-clazz/src/main/java/com/ruoyi/clazz/domain/req/ClazzEditReq.java @@ -0,0 +1,39 @@ +package com.ruoyi.clazz.domain.req; + +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import lombok.AllArgsConstructor; +import lombok.experimental.SuperBuilder; +import io.swagger.annotations.*; +import com.ruoyi.common.annotation.Excel; +import com.ruoyi.common.core.domain.BaseEntity; + +/** + * 班级管理对象 clazz + * + * @author seer + * @date 2024-04-22 + */ +@Data +@SuperBuilder +@NoArgsConstructor +@AllArgsConstructor +@ApiModel(value = "ClazzEditReq", description = "班级管理") +public class ClazzEditReq extends BaseEntity { + + private static final long serialVersionUID = 1L; + + /** 班级名称 */ + @ApiModelProperty(name = "班级名称", value = "班级名称") + private String clazzName; + + /** 班级状态 0-停用 1-启用 */ + @ApiModelProperty(name = "班级状态 0-停用 1-启用", value = "班级状态 0-停用 1-启用", required = true) + private Long clazzStatus; + +// private String remark; + +} diff --git a/ruoyi-modules/ruoyi-clazz/src/main/java/com/ruoyi/clazz/domain/req/ClazzQueryReq.java b/ruoyi-modules/ruoyi-clazz/src/main/java/com/ruoyi/clazz/domain/req/ClazzQueryReq.java new file mode 100644 index 0000000..bac02ce --- /dev/null +++ b/ruoyi-modules/ruoyi-clazz/src/main/java/com/ruoyi/clazz/domain/req/ClazzQueryReq.java @@ -0,0 +1,43 @@ +package com.ruoyi.clazz.domain.req; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import lombok.AllArgsConstructor; +import lombok.experimental.SuperBuilder; +import io.swagger.annotations.*; +import com.ruoyi.common.annotation.Excel; +import com.ruoyi.common.core.domain.BaseEntity; + +/** + * 班级管理对象 clazz + * + * @author seer + * @date 2024-04-22 + */ +@Data +@SuperBuilder +@NoArgsConstructor +@AllArgsConstructor +@ApiModel(value = "ClazzQueryReq", description = "班级管理") +public class ClazzQueryReq extends BaseEntity { + + private static final long serialVersionUID = 1L; + + /** 班级ID */ + @TableId(value = "clazzId",type = IdType.AUTO) + @ApiModelProperty(name = "班级ID", value = "班级ID") + private Long clazzId; + + /** 班级名称 */ + @ApiModelProperty(name = "班级名称", value = "班级名称") + private String clazzName; + + /** 班级状态 0-停用 1-启用 */ + @ApiModelProperty(name = "班级状态 0-停用 1-启用", value = "班级状态 0-停用 1-启用") + private Long clazzStatus; + +} diff --git a/ruoyi-modules/ruoyi-clazz/src/main/java/com/ruoyi/clazz/domain/req/ClazzSaveReq.java b/ruoyi-modules/ruoyi-clazz/src/main/java/com/ruoyi/clazz/domain/req/ClazzSaveReq.java new file mode 100644 index 0000000..3802703 --- /dev/null +++ b/ruoyi-modules/ruoyi-clazz/src/main/java/com/ruoyi/clazz/domain/req/ClazzSaveReq.java @@ -0,0 +1,41 @@ +package com.ruoyi.clazz.domain.req; + +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import lombok.AllArgsConstructor; +import lombok.experimental.SuperBuilder; +import io.swagger.annotations.*; +import com.ruoyi.common.annotation.Excel; +import com.ruoyi.common.core.domain.BaseEntity; + +/** + * 班级管理对象 clazz + * + * @author seer + * @date 2024-04-22 + */ +@Data +@SuperBuilder +@NoArgsConstructor +@AllArgsConstructor +@ApiModel(value = "ClazzSaveReq", description = "班级管理") +public class ClazzSaveReq extends BaseEntity { + + private static final long serialVersionUID = 1L; + + /** 班级名称 */ + + @ApiModelProperty(name = "班级名称", value = "班级名称") + private String clazzName; + + /** 班级状态 0-停用 1-启用 */ + + @ApiModelProperty(name = "班级状态 0-停用 1-启用", value = "班级状态 0-停用 1-启用", required = true) + private Long clazzStatus; + +// private String remark; + +} diff --git a/ruoyi-modules/ruoyi-clazz/src/main/java/com/ruoyi/clazz/mapper/ClazzMapper.java b/ruoyi-modules/ruoyi-clazz/src/main/java/com/ruoyi/clazz/mapper/ClazzMapper.java new file mode 100644 index 0000000..27139f6 --- /dev/null +++ b/ruoyi-modules/ruoyi-clazz/src/main/java/com/ruoyi/clazz/mapper/ClazzMapper.java @@ -0,0 +1,15 @@ +package com.ruoyi.clazz.mapper; + +import java.util.List; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.ruoyi.clazz.domain.Clazz; + +/** + * 班级管理Mapper接口 + * + * @author seer + * @date 2024-04-22 + */ +public interface ClazzMapper extends BaseMapper { + +} diff --git a/ruoyi-modules/ruoyi-clazz/src/main/java/com/ruoyi/clazz/service/ClazzService.java b/ruoyi-modules/ruoyi-clazz/src/main/java/com/ruoyi/clazz/service/ClazzService.java new file mode 100644 index 0000000..011c040 --- /dev/null +++ b/ruoyi-modules/ruoyi-clazz/src/main/java/com/ruoyi/clazz/service/ClazzService.java @@ -0,0 +1,22 @@ +package com.ruoyi.clazz.service; + +import java.util.List; +import com.ruoyi.clazz.domain.Clazz; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + * 班级管理Service接口 + * + * @author seer + * @date 2024-04-22 + */ +public interface ClazzService extends IService { + /** + * 查询班级管理列表 + * + * @param clazz 班级管理 + * @return 班级管理集合 + */ + public List list(Clazz clazz); + +} diff --git a/ruoyi-modules/ruoyi-clazz/src/main/java/com/ruoyi/clazz/service/impl/ClazzServiceImpl.java b/ruoyi-modules/ruoyi-clazz/src/main/java/com/ruoyi/clazz/service/impl/ClazzServiceImpl.java new file mode 100644 index 0000000..7a4a5d8 --- /dev/null +++ b/ruoyi-modules/ruoyi-clazz/src/main/java/com/ruoyi/clazz/service/impl/ClazzServiceImpl.java @@ -0,0 +1,53 @@ +package com.ruoyi.clazz.service.impl; + +import java.util.List; + +import com.ruoyi.common.utils.ObjUtils; +import com.ruoyi.common.utils.StringUtils; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; +import com.ruoyi.clazz.mapper.ClazzMapper; +import com.ruoyi.clazz.domain.Clazz; +import com.ruoyi.clazz.service.ClazzService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; + +/** + * 班级管理Service业务层处理 + * + * @author seer + * @date 2024-04-22 + */ +@Slf4j +@Service +public class ClazzServiceImpl extends ServiceImpl implements ClazzService { + + /** + * 查询班级管理列表 + * + * @param clazz 班级管理 + * @return 班级管理 + */ + @Override + public List list(Clazz clazz) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + + if (ObjUtils.notNull(clazz.getClazzId())){ + queryWrapper.eq(Clazz::getClazzId, clazz.getClazzId()); + } + + if (ObjUtils.notNull(clazz.getClazzName())){ + queryWrapper.like(Clazz::getClazzName, clazz.getClazzName()); + } + + if (ObjUtils.notNull(clazz.getClazzStatus())){ + queryWrapper.eq(Clazz::getClazzStatus, clazz.getClazzStatus()); + } + + + + + + return list(queryWrapper); + } +} diff --git a/ruoyi-modules/ruoyi-clazz/src/main/resources/mapper/data/ClazzMapper.xml b/ruoyi-modules/ruoyi-clazz/src/main/resources/mapper/data/ClazzMapper.xml new file mode 100644 index 0000000..023bf5c --- /dev/null +++ b/ruoyi-modules/ruoyi-clazz/src/main/resources/mapper/data/ClazzMapper.xml @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + select clazz_id, clazz_name, clazz_status, create_by, create_time, update_by, update_time, remark from clazz + +