From 0353092c2488af3ad56a3f7f8cec4afa41c9f90c Mon Sep 17 00:00:00 2001 From: fkf <1475794025@qq.com> Date: Sat, 29 Apr 2023 19:25:08 +0800 Subject: [PATCH] =?UTF-8?q?4-29=20=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/api/dict_type/DictTypeFeign.java | 2 +- .../SysForumCommentFeign.java | 4 +++ .../api/sys_info_ship/SysInfoShipFeign.java | 2 +- .../yxt/demo/system/api/sys_plan/SysPlan.java | 14 +++++++++ .../system/api/sys_plan/SysPlanFeign.java | 8 +++++ .../SysPlanScheduleFeign.java | 6 ++-- .../system/api/sys_role/SysRoleFeign.java | 2 +- .../yxt/demo/system/api/sys_user/SysUser.java | 11 +++++++ .../system/api/sys_user_role/SysUserRole.java | 10 +++++++ .../api/sys_user_role/SysUserRoleFeign.java | 9 +++--- .../SysForumCommentMapper.java | 3 ++ .../SysForumCommentMapper.xml | 4 +++ .../SysForumCommentRest.java | 5 ++++ .../SysForumCommentService.java | 6 ++++ .../system/biz/sys_plan/SysPlanMapper.java | 9 ++++++ .../system/biz/sys_plan/SysPlanMapper.xml | 29 ++++++++++++++++++- .../demo/system/biz/sys_plan/SysPlanRest.java | 10 +++++++ .../system/biz/sys_plan/SysPlanService.java | 19 ++++++++++++ .../SysPlanScheduleRest.java | 8 ++--- .../SysPlanScheduleService.java | 22 ++++++++------ .../biz/sys_user_role/SysUserRoleMapper.java | 3 ++ .../biz/sys_user_role/SysUserRoleMapper.xml | 7 +++++ .../biz/sys_user_role/SysUserRoleRest.java | 6 ++-- .../sys_user_role/SysUserRoleSerrvice.java | 7 +++-- 24 files changed, 176 insertions(+), 30 deletions(-) diff --git a/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/api/dict_type/DictTypeFeign.java b/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/api/dict_type/DictTypeFeign.java index a215f2b..40d280b 100644 --- a/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/api/dict_type/DictTypeFeign.java +++ b/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/api/dict_type/DictTypeFeign.java @@ -29,5 +29,5 @@ public interface DictTypeFeign { @DeleteMapping("/delete/{sid}") @ApiOperation(value = "数据字典类型删除") - ResultBean delete(@ApiParam(value = "sid", required = true) @PathVariable("sid") String sid); + ResultBean delete(@PathVariable String sid); } diff --git a/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/api/sys_forum_comment/SysForumCommentFeign.java b/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/api/sys_forum_comment/SysForumCommentFeign.java index 33f09c1..a41dc14 100644 --- a/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/api/sys_forum_comment/SysForumCommentFeign.java +++ b/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/api/sys_forum_comment/SysForumCommentFeign.java @@ -31,4 +31,8 @@ public interface SysForumCommentFeign { @ApiOperation(value = "查询论坛评论") @RequestMapping("/selectSysForumComment") ResultBean selectSysForumComment(); + + @ApiOperation(value = "查询论坛评论") + @RequestMapping("/selectSysForumCommentOne/{sid}") + ResultBean selectSysForumCommentOne(@PathVariable String sid); } diff --git a/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/api/sys_info_ship/SysInfoShipFeign.java b/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/api/sys_info_ship/SysInfoShipFeign.java index b094643..113798f 100644 --- a/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/api/sys_info_ship/SysInfoShipFeign.java +++ b/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/api/sys_info_ship/SysInfoShipFeign.java @@ -27,7 +27,7 @@ public interface SysInfoShipFeign { ResultBean deleteSysInfoShip(@PathVariable String sid); @ApiOperation(value = "修改教师学生关联") - @RequestMapping("alterSysInfoShip") + @RequestMapping("/alterSysInfoShip") ResultBean alterSysInfoShip(@RequestBody SysInfoShip sysInfoShip); @ApiOperation(value = "查询教师学生关联") diff --git a/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/api/sys_plan/SysPlan.java b/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/api/sys_plan/SysPlan.java index 574f56f..0a9b945 100644 --- a/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/api/sys_plan/SysPlan.java +++ b/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/api/sys_plan/SysPlan.java @@ -22,4 +22,18 @@ public class SysPlan extends BaseEntity { private String planContent; @ApiModelProperty("反馈意见") private String planOpinion; + + @ApiModelProperty("姓名") + private String name; + @ApiModelProperty("系别") + private String department; + @ApiModelProperty("专业") + private String speciality; + @ApiModelProperty("班级") + private String calss; + + @ApiModelProperty("进度内容") + private String planContentJd; + @ApiModelProperty("反馈意见") + private String planOpinionYj; } diff --git a/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/api/sys_plan/SysPlanFeign.java b/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/api/sys_plan/SysPlanFeign.java index 5e22d16..c1d3069 100644 --- a/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/api/sys_plan/SysPlanFeign.java +++ b/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/api/sys_plan/SysPlanFeign.java @@ -31,4 +31,12 @@ public interface SysPlanFeign { @ApiOperation(value = "查询自主学习计划") @RequestMapping("/selectSysPlan") ResultBean selectSysPlan(); + + @ApiOperation(value = "查询指定的一个自主学习计划") + @RequestMapping("/selectSysPlanOne/{sid}") + ResultBean selectSysPlanOne(@PathVariable String sid); + + @ApiOperation(value = "查询自主学习计划的进度") + @RequestMapping("/selectSysPlanComment/{sid}") + ResultBean selectSysPlanCommentBySid(@PathVariable String sid); } diff --git a/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/api/sys_plan_schedule/SysPlanScheduleFeign.java b/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/api/sys_plan_schedule/SysPlanScheduleFeign.java index 1b53767..89b6f1f 100644 --- a/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/api/sys_plan_schedule/SysPlanScheduleFeign.java +++ b/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/api/sys_plan_schedule/SysPlanScheduleFeign.java @@ -18,9 +18,9 @@ import org.springframework.web.bind.annotation.RequestMapping; @Api(tags = "自主学习计划进度表") public interface SysPlanScheduleFeign { - @ApiOperation(value = "修改自主学习计划进度") - @RequestMapping("/alterSysPlanSchedule") - ResultBean alterSysPlanSchedule(@RequestBody SysPlanSchedule sysPlanSchedule); +// @ApiOperation(value = "修改自主学习计划进度") +// @RequestMapping("/alterSysPlanSchedule") +// ResultBean alterSysPlanSchedule(@RequestBody SysPlanSchedule sysPlanSchedule); @ApiOperation(value = "添加/修改 自主学习计划进度") @RequestMapping("/saveSysPlanSchedule") diff --git a/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/api/sys_role/SysRoleFeign.java b/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/api/sys_role/SysRoleFeign.java index d8261a8..ec89cf4 100644 --- a/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/api/sys_role/SysRoleFeign.java +++ b/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/api/sys_role/SysRoleFeign.java @@ -22,7 +22,7 @@ public interface SysRoleFeign { @ApiOperation(value = "删除角色") @PostMapping("/deleteRole/{sid}") - ResultBean deleteRole(@ApiParam(value = "sid", required = true) @PathVariable("sid") String sid); + ResultBean deleteRole(@PathVariable String sid); @ApiOperation(value = "查询角色") @PostMapping("/RoleOne/{sid}") diff --git a/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/api/sys_user/SysUser.java b/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/api/sys_user/SysUser.java index c7b1827..a7dc0ac 100644 --- a/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/api/sys_user/SysUser.java +++ b/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/api/sys_user/SysUser.java @@ -29,4 +29,15 @@ public class SysUser extends BaseEntity { private int hasActivated; @ApiModelProperty("token") private String token; + + @ApiModelProperty("性别") + private String sex; + @ApiModelProperty("入学年份") + private String studyYear; + @ApiModelProperty("系别") + private String department; + @ApiModelProperty("专业") + private String speciality; + @ApiModelProperty("班级") + private String calss; } diff --git a/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/api/sys_user_role/SysUserRole.java b/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/api/sys_user_role/SysUserRole.java index 4168c8d..2624f2d 100644 --- a/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/api/sys_user_role/SysUserRole.java +++ b/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/api/sys_user_role/SysUserRole.java @@ -16,4 +16,14 @@ public class SysUserRole extends BaseEntity { private String userSid; @ApiModelProperty("角色sid") private String roleSid; + + @ApiModelProperty("姓名") + private String name; + @ApiModelProperty("昵称") + private String nickName; + @ApiModelProperty("工号/学号") + private String userName; + @ApiModelProperty("角色名称") + private String roleName; + } diff --git a/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/api/sys_user_role/SysUserRoleFeign.java b/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/api/sys_user_role/SysUserRoleFeign.java index dd2a9ff..738129b 100644 --- a/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/api/sys_user_role/SysUserRoleFeign.java +++ b/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/api/sys_user_role/SysUserRoleFeign.java @@ -24,10 +24,11 @@ public interface SysUserRoleFeign { ResultBean alterUserRole(@RequestBody SysUserRole sysUserRole); @ApiOperation(value = "删除该用户角色") - @RequestMapping("/deleteUserRoleById") - ResultBean deleteUserRoleById(@ApiParam(value = "sid", required = true) @PathVariable("sid") String sid); + @RequestMapping("/deleteUserRoleById/{sid}") + ResultBean deleteUserRoleById(@PathVariable String sid); @ApiOperation(value = "查询用户权限") - @RequestMapping("/selectUserRole") - ResultBean selectUserRole(); + @RequestMapping("/selectUserRole/{sid}") + ResultBean selectUserRole(@PathVariable String sid); + } diff --git a/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_forum_comment/SysForumCommentMapper.java b/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_forum_comment/SysForumCommentMapper.java index be5eae8..11f92ee 100644 --- a/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_forum_comment/SysForumCommentMapper.java +++ b/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_forum_comment/SysForumCommentMapper.java @@ -3,6 +3,7 @@ package com.yxt.demo.system.biz.sys_forum_comment; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.yxt.demo.system.api.sys_forum_comment.SysForumComment; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; import java.util.List; @@ -14,4 +15,6 @@ import java.util.List; @Mapper public interface SysForumCommentMapper extends BaseMapper { List selectSysForumCommentList(); + + SysForumComment selectSysForumCommentOne(@Param("sid") String sid); } diff --git a/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_forum_comment/SysForumCommentMapper.xml b/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_forum_comment/SysForumCommentMapper.xml index 17b511d..eb268be 100644 --- a/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_forum_comment/SysForumCommentMapper.xml +++ b/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_forum_comment/SysForumCommentMapper.xml @@ -4,4 +4,8 @@ + + \ No newline at end of file diff --git a/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_forum_comment/SysForumCommentRest.java b/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_forum_comment/SysForumCommentRest.java index 0a33b4c..fe4bb6f 100644 --- a/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_forum_comment/SysForumCommentRest.java +++ b/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_forum_comment/SysForumCommentRest.java @@ -47,4 +47,9 @@ public class SysForumCommentRest implements SysForumCommentFeign { public ResultBean selectSysForumComment() { return sysForumCommentService.selectSysForumComment(); } + + @Override + public ResultBean selectSysForumCommentOne(String sid) { + return sysForumCommentService.selectSysForumCommentOne(sid); + } } diff --git a/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_forum_comment/SysForumCommentService.java b/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_forum_comment/SysForumCommentService.java index 0c2a637..462d664 100644 --- a/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_forum_comment/SysForumCommentService.java +++ b/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_forum_comment/SysForumCommentService.java @@ -46,4 +46,10 @@ public class SysForumCommentService extends MybatisBaseService { List selectSysPlanList(); + + SysPlan selectSysPlanOneStudent(@Param("sid") String sid); + + SysPlan selectSysPlanOneTeacher(@Param("sid") String sid); + + SysPlan selectSysPlanBySid(@Param("sid") String sid); + + SysPlan selectSysPlanCommentBySid(@Param("sid") String sid); } diff --git a/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_plan/SysPlanMapper.xml b/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_plan/SysPlanMapper.xml index cecf662..2ee2a08 100644 --- a/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_plan/SysPlanMapper.xml +++ b/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_plan/SysPlanMapper.xml @@ -2,6 +2,33 @@ + + + + + + + + \ No newline at end of file diff --git a/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_plan/SysPlanRest.java b/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_plan/SysPlanRest.java index 716c8b1..04fd7f3 100644 --- a/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_plan/SysPlanRest.java +++ b/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_plan/SysPlanRest.java @@ -49,4 +49,14 @@ public class SysPlanRest implements SysPlanFeign { public ResultBean selectSysPlan() { return sysPlanService.selectSysPlan(); } + + @Override + public ResultBean selectSysPlanOne(String sid) { + return sysPlanService.selectSysPlanOne(sid); + } + + @Override + public ResultBean selectSysPlanCommentBySid(String sid) { + return sysPlanService.selectSysPlanCommentBySid(sid); + } } diff --git a/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_plan/SysPlanService.java b/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_plan/SysPlanService.java index f24fbec..b5606fd 100644 --- a/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_plan/SysPlanService.java +++ b/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_plan/SysPlanService.java @@ -49,4 +49,23 @@ public class SysPlanService extends MybatisBaseService { List sysPlans = sysPlanMapper.selectSysPlanList(); return rb.success().setData(sysPlans); } + + public ResultBean selectSysPlanOne(String sid) { + ResultBean rb = ResultBean.fireFail(); + SysPlan sysPlan1 = sysPlanMapper.selectSysPlanBySid(sid); + if (sysPlan1.getStudentNo() != null){ + SysPlan sysPlan = sysPlanMapper.selectSysPlanOneStudent(sid); + return rb.success().setData(sysPlan); + }else if (sysPlan1.getTeacherNo() != null){ + SysPlan sysPlan = sysPlanMapper.selectSysPlanOneTeacher(sid); + return rb.success().setData(sysPlan); + } + return rb.setMsg("没有该任务"); + } + + public ResultBean selectSysPlanCommentBySid(String sid) { + ResultBean rb = ResultBean.fireFail(); + SysPlan sysPlan = sysPlanMapper.selectSysPlanBySid(sid); + return rb.success().setData(sysPlan); + } } diff --git a/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_plan_schedule/SysPlanScheduleRest.java b/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_plan_schedule/SysPlanScheduleRest.java index 4533f82..866e712 100644 --- a/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_plan_schedule/SysPlanScheduleRest.java +++ b/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_plan_schedule/SysPlanScheduleRest.java @@ -21,10 +21,10 @@ public class SysPlanScheduleRest implements SysPlanScheduleFeign{ @Autowired private SysPlanScheduleService sysPlanScheduleService; - @Override - public ResultBean alterSysPlanSchedule(SysPlanSchedule sysPlanSchedule) { - return sysPlanScheduleService.alterSysPlanSchedule(sysPlanSchedule); - } +// @Override +// public ResultBean alterSysPlanSchedule(SysPlanSchedule sysPlanSchedule) { +// return sysPlanScheduleService.alterSysPlanSchedule(sysPlanSchedule); +// } @Override public ResultBean saveSysPlanSchedule(SysPlanSchedule sysPlanSchedule) { diff --git a/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_plan_schedule/SysPlanScheduleService.java b/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_plan_schedule/SysPlanScheduleService.java index c21ec56..588f08d 100644 --- a/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_plan_schedule/SysPlanScheduleService.java +++ b/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_plan_schedule/SysPlanScheduleService.java @@ -19,15 +19,15 @@ public class SysPlanScheduleService extends MybatisBaseService { List selectSysUserRole(String sid); List selectUserRoleList(); + + SysUserRole selectUserRole(@Param("sid") String sid); } diff --git a/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_user_role/SysUserRoleMapper.xml b/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_user_role/SysUserRoleMapper.xml index b38d381..90544e0 100644 --- a/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_user_role/SysUserRoleMapper.xml +++ b/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_user_role/SysUserRoleMapper.xml @@ -8,4 +8,11 @@ + + \ No newline at end of file diff --git a/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_user_role/SysUserRoleRest.java b/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_user_role/SysUserRoleRest.java index b99827f..9b22829 100644 --- a/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_user_role/SysUserRoleRest.java +++ b/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_user_role/SysUserRoleRest.java @@ -15,7 +15,7 @@ import org.springframework.web.bind.annotation.RestController; */ @Api(tags = "用户角色关联表") @RestController -@RequestMapping("v1/sysuser") +@RequestMapping("v1/sysuserrole") public class SysUserRoleRest implements SysUserRoleFeign { @Autowired @@ -43,7 +43,7 @@ public class SysUserRoleRest implements SysUserRoleFeign { } @Override - public ResultBean selectUserRole() { - return sysUserRoleSerrvice.selectUserRole(); + public ResultBean selectUserRole(String sid) { + return sysUserRoleSerrvice.selectUserRole(sid); } } diff --git a/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_user_role/SysUserRoleSerrvice.java b/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_user_role/SysUserRoleSerrvice.java index 5e99639..abd3cb8 100644 --- a/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_user_role/SysUserRoleSerrvice.java +++ b/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_user_role/SysUserRoleSerrvice.java @@ -44,9 +44,10 @@ public class SysUserRoleSerrvice extends MybatisBaseService userRolesList = sysUserRoleMapper.selectUserRoleList(); - return rb.setData(userRolesList); + SysUserRole sysUserRole = sysUserRoleMapper.selectUserRole(sid); +// List userRolesList = sysUserRoleMapper.selectUserRoleList(); + return rb.success().setData(sysUserRole); } }