From 8698f33d00972e449ffc6151c3a4f276b1abb773 Mon Sep 17 00:00:00 2001 From: Zhangyao <3538764418@qq.com> Date: Tue, 23 Apr 2024 22:23:59 +0800 Subject: [PATCH] =?UTF-8?q?#=E5=BC=A0=E8=80=80=20=E7=8F=AD=E7=BA=A7?= =?UTF-8?q?=E7=AE=A1=E7=90=86-=E5=B0=8F=E7=BB=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../regulate/ClazzGroupController.java | 121 ++++++++++++++++++ .../regulate/ClazzMiddleController.java | 103 +++++++++++++++ .../com/ruoyi/group/domain/ClazzGroup.java | 80 ++++++++++++ .../group/domain/req/ClazzGroupEditReq.java | 33 +++++ .../group/domain/req/ClazzGroupQueryReq.java | 33 +++++ .../group/domain/req/ClazzGroupSaveReq.java | 39 ++++++ .../ruoyi/group/mapper/ClazzGroupMapper.java | 15 +++ .../group/service/ClazzGroupService.java | 30 +++++ .../service/impl/ClazzGroupServiceImpl.java | 54 ++++++++ .../com/ruoyi/middle/domain/ClazzMiddle.java | 96 ++++++++++++++ .../middle/domain/req/ClazzMiddleEditReq.java | 37 ++++++ .../domain/req/ClazzMiddleQueryReq.java | 37 ++++++ .../middle/domain/req/ClazzMiddleSaveReq.java | 44 +++++++ .../middle/mapper/ClazzMiddleMapper.java | 20 +++ .../middle/service/ClazzMiddleService.java | 25 ++++ .../service/impl/ClazzMiddleServiceImpl.java | 51 ++++++++ .../mapper/group/ClazzGroupMapper.xml | 19 +++ .../mapper/middle/ClazzMiddleMapper.xml | 21 +++ 18 files changed, 858 insertions(+) create mode 100644 ruoyi-application/src/main/java/com/ruoyi/web/controller/regulate/ClazzGroupController.java create mode 100644 ruoyi-application/src/main/java/com/ruoyi/web/controller/regulate/ClazzMiddleController.java create mode 100644 ruoyi-basic/clazz-regulate/src/main/java/com/ruoyi/group/domain/ClazzGroup.java create mode 100644 ruoyi-basic/clazz-regulate/src/main/java/com/ruoyi/group/domain/req/ClazzGroupEditReq.java create mode 100644 ruoyi-basic/clazz-regulate/src/main/java/com/ruoyi/group/domain/req/ClazzGroupQueryReq.java create mode 100644 ruoyi-basic/clazz-regulate/src/main/java/com/ruoyi/group/domain/req/ClazzGroupSaveReq.java create mode 100644 ruoyi-basic/clazz-regulate/src/main/java/com/ruoyi/group/mapper/ClazzGroupMapper.java create mode 100644 ruoyi-basic/clazz-regulate/src/main/java/com/ruoyi/group/service/ClazzGroupService.java create mode 100644 ruoyi-basic/clazz-regulate/src/main/java/com/ruoyi/group/service/impl/ClazzGroupServiceImpl.java create mode 100644 ruoyi-basic/clazz-regulate/src/main/java/com/ruoyi/middle/domain/ClazzMiddle.java create mode 100644 ruoyi-basic/clazz-regulate/src/main/java/com/ruoyi/middle/domain/req/ClazzMiddleEditReq.java create mode 100644 ruoyi-basic/clazz-regulate/src/main/java/com/ruoyi/middle/domain/req/ClazzMiddleQueryReq.java create mode 100644 ruoyi-basic/clazz-regulate/src/main/java/com/ruoyi/middle/domain/req/ClazzMiddleSaveReq.java create mode 100644 ruoyi-basic/clazz-regulate/src/main/java/com/ruoyi/middle/mapper/ClazzMiddleMapper.java create mode 100644 ruoyi-basic/clazz-regulate/src/main/java/com/ruoyi/middle/service/ClazzMiddleService.java create mode 100644 ruoyi-basic/clazz-regulate/src/main/java/com/ruoyi/middle/service/impl/ClazzMiddleServiceImpl.java create mode 100644 ruoyi-basic/clazz-regulate/src/main/resources/mapper/group/ClazzGroupMapper.xml create mode 100644 ruoyi-basic/clazz-regulate/src/main/resources/mapper/middle/ClazzMiddleMapper.xml diff --git a/ruoyi-application/src/main/java/com/ruoyi/web/controller/regulate/ClazzGroupController.java b/ruoyi-application/src/main/java/com/ruoyi/web/controller/regulate/ClazzGroupController.java new file mode 100644 index 0000000..e66fa88 --- /dev/null +++ b/ruoyi-application/src/main/java/com/ruoyi/web/controller/regulate/ClazzGroupController.java @@ -0,0 +1,121 @@ +package com.ruoyi.web.controller.regulate; + +import java.util.List; +import javax.servlet.http.HttpServletResponse; + +import com.ruoyi.middle.domain.ClazzMiddle; +import com.ruoyi.middle.domain.req.ClazzMiddleSaveReq; +import com.ruoyi.middle.service.ClazzMiddleService; +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.group.domain.ClazzGroup; +import com.ruoyi.group.domain.req.ClazzGroupQueryReq; +import com.ruoyi.group.domain.req.ClazzGroupSaveReq; +import com.ruoyi.group.domain.req.ClazzGroupEditReq; +import com.ruoyi.group.service.ClazzGroupService; +import com.ruoyi.common.utils.poi.ExcelUtil; +import com.ruoyi.common.core.page.TableDataInfo; + +/** + * 小组Controller + * + * @author ruoyi + * @date 2024-04-23 + */ +@Api(tags = "小组") +@RestController +@RequestMapping("/group/group") +public class ClazzGroupController extends BaseController { + @Autowired + private ClazzGroupService clazzGroupService; + + @Autowired + private ClazzMiddleService clazzMiddleService; + /** + * 查询小组列表 + */ + @ApiOperation("获取小组列表") + @PreAuthorize("@ss.hasPermi('group:group:list')") + @GetMapping("/list") + public Result> list(ClazzGroupQueryReq clazzGroupQueryReq) { + startPage(); + List list = clazzGroupService.list(ClazzGroup.queryBuild(clazzGroupQueryReq)); + return getDataTable(list); + } + + /** + * 导出小组列表 + */ + @ApiOperation("导出小组列表") + @PreAuthorize("@ss.hasPermi('group:group:export')") + @Log(title = "小组", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, ClazzGroup clazzGroup) { + List list = clazzGroupService.list(clazzGroup); + ExcelUtil util = new ExcelUtil(ClazzGroup.class); + util.exportExcel(response, list, "小组数据"); + } + + /** + * 获取小组详细信息 + */ + @ApiOperation("获取小组详细信息") + @PreAuthorize("@ss.hasPermi('group:group:query')") + @GetMapping(value = "/{groupId}") + @ApiImplicitParam(name = "groupId", value = "groupId", required = true, dataType = "Long", paramType = "path", dataTypeClass = Long.class) + public Result getInfo(@PathVariable("groupId") Long groupId) { + return Result.success(clazzGroupService.getById(groupId)); + } + + /** + * 新增小组 + */ + @PreAuthorize("@ss.hasPermi('group:group:add')") + @Log(title = "小组", businessType = BusinessType.INSERT) + @PostMapping + @ApiOperation("新增小组") + public Result add(@RequestBody ClazzGroup clazzGroup) { + Integer i = clazzGroupService.add(clazzGroup); + ClazzMiddle clazzMiddle = new ClazzMiddle(); + clazzMiddle.setMiddleGroupId(clazzGroup.getGroupId()); + clazzMiddle.setMiddleClazzId(clazzGroup.getClazzId()); + clazzMiddleService.add(clazzMiddle); + return Result.success(i,i>0?"成功":"失败"); + } + + /** + * 修改小组 + */ + @PreAuthorize("@ss.hasPermi('group:group:edit')") + @Log(title = "小组", businessType = BusinessType.UPDATE) + @PutMapping("/{groupId}") + @ApiOperation("修改小组") + public Result edit(@PathVariable Long groupId, @RequestBody ClazzGroupEditReq clazzGroupEditReq) { + return toAjax(clazzGroupService.updateById(ClazzGroup.editBuild(groupId,clazzGroupEditReq))); + } + + /** + * 删除小组 + */ + @PreAuthorize("@ss.hasPermi('group:group:remove')") + @Log(title = "小组", businessType = BusinessType.DELETE) + @DeleteMapping("/{groupIds}") + @ApiOperation("删除小组") + @ApiImplicitParam(name = "groupId", value = "groupId", required = true, dataType = "Long", paramType = "path", dataTypeClass = String.class, example = "1,2,3,4") + public Result remove(@PathVariable List groupIds) { + return toAjax(clazzGroupService.removeBatchByIds(groupIds)); + } +} diff --git a/ruoyi-application/src/main/java/com/ruoyi/web/controller/regulate/ClazzMiddleController.java b/ruoyi-application/src/main/java/com/ruoyi/web/controller/regulate/ClazzMiddleController.java new file mode 100644 index 0000000..7986d3e --- /dev/null +++ b/ruoyi-application/src/main/java/com/ruoyi/web/controller/regulate/ClazzMiddleController.java @@ -0,0 +1,103 @@ +package com.ruoyi.web.controller.regulate; + +import java.util.List; +import java.util.Map; +import javax.servlet.http.HttpServletResponse; + +import com.ruoyi.group.domain.ClazzGroup; +import com.ruoyi.group.service.ClazzGroupService; +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.middle.domain.ClazzMiddle; +import com.ruoyi.middle.domain.req.ClazzMiddleQueryReq; +import com.ruoyi.middle.domain.req.ClazzMiddleSaveReq; +import com.ruoyi.middle.domain.req.ClazzMiddleEditReq; +import com.ruoyi.middle.service.ClazzMiddleService; +import com.ruoyi.common.utils.poi.ExcelUtil; +import com.ruoyi.common.core.page.TableDataInfo; + +/** + * 班级内的小组Controller + * + * @author ruoyi + * @date 2024-04-23 + */ +@Api(tags = "班级内的小组") +@RestController +@RequestMapping("/middle/middle") +public class ClazzMiddleController extends BaseController { + @Autowired + private ClazzMiddleService clazzMiddleService; + @Autowired + private ClazzGroupService clazzGroupService; + /** + * 查询班级内的小组列表 + */ + + @ApiOperation("获取班级内的小组列表") + @PreAuthorize("@ss.hasPermi('middle:middle:list')") + @GetMapping("/list/{middleClazzId}") + public Result> list(@PathVariable("middleClazzId") String middleClazzId) { + startPage(); + List list = clazzMiddleService.listByClazzId(middleClazzId); // 传入班级ID + return getDataTable(list); + } + + /** + * 获取班级内的小组详细信息 + */ + @ApiOperation("获取班级内的小组详细信息") + @PreAuthorize("@ss.hasPermi('middle:middle:query')") + @GetMapping(value = "/{middleId}") + @ApiImplicitParam(name = "middleId", value = "middleId", required = true, dataType = "Long", paramType = "path", dataTypeClass = Long.class) + public Result getInfo(@PathVariable("middleId") Long middleId) { + return Result.success(clazzMiddleService.getById(middleId)); + } + + /** + * 新增班级内的小组 + */ + @PreAuthorize("@ss.hasPermi('middle:middle:add')") + @Log(title = "班级内的小组", businessType = BusinessType.INSERT) + @PostMapping + @ApiOperation("新增班级内的小组") + public Result add(@RequestBody ClazzMiddle clazzMiddle) { + return Result.success(clazzMiddleService.add(clazzMiddle)); + } + + /** + * 修改班级内的小组 + */ + @PreAuthorize("@ss.hasPermi('middle:middle:edit')") + @Log(title = "班级内的小组", businessType = BusinessType.UPDATE) + @PutMapping("/{middleId}") + @ApiOperation("修改班级内的小组") + public Result edit(@PathVariable Long middleId, @RequestBody ClazzMiddleEditReq clazzMiddleEditReq) { + return toAjax(clazzMiddleService.updateById(ClazzMiddle.editBuild(middleId,clazzMiddleEditReq))); + } + + /** + * 删除班级内的小组 + */ + @PreAuthorize("@ss.hasPermi('middle:middle:remove')") + @Log(title = "班级内的小组", businessType = BusinessType.DELETE) + @DeleteMapping("/{middleIds}") + @ApiOperation("删除班级内的小组") + @ApiImplicitParam(name = "middleId", value = "middleId", required = true, dataType = "Long", paramType = "path", dataTypeClass = String.class, example = "1,2,3,4") + public Result remove(@PathVariable List middleIds) { + return toAjax(clazzMiddleService.removeBatchByIds(middleIds)); + } +} diff --git a/ruoyi-basic/clazz-regulate/src/main/java/com/ruoyi/group/domain/ClazzGroup.java b/ruoyi-basic/clazz-regulate/src/main/java/com/ruoyi/group/domain/ClazzGroup.java new file mode 100644 index 0000000..0e8830b --- /dev/null +++ b/ruoyi-basic/clazz-regulate/src/main/java/com/ruoyi/group/domain/ClazzGroup.java @@ -0,0 +1,80 @@ +package com.ruoyi.group.domain; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +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.group.domain.req.ClazzGroupQueryReq; +import com.ruoyi.group.domain.req.ClazzGroupSaveReq; +import com.ruoyi.group.domain.req.ClazzGroupEditReq; +import com.ruoyi.common.core.domain.BaseEntity; + +/** + * 小组对象 clazz_group + * + * @author ruoyi + * @date 2024-04-23 + */ +@Data +@SuperBuilder +@NoArgsConstructor +@AllArgsConstructor +@TableName("clazz_group") +@EqualsAndHashCode(callSuper = true) +@ApiModel(value = "ClazzGroup", description = "小组") +public class ClazzGroup extends BaseEntity { + + private static final long serialVersionUID = 1L; + + /** 小组ID */ + @TableId(value = "group_id",type = IdType.AUTO) + @ApiModelProperty(name = "小组ID", value = "小组ID") + private Long groupId; + + /** 班级ID */ + @TableId(value = "clazz_id",type = IdType.AUTO) + @ApiModelProperty(name = "班级ID", value = "班级ID") + @TableField(exist = false) + private Long clazzId; + + /** 小组名称 */ + @Excel(name = "小组名称") + @ApiModelProperty(name = "小组名称", value = "小组名称") + private String groupName; + + /** + * 查询构造器 + */ + public static ClazzGroup queryBuild( ClazzGroupQueryReq clazzGroupQueryReq){ + return ClazzGroup.builder() + .groupName(clazzGroupQueryReq.getGroupName()) + .build(); + } + + /** + * 添加构造器 + */ + public static ClazzGroup saveBuild(ClazzGroup clazzGroup){ + return ClazzGroup.builder() + .groupName(clazzGroup.getGroupName()) + .build(); + } + + /** + * 修改构造器 + */ + public static ClazzGroup editBuild(Long groupId, ClazzGroupEditReq clazzGroupEditReq){ + return ClazzGroup.builder() + .groupId(groupId) + .groupName(clazzGroupEditReq.getGroupName()) + .build(); + } + +} diff --git a/ruoyi-basic/clazz-regulate/src/main/java/com/ruoyi/group/domain/req/ClazzGroupEditReq.java b/ruoyi-basic/clazz-regulate/src/main/java/com/ruoyi/group/domain/req/ClazzGroupEditReq.java new file mode 100644 index 0000000..31538fc --- /dev/null +++ b/ruoyi-basic/clazz-regulate/src/main/java/com/ruoyi/group/domain/req/ClazzGroupEditReq.java @@ -0,0 +1,33 @@ +package com.ruoyi.group.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_group + * + * @author ruoyi + * @date 2024-04-23 + */ +@Data +@SuperBuilder +@NoArgsConstructor +@AllArgsConstructor +@ApiModel(value = "ClazzGroupEditReq", description = "小组") +public class ClazzGroupEditReq extends BaseEntity { + + private static final long serialVersionUID = 1L; + + /** 小组名称 */ + @ApiModelProperty(name = "小组名称", value = "小组名称") + private String groupName; + +} diff --git a/ruoyi-basic/clazz-regulate/src/main/java/com/ruoyi/group/domain/req/ClazzGroupQueryReq.java b/ruoyi-basic/clazz-regulate/src/main/java/com/ruoyi/group/domain/req/ClazzGroupQueryReq.java new file mode 100644 index 0000000..9518057 --- /dev/null +++ b/ruoyi-basic/clazz-regulate/src/main/java/com/ruoyi/group/domain/req/ClazzGroupQueryReq.java @@ -0,0 +1,33 @@ +package com.ruoyi.group.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_group + * + * @author ruoyi + * @date 2024-04-23 + */ +@Data +@SuperBuilder +@NoArgsConstructor +@AllArgsConstructor +@ApiModel(value = "ClazzGroupQueryReq", description = "小组") +public class ClazzGroupQueryReq extends BaseEntity { + + private static final long serialVersionUID = 1L; + + /** 小组名称 */ + @ApiModelProperty(name = "小组名称", value = "小组名称") + private String groupName; + +} diff --git a/ruoyi-basic/clazz-regulate/src/main/java/com/ruoyi/group/domain/req/ClazzGroupSaveReq.java b/ruoyi-basic/clazz-regulate/src/main/java/com/ruoyi/group/domain/req/ClazzGroupSaveReq.java new file mode 100644 index 0000000..39b5ee2 --- /dev/null +++ b/ruoyi-basic/clazz-regulate/src/main/java/com/ruoyi/group/domain/req/ClazzGroupSaveReq.java @@ -0,0 +1,39 @@ +package com.ruoyi.group.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_group + * + * @author ruoyi + * @date 2024-04-23 + */ +@Data +@SuperBuilder +@NoArgsConstructor +@AllArgsConstructor +@ApiModel(value = "ClazzGroupSaveReq", description = "小组") +public class ClazzGroupSaveReq extends BaseEntity { + + private static final long serialVersionUID = 1L; + + /** 小组ID */ + + @ApiModelProperty(name = "小组ID", value = "小组ID") + private Long groupId; + + /** 小组名称 */ + + @ApiModelProperty(name = "小组名称", value = "小组名称") + private String groupName; + +} diff --git a/ruoyi-basic/clazz-regulate/src/main/java/com/ruoyi/group/mapper/ClazzGroupMapper.java b/ruoyi-basic/clazz-regulate/src/main/java/com/ruoyi/group/mapper/ClazzGroupMapper.java new file mode 100644 index 0000000..1ef0fa7 --- /dev/null +++ b/ruoyi-basic/clazz-regulate/src/main/java/com/ruoyi/group/mapper/ClazzGroupMapper.java @@ -0,0 +1,15 @@ +package com.ruoyi.group.mapper; + +import java.util.List; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.ruoyi.group.domain.ClazzGroup; + +/** + * 小组Mapper接口 + * + * @author ruoyi + * @date 2024-04-23 + */ +public interface ClazzGroupMapper extends BaseMapper { + +} diff --git a/ruoyi-basic/clazz-regulate/src/main/java/com/ruoyi/group/service/ClazzGroupService.java b/ruoyi-basic/clazz-regulate/src/main/java/com/ruoyi/group/service/ClazzGroupService.java new file mode 100644 index 0000000..864bb0a --- /dev/null +++ b/ruoyi-basic/clazz-regulate/src/main/java/com/ruoyi/group/service/ClazzGroupService.java @@ -0,0 +1,30 @@ +package com.ruoyi.group.service; + +import java.util.List; +import com.ruoyi.group.domain.ClazzGroup; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + * 小组Service接口 + * + * @author ruoyi + * @date 2024-04-23 + */ +public interface ClazzGroupService extends IService { + /** + * 查询小组列表 + * + * @param clazzGroup 小组 + * @return 小组集合 + */ + public List list(ClazzGroup clazzGroup); + + + /** + * 添加小组 + * @param clazzGroup + * @return + */ + Integer add(ClazzGroup clazzGroup); + +} diff --git a/ruoyi-basic/clazz-regulate/src/main/java/com/ruoyi/group/service/impl/ClazzGroupServiceImpl.java b/ruoyi-basic/clazz-regulate/src/main/java/com/ruoyi/group/service/impl/ClazzGroupServiceImpl.java new file mode 100644 index 0000000..b91c855 --- /dev/null +++ b/ruoyi-basic/clazz-regulate/src/main/java/com/ruoyi/group/service/impl/ClazzGroupServiceImpl.java @@ -0,0 +1,54 @@ +package com.ruoyi.group.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.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.ruoyi.group.mapper.ClazzGroupMapper; +import com.ruoyi.group.domain.ClazzGroup; +import com.ruoyi.group.service.ClazzGroupService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; + +/** + * 小组Service业务层处理 + * + * @author ruoyi + * @date 2024-04-23 + */ +@Slf4j +@Service +public class ClazzGroupServiceImpl extends ServiceImpl implements ClazzGroupService { + + @Autowired + private ClazzGroupMapper clazzGroupMapper; + /** + * 查询小组列表 + * + * @param clazzGroup 小组 + * @return 小组 + */ + @Override + public List list(ClazzGroup clazzGroup) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + + + if (ObjUtils.notNull(clazzGroup.getGroupName())){ + queryWrapper.like(ClazzGroup::getGroupName, clazzGroup.getGroupName()); + } + + + + + return list(queryWrapper); + } + + @Override + public Integer add(ClazzGroup clazzGroup) { + int insert = clazzGroupMapper.insert(clazzGroup); + return insert; + } +} diff --git a/ruoyi-basic/clazz-regulate/src/main/java/com/ruoyi/middle/domain/ClazzMiddle.java b/ruoyi-basic/clazz-regulate/src/main/java/com/ruoyi/middle/domain/ClazzMiddle.java new file mode 100644 index 0000000..b626e5c --- /dev/null +++ b/ruoyi-basic/clazz-regulate/src/main/java/com/ruoyi/middle/domain/ClazzMiddle.java @@ -0,0 +1,96 @@ +package com.ruoyi.middle.domain; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.ruoyi.group.domain.ClazzGroup; +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.middle.domain.req.ClazzMiddleQueryReq; +import com.ruoyi.middle.domain.req.ClazzMiddleSaveReq; +import com.ruoyi.middle.domain.req.ClazzMiddleEditReq; +import com.ruoyi.common.core.domain.BaseEntity; + +/** + * 班级内的小组对象 clazz_middle + * + * @author ruoyi + * @date 2024-04-23 + */ +@Data +@SuperBuilder +@NoArgsConstructor +@AllArgsConstructor +@TableName("clazz_middle") +@EqualsAndHashCode(callSuper = true) +@ApiModel(value = "ClazzMiddle", description = "班级内的小组") +public class ClazzMiddle extends BaseEntity { + + private static final long serialVersionUID = 1L; + + /** 中间表ID */ + @TableId(value = "middle_id",type = IdType.AUTO) + @ApiModelProperty(name = "中间表ID", value = "中间表ID") + private Long middleId; + + /** 班级ID */ + @Excel(name = "班级ID") + @ApiModelProperty(name = "班级ID", value = "班级ID") + private Long middleClazzId; + + /** 小组ID */ + @Excel(name = "小组ID") + @ApiModelProperty(name = "小组ID", value = "小组ID") + private Long middleGroupId; + + /** 小组ID */ + @TableId(value = "group_id",type = IdType.AUTO) + @ApiModelProperty(name = "小组ID", value = "小组ID") + @TableField(exist = false) + private Long groupId; + + /** 小组名称 */ + @Excel(name = "小组名称") + @ApiModelProperty(name = "小组名称", value = "小组名称") + @TableField(exist = false) + private String groupName; + + + /** + * 查询构造器 + */ + public static ClazzMiddle queryBuild( ClazzMiddleQueryReq clazzMiddleQueryReq){ + return ClazzMiddle.builder() + .middleClazzId(clazzMiddleQueryReq.getMiddleClazzId()) + .middleGroupId(clazzMiddleQueryReq.getMiddleGroupId()) + .build(); + } + + /** + * 添加构造器 + */ + public static ClazzMiddle saveBuild(ClazzMiddleSaveReq clazzMiddleSaveReq){ + return ClazzMiddle.builder() + .middleClazzId(clazzMiddleSaveReq.getMiddleClazzId()) + .middleGroupId(clazzMiddleSaveReq.getMiddleGroupId()) + .build(); + } + + /** + * 修改构造器 + */ + public static ClazzMiddle editBuild(Long middleId, ClazzMiddleEditReq clazzMiddleEditReq){ + return ClazzMiddle.builder() + .middleId(middleId) + .middleClazzId(clazzMiddleEditReq.getMiddleClazzId()) + .middleGroupId(clazzMiddleEditReq.getMiddleGroupId()) + .build(); + } + +} diff --git a/ruoyi-basic/clazz-regulate/src/main/java/com/ruoyi/middle/domain/req/ClazzMiddleEditReq.java b/ruoyi-basic/clazz-regulate/src/main/java/com/ruoyi/middle/domain/req/ClazzMiddleEditReq.java new file mode 100644 index 0000000..e81e5c2 --- /dev/null +++ b/ruoyi-basic/clazz-regulate/src/main/java/com/ruoyi/middle/domain/req/ClazzMiddleEditReq.java @@ -0,0 +1,37 @@ +package com.ruoyi.middle.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_middle + * + * @author ruoyi + * @date 2024-04-23 + */ +@Data +@SuperBuilder +@NoArgsConstructor +@AllArgsConstructor +@ApiModel(value = "ClazzMiddleEditReq", description = "班级内的小组") +public class ClazzMiddleEditReq extends BaseEntity { + + private static final long serialVersionUID = 1L; + + /** 班级ID */ + @ApiModelProperty(name = "班级ID", value = "班级ID") + private Long middleClazzId; + + /** 小组ID */ + @ApiModelProperty(name = "小组ID", value = "小组ID") + private Long middleGroupId; + +} diff --git a/ruoyi-basic/clazz-regulate/src/main/java/com/ruoyi/middle/domain/req/ClazzMiddleQueryReq.java b/ruoyi-basic/clazz-regulate/src/main/java/com/ruoyi/middle/domain/req/ClazzMiddleQueryReq.java new file mode 100644 index 0000000..fb50e74 --- /dev/null +++ b/ruoyi-basic/clazz-regulate/src/main/java/com/ruoyi/middle/domain/req/ClazzMiddleQueryReq.java @@ -0,0 +1,37 @@ +package com.ruoyi.middle.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_middle + * + * @author ruoyi + * @date 2024-04-23 + */ +@Data +@SuperBuilder +@NoArgsConstructor +@AllArgsConstructor +@ApiModel(value = "ClazzMiddleQueryReq", description = "班级内的小组") +public class ClazzMiddleQueryReq extends BaseEntity { + + private static final long serialVersionUID = 1L; + + /** 班级ID */ + @ApiModelProperty(name = "班级ID", value = "班级ID") + private Long middleClazzId; + + /** 小组ID */ + @ApiModelProperty(name = "小组ID", value = "小组ID") + private Long middleGroupId; + +} diff --git a/ruoyi-basic/clazz-regulate/src/main/java/com/ruoyi/middle/domain/req/ClazzMiddleSaveReq.java b/ruoyi-basic/clazz-regulate/src/main/java/com/ruoyi/middle/domain/req/ClazzMiddleSaveReq.java new file mode 100644 index 0000000..621396c --- /dev/null +++ b/ruoyi-basic/clazz-regulate/src/main/java/com/ruoyi/middle/domain/req/ClazzMiddleSaveReq.java @@ -0,0 +1,44 @@ +package com.ruoyi.middle.domain.req; + +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.ruoyi.group.service.ClazzGroupService; +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_middle + * + * @author ruoyi + * @date 2024-04-23 + */ +@Data +@SuperBuilder +@NoArgsConstructor +@AllArgsConstructor +@ApiModel(value = "ClazzMiddleSaveReq", description = "班级内的小组") +public class ClazzMiddleSaveReq extends BaseEntity { + + private static final long serialVersionUID = 1L; + + /** 中间表ID */ + + @ApiModelProperty(name = "中间表ID", value = "中间表ID") + private Long middleId; + + /** 班级ID */ + + @ApiModelProperty(name = "班级ID", value = "班级ID") + private Long middleClazzId; + + /** 小组ID */ + + @ApiModelProperty(name = "小组ID", value = "小组ID") + private Long middleGroupId; +} diff --git a/ruoyi-basic/clazz-regulate/src/main/java/com/ruoyi/middle/mapper/ClazzMiddleMapper.java b/ruoyi-basic/clazz-regulate/src/main/java/com/ruoyi/middle/mapper/ClazzMiddleMapper.java new file mode 100644 index 0000000..f458a8a --- /dev/null +++ b/ruoyi-basic/clazz-regulate/src/main/java/com/ruoyi/middle/mapper/ClazzMiddleMapper.java @@ -0,0 +1,20 @@ +package com.ruoyi.middle.mapper; + +import java.util.List; +import java.util.Map; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.ruoyi.middle.domain.ClazzMiddle; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; + +/** + * 班级内的小组Mapper接口 + * + * @author ruoyi + * @date 2024-04-23 + */ +public interface ClazzMiddleMapper extends BaseMapper { + @Select("SELECT m.*, g.* FROM clazz_middle m LEFT JOIN clazz_group g ON m.middle_group_id = g.group_id WHERE m.middle_clazz_id = #{clazzId}") + List listByClazzId(@Param("clazzId") String clazzId); +} diff --git a/ruoyi-basic/clazz-regulate/src/main/java/com/ruoyi/middle/service/ClazzMiddleService.java b/ruoyi-basic/clazz-regulate/src/main/java/com/ruoyi/middle/service/ClazzMiddleService.java new file mode 100644 index 0000000..9b4287b --- /dev/null +++ b/ruoyi-basic/clazz-regulate/src/main/java/com/ruoyi/middle/service/ClazzMiddleService.java @@ -0,0 +1,25 @@ +package com.ruoyi.middle.service; + +import java.util.List; +import com.ruoyi.middle.domain.ClazzMiddle; +import com.baomidou.mybatisplus.extension.service.IService; +import com.ruoyi.middle.domain.req.ClazzMiddleSaveReq; + +/** + * 班级内的小组Service接口 + * + * @author ruoyi + * @date 2024-04-23 + */ +public interface ClazzMiddleService extends IService { + + /** + * 查询班级内的小组列表 + * + * @param middleClazzId 班级内的小组 + * @return 班级内的小组集合 + */ + List listByClazzId(String middleClazzId); + + Integer add(ClazzMiddle clazzMiddle); +} diff --git a/ruoyi-basic/clazz-regulate/src/main/java/com/ruoyi/middle/service/impl/ClazzMiddleServiceImpl.java b/ruoyi-basic/clazz-regulate/src/main/java/com/ruoyi/middle/service/impl/ClazzMiddleServiceImpl.java new file mode 100644 index 0000000..b281de9 --- /dev/null +++ b/ruoyi-basic/clazz-regulate/src/main/java/com/ruoyi/middle/service/impl/ClazzMiddleServiceImpl.java @@ -0,0 +1,51 @@ +package com.ruoyi.middle.service.impl; + +import java.util.Collections; +import java.util.List; +import java.util.Map; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.ruoyi.common.utils.ObjUtils; +import com.ruoyi.common.utils.StringUtils; +import com.ruoyi.group.domain.ClazzGroup; +import com.ruoyi.middle.domain.req.ClazzMiddleSaveReq; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.ruoyi.middle.mapper.ClazzMiddleMapper; +import com.ruoyi.middle.domain.ClazzMiddle; +import com.ruoyi.middle.service.ClazzMiddleService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; + +/** + * 班级内的小组Service业务层处理 + * + * @author ruoyi + * @date 2024-04-23 + */ +@Slf4j +@Service +public class ClazzMiddleServiceImpl extends ServiceImpl implements ClazzMiddleService { + + @Autowired + private ClazzMiddleMapper clazzMiddleMapper; + /** + * 查询班级内的小组列表 + * + * @param clazzId 班级内的小组 + * @return 班级内的小组 + */ + @Override + public List listByClazzId(String clazzId) { + List listByClazzId = clazzMiddleMapper.listByClazzId(clazzId); + return listByClazzId; + } + + @Override + public Integer add(ClazzMiddle clazzMiddle) { + clazzMiddleMapper.insert(clazzMiddle); + return 0; + } +} diff --git a/ruoyi-basic/clazz-regulate/src/main/resources/mapper/group/ClazzGroupMapper.xml b/ruoyi-basic/clazz-regulate/src/main/resources/mapper/group/ClazzGroupMapper.xml new file mode 100644 index 0000000..43e3c2d --- /dev/null +++ b/ruoyi-basic/clazz-regulate/src/main/resources/mapper/group/ClazzGroupMapper.xml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + select group_id, group_name, create_by, create_time, update_by, update_time from clazz_group + + diff --git a/ruoyi-basic/clazz-regulate/src/main/resources/mapper/middle/ClazzMiddleMapper.xml b/ruoyi-basic/clazz-regulate/src/main/resources/mapper/middle/ClazzMiddleMapper.xml new file mode 100644 index 0000000..07ce7b0 --- /dev/null +++ b/ruoyi-basic/clazz-regulate/src/main/resources/mapper/middle/ClazzMiddleMapper.xml @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + select middle_id, middle_clazz_id, middle_group_id, create_by, create_time, update_by, update_time from clazz_middle + + +