From f8c943647dfbf6df916843906572f125b84c297f Mon Sep 17 00:00:00 2001 From: fkf <1475794025@qq.com> Date: Sat, 6 May 2023 18:08:35 +0800 Subject: [PATCH] =?UTF-8?q?5-6=20=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/api/dict_type/DictTypeFeign.java | 2 +- .../system/api/sys_score/SysScoreFeign.java | 5 ++ .../SysStudentScoreFeign.java | 4 ++ .../system/biz/dict_type/DictTypeRest.java | 2 +- .../system/biz/sys_info/SysInfoMapper.java | 2 + .../system/biz/sys_info/SysInfoMapper.xml | 27 ++++++++- .../system/biz/sys_info/SysInfoService.java | 13 +++++ .../biz/sys_info_ship/SysInfoShipMapper.java | 2 + .../biz/sys_info_ship/SysInfoShipMapper.xml | 4 ++ .../system/biz/sys_score/SysScoreMapper.java | 2 + .../system/biz/sys_score/SysScoreMapper.xml | 4 ++ .../system/biz/sys_score/SysScoreRest.java | 5 ++ .../system/biz/sys_score/SysScoreService.java | 10 ++++ .../SysStudentScoreMapper.java | 3 + .../SysStudentScoreMapper.xml | 4 ++ .../SysStudentScoreRest.java | 5 ++ .../SysStudentScoreService.java | 16 ++++++ .../system/biz/sys_user/SysUserService.java | 56 ++++++++++++++++++- 18 files changed, 160 insertions(+), 6 deletions(-) diff --git a/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/api/dict_type/DictTypeFeign.java b/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/api/dict_type/DictTypeFeign.java index 40d280b..34b91d0 100644 --- a/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/api/dict_type/DictTypeFeign.java +++ b/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/api/dict_type/DictTypeFeign.java @@ -27,7 +27,7 @@ public interface DictTypeFeign { @ApiOperation(value = "数据字典类型分页列表") ResultBean> pageList(@RequestBody PagerQuery pagerQuery); - @DeleteMapping("/delete/{sid}") + @PostMapping("/delete/{sid}") @ApiOperation(value = "数据字典类型删除") ResultBean delete(@PathVariable String sid); } 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 7742a41..9f15848 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 @@ -2,6 +2,7 @@ package com.yxt.demo.system.api.sys_score; import com.yxt.demo.system.utils.ResultBean; import io.swagger.annotations.Api; +import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; import org.springframework.web.bind.annotation.PathVariable; @@ -32,4 +33,8 @@ public interface SysScoreFeign { @ApiOperation(value = "删除成绩") @RequestMapping("/deleteScore") ResultBean deleteScore(@ApiParam(value = "sid", required = true) @PathVariable("sid") String sid); + + @ApiOperation(value = "查询科目") + @RequestMapping("/selectScoreKM") + ResultBean selectScoreKM(); } 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 067e5ce..52fe348 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 @@ -40,4 +40,8 @@ public interface SysStudentScoreFeign { @ApiOperation(value = "查询学生升学率、就业率、考公率") @RequestMapping("/selectStudentRate") ResultBean selectStudentRate(@RequestBody SysStudentScoreYIELD sysStudentScoreYIELD); + + @ApiOperation(value = "查询班级") + @RequestMapping("/selectClass") + ResultBean selectClass(); } diff --git a/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/dict_type/DictTypeRest.java b/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/dict_type/DictTypeRest.java index 204fb69..f69626c 100644 --- a/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/dict_type/DictTypeRest.java +++ b/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/dict_type/DictTypeRest.java @@ -55,6 +55,6 @@ public class DictTypeRest implements DictTypeFeign { if (0 == dictTypeService.deleteBySid(sid)) { return rb.setMsg("删除失败"); } - return rb.setMsg("删除成功"); + return rb.success().setMsg("删除成功"); } } 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 2babf2a..564e17f 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 @@ -37,4 +37,6 @@ public interface SysInfoMapper extends BaseMapper { SysInfo selectInfoByUserSid(@Param("userSid") String userSid); IPage listPageVo(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); + + void updateInfoById(SysInfo sysInfo); } 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 9c7f988..279453e 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 @@ -33,7 +33,7 @@ + + + update sys_info + + + name = #{name}, + + + sex = #{sex}, + + + studyYear = #{studyYear}, + + + department = #{department}, + + + speciality = #{speciality}, + + + calss = #{calss}, + + + where id = #{id} + \ No newline at end of file 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 730b891..38c96bc 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 @@ -8,7 +8,9 @@ import com.yxt.demo.system.api.dict_common.DictCommon; import com.yxt.demo.system.api.dict_common.DictCommonQuery; import com.yxt.demo.system.api.dict_common.DictCommonVo; import com.yxt.demo.system.api.sys_info.SysInfoPageCount; +import com.yxt.demo.system.api.sys_info_ship.SysInfoShip; import com.yxt.demo.system.api.sys_user.SysUser; +import com.yxt.demo.system.biz.sys_info_ship.SysInfoShipMapper; import com.yxt.demo.system.biz.sys_user.SysUserMapper; import com.yxt.demo.system.jdbc.service.MybatisBaseService; import com.yxt.demo.system.api.sys_info.SysInfo; @@ -33,6 +35,8 @@ public class SysInfoService extends MybatisBaseService { private SysUserMapper sysUserMapper; @Autowired private SysInfoMapper sysInfoMapper; + @Autowired + private SysInfoShipMapper sysInfoShipMapper; public SysInfo selectByNoAndName(String userName, String name) { return baseMapper.selectByNoAndName(userName, name); @@ -42,6 +46,14 @@ public class SysInfoService extends MybatisBaseService { ResultBean rb = ResultBean.fireFail(); sysInfo.setModifyTime(new Date()); int i = baseMapper.updateById(sysInfo); + if (sysInfo.getUserSid() != null){ + SysUser sysUser = sysUserMapper.selectUser(sysInfo.getUserSid()); + if (sysUser != null){ + sysUser.setName(sysInfo.getName()); + sysUser.setSid(sysInfo.getUserSid()); + sysUserMapper.updateById(sysUser); + } + } if (i == 0){ return rb.setMsg("修改失败"); } @@ -90,6 +102,7 @@ public class SysInfoService extends MybatisBaseService { SysInfo sysInfo = baseMapper.selectBySid(sid); baseMapper.deleteInfoBySid(sid); sysUserMapper.deleteUserBySid(sysInfo.getUserSid()); + sysInfoShipMapper.deleteInfoShipByStudentNo(sysInfo.getInfoId()); return rb.success().setMsg("删除成功"); } 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 a0e1d1d..4b19d98 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 @@ -23,4 +23,6 @@ public interface SysInfoShipMapper extends BaseMapper { List selectTeacherDownStudent(@Param("teacher") String teacher); IPage listPageVo(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); + + void deleteInfoShipByStudentNo(@Param("studentNo") String studentNo); } 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 de2dc23..31bd87a 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 @@ -17,4 +17,8 @@ ${ew.sqlSegment} + + + delete from sys_info_ship where studentNo = #{studentNo} + \ No newline at end of file diff --git a/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_score/SysScoreMapper.java b/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_score/SysScoreMapper.java index 89ce9fa..dfd224c 100644 --- a/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_score/SysScoreMapper.java +++ b/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_score/SysScoreMapper.java @@ -16,4 +16,6 @@ import java.util.List; public interface SysScoreMapper extends BaseMapper { List selectScoreList(); + + List selectScoreKM(); } diff --git a/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_score/SysScoreMapper.xml b/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_score/SysScoreMapper.xml index 06f8e38..66b56f1 100644 --- a/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_score/SysScoreMapper.xml +++ b/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_score/SysScoreMapper.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_score/SysScoreRest.java b/demo-system/demo-system-biz/src/main/java/com/yxt/demo/system/biz/sys_score/SysScoreRest.java index be86525..f78b8e2 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 @@ -51,4 +51,9 @@ public class SysScoreRest implements SysScoreFeign { return rb.success(); } + + @Override + public ResultBean selectScoreKM() { + return sysScoreService.selectScoreKM(); + } } 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 d990fae..7aa3ed9 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 @@ -6,6 +6,7 @@ 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.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.List; @@ -18,6 +19,9 @@ import java.util.List; @Service public class SysScoreService extends MybatisBaseService{ + @Autowired + private SysScoreMapper sysScoreMapper; + public ResultBean save(SysScoreDto sysScoreDto) { ResultBean rb = ResultBean.fireFail(); SysScore sysScore = new SysScore(); @@ -41,4 +45,10 @@ public class SysScoreService extends MybatisBaseService scoreList = baseMapper.selectScoreList(); return rb.success().setData(scoreList); } + + public ResultBean selectScoreKM() { + ResultBean rb = ResultBean.fireFail(); + List sysScores = sysScoreMapper.selectScoreKM(); + return rb.success().setData(sysScores); + } } 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 3a34deb..2885426 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,6 +1,7 @@ package com.yxt.demo.system.biz.sys_student_score; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.yxt.demo.system.api.sys_info.SysInfo; import com.yxt.demo.system.api.sys_student_score.SysStudentScore; import com.yxt.demo.system.api.sys_student_score.SysStudentScoreYIELD; import org.apache.ibatis.annotations.Mapper; @@ -27,4 +28,6 @@ public interface SysStudentScoreMapper extends BaseMapper { SysStudentScoreYIELD selectStudentScoreEmployment(SysStudentScoreYIELD sysStudentScoreYIELD); SysStudentScoreYIELD selectStudentScoreComputerKaoGong(SysStudentScoreYIELD sysStudentScoreYIELD); + + List selectClass(); } 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 01283c4..46f56e5 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 @@ -52,4 +52,8 @@ where s.kaoGong = '1' group by i.calss + + \ 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 1eebf5a..619cb7a 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 @@ -58,4 +58,9 @@ public class SysStudentScoreRest implements SysStudentScoreFeign { public ResultBean selectStudentRate(SysStudentScoreYIELD sysStudentScoreYIELD) { return sysStudentScoreService.selectStudentRate(sysStudentScoreYIELD); } + + @Override + public ResultBean selectClass() { + return sysStudentScoreService.selectClass(); + } } 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 309b341..17ffa83 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,5 +1,6 @@ package com.yxt.demo.system.biz.sys_student_score; +import com.yxt.demo.system.api.sys_info.SysInfo; import com.yxt.demo.system.api.sys_student_score.SysStudentScore; import com.yxt.demo.system.api.sys_student_score.SysStudentScoreYIELD; import com.yxt.demo.system.api.sys_user.SysUser; @@ -8,6 +9,7 @@ import com.yxt.demo.system.utils.ResultBean; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.ArrayList; import java.util.Date; import java.util.List; @@ -98,4 +100,18 @@ public class SysStudentScoreService extends MybatisBaseService sysInfos = sysStudentScoreMapper.selectClass(); + int i = 1; + List list = new ArrayList<>(); + for (int j = 0;j < sysInfos.size();j++) { + Object [] a = new Object[2]; + a[0] = sysInfos.get(j); + a[1] = i++; + list.add(a); + } + return rb.success().setData(list); + } } 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 ea50148..7c0cc51 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 @@ -1,6 +1,7 @@ package com.yxt.demo.system.biz.sys_user; import cn.hutool.core.bean.BeanUtil; +import com.yxt.demo.system.biz.sys_info.SysInfoMapper; import com.yxt.demo.system.jdbc.service.MybatisBaseService; import com.yxt.demo.system.utils.ResultBean; import com.yxt.demo.system.utils.jwt.JWTUtil; @@ -12,7 +13,9 @@ import com.yxt.demo.system.biz.sys_info.SysInfoService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.ArrayList; import java.util.Date; +import java.util.List; /** * @Author dimengzhe @@ -27,6 +30,8 @@ public class SysUserService extends MybatisBaseService { private SysInfoService sysInfoService; @Autowired private SysUserMapper sysUserMapper; + @Autowired + private SysInfoMapper sysInfoMapper; public ResultBean register(SysUserDto dto) { ResultBean rb = ResultBean.fireFail(); @@ -50,6 +55,9 @@ public class SysUserService extends MybatisBaseService { BeanUtil.copyProperties(dto, sysUser); sysUser.setPassword(dto.getPassword()); sysUser.setInfoSid(sysInfo.getSid()); + if (dto.getUserName().contains("js")){ + sysUser.setType(1); + } baseMapper.insert(sysUser); sysInfo.setUserSid(sysUser.getSid()); sysInfoService.updateById(sysInfo); @@ -62,6 +70,45 @@ public class SysUserService extends MybatisBaseService { sysUser = new SysUser(); BeanUtil.copyProperties(dto, sysUser); sysUser.setPassword(dto.getPassword()); + if (dto.getUserName().contains("js")){ + sysUser.setType(1); + } + baseMapper.insert(sysUser); + return rb.success(); + } + }else if (dto.getUserName().contains("admin")){ + 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) { + return rb.setMsg("该账号已注册"); + } + sysUser = new SysUser(); + BeanUtil.copyProperties(dto, sysUser); + sysUser.setPassword(dto.getPassword()); + sysUser.setInfoSid(sysInfo.getSid()); + sysUser.setType(2); + baseMapper.insert(sysUser); + sysInfo.setUserSid(sysUser.getSid()); + sysInfoService.updateById(sysInfo); + return rb.success(); + }else { + SysUser sysUser = baseMapper.selectByNo(userName); + if (sysUser != null) { + return rb.setMsg("此账号已注册"); + } + sysUser = new SysUser(); + BeanUtil.copyProperties(dto, sysUser); + sysUser.setPassword(dto.getPassword()); + sysUser.setType(2); baseMapper.insert(sysUser); return rb.success(); } @@ -101,12 +148,15 @@ public class SysUserService extends MybatisBaseService { public ResultBean selectUserInfo(String sid) { ResultBean rb = ResultBean.fireFail(); + List sysUsers = new ArrayList<>(); SysUser sysUser = sysUserMapper.selectUserInfo(sid); if(sysUser == null){ SysUser sysUser1 = sysUserMapper.selectUser(sid); - return rb.success().setMsg("基础信息为空，请添加基础信息！！！").setData(sysUser1); + sysUsers.add(sysUser1); + return rb.success().setMsg("基础信息为空，请添加基础信息！！！").setData(sysUsers); } - return rb.success().setData(sysUser); + sysUsers.add(sysUser); + return rb.success().setData(sysUsers); } public ResultBean alterInfoUser(SysUser sysUser) { @@ -125,7 +175,7 @@ public class SysUserService extends MybatisBaseService { sysInfo1.setSex(sysUser.getSex()); sysInfo1.setStudyYear(sysUser.getStudyYear()); sysInfo1.setName(sysUser.getName()); - sysInfoService.alterInfo(sysInfo1); + sysInfoMapper.updateInfoById(sysInfo1); return rb.success(); }catch (Exception e){ return rb.setMsg("修改失败");