diff --git a/pom.xml b/pom.xml index cf49602..e664c94 100644 --- a/pom.xml +++ b/pom.xml @@ -189,6 +189,7 @@ ruoyi-application ruoyi-basic + ruoyi-modules pom diff --git a/ruoyi-application/src/main/java/com/ruoyi/controller/SysGroupController.java b/ruoyi-application/src/main/java/com/ruoyi/controller/SysGroupController.java new file mode 100644 index 0000000..f2ae3ae --- /dev/null +++ b/ruoyi-application/src/main/java/com/ruoyi/controller/SysGroupController.java @@ -0,0 +1,111 @@ +package com.ruoyi.controller; + +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.system.domain.SysGroup; +import com.ruoyi.system.domain.req.SysGroupQueryReq; +import com.ruoyi.system.domain.req.SysGroupSaveReq; +import com.ruoyi.system.domain.req.SysGroupEditReq; +import com.ruoyi.system.service.SysGroupService; +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 SysGroupController extends BaseController { + @Autowired + private SysGroupService sysGroupService; + + /** + * 查询小组管理列表 + */ + @ApiOperation("获取小组管理列表") + @PreAuthorize("@ss.hasPermi('group:group:list')") + @GetMapping("/list") + public Result> list(SysGroupQueryReq sysGroupQueryReq) { + startPage(); + List list = sysGroupService.list(SysGroup.queryBuild(sysGroupQueryReq)); + return getDataTable(list); + } + + /** + * 导出小组管理列表 + */ + @ApiOperation("导出小组管理列表") + @PreAuthorize("@ss.hasPermi('group:group:export')") + @Log(title = "小组管理", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, SysGroup sysGroup) { + List list = sysGroupService.list(sysGroup); + ExcelUtil util = new ExcelUtil(SysGroup.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(sysGroupService.getById(groupId)); + } + + /** + * 新增小组管理 + */ + @PreAuthorize("@ss.hasPermi('group:group:add')") + @Log(title = "小组管理", businessType = BusinessType.INSERT) + @PostMapping + @ApiOperation("新增小组管理") + public Result add(@RequestBody SysGroupSaveReq sysGroupSaveReq) { + return toAjax(sysGroupService.save(SysGroup.saveBuild(sysGroupSaveReq))); + } + + /** + * 修改小组管理 + */ + @PreAuthorize("@ss.hasPermi('group:group:edit')") + @Log(title = "小组管理", businessType = BusinessType.UPDATE) + @PutMapping("/{groupId}") + @ApiOperation("修改小组管理") + public Result edit(@PathVariable Long groupId, @RequestBody SysGroupEditReq sysGroupEditReq) { + return toAjax(sysGroupService.updateById(SysGroup.editBuild(groupId,sysGroupEditReq))); + } + + /** + * 删除小组管理 + */ + @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(sysGroupService.removeBatchByIds(groupIds)); + } +} diff --git a/ruoyi-basic/pom.xml b/ruoyi-basic/pom.xml index 0431f8d..3660df6 100644 --- a/ruoyi-basic/pom.xml +++ b/ruoyi-basic/pom.xml @@ -16,7 +16,6 @@ ruoyi-framework ruoyi-system ruoyi-common - ruoyi-clazz 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 0a2e4e5..97592a8 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,7 +67,7 @@ public class BaseEntity implements Serializable { @ApiModelProperty(hidden=true) private Date updateTime; - @TableField(value = "update_by" , fill = FieldFill.UPDATE) + @TableField(value = "remark" , fill = FieldFill.UPDATE) @ApiModelProperty(hidden=true) private String remark; diff --git a/ruoyi-modules/pom.xml b/ruoyi-modules/pom.xml new file mode 100644 index 0000000..878ed5e --- /dev/null +++ b/ruoyi-modules/pom.xml @@ -0,0 +1,26 @@ + + + 4.0.0 + + com.muyu + ruoyi + 3.8.6 + + + ruoyi-modules + pom + + ruoyi-clazz + + + + 17 + 17 + UTF-8 + + + + + diff --git a/ruoyi-basic/ruoyi-clazz/pom.xml b/ruoyi-modules/ruoyi-clazz/pom.xml similarity index 94% rename from ruoyi-basic/ruoyi-clazz/pom.xml rename to ruoyi-modules/ruoyi-clazz/pom.xml index 1cb8fff..5f496ff 100644 --- a/ruoyi-basic/ruoyi-clazz/pom.xml +++ b/ruoyi-modules/ruoyi-clazz/pom.xml @@ -5,7 +5,7 @@ 4.0.0 com.muyu - ruoyi-basic + ruoyi-modules 3.8.6 diff --git a/ruoyi-basic/ruoyi-clazz/src/main/java/com/ruoyi/system/domain/SysClazz.java b/ruoyi-modules/ruoyi-clazz/src/main/java/com/ruoyi/system/domain/SysClazz.java similarity index 100% rename from ruoyi-basic/ruoyi-clazz/src/main/java/com/ruoyi/system/domain/SysClazz.java rename to ruoyi-modules/ruoyi-clazz/src/main/java/com/ruoyi/system/domain/SysClazz.java diff --git a/ruoyi-modules/ruoyi-clazz/src/main/java/com/ruoyi/system/domain/SysGroup.java b/ruoyi-modules/ruoyi-clazz/src/main/java/com/ruoyi/system/domain/SysGroup.java new file mode 100644 index 0000000..d4f3562 --- /dev/null +++ b/ruoyi-modules/ruoyi-clazz/src/main/java/com/ruoyi/system/domain/SysGroup.java @@ -0,0 +1,89 @@ +package com.ruoyi.system.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.system.domain.req.SysGroupQueryReq; +import com.ruoyi.system.domain.req.SysGroupSaveReq; +import com.ruoyi.system.domain.req.SysGroupEditReq; +import com.ruoyi.common.core.domain.BaseEntity; + +/** + * 小组管理对象 sys_group + * + * @author ruoyi + * @date 2024-04-23 + */ +@Data +@SuperBuilder +@NoArgsConstructor +@AllArgsConstructor +@TableName("sys_group") +@EqualsAndHashCode(callSuper = true) +@ApiModel(value = "SysGroup", description = "小组管理") +public class SysGroup extends BaseEntity { + + private static final long serialVersionUID = 1L; + + /** 小组编号 */ + @TableId(value = "group_id",type = IdType.AUTO) + @ApiModelProperty(name = "小组编号", value = "小组编号") + private Long groupId; + + /** 小组名称 */ + @Excel(name = "小组名称") + @ApiModelProperty(name = "小组名称", value = "小组名称") + private String groupName; + + /** 小组人数 */ + @Excel(name = "小组人数") + @ApiModelProperty(name = "小组人数", value = "小组人数") + private Long groupNum; + + /** 班级编号 */ + @Excel(name = "班级编号") + @ApiModelProperty(name = "班级编号", value = "班级编号") + private Long clazzId; + + /** + * 查询构造器 + */ + public static SysGroup queryBuild( SysGroupQueryReq sysGroupQueryReq){ + return SysGroup.builder() + .groupName(sysGroupQueryReq.getGroupName()) + .groupNum(sysGroupQueryReq.getGroupNum()) + .clazzId(sysGroupQueryReq.getClazzId()) + .build(); + } + + /** + * 添加构造器 + */ + public static SysGroup saveBuild(SysGroupSaveReq sysGroupSaveReq){ + return SysGroup.builder() + .groupName(sysGroupSaveReq.getGroupName()) + .groupNum(sysGroupSaveReq.getGroupNum()) + .clazzId(sysGroupSaveReq.getClazzId()) + .build(); + } + + /** + * 修改构造器 + */ + public static SysGroup editBuild(Long groupId, SysGroupEditReq sysGroupEditReq){ + return SysGroup.builder() + .groupId(groupId) + .groupName(sysGroupEditReq.getGroupName()) + .groupNum(sysGroupEditReq.getGroupNum()) + .clazzId(sysGroupEditReq.getClazzId()) + .build(); + } + +} diff --git a/ruoyi-basic/ruoyi-clazz/src/main/java/com/ruoyi/system/domain/req/SysClazzEditReq.java b/ruoyi-modules/ruoyi-clazz/src/main/java/com/ruoyi/system/domain/req/SysClazzEditReq.java similarity index 100% rename from ruoyi-basic/ruoyi-clazz/src/main/java/com/ruoyi/system/domain/req/SysClazzEditReq.java rename to ruoyi-modules/ruoyi-clazz/src/main/java/com/ruoyi/system/domain/req/SysClazzEditReq.java diff --git a/ruoyi-basic/ruoyi-clazz/src/main/java/com/ruoyi/system/domain/req/SysClazzQueryReq.java b/ruoyi-modules/ruoyi-clazz/src/main/java/com/ruoyi/system/domain/req/SysClazzQueryReq.java similarity index 100% rename from ruoyi-basic/ruoyi-clazz/src/main/java/com/ruoyi/system/domain/req/SysClazzQueryReq.java rename to ruoyi-modules/ruoyi-clazz/src/main/java/com/ruoyi/system/domain/req/SysClazzQueryReq.java diff --git a/ruoyi-basic/ruoyi-clazz/src/main/java/com/ruoyi/system/domain/req/SysClazzSaveReq.java b/ruoyi-modules/ruoyi-clazz/src/main/java/com/ruoyi/system/domain/req/SysClazzSaveReq.java similarity index 100% rename from ruoyi-basic/ruoyi-clazz/src/main/java/com/ruoyi/system/domain/req/SysClazzSaveReq.java rename to ruoyi-modules/ruoyi-clazz/src/main/java/com/ruoyi/system/domain/req/SysClazzSaveReq.java diff --git a/ruoyi-modules/ruoyi-clazz/src/main/java/com/ruoyi/system/domain/req/SysGroupEditReq.java b/ruoyi-modules/ruoyi-clazz/src/main/java/com/ruoyi/system/domain/req/SysGroupEditReq.java new file mode 100644 index 0000000..9b87618 --- /dev/null +++ b/ruoyi-modules/ruoyi-clazz/src/main/java/com/ruoyi/system/domain/req/SysGroupEditReq.java @@ -0,0 +1,41 @@ +package com.ruoyi.system.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; + +/** + * 小组管理对象 sys_group + * + * @author ruoyi + * @date 2024-04-23 + */ +@Data +@SuperBuilder +@NoArgsConstructor +@AllArgsConstructor +@ApiModel(value = "SysGroupEditReq", description = "小组管理") +public class SysGroupEditReq extends BaseEntity { + + private static final long serialVersionUID = 1L; + + /** 小组名称 */ + @ApiModelProperty(name = "小组名称", value = "小组名称") + private String groupName; + + /** 小组人数 */ + @ApiModelProperty(name = "小组人数", value = "小组人数") + private Long groupNum; + + /** 班级编号 */ + @ApiModelProperty(name = "班级编号", value = "班级编号") + private Long clazzId; + +} diff --git a/ruoyi-modules/ruoyi-clazz/src/main/java/com/ruoyi/system/domain/req/SysGroupQueryReq.java b/ruoyi-modules/ruoyi-clazz/src/main/java/com/ruoyi/system/domain/req/SysGroupQueryReq.java new file mode 100644 index 0000000..8f17edc --- /dev/null +++ b/ruoyi-modules/ruoyi-clazz/src/main/java/com/ruoyi/system/domain/req/SysGroupQueryReq.java @@ -0,0 +1,41 @@ +package com.ruoyi.system.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; + +/** + * 小组管理对象 sys_group + * + * @author ruoyi + * @date 2024-04-23 + */ +@Data +@SuperBuilder +@NoArgsConstructor +@AllArgsConstructor +@ApiModel(value = "SysGroupQueryReq", description = "小组管理") +public class SysGroupQueryReq extends BaseEntity { + + private static final long serialVersionUID = 1L; + + /** 小组名称 */ + @ApiModelProperty(name = "小组名称", value = "小组名称") + private String groupName; + + /** 小组人数 */ + @ApiModelProperty(name = "小组人数", value = "小组人数") + private Long groupNum; + + /** 班级编号 */ + @ApiModelProperty(name = "班级编号", value = "班级编号") + private Long clazzId; + +} diff --git a/ruoyi-modules/ruoyi-clazz/src/main/java/com/ruoyi/system/domain/req/SysGroupSaveReq.java b/ruoyi-modules/ruoyi-clazz/src/main/java/com/ruoyi/system/domain/req/SysGroupSaveReq.java new file mode 100644 index 0000000..cedfcc5 --- /dev/null +++ b/ruoyi-modules/ruoyi-clazz/src/main/java/com/ruoyi/system/domain/req/SysGroupSaveReq.java @@ -0,0 +1,49 @@ +package com.ruoyi.system.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; + +/** + * 小组管理对象 sys_group + * + * @author ruoyi + * @date 2024-04-23 + */ +@Data +@SuperBuilder +@NoArgsConstructor +@AllArgsConstructor +@ApiModel(value = "SysGroupSaveReq", description = "小组管理") +public class SysGroupSaveReq extends BaseEntity { + + private static final long serialVersionUID = 1L; + + /** 小组编号 */ + + @ApiModelProperty(name = "小组编号", value = "小组编号") + private Long groupId; + + /** 小组名称 */ + + @ApiModelProperty(name = "小组名称", value = "小组名称") + private String groupName; + + /** 小组人数 */ + + @ApiModelProperty(name = "小组人数", value = "小组人数") + private Long groupNum; + + /** 班级编号 */ + + @ApiModelProperty(name = "班级编号", value = "班级编号") + private Long clazzId; + +} diff --git a/ruoyi-basic/ruoyi-clazz/src/main/java/com/ruoyi/system/mapper/SysClazzMapper.java b/ruoyi-modules/ruoyi-clazz/src/main/java/com/ruoyi/system/mapper/SysClazzMapper.java similarity index 100% rename from ruoyi-basic/ruoyi-clazz/src/main/java/com/ruoyi/system/mapper/SysClazzMapper.java rename to ruoyi-modules/ruoyi-clazz/src/main/java/com/ruoyi/system/mapper/SysClazzMapper.java diff --git a/ruoyi-modules/ruoyi-clazz/src/main/java/com/ruoyi/system/mapper/SysGroupMapper.java b/ruoyi-modules/ruoyi-clazz/src/main/java/com/ruoyi/system/mapper/SysGroupMapper.java new file mode 100644 index 0000000..3a0580f --- /dev/null +++ b/ruoyi-modules/ruoyi-clazz/src/main/java/com/ruoyi/system/mapper/SysGroupMapper.java @@ -0,0 +1,15 @@ +package com.ruoyi.system.mapper; + +import java.util.List; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.ruoyi.system.domain.SysGroup; + +/** + * 小组管理Mapper接口 + * + * @author ruoyi + * @date 2024-04-23 + */ +public interface SysGroupMapper extends BaseMapper { + +} diff --git a/ruoyi-basic/ruoyi-clazz/src/main/java/com/ruoyi/system/service/SysClazzService.java b/ruoyi-modules/ruoyi-clazz/src/main/java/com/ruoyi/system/service/SysClazzService.java similarity index 100% rename from ruoyi-basic/ruoyi-clazz/src/main/java/com/ruoyi/system/service/SysClazzService.java rename to ruoyi-modules/ruoyi-clazz/src/main/java/com/ruoyi/system/service/SysClazzService.java diff --git a/ruoyi-modules/ruoyi-clazz/src/main/java/com/ruoyi/system/service/SysGroupService.java b/ruoyi-modules/ruoyi-clazz/src/main/java/com/ruoyi/system/service/SysGroupService.java new file mode 100644 index 0000000..ef37488 --- /dev/null +++ b/ruoyi-modules/ruoyi-clazz/src/main/java/com/ruoyi/system/service/SysGroupService.java @@ -0,0 +1,22 @@ +package com.ruoyi.system.service; + +import java.util.List; +import com.ruoyi.system.domain.SysGroup; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + * 小组管理Service接口 + * + * @author ruoyi + * @date 2024-04-23 + */ +public interface SysGroupService extends IService { + /** + * 查询小组管理列表 + * + * @param sysGroup 小组管理 + * @return 小组管理集合 + */ + public List list(SysGroup sysGroup); + +} diff --git a/ruoyi-basic/ruoyi-clazz/src/main/java/com/ruoyi/system/service/impl/SysClazzServiceImpl.java b/ruoyi-modules/ruoyi-clazz/src/main/java/com/ruoyi/system/service/impl/SysClazzServiceImpl.java similarity index 100% rename from ruoyi-basic/ruoyi-clazz/src/main/java/com/ruoyi/system/service/impl/SysClazzServiceImpl.java rename to ruoyi-modules/ruoyi-clazz/src/main/java/com/ruoyi/system/service/impl/SysClazzServiceImpl.java diff --git a/ruoyi-modules/ruoyi-clazz/src/main/java/com/ruoyi/system/service/impl/SysGroupServiceImpl.java b/ruoyi-modules/ruoyi-clazz/src/main/java/com/ruoyi/system/service/impl/SysGroupServiceImpl.java new file mode 100644 index 0000000..7aed8d5 --- /dev/null +++ b/ruoyi-modules/ruoyi-clazz/src/main/java/com/ruoyi/system/service/impl/SysGroupServiceImpl.java @@ -0,0 +1,54 @@ +package com.ruoyi.system.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.system.mapper.SysGroupMapper; +import com.ruoyi.system.domain.SysGroup; +import com.ruoyi.system.service.SysGroupService; +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 SysGroupServiceImpl extends ServiceImpl implements SysGroupService { + + /** + * 查询小组管理列表 + * + * @param sysGroup 小组管理 + * @return 小组管理 + */ + @Override + public List list(SysGroup sysGroup) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + + + if (ObjUtils.notNull(sysGroup.getGroupName())){ + queryWrapper.like(SysGroup::getGroupName, sysGroup.getGroupName()); + } + + if (ObjUtils.notNull(sysGroup.getGroupNum())){ + queryWrapper.eq(SysGroup::getGroupNum, sysGroup.getGroupNum()); + } + + if (ObjUtils.notNull(sysGroup.getClazzId())){ + queryWrapper.eq(SysGroup::getClazzId, sysGroup.getClazzId()); + } + + + + + + return list(queryWrapper); + } +} diff --git a/ruoyi-basic/ruoyi-clazz/src/main/resources/mapper/clazz/SysClazzMapper.xml b/ruoyi-modules/ruoyi-clazz/src/main/resources/mapper/SysClazzMapper.xml similarity index 100% rename from ruoyi-basic/ruoyi-clazz/src/main/resources/mapper/clazz/SysClazzMapper.xml rename to ruoyi-modules/ruoyi-clazz/src/main/resources/mapper/SysClazzMapper.xml diff --git a/ruoyi-modules/ruoyi-clazz/src/main/resources/mapper/SysGroupMapper.xml b/ruoyi-modules/ruoyi-clazz/src/main/resources/mapper/SysGroupMapper.xml new file mode 100644 index 0000000..8891fb8 --- /dev/null +++ b/ruoyi-modules/ruoyi-clazz/src/main/resources/mapper/SysGroupMapper.xml @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + select group_id, group_name, group_num, clazz_id, create_by, create_time, update_by, update_time, remark from sys_group + +