3

pom.xml

@@ -189,6 +189,7 @@
     <modules>
         <module>ruoyi-application</module>
         <module>ruoyi-basic</module>
+        <module>ruoyi-modules</module>
     </modules>
     <packaging>pom</packaging>
 

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<TableDataInfo<SysGroup>> list(SysGroupQueryReq sysGroupQueryReq) {
+        startPage();
+        List<SysGroup> 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<SysGroup> list = sysGroupService.list(sysGroup);
+        ExcelUtil<SysGroup> util = new ExcelUtil<SysGroup>(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<SysGroup> 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<String> 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<String> 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<String> remove(@PathVariable List<Long> groupIds) {
+        return toAjax(sysGroupService.removeBatchByIds(groupIds));
+    }
+}

ruoyi-basic/pom.xml

@@ -16,7 +16,6 @@
         <module>ruoyi-framework</module>
         <module>ruoyi-system</module>
         <module>ruoyi-common</module>
-        <module>ruoyi-clazz</module>
     </modules>
 
     <properties>

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;
 

ruoyi-modules/pom.xml

@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>com.muyu</groupId>
+        <artifactId>ruoyi</artifactId>
+        <version>3.8.6</version>
+    </parent>
+
+    <artifactId>ruoyi-modules</artifactId>
+    <packaging>pom</packaging>
+    <modules>
+        <module>ruoyi-clazz</module>
+    </modules>
+
+    <properties>
+        <maven.compiler.source>17</maven.compiler.source>
+        <maven.compiler.target>17</maven.compiler.target>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    </properties>
+
+
+
+</project>

ruoyi-modules/ruoyi-clazz/pom.xml

@@ -5,7 +5,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>com.muyu</groupId>
-        <artifactId>ruoyi-basic</artifactId>
+        <artifactId>ruoyi-modules</artifactId>
         <version>3.8.6</version>
     </parent>
 

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();
+    }
+
+}

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;
+
+}

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;
+
+}

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;
+
+}

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<SysGroup> {
+
+}

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<SysGroup> {
+    /**
+     * 查询小组管理列表
+     *
+     * @param sysGroup 小组管理
+     * @return 小组管理集合
+     */
+    public List<SysGroup> list(SysGroup sysGroup);
+
+}

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<SysGroupMapper, SysGroup>  implements SysGroupService {
+
+    /**
+     * 查询小组管理列表
+     *
+     * @param sysGroup 小组管理
+     * @return 小组管理
+     */
+    @Override
+    public List<SysGroup> list(SysGroup sysGroup) {
+        LambdaQueryWrapper<SysGroup> 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);
+    }
+}

ruoyi-modules/ruoyi-clazz/src/main/resources/mapper/SysGroupMapper.xml

@@ -0,0 +1,22 @@
+<?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.ruoyi.system.mapper.SysGroupMapper">
+
+    <resultMap type="com.ruoyi.system.domain.SysGroup" id="SysGroupResult">
+        <result property="groupId"    column="group_id"    />
+        <result property="groupName"    column="group_name"    />
+        <result property="groupNum"    column="group_num"    />
+        <result property="clazzId"    column="clazz_id"    />
+        <result property="createBy"    column="create_by"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateBy"    column="update_by"    />
+        <result property="updateTime"    column="update_time"    />
+        <result property="remark"    column="remark"    />
+    </resultMap>
+
+    <sql id="selectSysGroupVo">
+        select group_id, group_name, group_num, clazz_id, create_by, create_time, update_by, update_time, remark from sys_group
+    </sql>
+</mapper>