diff --git a/demo-system/demo-system-biz/pom.xml b/demo-system/demo-system-biz/pom.xml index e4634c7..cac6dd0 100644 --- a/demo-system/demo-system-biz/pom.xml +++ b/demo-system/demo-system-biz/pom.xml @@ -56,17 +56,6 @@ java-jwt 3.10.1 - - - org.springframework.boot - spring-boot-starter-security - - - - org.springframework.security.oauth.boot - spring-security-oauth2-autoconfigure - 2.0.0.RELEASE - 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 new file mode 100644 index 0000000..85c3f6d --- /dev/null +++ b/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/api/sys_info_ship/SysInfoShipFeign.java @@ -0,0 +1,36 @@ +package com.yxt.demo.system.api.sys_info_ship; + +import com.yxt.demo.system.api.sys_user.SysUserDto; +import com.yxt.demo.system.biz.sys_info_ship.SysInfoShipService; +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 shkstart + * @create 2023-04-27-15:20 + */ +@Api(tags = "教师学生表") +public interface SysInfoShipFeign { + + @ApiOperation(value = "添加教师学生") + @RequestMapping("/saveSysInfoShip") + ResultBean saveSysInfoShip(@RequestBody SysInfoShip sysInfoShip); + + @ApiOperation(value = "删除教师学生关联") + @RequestMapping("/deleteSysInfoShip/{sid}") + ResultBean deleteSysInfoShip(@ApiParam(value = "sid", required = true) @PathVariable("sid") String sid); + + @ApiOperation(value = "修改教师学生关联") + @RequestMapping("alterSysInfoShip") + ResultBean alterSysInfoShip(@RequestBody SysInfoShip sysInfoShip); + + @ApiOperation(value = "查询教师学生关联") + @RequestMapping("/selectSysInfoShip") + ResultBean selectSysInfoShip(); +} diff --git a/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/api/sys_menu/SysMenu.java b/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/api/sys_menu/SysMenu.java index 0427970..c9459e5 100644 --- a/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/api/sys_menu/SysMenu.java +++ b/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/api/sys_menu/SysMenu.java @@ -12,6 +12,8 @@ import lombok.Data; @Data public class SysMenu extends BaseEntity { private static final long serialVersionUID = 1451455109001765427L; + @ApiModelProperty("唯一id") + private Integer id; @ApiModelProperty("菜单名称") private String name; @ApiModelProperty("菜单路由路径") diff --git a/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/api/sys_menu/SysMenuFeign.java b/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/api/sys_menu/SysMenuFeign.java index cf7bde1..fef4911 100644 --- a/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/api/sys_menu/SysMenuFeign.java +++ b/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/api/sys_menu/SysMenuFeign.java @@ -3,8 +3,8 @@ package com.yxt.demo.system.api.sys_menu; import com.yxt.demo.system.utils.ResultBean; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; +import io.swagger.annotations.ApiParam; +import org.springframework.web.bind.annotation.*; /** * @Author dimengzhe @@ -20,5 +20,13 @@ public interface SysMenuFeign { @PostMapping(value = "/list") @ApiOperation(value = "列表") - ResultBean list(@RequestBody SysMenuQuery sysMenuQuery); + ResultBean list(); + + @RequestMapping(value = "/deleteSysMenu/{sid}") + @ApiOperation(value = "删除菜单") + ResultBean deleteSysMenu(@ApiParam(value = "sid", required = true) @PathVariable("sid") String sid); + + @RequestMapping(value = "/alterSysMenu") + @ApiOperation(value = "修改菜单") + ResultBean alterSysMenu(@RequestBody SysMenu sysMenu); } 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 new file mode 100644 index 0000000..7fde6f2 --- /dev/null +++ b/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/api/sys_menu_role/SysMenuRoleFeign.java @@ -0,0 +1,35 @@ +package com.yxt.demo.system.api.sys_menu_role; + +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 shkstart + * @create 2023-04-27-13:32 + */ +@Api(tags = "菜单角色表") +public interface SysMenuRoleFeign { + + @ApiOperation(value = "给菜单设置角色") + @RequestMapping("/addSysMenuRole") + ResultBean addSysMenuRole(@RequestBody SysMenuRole sysMenuRole); + + @ApiOperation(value = "删除给菜单设置的权限") + @RequestMapping("/deleteSysMenuRole") + ResultBean deleteSysMenuRole(@ApiParam(value = "sid", required = true) @PathVariable("sid") String sid); + + @ApiOperation(value = "修改菜单角色") + @RequestMapping("/alterSysMenuRole") + ResultBean alterSysMenuRole(@RequestBody SysMenuRole sysMenuRole); + + @ApiOperation(value = "查询菜单角色") + @RequestMapping("/selectSysMenuRole") + ResultBean selectSysMenuRole(); +} 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 e657883..5e22d16 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 @@ -1,9 +1,34 @@ package com.yxt.demo.system.api.sys_plan; +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.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; + /** * @Author dimengzhe * @Date 2023/4/24 14:24 * @Description */ +@Api(tags = "自主学习表") public interface SysPlanFeign { + + @ApiOperation(value = "添加自主学习计划") + @RequestMapping("/saveSysPlan") + ResultBean saveSysPlan(@RequestBody SysPlan sysPlan); + + @ApiOperation(value = "删除自主学习计划") + @RequestMapping("/deleteSysPlan/{sid}") + ResultBean deleteSysPlan(@ApiParam(value = "sid", required = true) @PathVariable("sid") String sid); + + @ApiOperation(value = "修改自主学习计划") + @RequestMapping("/alterSysPlan") + ResultBean alterSysPlan(@RequestBody SysPlan sysPlan); + + @ApiOperation(value = "查询自主学习计划") + @RequestMapping("/selectSysPlan") + ResultBean selectSysPlan(); } 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 180e273..c7ac526 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 @@ -1,9 +1,25 @@ package com.yxt.demo.system.api.sys_plan_schedule; +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 org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; + /** * @Author dimengzhe * @Date 2023/4/24 14:25 * @Description */ +@Api(tags = "自主学习计划进度表") public interface SysPlanScheduleFeign { + + @ApiOperation(value = "修改自主学习计划进度") + @PostMapping("/alterSysPlanSchedule") + ResultBean alterSysPlanSchedule(@RequestBody SysPlanSchedule sysPlanSchedule); + +// @ApiOperation(value = "添加自主学习计划进度") +// @PostMapping("/alterSysPlanSchedule") +// ResultBean } diff --git a/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/api/sys_score/SysScoreFeign.java b/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/api/sys_score/SysScoreFeign.java index 56a7748..7742a41 100644 --- a/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/api/sys_score/SysScoreFeign.java +++ b/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/api/sys_score/SysScoreFeign.java @@ -3,8 +3,11 @@ package com.yxt.demo.system.api.sys_score; 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 @@ -14,7 +17,7 @@ import org.springframework.web.bind.annotation.RequestBody; @Api(tags = "成绩表") public interface SysScoreFeign { - @ApiOperation(value = "查询成绩") + @ApiOperation(value = "添加成绩") @PostMapping("/save") ResultBean save(@RequestBody SysScoreDto sysScoreDto); @@ -22,4 +25,11 @@ public interface SysScoreFeign { @PostMapping("/update") ResultBean alterById(@RequestBody SysScore sysScore); + @ApiOperation(value = "查询成绩") + @RequestMapping("/selectScore") + ResultBean selectScore(); + + @ApiOperation(value = "删除成绩") + @RequestMapping("/deleteScore") + ResultBean deleteScore(@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_student_score/SysStudentScoreFeign.java b/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/api/sys_student_score/SysStudentScoreFeign.java index 1b54b2b..1ce7e43 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 @@ -1,9 +1,35 @@ package com.yxt.demo.system.api.sys_student_score; +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 * @Date 2023/4/24 14:29 * @Description */ +@Api(tags = "学生成绩表") public interface SysStudentScoreFeign { + + @ApiOperation(value = "添加学生成绩") + @RequestMapping("/addStudentScore") + ResultBean addStudentScore(@RequestBody SysStudentScore sysStudentScore); + + @ApiOperation(value = "删除学生成绩") + @RequestMapping("/deleteStudentScore") + ResultBean deleteStudentScore(@ApiParam(value = "sid", required = true) @PathVariable("sid") String sid); + + @ApiOperation(value = "修改学生成绩") + @RequestMapping("/alterStudentScore") + ResultBean alterStudentScore(@RequestBody SysStudentScore sysStudentScore); + + @ApiOperation(value = "查询学生信息") + @RequestMapping("/selectStudentScore") + ResultBean selectStudentScore(); } 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 9c17575..c7b1827 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 @@ -27,4 +27,6 @@ public class SysUser extends BaseEntity { private int type; @ApiModelProperty("是否已激活：0未激活，1已激活") private int hasActivated; + @ApiModelProperty("token") + private String token; } 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 2e5d409..dd2a9ff 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 @@ -26,4 +26,8 @@ public interface SysUserRoleFeign { @ApiOperation(value = "删除该用户角色") @RequestMapping("/deleteUserRoleById") ResultBean deleteUserRoleById(@ApiParam(value = "sid", required = true) @PathVariable("sid") String sid); + + @ApiOperation(value = "查询用户权限") + @RequestMapping("/selectUserRole") + ResultBean selectUserRole(); } diff --git a/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_info/SysInfoService.java b/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_info/SysInfoService.java index 4d79113..a721cf5 100644 --- a/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_info/SysInfoService.java +++ b/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_info/SysInfoService.java @@ -3,10 +3,8 @@ package com.yxt.demo.system.biz.sys_info; import com.yxt.demo.system.api.sys_info.SysInfoPageCount; import com.yxt.demo.system.api.sys_user.SysUser; import com.yxt.demo.system.biz.sys_user.SysUserMapper; -import com.yxt.demo.system.biz.sys_user.SysUserService; import com.yxt.demo.system.jdbc.service.MybatisBaseService; import com.yxt.demo.system.api.sys_info.SysInfo; -import com.yxt.demo.system.utils.Const; import com.yxt.demo.system.utils.ResultBean; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -30,46 +28,30 @@ public class SysInfoService extends MybatisBaseService { } public ResultBean alterInfo(SysInfo sysInfo){ - SysUser user = Const.getUser(); ResultBean rb = ResultBean.fireFail(); - sysInfo.setUpdateBySid(user.getSid()); sysInfo.setModifyTime(new Date()); int i = baseMapper.updateById(sysInfo); if (i == 0){ return rb.setMsg("修改失败"); } - return rb.setMsg("修改成功"); + return rb.success().setMsg("修改成功"); } public ResultBean selectInfoOne(SysInfoPageCount sysInfoPageCount){ - SysUser user = Const.getUser(); ResultBean rb = ResultBean.fireFail(); - int type = user.getType(); - if (type == 0 || type == 1){ - SysInfo sysInfo = baseMapper.selectStudentBySid(sysInfoPageCount); - return rb.setData(sysInfo); - }else if (type == 2){ - List sysInfos = baseMapper.selectInfoList(sysInfoPageCount); - return rb.setData(sysInfos); - } - return rb; + SysInfo sysInfo = baseMapper.selectStudentBySid(sysInfoPageCount); + return rb.success().setData(sysInfo); } public ResultBean deleteInfoBySid(String sid){ - SysUser user = Const.getUser(); ResultBean rb = ResultBean.fireFail(); - if (user.getType() == 2){ - SysInfo sysInfo = baseMapper.selectBySid(sid); - baseMapper.deleteInfoBySid(sid); - sysUserMapper.deleteUserBySid(sysInfo.getUserSid()); - return rb.setMsg("删除成功"); - }else { - return rb.setMsg("无权操作"); - } + SysInfo sysInfo = baseMapper.selectBySid(sid); + baseMapper.deleteInfoBySid(sid); + sysUserMapper.deleteUserBySid(sysInfo.getUserSid()); + return rb.success().setMsg("删除成功"); } public ResultBean saveInfo(SysInfo sysInfo){ - SysUser user = Const.getUser(); ResultBean rb = ResultBean.fireFail(); SysUser sysUser = sysUserMapper.selectByNameAndUserName(sysInfo.getInfoId(), sysInfo.getName()); if (sysUser != null){ @@ -77,7 +59,6 @@ public class SysInfoService extends MybatisBaseService { baseMapper.insert(sysInfo); sysUser.setInfoSid(sysInfo.getSid()); sysUser.setModifyTime(new Date()); - sysUser.setUpdateBySid(user.getSid()); sysUserMapper.updateById(sysUser); return rb.success(); }else { diff --git a/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_info_ship/SysInfoShipMapper.java b/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_info_ship/SysInfoShipMapper.java index af02fc2..b7253c8 100644 --- a/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_info_ship/SysInfoShipMapper.java +++ b/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_info_ship/SysInfoShipMapper.java @@ -1,12 +1,17 @@ package com.yxt.demo.system.biz.sys_info_ship; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.yxt.demo.system.api.sys_info_ship.SysInfoShip; import org.apache.ibatis.annotations.Mapper; +import java.util.List; + /** * @Author dimengzhe * @Date 2023/4/24 14:15 * @Description */ @Mapper -public interface SysInfoShipMapper { +public interface SysInfoShipMapper extends BaseMapper { + List selectSysInfoShipList(); } diff --git a/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_info_ship/SysInfoShipMapper.xml b/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_info_ship/SysInfoShipMapper.xml index 8ff360d..3b38855 100644 --- a/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_info_ship/SysInfoShipMapper.xml +++ b/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_info_ship/SysInfoShipMapper.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_info_ship/SysInfoShipRest.java b/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_info_ship/SysInfoShipRest.java new file mode 100644 index 0000000..14a9d59 --- /dev/null +++ b/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_info_ship/SysInfoShipRest.java @@ -0,0 +1,47 @@ +package com.yxt.demo.system.biz.sys_info_ship; + +import com.yxt.demo.system.api.sys_info_ship.SysInfoShip; +import com.yxt.demo.system.api.sys_info_ship.SysInfoShipFeign; +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 shkstart + * @create 2023-04-27-15:28 + */ +@Api(tags = "教师学生表") +@RestController +@RequestMapping("v1/sysinfoship") +public class SysInfoShipRest implements SysInfoShipFeign { + + @Autowired + private SysInfoShipService sysInfoShipService; + + @Override + public ResultBean saveSysInfoShip(SysInfoShip sysInfoShip) { + return sysInfoShipService.saveSysInfoShip(sysInfoShip); + } + + @Override + public ResultBean deleteSysInfoShip(String sid) { + ResultBean rb = ResultBean.fireFail(); + int i = sysInfoShipService.deleteBySid(sid); + if (i == 0){ + return rb.setMsg("删除失败"); + } + return rb.success(); + } + + @Override + public ResultBean alterSysInfoShip(SysInfoShip sysInfoShip) { + return sysInfoShipService.alterSysInfoShip(sysInfoShip); + } + + @Override + public ResultBean selectSysInfoShip() { + return sysInfoShipService.selectSysInfoShip(); + } +} 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 9d2c44d..c16de4c 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 @@ -1,12 +1,47 @@ package com.yxt.demo.system.biz.sys_info_ship; +import com.yxt.demo.system.api.sys_info_ship.SysInfoShip; +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:15 * @Description */ @Service -public class SysInfoShipService { +public class SysInfoShipService extends MybatisBaseService { + + @Autowired + private SysInfoShipMapper sysInfoShipMapper; + + public ResultBean saveSysInfoShip(SysInfoShip sysInfoShip) { + ResultBean rb = ResultBean.fireFail(); + int insert = baseMapper.insert(sysInfoShip); + if (insert == 0){ + return rb.setMsg("添加失败"); + } + return rb.success(); + } + + public ResultBean alterSysInfoShip(SysInfoShip sysInfoShip){ + ResultBean rb = ResultBean.fireFail(); + sysInfoShip.setModifyTime(new Date()); + int i = baseMapper.updateById(sysInfoShip); + if (i == 0){ + return rb.setMsg("修改失败"); + } + return rb.success(); + } + + public ResultBean selectSysInfoShip() { + ResultBean rb = ResultBean.fireFail(); + List sysInfoShips = sysInfoShipMapper.selectSysInfoShipList(); + return rb.success().setData(sysInfoShips); + } } diff --git a/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_menu/SysMenuMapper.java b/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_menu/SysMenuMapper.java index 49b7edc..d046527 100644 --- a/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_menu/SysMenuMapper.java +++ b/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_menu/SysMenuMapper.java @@ -5,6 +5,8 @@ import com.yxt.demo.system.api.sys_info.SysInfo; import com.yxt.demo.system.api.sys_menu.SysMenu; import org.apache.ibatis.annotations.Mapper; +import java.util.List; + /** * @Author dimengzhe * @Date 2023/4/24 14:09 @@ -12,4 +14,6 @@ import org.apache.ibatis.annotations.Mapper; */ @Mapper public interface SysMenuMapper extends BaseMapper { + + List selectMenuList(); } diff --git a/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_menu/SysMenuMapper.xml b/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_menu/SysMenuMapper.xml index fdd7318..9e91a08 100644 --- a/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_menu/SysMenuMapper.xml +++ b/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_menu/SysMenuMapper.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_menu/SysMenuRest.java b/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_menu/SysMenuRest.java index e56ca55..1d6b205 100644 --- a/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_menu/SysMenuRest.java +++ b/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_menu/SysMenuRest.java @@ -1,9 +1,6 @@ package com.yxt.demo.system.biz.sys_menu; -import com.yxt.demo.system.api.sys_menu.SysMenuDto; -import com.yxt.demo.system.api.sys_menu.SysMenuFeign; -import com.yxt.demo.system.api.sys_menu.SysMenuQuery; -import com.yxt.demo.system.api.sys_menu.SysMenuVo; +import com.yxt.demo.system.api.sys_menu.*; import com.yxt.demo.system.utils.ResultBean; import io.swagger.annotations.Api; import org.springframework.beans.factory.annotation.Autowired; @@ -15,7 +12,7 @@ import org.springframework.web.bind.annotation.RestController; * @Date 2023/4/24 14:09 * @Description */ -@Api(tags = "菜单") +@Api(tags = "菜单表") @RestController @RequestMapping("v1/SysMenu") public class SysMenuRest implements SysMenuFeign { @@ -28,7 +25,27 @@ public class SysMenuRest implements SysMenuFeign { } @Override - public ResultBean list(SysMenuQuery sysMenuQuery) { - return sysMenuService.lists(sysMenuQuery); + public ResultBean list() { + return sysMenuService.lists(); + } + + @Override + public ResultBean deleteSysMenu(String sid) { + ResultBean rb = ResultBean.fireFail(); + int i = sysMenuService.deleteBySid(sid); + if (i == 0){ + return rb.setMsg("删除失败"); + } + return rb.success(); + } + + @Override + public ResultBean alterSysMenu(SysMenu sysMenu) { + try { + return sysMenuService.alterSysMenu(sysMenu); + }catch (Exception e){ + e.getLocalizedMessage(); + return null; + } } } diff --git a/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_menu/SysMenuService.java b/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_menu/SysMenuService.java index 4b5acd0..34723e6 100644 --- a/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_menu/SysMenuService.java +++ b/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_menu/SysMenuService.java @@ -8,8 +8,12 @@ import com.yxt.demo.system.api.sys_menu.SysMenuDto; import com.yxt.demo.system.api.sys_menu.SysMenuQuery; import com.yxt.demo.system.api.sys_menu.SysMenuVo; 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:09 @@ -18,6 +22,8 @@ import org.springframework.stereotype.Service; @Service public class SysMenuService extends MybatisBaseService { + @Autowired + private SysMenuMapper sysMenuMapper; public ResultBean saveOrUpdates(SysMenuDto dto) { ResultBean rb = ResultBean.fireFail(); @@ -37,7 +43,23 @@ public class SysMenuService extends MybatisBaseService { return rb.success(); } - public ResultBean lists(SysMenuQuery sysMenuQuery) { - return null; + public ResultBean lists() { + ResultBean rb = ResultBean.fireFail(); + List sysMenus = sysMenuMapper.selectMenuList(); + return rb.success().setData(sysMenus); + } + + public ResultBean alterSysMenu(SysMenu sysMenu) { + ResultBean rb = ResultBean.fireFail(); + sysMenu.setModifyTime(new Date()); + try { + int i = baseMapper.updateById(sysMenu); + if (i == 0){ + return rb.setMsg("修改失败"); + } + }catch (Exception e){ + e.getLocalizedMessage(); + } + return rb.success(); } } diff --git a/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_menu_role/SysMenuRoleMapper.java b/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_menu_role/SysMenuRoleMapper.java index 4f887c3..8547255 100644 --- a/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_menu_role/SysMenuRoleMapper.java +++ b/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_menu_role/SysMenuRoleMapper.java @@ -1,12 +1,18 @@ package com.yxt.demo.system.biz.sys_menu_role; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.yxt.demo.system.api.sys_menu_role.SysMenuRole; import org.apache.ibatis.annotations.Mapper; +import java.util.List; + /** * @Author dimengzhe * @Date 2023/4/24 14:12 * @Description */ @Mapper -public interface SysMenuRoleMapper { +public interface SysMenuRoleMapper extends BaseMapper { + + List selectMenuRoleList(); } diff --git a/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_menu_role/SysMenuRoleMapper.xml b/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_menu_role/SysMenuRoleMapper.xml index 6ae423f..a1e7082 100644 --- a/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_menu_role/SysMenuRoleMapper.xml +++ b/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_menu_role/SysMenuRoleMapper.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_menu_role/SysMenuRoleRest.java b/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_menu_role/SysMenuRoleRest.java new file mode 100644 index 0000000..75f6724 --- /dev/null +++ b/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_menu_role/SysMenuRoleRest.java @@ -0,0 +1,47 @@ +package com.yxt.demo.system.biz.sys_menu_role; + +import com.yxt.demo.system.api.sys_menu_role.SysMenuRole; +import com.yxt.demo.system.api.sys_menu_role.SysMenuRoleFeign; +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 shkstart + * @create 2023-04-27-13:39 + */ +@Api(tags = "菜单角色表") +@RestController +@RequestMapping("v1/sysmenurole") +public class SysMenuRoleRest implements SysMenuRoleFeign { + + @Autowired + private SysMenuRoleService sysMenuRoleService; + + @Override + public ResultBean addSysMenuRole(SysMenuRole sysMenuRole) { + return sysMenuRoleService.addSysMenuRole(sysMenuRole); + } + + @Override + public ResultBean deleteSysMenuRole(String sid) { + ResultBean rb = ResultBean.fireFail(); + int i = sysMenuRoleService.deleteBySid(sid); + if (i == 0){ + return rb.setMsg("删除失败"); + } + return rb.success(); + } + + @Override + public ResultBean alterSysMenuRole(SysMenuRole sysMenuRole) { + return sysMenuRoleService.alterSysMenuRole(sysMenuRole); + } + + @Override + public ResultBean selectSysMenuRole() { + return sysMenuRoleService.selectSysMenuRole(); + } +} diff --git a/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_menu_role/SysMenuRoleService.java b/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_menu_role/SysMenuRoleService.java index 8d74b80..1b9a60d 100644 --- a/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_menu_role/SysMenuRoleService.java +++ b/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_menu_role/SysMenuRoleService.java @@ -1,12 +1,47 @@ package com.yxt.demo.system.biz.sys_menu_role; +import com.yxt.demo.system.api.sys_menu_role.SysMenuRole; +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:12 * @Description */ @Service -public class SysMenuRoleService { +public class SysMenuRoleService extends MybatisBaseService { + + @Autowired + private SysMenuRoleMapper sysMenuRoleMapper; + + public ResultBean addSysMenuRole(SysMenuRole sysMenuRole){ + ResultBean rb = ResultBean.fireFail(); + int insert = baseMapper.insert(sysMenuRole); + if (insert == 0){ + return rb.setMsg("添加失败"); + } + return rb.success(); + } + + public ResultBean alterSysMenuRole(SysMenuRole sysMenuRole){ + ResultBean rb = ResultBean.fireFail(); + sysMenuRole.setModifyTime(new Date()); + int i = baseMapper.updateById(sysMenuRole); + if (i == 0){ + return rb.setMsg("修改失败"); + } + return rb.success(); + } + + public ResultBean selectSysMenuRole(){ + ResultBean rb = ResultBean.fireFail(); + List sysMenuRoles = sysMenuRoleMapper.selectMenuRoleList(); + return rb.success().setData(sysMenuRoles); + } } diff --git a/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_plan/SysPlanMapper.java b/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_plan/SysPlanMapper.java index 427792d..c9c0b35 100644 --- a/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_plan/SysPlanMapper.java +++ b/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_plan/SysPlanMapper.java @@ -1,9 +1,17 @@ package com.yxt.demo.system.biz.sys_plan; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.yxt.demo.system.api.sys_plan.SysPlan; +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; + /** * @Author dimengzhe * @Date 2023/4/24 14:24 * @Description */ -public interface SysPlanMapper { +@Mapper +public interface SysPlanMapper extends BaseMapper { + List selectSysPlanList(); } 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 09c2287..cecf662 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 @@ -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_plan/SysPlanRest.java b/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_plan/SysPlanRest.java index 413f3b5..7a1cde7 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 @@ -1,9 +1,48 @@ 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.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:24 * @Description */ -public class SysPlanRest { +@Api(tags = "自主学习表") +@RestController +@RequestMapping("v1/sysPlan") +public class SysPlanRest implements SysPlanFeign { + + @Autowired + private SysPlanService sysPlanService; + + @Override + public ResultBean saveSysPlan(SysPlan sysPlan) { + return sysPlanService.saveSysPlan(sysPlan); + } + + @Override + public ResultBean deleteSysPlan(String sid) { + ResultBean rb = ResultBean.fireFail(); + int i = sysPlanService.deleteBySid(sid); + if (i == 0){ + return rb.setMsg("删除失败"); + } + return rb.success(); + } + + @Override + public ResultBean alterSysPlan(SysPlan sysPlan) { + return sysPlanService.alterSysPlan(sysPlan); + } + + @Override + public ResultBean selectSysPlan() { + return sysPlanService.selectSysPlan(); + } } 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 a1dd611..dabb959 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,9 +1,45 @@ package com.yxt.demo.system.biz.sys_plan; +import com.yxt.demo.system.api.sys_plan.SysPlan; +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:24 * @Description */ -public class SysPlanService { +@Service +public class SysPlanService extends MybatisBaseService { + + @Autowired + private SysPlanMapper sysPlanMapper; + + public ResultBean saveSysPlan(SysPlan sysPlan){ + ResultBean rb = ResultBean.fireFail(); + int insert = baseMapper.insert(sysPlan); + if (insert == 0){ + return rb.setMsg("添加失败"); + } + return rb.success(); + } + + public ResultBean alterSysPlan(SysPlan sysPlan) { + ResultBean rb = ResultBean.fireFail(); + int i = baseMapper.updateById(sysPlan); + if (i == 0){ + return rb.setMsg("修改失败"); + } + return rb.success(); + } + + public ResultBean selectSysPlan() { + ResultBean rb = ResultBean.fireFail(); + List sysPlans = sysPlanMapper.selectSysPlanList(); + return rb.success().setData(sysPlans); + } } 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 2c738a4..2b17faa 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 @@ -1,9 +1,14 @@ package com.yxt.demo.system.biz.sys_plan_schedule; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.yxt.demo.system.api.sys_plan_schedule.SysPlanSchedule; +import org.apache.ibatis.annotations.Mapper; + /** * @Author dimengzhe * @Date 2023/4/24 14:25 * @Description */ -public interface SysPlanScheduleMapper { +@Mapper +public interface SysPlanScheduleMapper extends BaseMapper { } 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 bd6766f..441bc60 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 @@ -1,9 +1,28 @@ package com.yxt.demo.system.biz.sys_plan_schedule; +import com.yxt.demo.system.api.sys_plan_schedule.SysPlanSchedule; +import com.yxt.demo.system.api.sys_plan_schedule.SysPlanScheduleFeign; +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:25 * @Description */ -public class SysPlanScheduleRest { +@Api(tags = "自主学习计划进度表") +@RestController +@RequestMapping("v1/sysPlanSchedule") +public class SysPlanScheduleRest implements SysPlanScheduleFeign{ + + @Autowired + private SysPlanScheduleService sysPlanScheduleService; + + @Override + public ResultBean alterSysPlanSchedule(SysPlanSchedule sysPlanSchedule) { + return sysPlanScheduleService.alterSysPlanSchedule(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 b638c7d..6f2d9dc 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 @@ -1,9 +1,31 @@ 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.stereotype.Service; + +import java.util.Date; + /** * @Author dimengzhe * @Date 2023/4/24 14:25 * @Description */ -public class SysPlanScheduleService { +@Service +public class SysPlanScheduleService extends MybatisBaseService { + + + public ResultBean alterSysPlanSchedule(SysPlanSchedule sysPlanSchedule){ + ResultBean rb = ResultBean.fireFail(); + sysPlanSchedule.setModifyTime(new Date()); + int i = baseMapper.updateById(sysPlanSchedule); + if (i == 0){ + return rb.setMsg("修改失败"); + } + return rb.success(); + } + + public void saveSysPlanSchedule(){ + } } diff --git a/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_role/SysRoleMapper.xml b/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_role/SysRoleMapper.xml index d8c2385..317b15c 100644 --- a/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_role/SysRoleMapper.xml +++ b/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_role/SysRoleMapper.xml @@ -2,7 +2,7 @@ + select * from sys_score + \ No newline at end of file diff --git a/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_score/SysScoreRest.java b/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_score/SysScoreRest.java index 36340d7..be86525 100644 --- a/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_score/SysScoreRest.java +++ b/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_score/SysScoreRest.java @@ -31,8 +31,24 @@ public class SysScoreRest implements SysScoreFeign { return sysScoreService.save(sysScoreDto); } - + @Override public ResultBean alterById(SysScore sysScore){ return sysScoreService.alterById(sysScore); } + + @Override + public ResultBean selectScore() { + return sysScoreService.selectScore(); + } + + @Override + public ResultBean deleteScore(String sid) { + ResultBean rb = ResultBean.fireFail(); + int i = sysScoreService.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_score/SysScoreService.java b/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_score/SysScoreService.java index ad5879f..d990fae 100644 --- a/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_score/SysScoreService.java +++ b/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_score/SysScoreService.java @@ -1,12 +1,15 @@ package com.yxt.demo.system.biz.sys_score; import cn.hutool.core.bean.BeanUtil; +import com.yxt.demo.system.api.sys_user.SysUser; import com.yxt.demo.system.jdbc.service.MybatisBaseService; import com.yxt.demo.system.api.sys_score.SysScore; import com.yxt.demo.system.api.sys_score.SysScoreDto; import com.yxt.demo.system.utils.ResultBean; import org.springframework.stereotype.Service; +import java.util.List; + /** * @Author dimengzhe * @Date 2023/4/24 14:28 @@ -32,4 +35,10 @@ public class SysScoreService extends MybatisBaseService scoreList = baseMapper.selectScoreList(); + return rb.success().setData(scoreList); + } } diff --git a/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_student_score/SysStudentScoreMapper.java b/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_student_score/SysStudentScoreMapper.java index 3dd69aa..28ccc9c 100644 --- a/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_student_score/SysStudentScoreMapper.java +++ b/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_student_score/SysStudentScoreMapper.java @@ -1,9 +1,17 @@ package com.yxt.demo.system.biz.sys_student_score; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.yxt.demo.system.api.sys_student_score.SysStudentScore; +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; + /** * @Author dimengzhe * @Date 2023/4/24 14:31 * @Description */ -public interface SysStudentScoreMapper { +@Mapper +public interface SysStudentScoreMapper extends BaseMapper { + List selectStudentScoreList(); } diff --git a/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_student_score/SysStudentScoreMapper.xml b/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_student_score/SysStudentScoreMapper.xml index 467347c..9439471 100644 --- a/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_student_score/SysStudentScoreMapper.xml +++ b/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_student_score/SysStudentScoreMapper.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_student_score/SysStudentScoreRest.java b/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_student_score/SysStudentScoreRest.java index ec4dab2..a964df2 100644 --- a/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_student_score/SysStudentScoreRest.java +++ b/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_student_score/SysStudentScoreRest.java @@ -1,9 +1,50 @@ package com.yxt.demo.system.biz.sys_student_score; +import com.yxt.demo.system.api.sys_student_score.SysStudentScore; +import com.yxt.demo.system.api.sys_student_score.SysStudentScoreFeign; +import com.yxt.demo.system.api.sys_user.SysUser; +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:29 * @Description */ -public class SysStudentScoreRest { +@Api(tags = "学生成绩表") +@RestController +@RequestMapping("v1/sysstudentscore") +public class SysStudentScoreRest implements SysStudentScoreFeign { + + @Autowired + private SysStudentScoreService sysStudentScoreService; + + @Override + public ResultBean addStudentScore(SysStudentScore sysStudentScore) { + return sysStudentScoreService.addStudentScore(sysStudentScore); + } + + @Override + public ResultBean deleteStudentScore(String sid) { + ResultBean rb = ResultBean.fireFail(); + int i = sysStudentScoreService.deleteBySid(sid); + if (i == 0){ + return rb.setMsg("删除失败"); + }else { + return rb.setMsg("删除成功"); + } + } + + @Override + public ResultBean alterStudentScore(SysStudentScore sysStudentScore) { + return sysStudentScoreService.alterStudentScore(sysStudentScore); + } + + @Override + public ResultBean selectStudentScore() { + return sysStudentScoreService.selectStudentScore(); + } } diff --git a/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_student_score/SysStudentScoreService.java b/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_student_score/SysStudentScoreService.java index f855ab9..7f7ff20 100644 --- a/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_student_score/SysStudentScoreService.java +++ b/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_student_score/SysStudentScoreService.java @@ -1,9 +1,45 @@ package com.yxt.demo.system.biz.sys_student_score; +import com.yxt.demo.system.api.sys_student_score.SysStudentScore; +import com.yxt.demo.system.api.sys_user.SysUser; +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:31 * @Description */ -public class SysStudentScoreService { +@Service +public class SysStudentScoreService extends MybatisBaseService{ + + @Autowired + private SysStudentScoreMapper sysStudentScoreMapper; + + public ResultBean addStudentScore(SysStudentScore sysStudentScore) { + ResultBean rb = ResultBean.fireFail(); + baseMapper.insert(sysStudentScore); + return rb.success(); + } + + public ResultBean alterStudentScore(SysStudentScore sysStudentScore){ + ResultBean rb = ResultBean.fireFail(); + sysStudentScore.setModifyTime(new Date()); + int i = baseMapper.updateById(sysStudentScore); + if (i == 0){ + return rb.setMsg("修改失败"); + } + return rb.success(); + } + + public ResultBean selectStudentScore(){ + ResultBean rb = ResultBean.fireFail(); + List sysStudentScores = sysStudentScoreMapper.selectStudentScoreList(); + return rb.success().setData(sysStudentScores); + } } 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 d6a668b..0ae46e5 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 @@ -84,6 +84,8 @@ public class SysUserService extends MybatisBaseService { return rb.setMsg("该账号已失效"); } } + String uniqueToken = JWTUtil.create(sysUser.getSid() + ""); + sysUser.setToken(uniqueToken); return rb.success().setData(sysUser); } @@ -91,7 +93,7 @@ public class SysUserService extends MybatisBaseService { ResultBean rb = ResultBean.fireFail(); int i = sysUserMapper.updateById(sysUser); if (i != 0){ - return rb.setMsg("修改账号或密码成功"); + return rb.setMsg("修改密码成功"); } return rb.setMsg("修改失败,请重试！！！"); } diff --git a/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_user_role/SysUserRoleMapper.java b/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_user_role/SysUserRoleMapper.java index 4c2e5bc..6fa0e5f 100644 --- a/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_user_role/SysUserRoleMapper.java +++ b/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_user_role/SysUserRoleMapper.java @@ -15,4 +15,6 @@ import java.util.List; public interface SysUserRoleMapper extends BaseMapper { List selectSysUserRole(String sid); + + List selectUserRoleList(); } 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 b51bc7e..b38d381 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 @@ -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_user_role/SysUserRoleRest.java b/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_user_role/SysUserRoleRest.java index a3a8161..b99827f 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 @@ -3,7 +3,6 @@ package com.yxt.demo.system.biz.sys_user_role; import com.yxt.demo.system.api.sys_user.SysUser; import com.yxt.demo.system.api.sys_user_role.SysUserRole; import com.yxt.demo.system.api.sys_user_role.SysUserRoleFeign; -import com.yxt.demo.system.utils.Const; import com.yxt.demo.system.utils.ResultBean; import io.swagger.annotations.Api; import org.springframework.beans.factory.annotation.Autowired; @@ -35,16 +34,16 @@ public class SysUserRoleRest implements SysUserRoleFeign { @Override public ResultBean deleteUserRoleById(String sid) { ResultBean rb = ResultBean.fireFail(); - SysUser user = Const.getUser(); - if (user.getType() == 2){ - int i = sysUserRoleSerrvice.deleteBySid(sid); - if (i == 0){ - return rb.setMsg("删除失败"); - }else { - return rb.success().setMsg("删除成功"); - } + int i = sysUserRoleSerrvice.deleteBySid(sid); + if (i == 0){ + return rb.setMsg("删除失败"); }else { - return rb.setMsg("无权操作"); + return rb.success().setMsg("删除成功"); } } + + @Override + public ResultBean selectUserRole() { + return sysUserRoleSerrvice.selectUserRole(); + } } 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 2877cd5..5e99639 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 @@ -3,12 +3,10 @@ package com.yxt.demo.system.biz.sys_user_role; import com.yxt.demo.system.api.sys_user.SysUser; import com.yxt.demo.system.jdbc.service.MybatisBaseService; import com.yxt.demo.system.api.sys_user_role.SysUserRole; -import com.yxt.demo.system.utils.Const; import com.yxt.demo.system.utils.ResultBean; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import java.sql.Time; import java.util.Date; import java.util.List; @@ -27,9 +25,7 @@ public class SysUserRoleSerrvice extends MybatisBaseService userRolesList = sysUserRoleMapper.selectUserRoleList(); + return rb.setData(userRolesList); + } } diff --git a/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/utils/Const.java b/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/utils/Const.java deleted file mode 100644 index 139e438..0000000 --- a/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/utils/Const.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.yxt.demo.system.utils; - -import com.yxt.demo.system.api.sys_user.SysUser; -import org.springframework.security.core.context.SecurityContextHolder; - -/** - * @author shkstart - * @create 2023-04-26-14:42 - */ -public class Const{ - public static final long EXPIRATION_TIME = 3600 * 24 * 7; // 以秒计 - public static final String SECRET = "sinsinsinsinsinsinnetnetnetnetnetnet"; // JWT密码 - public static final String TOKEN_PREFIX = "Bearer"; // Token前缀 - public static final String HEADER_STRING = "Authorization"; // 存放Token的Header Key - public static final String AUTHORITY = "admin"; //管理员 - - - public static SysUser getUser(){ - Object principal = SecurityContextHolder.getContext().getAuthentication().getPrincipal(); - if(principal instanceof SysUser){ - return (SysUser)principal; - } - return null; - } -}