xiaofan
/
ruoyi-vue-server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

4.23

main
肖凡 2024-04-24 09:05:11 +08:00
parent 7127653951
commit 39be7fbd07
17 changed files with 52 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ruoyi-application/src/main/java/com/ruoyi/web/controller/classe/ClasseController.java
View File

@ -3,9 +3,6 @@ package com.ruoyi.web.controller.classe;
import java.util.List;
import javax.servlet.http.HttpServletResponse;
import com.ruoyi.system.domain.Groupe;
import com.ruoyi.system.domain.req.GroupeQueryReq;
import com.ruoyi.system.service.GroupeService;
import io.swagger.annotations.*;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
@ -42,7 +39,6 @@ public class ClasseController extends BaseController {
@Autowired
private ClasseService classeService;
/**
* 查询班级信息列表
*/
@ -112,13 +108,4 @@ public class ClasseController extends BaseController {
public Result<String> remove(@PathVariable List<Long> classeIds) {
return toAjax(classeService.removeBatchByIds(classeIds));
}
@ApiOperation("获取小组信息列表")
@PreAuthorize("@ss.hasPermi('system:groupe:list')")
@GetMapping("/selectGroupe")
public Result<List<Groupe>> list() {
List<Groupe> list=classeService.selectGroupe();
return Result.success(list);
}
}

11
ruoyi-application/src/main/java/com/ruoyi/web/controller/groupe/GroupeController.java
View File

@ -25,6 +25,7 @@ import com.ruoyi.system.domain.req.GroupeEditReq;
import com.ruoyi.system.service.GroupeService;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.system.domain.Classe;
/**
* 小组信息Controller
@ -75,6 +76,16 @@ public class GroupeController extends BaseController {
return Result.success(groupeService.getById(groupId));
}
/**
* 获取小组详细信息展示
*/
@ApiOperation("获取小组详细信息")
@PreAuthorize("@ss.hasPermi('system:groupe:query')")
@GetMapping(value = "/findGroupByClassId/{classeId}")
@ApiImplicitParam(name = "classeId", value = "classeId", required = true, dataType = "Long", paramType = "path", dataTypeClass = Long.class)
public Result<List<Groupe>> findGroupByClassId(@PathVariable("classeId") Long classeId) {
return Result.success(groupeService.findGroupByClassId(classeId));
}
/**
* 新增小组信息
*/

8
ruoyi-basic/ruoyi-classe/src/main/java/com/ruoyi/system/domain/Classe.java
View File

@ -42,18 +42,12 @@ public class Classe extends BaseEntity {
@ApiModelProperty(name = "班级名称", value = "班级名称")
private String classeName;
/** 小组id */
@Excel(name = "小组id")
@ApiModelProperty(name = "小组id", value = "小组id")
private String groups;
/**
* 查询构造器
*/
public static Classe queryBuild( ClasseQueryReq classeQueryReq){
return Classe.builder()
.classeName(classeQueryReq.getClasseName())
.groups(classeQueryReq.getGroups())
.build();
}
@ -63,7 +57,6 @@ public class Classe extends BaseEntity {
public static Classe saveBuild(ClasseSaveReq classeSaveReq){
return Classe.builder()
.classeName(classeSaveReq.getClasseName())
.groups(classeSaveReq.getGroups())
.build();
}
@ -74,7 +67,6 @@ public class Classe extends BaseEntity {
return Classe.builder()
.classeId(classeId)
.classeName(classeEditReq.getClasseName())
.groups(classeEditReq.getGroups())
.build();
}

4
ruoyi-basic/ruoyi-classe/src/main/java/com/ruoyi/system/domain/req/ClasseEditReq.java
View File

@ -30,8 +30,4 @@ public class ClasseEditReq extends BaseEntity {
@ApiModelProperty(name = "班级名称", value = "班级名称")
private String classeName;
/** 小组id */
@ApiModelProperty(name = "小组id", value = "小组id")
private String groups;
}

4
ruoyi-basic/ruoyi-classe/src/main/java/com/ruoyi/system/domain/req/ClasseQueryReq.java
View File

@ -30,8 +30,4 @@ public class ClasseQueryReq extends BaseEntity {
@ApiModelProperty(name = "班级名称", value = "班级名称")
private String classeName;
/** 小组id */
@ApiModelProperty(name = "小组id", value = "小组id")
private String groups;
}

5
ruoyi-basic/ruoyi-classe/src/main/java/com/ruoyi/system/domain/req/ClasseSaveReq.java
View File

@ -36,9 +36,4 @@ public class ClasseSaveReq extends BaseEntity {
@ApiModelProperty(name = "班级名称", value = "班级名称")
private String classeName;
/** 小组id */
@ApiModelProperty(name = "小组id", value = "小组id")
private String groups;
}

3
ruoyi-basic/ruoyi-classe/src/main/java/com/ruoyi/system/mapper/ClasseMapper.java
View File

@ -3,7 +3,6 @@ package com.ruoyi.system.mapper;
import java.util.List;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.system.domain.Classe;
import com.ruoyi.system.domain.Groupe;
/**
* 班级信息Mapper接口
@ -13,6 +12,4 @@ import com.ruoyi.system.domain.Groupe;
*/
public interface ClasseMapper extends BaseMapper<Classe> {
List<Groupe> selectGroupe();
}

4
ruoyi-basic/ruoyi-classe/src/main/java/com/ruoyi/system/service/ClasseService.java
View File

@ -3,7 +3,6 @@ package com.ruoyi.system.service;
import java.util.List;
import com.ruoyi.system.domain.Classe;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.system.domain.Groupe;
/**
* 班级信息Service接口
@ -20,7 +19,4 @@ public interface ClasseService extends IService<Classe> {
*/
public List<Classe> list(Classe classe);
List<Groupe> selectGroupe();
}

13
ruoyi-basic/ruoyi-classe/src/main/java/com/ruoyi/system/service/impl/ClasseServiceImpl.java
View File

@ -4,9 +4,7 @@ import java.util.List;
import com.ruoyi.common.utils.ObjUtils;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.system.domain.Groupe;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.ruoyi.system.mapper.ClasseMapper;
import com.ruoyi.system.domain.Classe;
@ -24,8 +22,6 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@Service
public class ClasseServiceImpl extends ServiceImpl<ClasseMapper, Classe> implements ClasseService {
@Autowired
ClasseMapper classeMapper;
/**
* 查询班级信息列表
*
@ -41,18 +37,9 @@ public class ClasseServiceImpl extends ServiceImpl<ClasseMapper, Classe> implem
queryWrapper.like(Classe::getClasseName, classe.getClasseName());
}
if (ObjUtils.notNull(classe.getGroups())){
queryWrapper.eq(Classe::getGroups, classe.getGroups());
}
return list(queryWrapper);
}
@Override
public List<Groupe> selectGroupe() {
return classeMapper.selectGroupe();
}
}

6
ruoyi-basic/ruoyi-classe/src/main/resources/mapper/system/ClasseMapper.xml
View File

@ -7,7 +7,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<resultMap type="com.ruoyi.system.domain.Classe" id="ClasseResult">
<result property="classeId" column="classe_id" />
<result property="classeName" column="classe_name" />
<result property="groups" column="groups" />
<result property="createBy" column="create_by" />
<result property="createTime" column="create_time" />
<result property="updateBy" column="update_by" />
@ -15,9 +14,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</resultMap>
<sql id="selectClasseVo">
select classe_id, classe_name, groups, create_by, create_time, update_by, update_time from classe
select classe_id, classe_name, create_by, create_time, update_by, update_time from classe
</sql>
<select id="selectGroupe" resultType="com.ruoyi.system.domain.Groupe">
select group_id,group_name from groupe
</select>
</mapper>

8
ruoyi-basic/ruoyi-groupe/src/main/java/com/ruoyi/system/domain/Groupe.java
View File

@ -42,12 +42,18 @@ public class Groupe extends BaseEntity {
@ApiModelProperty(name = "小组名称", value = "小组名称")
private String groupName;
/** 班级id */
@Excel(name = "班级id")
@ApiModelProperty(name = "班级id", value = "班级id")
private Long classes;
/**
* 查询构造器
*/
public static Groupe queryBuild( GroupeQueryReq groupeQueryReq){
return Groupe.builder()
.groupName(groupeQueryReq.getGroupName())
.classes(groupeQueryReq.getClasses())
.build();
}
@ -57,6 +63,7 @@ public class Groupe extends BaseEntity {
public static Groupe saveBuild(GroupeSaveReq groupeSaveReq){
return Groupe.builder()
.groupName(groupeSaveReq.getGroupName())
.classes(groupeSaveReq.getClasses())
.build();
}
@ -67,6 +74,7 @@ public class Groupe extends BaseEntity {
return Groupe.builder()
.groupId(groupId)
.groupName(groupeEditReq.getGroupName())
.classes(groupeEditReq.getClasses())
.build();
}

4
ruoyi-basic/ruoyi-groupe/src/main/java/com/ruoyi/system/domain/req/GroupeEditReq.java
View File

@ -30,4 +30,8 @@ public class GroupeEditReq extends BaseEntity {
@ApiModelProperty(name = "小组名称", value = "小组名称")
private String groupName;
/** 班级id */
@ApiModelProperty(name = "班级id", value = "班级id")
private Long classes;
}

4
ruoyi-basic/ruoyi-groupe/src/main/java/com/ruoyi/system/domain/req/GroupeQueryReq.java
View File

@ -30,4 +30,8 @@ public class GroupeQueryReq extends BaseEntity {
@ApiModelProperty(name = "小组名称", value = "小组名称")
private String groupName;
/** 班级id */
@ApiModelProperty(name = "班级id", value = "班级id")
private Long classes;
}

5
ruoyi-basic/ruoyi-groupe/src/main/java/com/ruoyi/system/domain/req/GroupeSaveReq.java
View File

@ -36,4 +36,9 @@ public class GroupeSaveReq extends BaseEntity {
@ApiModelProperty(name = "小组名称", value = "小组名称")
private String groupName;
/** 班级id */
@ApiModelProperty(name = "班级id", value = "班级id")
private Long classes;
}

1
ruoyi-basic/ruoyi-groupe/src/main/java/com/ruoyi/system/service/GroupeService.java
View File

@ -19,4 +19,5 @@ public interface GroupeService extends IService<Groupe> {
*/
public List<Groupe> list(Groupe groupe);
List<Groupe> findGroupByClassId(Long classeId);
}

16
ruoyi-basic/ruoyi-groupe/src/main/java/com/ruoyi/system/service/impl/GroupeServiceImpl.java
View File

@ -5,6 +5,7 @@ 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.system.mapper.GroupeMapper;
import com.ruoyi.system.domain.Groupe;
@ -22,6 +23,8 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@Service
public class GroupeServiceImpl extends ServiceImpl<GroupeMapper, Groupe> implements GroupeService {
@Autowired
private GroupeMapper groupeMapper;
/**
* 查询小组信息列表
*
@ -37,9 +40,22 @@ public class GroupeServiceImpl extends ServiceImpl<GroupeMapper, Groupe> implem
queryWrapper.like(Groupe::getGroupName, groupe.getGroupName());
}
if (ObjUtils.notNull(groupe.getClasses())){
queryWrapper.eq(Groupe::getClasses, groupe.getClasses());
}
return list(queryWrapper);
}
@Override
public List<Groupe> findGroupByClassId(Long classeId) {
LambdaQueryWrapper<Groupe> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(StringUtils.isNotNull(classeId),Groupe::getClasses,classeId);
return groupeMapper.selectList(queryWrapper);
}
}

3
ruoyi-basic/ruoyi-groupe/src/main/resources/mapper/system/GroupeMapper.xml
View File

@ -7,6 +7,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<resultMap type="com.ruoyi.system.domain.Groupe" id="GroupeResult">
<result property="groupId" column="group_id" />
<result property="groupName" column="group_name" />
<result property="classes" column="classes" />
<result property="createBy" column="create_by" />
<result property="createTime" column="create_time" />
<result property="updateBy" column="update_by" />
@ -14,6 +15,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</resultMap>
<sql id="selectGroupeVo">
select group_id, group_name, create_by, create_time, update_by, update_time from groupe
select group_id, group_name, classes, create_by, create_time, update_by, update_time from groupe
</sql>
</mapper>