From 3932ddcd6ebde42b8990853a6dd641b4bec57564 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=84=E5=A4=A7=E4=B8=BE?= <13970129+huandgaju@user.noreply.gitee.com> Date: Tue, 23 Apr 2024 21:35:42 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=8F=AD=E7=BA=A7=E5=B0=8F?= =?UTF-8?q?=E7=BB=84=E5=88=97=E8=A1=A8:=E5=A2=9E=E5=88=A0=E6=94=B9?= =?UTF-8?q?=E6=9F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/system/TClazzController.java | 2 + .../controller/system/TGroupController.java | 102 ++++++++++++++++++ .../framework/config/SecurityConfig.java | 3 + .../java/com/ruoyi/system/domain/TGroup.java | 39 +++++++ .../com/ruoyi/system/mapper/TGroupMapper.java | 32 ++++++ .../ruoyi/system/service/TClazzService.java | 7 ++ .../ruoyi/system/service/TGroupService.java | 38 +++++++ .../service/impl/TClazzServiceImpl.java | 18 +++- .../service/impl/TGroupServiceImpl.java | 66 ++++++++++++ .../resources/mapper/system/TGroupMapper.xml | 32 ++++++ 10 files changed, 334 insertions(+), 5 deletions(-) create mode 100644 ruoyi-application/src/main/java/com/ruoyi/web/controller/system/TGroupController.java create mode 100644 ruoyi-basic/ruoyi-system/src/main/java/com/ruoyi/system/domain/TGroup.java create mode 100644 ruoyi-basic/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TGroupMapper.java create mode 100644 ruoyi-basic/ruoyi-system/src/main/java/com/ruoyi/system/service/TGroupService.java create mode 100644 ruoyi-basic/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TGroupServiceImpl.java create mode 100644 ruoyi-basic/ruoyi-system/src/main/resources/mapper/system/TGroupMapper.xml diff --git a/ruoyi-application/src/main/java/com/ruoyi/web/controller/system/TClazzController.java b/ruoyi-application/src/main/java/com/ruoyi/web/controller/system/TClazzController.java index e8e3ba4..e9deb6f 100644 --- a/ruoyi-application/src/main/java/com/ruoyi/web/controller/system/TClazzController.java +++ b/ruoyi-application/src/main/java/com/ruoyi/web/controller/system/TClazzController.java @@ -4,6 +4,7 @@ import java.util.List; import javax.servlet.http.HttpServletResponse; import com.ruoyi.system.domain.TClazz; +import com.ruoyi.system.domain.TGroup; import com.ruoyi.system.domain.req.TClazzEditReq; import com.ruoyi.system.domain.req.TClazzQueryReq; import com.ruoyi.system.domain.req.TClazzSaveReq; @@ -52,6 +53,7 @@ public class TClazzController extends BaseController { return getDataTable(list); } + /** * 导出数据管理列表 */ diff --git a/ruoyi-application/src/main/java/com/ruoyi/web/controller/system/TGroupController.java b/ruoyi-application/src/main/java/com/ruoyi/web/controller/system/TGroupController.java new file mode 100644 index 0000000..cb61b96 --- /dev/null +++ b/ruoyi-application/src/main/java/com/ruoyi/web/controller/system/TGroupController.java @@ -0,0 +1,102 @@ +package com.ruoyi.web.controller.system; + +import com.ruoyi.common.annotation.Log; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.Result; +import com.ruoyi.common.core.page.TableDataInfo; +import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.common.utils.poi.ExcelUtil; +import com.ruoyi.system.domain.TClazz; +import com.ruoyi.system.domain.TGroup; +import com.ruoyi.system.domain.req.TClazzEditReq; +import com.ruoyi.system.domain.req.TClazzQueryReq; +import com.ruoyi.system.domain.req.TClazzSaveReq; +import com.ruoyi.system.mapper.TGroupMapper; +import com.ruoyi.system.service.TClazzService; +import com.ruoyi.system.service.TGroupService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; + +/** + * 数据管理Controller + * + * @author HuangDaJu + * @date 2024-04-22 + */ + +@RestController +@RequestMapping("/clazz/group") +public class TGroupController extends BaseController { + + @Autowired + private TGroupMapper tGroupMapper; + @Autowired + private TGroupService tGroupService; + + /** + * 获取班级小组数据列表 + */ + @ApiOperation("获取班级小组数据列表") +// @PreAuthorize("@ss.hasPermi('clazz:clazz:list')") + @GetMapping("/groupList/{clazzId}") + public Result> groupList(@PathVariable Long clazzId) { + startPage(); + List list = tGroupMapper.clazzGroupList(clazzId); + return getDataTable(list); + } + + +// @PreAuthorize("@ss.hasPermi('clazz:clazz:remove')") + @Log(title = "删除小组", businessType = BusinessType.DELETE) + @DeleteMapping("/{groupId}") + @ApiOperation("删除小组") +// @ApiImplicitParam(name = "clazzId", value = "clazzId", required = true, dataType = "Long", paramType = "path", dataTypeClass = String.class, example = "1,2,3,4") + public Result remove(@PathVariable Long groupId) { + return toAjax(tGroupService.removeGroup(groupId)); + } + + + /** + * 获取数据管理详细信息 + */ + @ApiOperation("获取小组详细信息") +// @PreAuthorize("@ss.hasPermi('clazz:clazz:query')") + @GetMapping(value = "/{groupId}") +// @ApiImplicitParam(name = "clazzId", value = "clazzId", required = true, dataType = "Long", paramType = "path", dataTypeClass = Long.class) + public Result getInfo(@PathVariable("groupId") Long groupId) { + return Result.success(tGroupService.getById(groupId)); + } + + /** + * 新增数据管理 + */ +// @PreAuthorize("@ss.hasPermi('clazz:clazz:add')") + @Log(title = "添加小组信息", businessType = BusinessType.INSERT) + @PostMapping + @ApiOperation("新增数据管理") + public Result add(@RequestBody TGroup tGroup) { + return toAjax(tGroupService.addTGroup(tGroup)); + } + + /** + * 修改数据管理 + */ +// @PreAuthorize("@ss.hasPermi('clazz:clazz:edit')") + @Log(title = "修改小组数据", businessType = BusinessType.UPDATE) + @PutMapping + @ApiOperation("修改数据管理") + public Result edit(@RequestBody TGroup tGroup) { + return toAjax(tGroupService.updateById(tGroup)); + } + + + + +} diff --git a/ruoyi-basic/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java b/ruoyi-basic/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java index 6e5211d..1d13483 100644 --- a/ruoyi-basic/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java +++ b/ruoyi-basic/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java @@ -113,6 +113,9 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter { // 静态资源，可匿名访问 .antMatchers(HttpMethod.GET, "/", "/*.html", "/**/*.html", "/**/*.css", "/**/*.js", "/profile/**").permitAll() .antMatchers("/swagger-ui.html", "/swagger-resources/**", "/webjars/**", "/*/api-docs", "/druid/**").permitAll() + + //在这里添加想要测试的方法访问URL，后面添加匿名访问的权限permitAll() + .antMatchers("/clazz/clazz/groupList").permitAll() // 除上面外的所有请求全部需要鉴权认证 .anyRequest().authenticated() .and() diff --git a/ruoyi-basic/ruoyi-system/src/main/java/com/ruoyi/system/domain/TGroup.java b/ruoyi-basic/ruoyi-system/src/main/java/com/ruoyi/system/domain/TGroup.java new file mode 100644 index 0000000..abbc781 --- /dev/null +++ b/ruoyi-basic/ruoyi-system/src/main/java/com/ruoyi/system/domain/TGroup.java @@ -0,0 +1,39 @@ +package com.ruoyi.system.domain; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * 班级小组列表 + * @Author HuangDaJu + * @Date 2024/4/23 19:13 + * @Version 1.0 + */ +@Data +@Builder +@AllArgsConstructor +@NoArgsConstructor +public class TGroup { + + /** + * 小组id + */ + private Long groupId; + /** + * 班级id + */ + private Integer clazzId; + /** + * 小组名称 + */ + private String groupName; + /** + * 小组组长 + */ + private String groupUserName; + + + +} diff --git a/ruoyi-basic/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TGroupMapper.java b/ruoyi-basic/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TGroupMapper.java new file mode 100644 index 0000000..de6a889 --- /dev/null +++ b/ruoyi-basic/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TGroupMapper.java @@ -0,0 +1,32 @@ +package com.ruoyi.system.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.ruoyi.system.domain.TClazz; +import com.ruoyi.system.domain.TGroup; + +import java.util.List; + + +/** + * 班级小组Mapper接口 + * + * @author HuangDaJu + * @date 2024-04-22 + */ +public interface TGroupMapper { + + List clazzGroupList(Long clazzId); + + + int removeGroup(Long groupId); + + + TGroup getById(Long groupId); + + int updateById(TGroup tGroup); + + + int addTGroup(TGroup tGroup); + + +} diff --git a/ruoyi-basic/ruoyi-system/src/main/java/com/ruoyi/system/service/TClazzService.java b/ruoyi-basic/ruoyi-system/src/main/java/com/ruoyi/system/service/TClazzService.java index 12f64f1..64bce39 100644 --- a/ruoyi-basic/ruoyi-system/src/main/java/com/ruoyi/system/service/TClazzService.java +++ b/ruoyi-basic/ruoyi-system/src/main/java/com/ruoyi/system/service/TClazzService.java @@ -4,6 +4,7 @@ import java.util.List; import com.baomidou.mybatisplus.extension.service.IService; import com.ruoyi.system.domain.TClazz; +import com.ruoyi.system.domain.TGroup; /** * 数据管理Service接口 @@ -20,4 +21,10 @@ public interface TClazzService extends IService { */ public List list(TClazz tClazz); + List clazzGroupList(Long clazzId); + + + + + } diff --git a/ruoyi-basic/ruoyi-system/src/main/java/com/ruoyi/system/service/TGroupService.java b/ruoyi-basic/ruoyi-system/src/main/java/com/ruoyi/system/service/TGroupService.java new file mode 100644 index 0000000..00725a5 --- /dev/null +++ b/ruoyi-basic/ruoyi-system/src/main/java/com/ruoyi/system/service/TGroupService.java @@ -0,0 +1,38 @@ +package com.ruoyi.system.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.ruoyi.system.domain.TClazz; +import com.ruoyi.system.domain.TGroup; + +import java.util.List; + +/** + * 数据管理Service接口 + * + * @author HuangDaJu + * @date 2024-04-22 + */ +public interface TGroupService { + + /** + * 查询数据管理列表 + * + * @param clazzId 数据管理 + * @return 数据管理集合 + */ + List clazzGroupList(Long clazzId); + + + int removeGroup(Long groupId); + + + TGroup getById(Long groupId); + + + int updateById(TGroup tGroup); + + + int addTGroup(TGroup tGroup); + + +} diff --git a/ruoyi-basic/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TClazzServiceImpl.java b/ruoyi-basic/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TClazzServiceImpl.java index 73f9108..8be74b9 100644 --- a/ruoyi-basic/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TClazzServiceImpl.java +++ b/ruoyi-basic/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TClazzServiceImpl.java @@ -5,9 +5,11 @@ import java.util.List; import com.ruoyi.common.utils.ObjUtils; import com.ruoyi.common.utils.StringUtils; import com.ruoyi.system.domain.TClazz; +import com.ruoyi.system.domain.TGroup; import com.ruoyi.system.mapper.TClazzMapper; import com.ruoyi.system.service.TClazzService; import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -23,6 +25,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; @Service public class TClazzServiceImpl extends ServiceImpl implements TClazzService { + /** * 查询数据管理列表 * @@ -33,7 +36,6 @@ public class TClazzServiceImpl extends ServiceImpl implem public List list(TClazz tClazz) { LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - if (ObjUtils.notNull(tClazz.getClazzName())){ queryWrapper.like(TClazz::getClazzName, tClazz.getClazzName()); } @@ -42,10 +44,16 @@ public class TClazzServiceImpl extends ServiceImpl implem queryWrapper.eq(TClazz::getClazzState, tClazz.getClazzState()); } - - - - return list(queryWrapper); } + + @Override + public List clazzGroupList(Long clazzId) { + if (StringUtils.isNotEmpty(new Long[]{clazzId})){ + throw new RuntimeException("参数错误"); + } + return clazzGroupList(clazzId); + } + + } diff --git a/ruoyi-basic/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TGroupServiceImpl.java b/ruoyi-basic/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TGroupServiceImpl.java new file mode 100644 index 0000000..b87f140 --- /dev/null +++ b/ruoyi-basic/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TGroupServiceImpl.java @@ -0,0 +1,66 @@ +package com.ruoyi.system.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.ruoyi.common.utils.ObjUtils; +import com.ruoyi.common.utils.StringUtils; +import com.ruoyi.system.domain.TClazz; +import com.ruoyi.system.domain.TGroup; +import com.ruoyi.system.mapper.TClazzMapper; +import com.ruoyi.system.mapper.TGroupMapper; +import com.ruoyi.system.service.TClazzService; +import com.ruoyi.system.service.TGroupService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * 数据管理Service业务层处理 + * + * @author HuangDaJu + * @date 2024-04-22 + */ +@Slf4j +@Service +public class TGroupServiceImpl implements TGroupService { + + @Autowired + private TGroupMapper tGroupMapper; + /** + * 查询小组数据管理列表 + * + * @param clazzId 数据管理 + * @return 数据管理 + */ + @Override + public List clazzGroupList(Long clazzId) { + if (StringUtils.isNotEmpty(new Long[]{clazzId})){ + throw new RuntimeException("参数错误"); + } + return clazzGroupList(clazzId); + } + + @Override + public int removeGroup(Long groupId) { + return tGroupMapper.removeGroup(groupId); + } + + @Override + public TGroup getById(Long groupId) { + return tGroupMapper.getById(groupId); + } + + @Override + public int updateById(TGroup tGroup) { + return tGroupMapper.updateById(tGroup); + } + + @Override + public int addTGroup(TGroup tGroup) { + return tGroupMapper.addTGroup(tGroup); + } + + +} diff --git a/ruoyi-basic/ruoyi-system/src/main/resources/mapper/system/TGroupMapper.xml b/ruoyi-basic/ruoyi-system/src/main/resources/mapper/system/TGroupMapper.xml new file mode 100644 index 0000000..f369c6a --- /dev/null +++ b/ruoyi-basic/ruoyi-system/src/main/resources/mapper/system/TGroupMapper.xml @@ -0,0 +1,32 @@ + + + + + INSERT INTO `qrtz_job_details`.`t_group` (`clazz_id`, `group_name`, `group_user_name`) VALUES + (#{clazzId}, #{groupName}, #{groupUserName}); + + + update t_group + + group_name = #{groupName}, + group_user_name = #{groupUserName}, + clazz_id = #{clazzId}, + + where group_id = #{groupId} + + + delete from t_group where group_id = #{groupId} + + + + + + + +