From ef96dbc9278ebae4af204cca9de98c63f0d6328e Mon Sep 17 00:00:00 2001 From: 44323 <443237572@qq.com> Date: 星期三, 20 九月 2023 19:16:21 +0800 Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/PlayPai --- cloud-server-account/src/main/java/com/dsh/account/controller/StudentController.java | 94 +++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 94 insertions(+), 0 deletions(-) diff --git a/cloud-server-account/src/main/java/com/dsh/account/controller/StudentController.java b/cloud-server-account/src/main/java/com/dsh/account/controller/StudentController.java index eae162f..e3b035a 100644 --- a/cloud-server-account/src/main/java/com/dsh/account/controller/StudentController.java +++ b/cloud-server-account/src/main/java/com/dsh/account/controller/StudentController.java @@ -1,15 +1,21 @@ package com.dsh.account.controller; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.dsh.account.dto.CreateHistoryDto; +import com.dsh.account.dto.GetHistoryDto; +import com.dsh.account.dto.StudentSearch; +import com.dsh.account.dto.TStudentDto; import com.dsh.account.entity.TStudent; import com.dsh.account.model.StudentVo; import com.dsh.account.service.TAppUserService; import com.dsh.account.service.TStudentService; import com.dsh.account.util.ResultUtil; import com.dsh.account.util.TokenUtil; +import io.micrometer.core.instrument.search.Search; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; +import jdk.nashorn.internal.ir.annotations.Ignore; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -86,6 +92,7 @@ SimpleDateFormat sdf = new SimpleDateFormat("yyyy"); studentVo.setAge(Integer.valueOf(sdf.format(new Date())) - Integer.valueOf(sdf.format(tStudent.getBirthday()))); listVo.add(studentVo); + studentVo.setName(tStudent.getName()); } return ResultUtil.success(listVo); }catch (Exception e){ @@ -94,4 +101,91 @@ } } + + /** + * 根据电话号码学员信息 + * @param phone + * @return + */ + @ResponseBody + @PostMapping("/student/queryStudentByPhone") + public TStudent queryStudentByPhone(@RequestBody String phone){ + try { + TStudent one = studentService.getOne(new QueryWrapper<TStudent>().eq("phone", phone).eq("state", 1)); + return one; + }catch (Exception e){ + e.printStackTrace(); + return null; + } + } + + + /** + * 根据id获取数据 + * @param id + * @return + */ + @ResponseBody + @PostMapping("/student/queryStudentById") + public TStudent queryStudentById(@RequestBody Integer id){ + TStudent student = studentService.getById(id); + return student; + } + + + /** + * 根据名称模糊搜索学员 + * @param name + * @return + */ + @ResponseBody + @PostMapping("/student/queryStudentListByName") + public List<TStudent> queryStudentListByName(@RequestBody String name){ + return studentService.list(new QueryWrapper<TStudent>().eq("state", 1).like("name", name)); + } + + /** + * web端查找学员 + * + * @return + */ + + @ResponseBody + @PostMapping("/student/webStudentList") + public List<TStudentDto> querywebStudent(@RequestBody StudentSearch search){ + return studentService.listAll(search); + } + + @ResponseBody + @PostMapping("/student/webOneStudent") + public TStudentDto querywebStudentOne(@RequestParam("id")Integer id){ + System.out.println("===?==》"+id); + return studentService.listOne(id); + } + + @ResponseBody + @PostMapping("/student/update") + public void update(@RequestBody TStudent tStudent){ + System.out.println("======tStudent======"+tStudent); + studentService.updateById(tStudent); + } + + @ResponseBody + @PostMapping("/student/createHistory") + public void createHistory(@RequestBody CreateHistoryDto createHistoryDto){ + createHistoryDto.setDate(new Date()); + studentService.createHistory(createHistoryDto); + + + } + + + @ResponseBody + @PostMapping("/student/getHisory") + public List<GetHistoryDto> getHisory(){ + + List<GetHistoryDto> getHistoryDtos = studentService.getHistory(); + + return getHistoryDtos; + } } -- Gitblit v1.7.1