From d5367176a4699fccca4b0d85442e9ed735a8e4d5 Mon Sep 17 00:00:00 2001 From: lisy <linlangsur163@163.com> Date: 星期一, 03 七月 2023 10:10:38 +0800 Subject: [PATCH] 开始上课:学员评语接口 --- cloud-server-account/src/main/java/com/dsh/account/model/vo/commentDetail/StuCommentsVo.java | 26 ++++++ cloud-server-account/src/main/java/com/dsh/account/service/impl/EvaluateStudentServiceImpl.java | 56 ++++++++++++++ cloud-server-account/src/main/java/com/dsh/account/entity/EvaluateStudent.java | 66 ++++++++++++++++ cloud-server-account/src/main/java/com/dsh/account/controller/ClassDetailsController.java | 13 ++- cloud-server-account/src/main/java/com/dsh/account/service/EvaluateStudentService.java | 21 +++++ cloud-server-account/src/main/java/com/dsh/account/mapper/EvaluateStudentMapper.java | 16 ++++ cloud-server-account/src/main/resources/mapper/EvaluateStudentMapper.xml | 8 ++ 7 files changed, 201 insertions(+), 5 deletions(-) diff --git a/cloud-server-account/src/main/java/com/dsh/account/controller/ClassDetailsController.java b/cloud-server-account/src/main/java/com/dsh/account/controller/ClassDetailsController.java index 205d703..076c089 100644 --- a/cloud-server-account/src/main/java/com/dsh/account/controller/ClassDetailsController.java +++ b/cloud-server-account/src/main/java/com/dsh/account/controller/ClassDetailsController.java @@ -5,9 +5,11 @@ import com.dsh.account.entity.TStudent; import com.dsh.account.feignclient.competition.model.PurchaseRecordVo; import com.dsh.account.model.vo.classDetails.classInsVo.*; +import com.dsh.account.model.vo.commentDetail.StuCommentsVo; +import com.dsh.account.model.vo.sourceDetail.CouponStuAvailableVo; import com.dsh.account.model.vo.sourceDetail.CourseDetailsOfContinuationResp; import com.dsh.account.model.vo.sourceDetail.RecordTimeRequest; -import com.dsh.account.model.vo.sourceDetail.CouponStuAvailableVo; +import com.dsh.account.service.EvaluateStudentService; import com.dsh.account.service.TAppUserService; import com.dsh.account.service.TStudentService; import com.dsh.account.util.DateUtil; @@ -43,6 +45,9 @@ @Autowired private TAppUserService tappuService; + + @Autowired + private EvaluateStudentService evalstuService; @Autowired private TokenUtil tokenUtil; @@ -276,11 +281,9 @@ @ApiImplicitParams({ @ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....") }) - public ResultUtil<?> queryStuComment(@RequestParam("stuId") Integer stuId, HttpServletRequest request){ + public ResultUtil<List<StuCommentsVo>> queryStuComment(@RequestParam("stuId") Integer stuId){ try { - - - return ResultUtil.success(); + return ResultUtil.success(evalstuService.queryStuCommentsList(stuId)); }catch (Exception e){ return ResultUtil.runErr(); } diff --git a/cloud-server-account/src/main/java/com/dsh/account/entity/EvaluateStudent.java b/cloud-server-account/src/main/java/com/dsh/account/entity/EvaluateStudent.java new file mode 100644 index 0000000..78248aa --- /dev/null +++ b/cloud-server-account/src/main/java/com/dsh/account/entity/EvaluateStudent.java @@ -0,0 +1,66 @@ +package com.dsh.account.entity; + +import com.baomidou.mybatisplus.enums.IdType; +import java.util.Date; +import com.baomidou.mybatisplus.annotations.TableId; +import com.baomidou.mybatisplus.activerecord.Model; +import com.baomidou.mybatisplus.annotations.TableName; +import java.io.Serializable; + +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +/** + * <p> + * 评价学员记录 + * </p> + * + * @author jqs + * @since 2023-07-03 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@Accessors(chain = true) +@TableName("t_evaluate_student") +public class EvaluateStudent extends Model<EvaluateStudent> { + + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @TableId(value = "id", type = IdType.AUTO) + private Integer id; + /** + * 教练id + */ + private Integer coachId; + /** + * 学员id + */ + private Integer studentId; + /** + * 评语 + */ + private String content; + /** + * 图片 + */ + private String imgs; + /** + * 状态(1=正常,2=冻结,3=删除) + */ + private Integer state; + /** + * 添加时间 + */ + private Date insertTime; + + + @Override + protected Serializable pkVal() { + return this.id; + } + +} diff --git a/cloud-server-account/src/main/java/com/dsh/account/mapper/EvaluateStudentMapper.java b/cloud-server-account/src/main/java/com/dsh/account/mapper/EvaluateStudentMapper.java new file mode 100644 index 0000000..207e1f1 --- /dev/null +++ b/cloud-server-account/src/main/java/com/dsh/account/mapper/EvaluateStudentMapper.java @@ -0,0 +1,16 @@ +package com.dsh.account.mapper; + +import com.dsh.account.entity.EvaluateStudent; +import com.baomidou.mybatisplus.mapper.BaseMapper; + +/** + * <p> + * 评价学员记录 Mapper 接口 + * </p> + * + * @author jqs + * @since 2023-07-03 + */ +public interface EvaluateStudentMapper extends BaseMapper<EvaluateStudent> { + +} diff --git a/cloud-server-account/src/main/java/com/dsh/account/model/vo/commentDetail/StuCommentsVo.java b/cloud-server-account/src/main/java/com/dsh/account/model/vo/commentDetail/StuCommentsVo.java new file mode 100644 index 0000000..95322aa --- /dev/null +++ b/cloud-server-account/src/main/java/com/dsh/account/model/vo/commentDetail/StuCommentsVo.java @@ -0,0 +1,26 @@ +package com.dsh.account.model.vo.commentDetail; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +@Data +public class StuCommentsVo { + + @ApiModelProperty(value = "学员头像") + private String headImg; + + @ApiModelProperty(value = "学员姓名") + private String stuName; + + @ApiModelProperty(value = "评价时间") + private String comTime; + + @ApiModelProperty(value = "评价内容") + private String contents; + + @ApiModelProperty(value = "评价上传图片地址列表") + private List<String> imgs; + +} diff --git a/cloud-server-account/src/main/java/com/dsh/account/service/EvaluateStudentService.java b/cloud-server-account/src/main/java/com/dsh/account/service/EvaluateStudentService.java new file mode 100644 index 0000000..431a503 --- /dev/null +++ b/cloud-server-account/src/main/java/com/dsh/account/service/EvaluateStudentService.java @@ -0,0 +1,21 @@ +package com.dsh.account.service; + +import com.dsh.account.entity.EvaluateStudent; +import com.baomidou.mybatisplus.service.IService; +import com.dsh.account.model.vo.commentDetail.StuCommentsVo; + +import java.util.List; + +/** + * <p> + * 评价学员记录 服务类 + * </p> + * + * @author jqs + * @since 2023-07-03 + */ +public interface EvaluateStudentService extends IService<EvaluateStudent> { + + List<StuCommentsVo> queryStuCommentsList(Integer stuId); + +} diff --git a/cloud-server-account/src/main/java/com/dsh/account/service/impl/EvaluateStudentServiceImpl.java b/cloud-server-account/src/main/java/com/dsh/account/service/impl/EvaluateStudentServiceImpl.java new file mode 100644 index 0000000..5d1b1d0 --- /dev/null +++ b/cloud-server-account/src/main/java/com/dsh/account/service/impl/EvaluateStudentServiceImpl.java @@ -0,0 +1,56 @@ +package com.dsh.account.service.impl; + +import com.baomidou.mybatisplus.mapper.EntityWrapper; +import com.baomidou.mybatisplus.service.impl.ServiceImpl; +import com.dsh.account.entity.EvaluateStudent; +import com.dsh.account.entity.TStudent; +import com.dsh.account.mapper.EvaluateStudentMapper; +import com.dsh.account.mapper.TStudentMapper; +import com.dsh.account.model.vo.commentDetail.StuCommentsVo; +import com.dsh.account.service.EvaluateStudentService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + +/** + * <p> + * 评价学员记录 服务实现类 + * </p> + * + * @author jqs + * @since 2023-07-03 + */ +@Service +public class EvaluateStudentServiceImpl extends ServiceImpl<EvaluateStudentMapper, EvaluateStudent> implements EvaluateStudentService { + + @Autowired + private TStudentMapper tstuMapper; + + private final SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm"); + + @Override + public List<StuCommentsVo> queryStuCommentsList(Integer stuId) { + List<StuCommentsVo> stuCommentsVos = new ArrayList<>(); + TStudent tStudent = tstuMapper.selectById(stuId); + List<EvaluateStudent> evaluateStudents = this.baseMapper.selectList(new EntityWrapper<EvaluateStudent>() + .eq("studentId",stuId )); + if (evaluateStudents.size() > 0){ + for (EvaluateStudent evaluateStudent : evaluateStudents) { + StuCommentsVo vo = new StuCommentsVo(); + vo.setHeadImg(tStudent.getHeadImg()); + vo.setStuName(tStudent.getName()); + vo.setComTime(format.format(tStudent.getInsertTime())); + vo.setContents(evaluateStudent.getContent()); + String imgs = evaluateStudent.getImgs(); + String[] split = imgs.split(","); + vo.setImgs(Arrays.asList(split)); + stuCommentsVos.add(vo); + } + } + return stuCommentsVos; + } +} diff --git a/cloud-server-account/src/main/resources/mapper/EvaluateStudentMapper.xml b/cloud-server-account/src/main/resources/mapper/EvaluateStudentMapper.xml new file mode 100644 index 0000000..47ed8a8 --- /dev/null +++ b/cloud-server-account/src/main/resources/mapper/EvaluateStudentMapper.xml @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> +<mapper namespace="com.dsh.account.mapper.EvaluateStudentMapper"> + + <!-- 开启二级缓存 --> + <cache type="org.mybatis.caches.ehcache.LoggingEhcache"/> + +</mapper> -- Gitblit v1.7.1