diff --git a/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/api/sys_forum/SysForumFeign.java b/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/api/sys_forum/SysForumFeign.java index 5c962b6..9e0a0d3 100644 --- a/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/api/sys_forum/SysForumFeign.java +++ b/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/api/sys_forum/SysForumFeign.java @@ -1,14 +1,34 @@ package com.yxt.demo.system.api.sys_forum; +import com.yxt.demo.system.api.sys_student_score.SysStudentScore; +import com.yxt.demo.system.utils.ResultBean; import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; /** * @Author dimengzhe * @Date 2023/4/24 14:21 * @Description */ -@Api(tags = "论坛") +@Api(tags = "论坛表") public interface SysForumFeign { + @ApiOperation(value = "添加论坛") + @RequestMapping("/saveSysForum") + ResultBean saveSysForum(@RequestBody SysForum sysForum); + @ApiOperation(value = "删除论坛") + @RequestMapping("/deleteSysForum/{sid}") + ResultBean deleteSysForum(@PathVariable String sid); + + @ApiOperation(value = "修改论坛") + @RequestMapping("/alterSysForum") + ResultBean alterSysForum(@RequestBody SysForum sysForum); + + @ApiOperation(value = "查询论坛") + @RequestMapping("/selectSysForum") + ResultBean selectSysForum(); } 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 ef3dec9..33f09c1 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 @@ -1,12 +1,34 @@ package com.yxt.demo.system.api.sys_forum_comment; +import com.yxt.demo.system.api.sys_student_score.SysStudentScore; +import com.yxt.demo.system.utils.ResultBean; import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; /** * @Author dimengzhe * @Date 2023/4/24 14:22 * @Description */ -@Api(tags = "论坛评论") +@Api(tags = "论坛评论表") public interface SysForumCommentFeign { + + @ApiOperation(value = "添加论坛评论") + @RequestMapping("/saveSysForumComment") + ResultBean saveSysForumComment(@RequestBody SysForumComment sysForumComment); + + @ApiOperation(value = "删除论坛评论") + @RequestMapping("/deleteSysForumComment/{sid}") + ResultBean deleteSysForumComment(@PathVariable String sid); + + @ApiOperation(value = "修改论坛评论") + @RequestMapping("/alterSysForumComment") + ResultBean alterSysForumComment(@RequestBody SysForumComment sysForumComment); + + @ApiOperation(value = "查询论坛评论") + @RequestMapping("/selectSysForumComment") + ResultBean selectSysForumComment(); } diff --git a/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/api/sys_info/SysInfo.java b/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/api/sys_info/SysInfo.java index 862d7da..bf29757 100644 --- a/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/api/sys_info/SysInfo.java +++ b/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/api/sys_info/SysInfo.java @@ -13,6 +13,8 @@ import lombok.Data; public class SysInfo extends BaseEntity { private static final long serialVersionUID = -6222893927885655368L; + @ApiModelProperty("sid") + private String sid; @ApiModelProperty("用户sid") private String userSid; @ApiModelProperty("学号、工号") diff --git a/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/api/sys_info/SysInfoFeign.java b/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/api/sys_info/SysInfoFeign.java index daf59b2..9a867bb 100644 --- a/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/api/sys_info/SysInfoFeign.java +++ b/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/api/sys_info/SysInfoFeign.java @@ -9,10 +9,8 @@ import com.yxt.demo.system.utils.ResultBean; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; +import org.apache.ibatis.annotations.Param; +import org.springframework.web.bind.annotation.*; /** * @Author dimengzhe @@ -30,9 +28,13 @@ public interface SysInfoFeign { @RequestMapping("/selectInfo") ResultBean selectInfoOne(@RequestBody SysInfoPageCount sysInfoPageCount); + @ApiOperation(value = "查询基本信息") + @RequestMapping("/selectInfoList") + ResultBean selectInfoList(@RequestBody String type); + @ApiOperation(value = "删除基本信息") - @RequestMapping("/deleteInfo") - ResultBean deleteInfo(@ApiParam(value = "sid", required = true) @PathVariable("sid") String sid); + @RequestMapping("/deleteInfo/{sid}") + ResultBean deleteInfo(@PathVariable String sid); @ApiOperation(value = "添加基本信息") @RequestMapping("/saveInfo") diff --git a/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/api/sys_info/SysInfoPageCount.java b/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/api/sys_info/SysInfoPageCount.java index b03ebe9..e249b78 100644 --- a/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/api/sys_info/SysInfoPageCount.java +++ b/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/api/sys_info/SysInfoPageCount.java @@ -15,4 +15,7 @@ public class SysInfoPageCount { private Integer from; @ApiModelProperty(value = "显示条数") private Integer to; + @ApiModelProperty(value = "学生还是教师") + private String studentAndTeacher; + } diff --git a/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/api/sys_info_ship/SysInfoShip.java b/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/api/sys_info_ship/SysInfoShip.java index 24e7dbd..a45290d 100644 --- a/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/api/sys_info_ship/SysInfoShip.java +++ b/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/api/sys_info_ship/SysInfoShip.java @@ -20,4 +20,12 @@ public class SysInfoShip extends BaseEntity { private String studentNo; @ApiModelProperty("学生") private String studentName; + @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_info_ship/SysInfoShipFeign.java b/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/api/sys_info_ship/SysInfoShipFeign.java index 85c3f6d..b094643 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 @@ -24,7 +24,7 @@ public interface SysInfoShipFeign { @ApiOperation(value = "删除教师学生关联") @RequestMapping("/deleteSysInfoShip/{sid}") - ResultBean deleteSysInfoShip(@ApiParam(value = "sid", required = true) @PathVariable("sid") String sid); + ResultBean deleteSysInfoShip(@PathVariable String sid); @ApiOperation(value = "修改教师学生关联") @RequestMapping("alterSysInfoShip") @@ -33,4 +33,8 @@ public interface SysInfoShipFeign { @ApiOperation(value = "查询教师学生关联") @RequestMapping("/selectSysInfoShip") ResultBean selectSysInfoShip(); + + @ApiOperation(value = "查询该老师下的学生") + @RequestMapping("/selectTeacherDownStudent/{teacher}") + ResultBean selectTeacherDownStudent(@PathVariable String teacher); } diff --git a/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/api/sys_menu_role/SysMenuRoleFeign.java b/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/api/sys_menu_role/SysMenuRoleFeign.java index 7fde6f2..921b020 100644 --- a/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/api/sys_menu_role/SysMenuRoleFeign.java +++ b/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/api/sys_menu_role/SysMenuRoleFeign.java @@ -22,8 +22,8 @@ public interface SysMenuRoleFeign { ResultBean addSysMenuRole(@RequestBody SysMenuRole sysMenuRole); @ApiOperation(value = "删除给菜单设置的权限") - @RequestMapping("/deleteSysMenuRole") - ResultBean deleteSysMenuRole(@ApiParam(value = "sid", required = true) @PathVariable("sid") String sid); + @RequestMapping("/deleteSysMenuRole/{sid}") + ResultBean deleteSysMenuRole(@PathVariable String sid); @ApiOperation(value = "修改菜单角色") @RequestMapping("/alterSysMenuRole") diff --git a/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/api/sys_notice/SysNoticeFeign.java b/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/api/sys_notice/SysNoticeFeign.java index a13b245..edc626e 100644 --- a/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/api/sys_notice/SysNoticeFeign.java +++ b/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/api/sys_notice/SysNoticeFeign.java @@ -1,12 +1,33 @@ package com.yxt.demo.system.api.sys_notice; +import com.yxt.demo.system.utils.ResultBean; import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; /** * @Author dimengzhe * @Date 2023/4/24 14:23 * @Description */ -@Api(tags = "公告") +@Api(tags = "公告表") public interface SysNoticeFeign { + + @ApiOperation(value = "增加公告") + @RequestMapping("/saveSysNotice") + ResultBean saveSysNotice(@RequestBody SysNotice sysNotice); + + @ApiOperation(value = "删除公告") + @RequestMapping("/deleteSysNotice/{sid}") + ResultBean deleteSysNotice(@PathVariable String sid); + + @ApiOperation(value = "修改公告") + @RequestMapping("/alterSysNotice") + ResultBean alterSysNotice(@RequestBody SysNotice sysNotice); + + @ApiOperation(value = "查询公告") + @RequestMapping("/selectSysNotice") + ResultBean selectSysNotice(); } 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 c7ac526..1b53767 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 @@ -4,8 +4,11 @@ import com.yxt.demo.system.api.sys_user.SysUserDto; import com.yxt.demo.system.utils.ResultBean; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiParam; +import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; /** * @Author dimengzhe @@ -16,10 +19,14 @@ import org.springframework.web.bind.annotation.RequestBody; public interface SysPlanScheduleFeign { @ApiOperation(value = "修改自主学习计划进度") - @PostMapping("/alterSysPlanSchedule") + @RequestMapping("/alterSysPlanSchedule") ResultBean alterSysPlanSchedule(@RequestBody SysPlanSchedule sysPlanSchedule); -// @ApiOperation(value = "添加自主学习计划进度") -// @PostMapping("/alterSysPlanSchedule") -// ResultBean + @ApiOperation(value = "添加/修改 自主学习计划进度") + @RequestMapping("/saveSysPlanSchedule") + ResultBean saveSysPlanSchedule(@RequestBody SysPlanSchedule sysPlanSchedule); + + @ApiOperation(value = "删除自主学习计划进度") + @RequestMapping("/deleteSysPlanSchedule/{sid}") + ResultBean deleteSysPlanSchedule(@ApiParam(value = "sid", required = true) @PathVariable("sid") String sid); } 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 77671fc..d8261a8 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 @@ -26,7 +26,7 @@ public interface SysRoleFeign { @ApiOperation(value = "查询角色") @PostMapping("/RoleOne/{sid}") - ResultBean RoleOne(@ApiParam(value = "sid", required = true) @PathVariable("sid") String sid); + ResultBean RoleOne(@PathVariable String sid); @ApiOperation(value = "查询多角色") @PostMapping("/RoleOne") diff --git a/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/api/sys_student_score/SysStudentScoreFeign.java b/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/api/sys_student_score/SysStudentScoreFeign.java index 1ce7e43..681748e 100644 --- a/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/api/sys_student_score/SysStudentScoreFeign.java +++ b/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/api/sys_student_score/SysStudentScoreFeign.java @@ -22,8 +22,8 @@ public interface SysStudentScoreFeign { ResultBean addStudentScore(@RequestBody SysStudentScore sysStudentScore); @ApiOperation(value = "删除学生成绩") - @RequestMapping("/deleteStudentScore") - ResultBean deleteStudentScore(@ApiParam(value = "sid", required = true) @PathVariable("sid") String sid); + @RequestMapping("/deleteStudentScore/{sid}") + ResultBean deleteStudentScore(@PathVariable String sid); @ApiOperation(value = "修改学生成绩") @RequestMapping("/alterStudentScore") diff --git a/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/api/sys_user/SysUserFeign.java b/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/api/sys_user/SysUserFeign.java index cda735c..c2be991 100644 --- a/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/api/sys_user/SysUserFeign.java +++ b/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/api/sys_user/SysUserFeign.java @@ -3,6 +3,7 @@ package com.yxt.demo.system.api.sys_user; import com.yxt.demo.system.utils.ResultBean; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -27,4 +28,8 @@ public interface SysUserFeign { @ApiOperation(value = "修改密码") @RequestMapping("/alterPassword") ResultBean alterPassword(@RequestBody SysUser sysUser); + + @ApiOperation(value = "查询个人信息") + @RequestMapping("/selectUserInfo/{sid}") + ResultBean selectUserInfo(@PathVariable String sid); } diff --git a/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_forum/SysForumMapper.java b/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_forum/SysForumMapper.java index 5563aa3..8f35461 100644 --- a/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_forum/SysForumMapper.java +++ b/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_forum/SysForumMapper.java @@ -1,12 +1,17 @@ package com.yxt.demo.system.biz.sys_forum; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.yxt.demo.system.api.sys_forum.SysForum; import org.apache.ibatis.annotations.Mapper; +import java.util.List; + /** * @Author dimengzhe * @Date 2023/4/24 14:21 * @Description */ @Mapper -public interface SysForumMapper { +public interface SysForumMapper extends BaseMapper { + List selectSysForumList(); } diff --git a/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_forum/SysForumMapper.xml b/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_forum/SysForumMapper.xml index 2221b58..f04d1bb 100644 --- a/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_forum/SysForumMapper.xml +++ b/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_forum/SysForumMapper.xml @@ -1,4 +1,7 @@ + \ No newline at end of file diff --git a/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_forum/SysForumRest.java b/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_forum/SysForumRest.java index 0e0a7b2..3b4bfff 100644 --- a/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_forum/SysForumRest.java +++ b/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_forum/SysForumRest.java @@ -1,9 +1,48 @@ package com.yxt.demo.system.biz.sys_forum; +import com.yxt.demo.system.api.sys_forum.SysForum; +import com.yxt.demo.system.api.sys_forum.SysForumFeign; +import com.yxt.demo.system.utils.ResultBean; +import io.swagger.annotations.Api; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + /** * @Author dimengzhe * @Date 2023/4/24 14:21 * @Description */ -public class SysForumRest { +@Api(tags = "论坛表") +@RequestMapping("v1/sysforum") +@RestController +public class SysForumRest implements SysForumFeign { + + @Autowired + private SysForumService sysForumService; + + @Override + public ResultBean saveSysForum(SysForum sysForum) { + return sysForumService.saveSysForum(sysForum); + } + + @Override + public ResultBean deleteSysForum(String sid) { + ResultBean rb = ResultBean.fireFail(); + int i = sysForumService.deleteBySid(sid); + if (i == 0){ + return rb.setMsg("删除失败"); + } + return rb.success(); + } + + @Override + public ResultBean alterSysForum(SysForum sysForum) { + return sysForumService.alterSysForum(sysForum); + } + + @Override + public ResultBean selectSysForum() { + return sysForumService.selectSysForum(); + } } diff --git a/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_forum/SysForumService.java b/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_forum/SysForumService.java index 91ab117..5f44ffc 100644 --- a/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_forum/SysForumService.java +++ b/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_forum/SysForumService.java @@ -1,9 +1,47 @@ package com.yxt.demo.system.biz.sys_forum; +import com.yxt.demo.system.api.sys_forum.SysForum; +import com.yxt.demo.system.jdbc.service.MybatisBaseService; +import com.yxt.demo.system.utils.ResultBean; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.Date; +import java.util.List; + /** * @Author dimengzhe * @Date 2023/4/24 14:21 * @Description */ -public class SysForumService { +@Service +public class SysForumService extends MybatisBaseService { + + @Autowired + private SysForumMapper sysForumMapper; + + public ResultBean saveSysForum(SysForum sysForum) { + ResultBean rb = ResultBean.fireFail(); + int insert = sysForumMapper.insert(sysForum); + if (insert == 0){ + return rb.setMsg("添加失败"); + } + return rb.success(); + } + + public ResultBean alterSysForum(SysForum sysForum) { + ResultBean rb = ResultBean.fireFail(); + sysForum.setModifyTime(new Date()); + int i = baseMapper.updateById(sysForum); + if (i == 0){ + return rb.setMsg("修改失败"); + } + return rb.success(); + } + + public ResultBean selectSysForum() { + ResultBean rb = ResultBean.fireFail(); + List sysForums = sysForumMapper.selectSysForumList(); + return rb.success().setData(sysForums); + } } 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 accb37d..be5eae8 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 @@ -1,9 +1,17 @@ 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 java.util.List; + /** * @Author dimengzhe * @Date 2023/4/24 14:22 * @Description */ -public interface SysForumCommentMapper { +@Mapper +public interface SysForumCommentMapper extends BaseMapper { + List selectSysForumCommentList(); } 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 abcdbfc..17b511d 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 @@ -1,4 +1,7 @@ + \ 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 7e6839f..0a33b4c 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 @@ -1,9 +1,50 @@ package com.yxt.demo.system.biz.sys_forum_comment; +import com.yxt.demo.system.api.sys_forum.SysForum; +import com.yxt.demo.system.api.sys_forum.SysForumFeign; +import com.yxt.demo.system.api.sys_forum_comment.SysForumComment; +import com.yxt.demo.system.api.sys_forum_comment.SysForumCommentFeign; +import com.yxt.demo.system.utils.ResultBean; +import io.swagger.annotations.Api; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + /** * @Author dimengzhe * @Date 2023/4/24 14:22 * @Description */ -public class SysForumCommentRest { +@Api(tags = "论坛评论表") +@RestController +@RequestMapping("v1/sysforumcommen") +public class SysForumCommentRest implements SysForumCommentFeign { + + @Autowired + private SysForumCommentService sysForumCommentService; + + @Override + public ResultBean saveSysForumComment(SysForumComment sysForumComment) { + return sysForumCommentService.saveSysForumComment(sysForumComment); + } + + @Override + public ResultBean deleteSysForumComment(String sid) { + ResultBean rb = ResultBean.fireFail(); + int i = sysForumCommentService.deleteBySid(sid); + if (i == 0){ + return rb.setMsg("删除失败"); + } + return rb.success(); + } + + @Override + public ResultBean alterSysForumComment(SysForumComment sysForumComment) { + return sysForumCommentService.alterSysForumComment(sysForumComment); + } + + @Override + public ResultBean selectSysForumComment() { + return sysForumCommentService.selectSysForumComment(); + } } 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 9dce01c..0c2a637 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 @@ -1,9 +1,49 @@ package com.yxt.demo.system.biz.sys_forum_comment; +import com.yxt.demo.system.api.sys_forum.SysForum; +import com.yxt.demo.system.api.sys_forum_comment.SysForumComment; +import com.yxt.demo.system.jdbc.service.MybatisBaseService; +import com.yxt.demo.system.utils.ResultBean; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + /** * @Author dimengzhe * @Date 2023/4/24 14:22 * @Description */ -public class SysForumCommentService { +@Service +public class SysForumCommentService extends MybatisBaseService { + + @Autowired + private SysForumCommentMapper sysForumCommentMapper; + + public ResultBean saveSysForumComment(SysForumComment sysForumComment) { + ResultBean rb = ResultBean.fireFail(); + int insert = sysForumCommentMapper.insert(sysForumComment); + if (insert == 0){ + return rb.setMsg("添加失败"); + } + return rb.success(); + } + + public ResultBean alterSysForumComment(SysForumComment sysForumComment) { + ResultBean rb = ResultBean.fireFail(); + int i = sysForumCommentMapper.updateById(sysForumComment); + if (i == 0){ + return rb.setMsg("修改失败"); + } + return rb.success(); + } + + public ResultBean selectSysForumComment() { + ResultBean rb = ResultBean.fireFail(); + List sysForumComments = sysForumCommentMapper.selectSysForumCommentList(); + if (sysForumComments == null){ + return rb.setMsg("查询失败"); + } + return rb.success().setData(sysForumComments); + } } diff --git a/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_info/SysInfoMapper.java b/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_info/SysInfoMapper.java index 31b3f42..e6c42bd 100644 --- a/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_info/SysInfoMapper.java +++ b/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_info/SysInfoMapper.java @@ -21,7 +21,9 @@ public interface SysInfoMapper extends BaseMapper { SysInfo selectStudentBySid(SysInfoPageCount sysInfoPageCount); - List selectInfoList(SysInfoPageCount sysInfoPageCount); + List selectInfoStudentList(); + + List selectInfoTeacherList(); SysInfo selectBySid(@Param("sid") String sid); diff --git a/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_info/SysInfoMapper.xml b/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_info/SysInfoMapper.xml index 2329bd5..d62d7ef 100644 --- a/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_info/SysInfoMapper.xml +++ b/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_info/SysInfoMapper.xml @@ -16,11 +16,12 @@ where i.userSid = #{sid} limit #{from},#{to} - + select * from sys_info where infoId like "%xs%" + + + select * from sys_info_ship + + \ No newline at end of file diff --git a/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_info_ship/SysInfoShipRest.java b/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_info_ship/SysInfoShipRest.java index 14a9d59..baaf6ed 100644 --- a/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_info_ship/SysInfoShipRest.java +++ b/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_info_ship/SysInfoShipRest.java @@ -44,4 +44,9 @@ public class SysInfoShipRest implements SysInfoShipFeign { public ResultBean selectSysInfoShip() { return sysInfoShipService.selectSysInfoShip(); } + + @Override + public ResultBean selectTeacherDownStudent(String teacher) { + return sysInfoShipService.selectTeacherDownStudent(teacher); + } } diff --git a/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_info_ship/SysInfoShipService.java b/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_info_ship/SysInfoShipService.java index c16de4c..3556de0 100644 --- a/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_info_ship/SysInfoShipService.java +++ b/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_info_ship/SysInfoShipService.java @@ -44,4 +44,13 @@ public class SysInfoShipService extends MybatisBaseService sysInfoShips = sysInfoShipMapper.selectSysInfoShipList(); return rb.success().setData(sysInfoShips); } + + public ResultBean selectTeacherDownStudent(String teacher) { + ResultBean rb = ResultBean.fireFail(); + List list = sysInfoShipMapper.selectTeacherDownStudent(teacher); + if(list.size() == 0){ + return rb.success().setMsg("该老师没有学生"); + } + return rb.success().setData(list); + } } diff --git a/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_notice/SysNoticeMapper.java b/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_notice/SysNoticeMapper.java index 6fe6fc8..eb5e071 100644 --- a/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_notice/SysNoticeMapper.java +++ b/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_notice/SysNoticeMapper.java @@ -1,12 +1,17 @@ package com.yxt.demo.system.biz.sys_notice; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.yxt.demo.system.api.sys_notice.SysNotice; import org.apache.ibatis.annotations.Mapper; +import java.util.List; + /** * @Author dimengzhe * @Date 2023/4/24 14:14 * @Description */ @Mapper -public interface SysNoticeMapper { +public interface SysNoticeMapper extends BaseMapper { + List selectSysNoticeList(); } diff --git a/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_notice/SysNoticeMapper.xml b/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_notice/SysNoticeMapper.xml index a408d62..11c8d5c 100644 --- a/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_notice/SysNoticeMapper.xml +++ b/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_notice/SysNoticeMapper.xml @@ -1,4 +1,7 @@ + \ No newline at end of file diff --git a/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_notice/SysNoticeRest.java b/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_notice/SysNoticeRest.java index 2a10230..697ad90 100644 --- a/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_notice/SysNoticeRest.java +++ b/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_notice/SysNoticeRest.java @@ -1,9 +1,48 @@ package com.yxt.demo.system.biz.sys_notice; +import com.yxt.demo.system.api.sys_notice.SysNotice; +import com.yxt.demo.system.api.sys_notice.SysNoticeFeign; +import com.yxt.demo.system.utils.ResultBean; +import io.swagger.annotations.Api; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + /** * @Author dimengzhe * @Date 2023/4/24 14:23 * @Description */ -public class SysNoticeRest { +@Api(tags = "公告表") +@RequestMapping("v1/sysnatic") +@RestController +public class SysNoticeRest implements SysNoticeFeign { + + @Autowired + private SysNoticeService sysNoticeService; + + @Override + public ResultBean saveSysNotice(SysNotice sysNotice) { + return sysNoticeService.saveSysNotice(sysNotice); + } + + @Override + public ResultBean deleteSysNotice(String sid) { + ResultBean rb = ResultBean.fireFail(); + int i = sysNoticeService.deleteBySid(sid); + if (i == 0){ + return rb.setMsg("删除失败"); + } + return rb.success(); + } + + @Override + public ResultBean alterSysNotice(SysNotice sysNotice) { + return sysNoticeService.alterSysNotice(sysNotice); + } + + @Override + public ResultBean selectSysNotice() { + return sysNoticeService.selectSysNotice(); + } } diff --git a/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_notice/SysNoticeService.java b/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_notice/SysNoticeService.java index 228b15a..797c74b 100644 --- a/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_notice/SysNoticeService.java +++ b/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_notice/SysNoticeService.java @@ -1,12 +1,47 @@ package com.yxt.demo.system.biz.sys_notice; +import com.yxt.demo.system.api.sys_notice.SysNotice; +import com.yxt.demo.system.jdbc.service.MybatisBaseService; +import com.yxt.demo.system.utils.ResultBean; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.Date; +import java.util.List; + /** * @Author dimengzhe * @Date 2023/4/24 14:13 * @Description */ @Service -public class SysNoticeService { +public class SysNoticeService extends MybatisBaseService { + + @Autowired + private SysNoticeMapper sysNoticeMapper; + + public ResultBean saveSysNotice(SysNotice sysNotice) { + ResultBean rb = ResultBean.fireFail(); + int insert = baseMapper.insert(sysNotice); + if (insert == 0){ + return rb.setMsg("添加失败"); + } + return rb.success(); + } + + public ResultBean alterSysNotice(SysNotice sysNotice) { + ResultBean rb = ResultBean.fireFail(); + sysNotice.setModifyTime(new Date()); + int i = baseMapper.updateById(sysNotice); + if (i == 0){ + return rb.setMsg("修改失败"); + } + return rb.success(); + } + + public ResultBean selectSysNotice() { + ResultBean rb = ResultBean.fireFail(); + List sysNotices = sysNoticeMapper.selectSysNoticeList(); + return rb.success().setData(sysNotices); + } } 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 7a1cde7..716c8b1 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 @@ -2,6 +2,7 @@ package com.yxt.demo.system.biz.sys_plan; import com.yxt.demo.system.api.sys_plan.SysPlan; import com.yxt.demo.system.api.sys_plan.SysPlanFeign; +import com.yxt.demo.system.biz.sys_plan_schedule.SysPlanScheduleRest; import com.yxt.demo.system.utils.ResultBean; import io.swagger.annotations.Api; import org.springframework.beans.factory.annotation.Autowired; @@ -20,6 +21,8 @@ public class SysPlanRest implements SysPlanFeign { @Autowired private SysPlanService sysPlanService; + @Autowired + private SysPlanScheduleRest sysPlanScheduleRest; @Override public ResultBean saveSysPlan(SysPlan sysPlan) { @@ -30,6 +33,7 @@ public class SysPlanRest implements SysPlanFeign { public ResultBean deleteSysPlan(String sid) { ResultBean rb = ResultBean.fireFail(); int i = sysPlanService.deleteBySid(sid); + sysPlanScheduleRest.deleteSysPlanSchedule(sid); if (i == 0){ return rb.setMsg("删除失败"); } 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 dabb959..f24fbec 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 @@ -1,6 +1,8 @@ package com.yxt.demo.system.biz.sys_plan; import com.yxt.demo.system.api.sys_plan.SysPlan; +import com.yxt.demo.system.api.sys_plan_schedule.SysPlanSchedule; +import com.yxt.demo.system.biz.sys_plan_schedule.SysPlanScheduleService; import com.yxt.demo.system.jdbc.service.MybatisBaseService; import com.yxt.demo.system.utils.ResultBean; import org.springframework.beans.factory.annotation.Autowired; @@ -18,6 +20,8 @@ public class SysPlanService extends MybatisBaseService { @Autowired private SysPlanMapper sysPlanMapper; + @Autowired + private SysPlanScheduleService sysPlanScheduleService; public ResultBean saveSysPlan(SysPlan sysPlan){ ResultBean rb = ResultBean.fireFail(); @@ -25,6 +29,9 @@ public class SysPlanService extends MybatisBaseService { if (insert == 0){ return rb.setMsg("添加失败"); } + SysPlanSchedule sysPlanSchedule = new SysPlanSchedule(); + sysPlanSchedule.setPlanSid(sysPlan.getSid()); + sysPlanScheduleService.saveSysPlanSchedule(sysPlanSchedule); return rb.success(); } diff --git a/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_plan_schedule/SysPlanScheduleMapper.java b/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_plan_schedule/SysPlanScheduleMapper.java index 2b17faa..89f709a 100644 --- a/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_plan_schedule/SysPlanScheduleMapper.java +++ b/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_plan_schedule/SysPlanScheduleMapper.java @@ -11,4 +11,5 @@ import org.apache.ibatis.annotations.Mapper; */ @Mapper public interface SysPlanScheduleMapper extends BaseMapper { + void updateSysPlanScheduleBySid(SysPlanSchedule sysPlanSchedule); } diff --git a/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_plan_schedule/SysPlanScheduleMapper.xml b/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_plan_schedule/SysPlanScheduleMapper.xml index c20c158..0912542 100644 --- a/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_plan_schedule/SysPlanScheduleMapper.xml +++ b/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_plan_schedule/SysPlanScheduleMapper.xml @@ -1,4 +1,16 @@ + + update sys_plan_schedule + + + planContent = #{planContent}, + + + planOpinion=#{planOpinion}, + + + where planSid=#{planSid} + \ No newline at end of file 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 441bc60..4533f82 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 @@ -25,4 +25,19 @@ public class SysPlanScheduleRest implements SysPlanScheduleFeign{ public ResultBean alterSysPlanSchedule(SysPlanSchedule sysPlanSchedule) { return sysPlanScheduleService.alterSysPlanSchedule(sysPlanSchedule); } + + @Override + public ResultBean saveSysPlanSchedule(SysPlanSchedule sysPlanSchedule) { + return sysPlanScheduleService.updateSysPlanSchedule(sysPlanSchedule); + } + + @Override + public ResultBean deleteSysPlanSchedule(String sid) { + ResultBean rb = ResultBean.fireFail(); + int i = sysPlanScheduleService.deleteBySid(sid); + if (i == 0){ + return rb.setMsg("删除失败"); + } + return rb.success(); + } } 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 6f2d9dc..c21ec56 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 @@ -3,6 +3,7 @@ package com.yxt.demo.system.biz.sys_plan_schedule; import com.yxt.demo.system.api.sys_plan_schedule.SysPlanSchedule; import com.yxt.demo.system.jdbc.service.MybatisBaseService; import com.yxt.demo.system.utils.ResultBean; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.Date; @@ -15,6 +16,8 @@ import java.util.Date; @Service public class SysPlanScheduleService extends MybatisBaseService { + @Autowired + private SysPlanScheduleMapper sysPlanScheduleMapper; public ResultBean alterSysPlanSchedule(SysPlanSchedule sysPlanSchedule){ ResultBean rb = ResultBean.fireFail(); @@ -26,6 +29,13 @@ public class SysPlanScheduleService extends MybatisBaseService { void deleteUserBySid(@Param("sid") String sid); SysUser selectByNameAndUserName(@Param("userName") String userName, @Param("name") String name); + + SysUser selectUserInfo(@Param("sid") String sid); } diff --git a/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_user/SysUserMapper.xml b/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_user/SysUserMapper.xml index dbf67ca..29d05aa 100644 --- a/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_user/SysUserMapper.xml +++ b/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_user/SysUserMapper.xml @@ -14,4 +14,10 @@ + + \ No newline at end of file diff --git a/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_user/SysUserRest.java b/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_user/SysUserRest.java index b033e0b..ea2bcc7 100644 --- a/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_user/SysUserRest.java +++ b/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_user/SysUserRest.java @@ -37,4 +37,9 @@ public class SysUserRest implements SysUserFeign { public ResultBean alterPassword(SysUser sysUser){ return sysUserService.alterPassword(sysUser); } + + @Override + public ResultBean selectUserInfo(String sid) { + return sysUserService.selectUserInfo(sid); + } } diff --git a/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_user/SysUserService.java b/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_user/SysUserService.java index 0ae46e5..fe6d861 100644 --- a/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_user/SysUserService.java +++ b/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_user/SysUserService.java @@ -29,43 +29,47 @@ public class SysUserService extends MybatisBaseService { public ResultBean register(SysUserDto dto) { ResultBean rb = ResultBean.fireFail(); - //密码和确认密码是否相同 - if(!dto.getPassword().equals(dto.getConfirmPassword())){ - return rb.setMsg("密码和确认密码不一致"); - } - //验证学号+姓名是否存在 - String userName = dto.getUserName(); - String name = dto.getName(); - SysInfo sysInfo = sysInfoService.selectByNoAndName(userName, name); - if (sysInfo != null) { + if (dto.getUserName().contains("xs") || dto.getUserName().contains("js")){ + //密码和确认密码是否相同 + if(!dto.getPassword().equals(dto.getConfirmPassword())){ + return rb.setMsg("密码和确认密码不一致"); + } + //验证学号+姓名是否存在 + String userName = dto.getUserName(); + String name = dto.getName(); + SysInfo sysInfo = sysInfoService.selectByNoAndName(userName, name); + if (sysInfo != null) { // return rb.setMsg("学号或姓名错误"); - //查看该账号是否已激活 - SysUser sysUser = baseMapper.selectByNo(userName); - if (sysUser != null) { - if (sysUser.getHasActivated() == 1) { - return rb.setMsg("该账号已注册"); + //查看该账号是否已激活 + SysUser sysUser = baseMapper.selectByNo(userName); + if (sysUser != null) { + if (sysUser.getHasActivated() == 1) { + return rb.setMsg("该账号已注册"); + } } - } - sysUser = new SysUser(); - BeanUtil.copyProperties(dto, sysUser); - sysUser.setPassword(dto.getPassword()); - sysUser.setInfoSid(sysInfo.getSid()); - baseMapper.insert(sysUser); - sysInfo.setUserSid(sysUser.getSid()); - sysInfoService.updateById(sysInfo); - return rb.success(); - }else { - SysUser sysUser = baseMapper.selectByNo(userName); - if (sysUser != null) { - if (sysUser.getHasActivated() == 1) { - return rb.setMsg("该账号已注册"); + sysUser = new SysUser(); + BeanUtil.copyProperties(dto, sysUser); + sysUser.setPassword(dto.getPassword()); + sysUser.setInfoSid(sysInfo.getSid()); + baseMapper.insert(sysUser); + sysInfo.setUserSid(sysUser.getSid()); + sysInfoService.updateById(sysInfo); + return rb.success(); + }else { + SysUser sysUser = baseMapper.selectByNo(userName); + if (sysUser != null) { + if (sysUser.getHasActivated() == 1) { + return rb.setMsg("该账号已注册"); + } } + sysUser = new SysUser(); + BeanUtil.copyProperties(dto, sysUser); + sysUser.setPassword(dto.getPassword()); + baseMapper.insert(sysUser); + return rb.success(); } - sysUser = new SysUser(); - BeanUtil.copyProperties(dto, sysUser); - sysUser.setPassword(dto.getPassword()); - baseMapper.insert(sysUser); - return rb.success(); + }else { + return rb.setMsg("学号格式不正确！！！"); } } @@ -97,4 +101,10 @@ public class SysUserService extends MybatisBaseService { } return rb.setMsg("修改失败,请重试！！！"); } + + public ResultBean selectUserInfo(String sid) { + ResultBean rb = ResultBean.fireFail(); + SysUser sysUser = sysUserMapper.selectUserInfo(sid); + return rb.success().setData(sysUser); + } }