zcloud_gbs
/
zcloud_gbs_edu
14
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

教育资源修改

dev
zhaokai 2026-01-20 09:12:34 +08:00
parent da1f082c11
commit aba3763aa7
26 changed files with 121 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
web-app/src/main/java/com/zcloud/edu/command/resource/VideoCoursewareAddExe.java
View File

@ -1,5 +1,6 @@
package com.zcloud.edu.command.resource;
import com.zcloud.edu.domain.enums.CommonFlagEnum;
import com.zcloud.edu.domain.gateway.resource.VideoCoursewareGateway;
import com.zcloud.edu.domain.model.resource.VideoCoursewareE;
import com.zcloud.edu.dto.resource.VideoCoursewareAddCmd;
@ -27,8 +28,10 @@ public class VideoCoursewareAddExe {
VideoCoursewareE videoCoursewareE = new VideoCoursewareE();
BeanUtils.copyProperties(cmd, videoCoursewareE);
boolean res = false;
try {
videoCoursewareE.setState(CommonFlagEnum.NO.getCode());
res = videoCoursewareGateway.add(videoCoursewareE);
} catch (Exception e) {
throw new RuntimeException(e);

2
web-client/src/main/java/com/zcloud/edu/dto/clientobject/resource/ExamPaperCO.java
View File

@ -37,7 +37,7 @@ public class ExamPaperCO {
private Integer sellFlag;
//考试时长（分钟）
@ApiModelProperty(value = "考试时长（分钟）")
private String examTime;
private Integer examTime;
//试卷类型 1-自建试卷 2-班级中自动生成试卷
@ApiModelProperty(value = "试卷类型 1-自建试卷 2-班级中自动生成试卷")
private Integer type;

3
web-client/src/main/java/com/zcloud/edu/dto/clientobject/resource/QuestionCO.java
View File

@ -33,8 +33,7 @@ public class QuestionCO extends ClientObject {
// private Integer questionNumber;
//试题类型（单选题、多选题、判断题、填空题）
@ApiModelProperty(value = "试题类型（1单选题、2多选题、3判断题）")
private String questionType;
private Integer questionType;
//题干
@ApiModelProperty(value = "题干")

16
web-client/src/main/java/com/zcloud/edu/dto/clientobject/resource/TeacherCO.java
View File

@ -1,11 +1,13 @@
package com.zcloud.edu.dto.clientobject.resource;
import com.alibaba.cola.dto.ClientObject;
import com.baomidou.mybatisplus.annotation.TableField;
import io.swagger.annotations.ApiModelProperty;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import java.time.LocalDateTime;
import java.util.Date;
import java.util.List;
/**
@ -42,12 +44,13 @@ public class TeacherCO extends ClientObject {
private String assessmentDepartment;
//考核时间
@ApiModelProperty(value = "考核时间")
private LocalDateTime assessmentTime;
@JsonFormat(pattern = "yyyy-MM-dd")
private Date assessmentTime;
//考核结果
@ApiModelProperty(value = "考核结果")
private String assessmentResult;
//状态（0-禁用 1-启用）(老项目0启用,1禁用)
@ApiModelProperty(value = "状态（0-禁用 1-启用）(老项目0启用,1禁用)")
//状态（0启用,1禁用)
@ApiModelProperty(value = "状态（0启用,1禁用)")
private Integer state;
@ApiModelProperty(value = "创建时间")
@ -60,6 +63,13 @@ public class TeacherCO extends ClientObject {
@ApiModelProperty(value = "单位名称")
private String corpinfoName;
@ApiModelProperty(value = "身份证")
private String userIdCard;
@ApiModelProperty(value = "文化程度字典")
private String culturalLevel;
@ApiModelProperty(value = "文化程度子字典名称")
private String culturalLevelName;
@ApiModelProperty(value = "教师资格证书列表")
private List<TeacherCertificateCO> teacherCertificateList;
}

6
web-client/src/main/java/com/zcloud/edu/dto/clientobject/resource/TeacherCertificateCO.java
View File

@ -6,6 +6,7 @@ import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import java.time.LocalDate;
import java.util.Date;
/**
* web-client
@ -43,14 +44,13 @@ public class TeacherCertificateCO extends ClientObject {
private Integer effectiveFlag;
//证书有效期（开始）
@ApiModelProperty(value = "证书有效期（开始）")
@JsonFormat(pattern = "yyyy-MM-dd")
private LocalDate certificateDateStart;
private Date certificateDateStart;
//证书有效期（结束）
@ApiModelProperty(value = "证书有效期（结束）")
@JsonFormat(pattern = "yyyy-MM-dd")
private LocalDate certificateDateEnd;
private Date certificateDateEnd;
//企业ID
@ApiModelProperty(value = "企业ID")

13
web-client/src/main/java/com/zcloud/edu/dto/clientobject/resource/VideoCoursewareCO.java
View File

@ -1,10 +1,15 @@
package com.zcloud.edu.dto.clientobject.resource;
import com.alibaba.cola.dto.ClientObject;
import com.alibaba.fastjson.annotation.JSONField;
import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.TableField;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.math.BigDecimal;
import java.time.LocalDateTime;
/**
@ -36,6 +41,8 @@ public class VideoCoursewareCO extends ClientObject {
//课件文件路径
@ApiModelProperty(value = "课件文件路径")
private String videoFiles;
@ApiModelProperty(value = "课件文件名称", name = "videoName")
private String videoName;
//课件描述
@ApiModelProperty(value = "课件描述")
private String coursewareIntroduce;
@ -64,5 +71,11 @@ public class VideoCoursewareCO extends ClientObject {
private Integer corpType;
@ApiModelProperty(value = "是否是当前用户创建的数据")
private Boolean isUserCreate = false;
@ApiModelProperty(value = "上传时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime createTime;
@ApiModelProperty(value = "习题数")
private Integer questionCount;
}

6
web-client/src/main/java/com/zcloud/edu/dto/resource/ExamPaperPageQry.java
View File

@ -4,6 +4,8 @@ import com.alibaba.cola.dto.PageQuery;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.math.BigDecimal;
/**
* web-client
@ -27,9 +29,9 @@ public class ExamPaperPageQry extends PageQuery {
@ApiModelProperty(value = "试卷名称")
private String examPaperName;
@ApiModelProperty(value = "试卷总分数")
private String examScore;
private BigDecimal examScore;
@ApiModelProperty(value = "及格分数")
private String passScore;
private BigDecimal passScore;
@ApiModelProperty(value = "是否上架（0否 1是）")
private Integer sellFlag;
//上传开始时间

2
web-client/src/main/java/com/zcloud/edu/dto/resource/QuestionAddCmd.java
View File

@ -30,7 +30,7 @@ public class QuestionAddCmd extends Command {
@ApiModelProperty(value = "试题类型（1单选题、2多选题、3判断题）", name = "questionType", required = true)
@NotEmpty(message = "试题类型（单选题、多选题、判断题）不能为空")
private String questionType;
private Integer questionType;
@ApiModelProperty(value = "题干", name = "questionDry", required = true)
@NotEmpty(message = "题干不能为空")

2
web-client/src/main/java/com/zcloud/edu/dto/resource/QuestionUpdateCmd.java
View File

@ -36,7 +36,7 @@ public class QuestionUpdateCmd extends Command {
@ApiModelProperty(value = "试题类型（1单选题、2多选题、3判断题）", name = "questionType", required = true)
@NotEmpty(message = "试题类型（单选题、多选题、判断题）不能为空")
private String questionType;
private Integer questionType;
@ApiModelProperty(value = "题干", name = "questionDry", required = true)
@NotEmpty(message = "题干不能为空")

6
web-client/src/main/java/com/zcloud/edu/dto/resource/TeacherCertificateAddCmd.java
View File

@ -22,6 +22,9 @@ import java.util.Date;
@NoArgsConstructor
@AllArgsConstructor
public class TeacherCertificateAddCmd extends Command {
@ApiModelProperty(value = "业务主键id", name = "teacherCertificateId", required = true)
private String teacherCertificateId;
@ApiModelProperty(value = "教师ID", name = "teacherId", required = true)
@NotEmpty(message = "教师ID不能为空")
private String teacherId;
@ -51,9 +54,6 @@ public class TeacherCertificateAddCmd extends Command {
@JsonFormat(pattern = "yyyy-MM-dd")
private Date certificateDateEnd;
@ApiModelProperty(value = "证书照片", name = "certificateFilepath", required = true)
@NotEmpty(message = "证书照片不能为空")
private String certificateFilepath;
@ApiModelProperty(value = "企业ID", name = "corpinfoId")
private Long corpinfoId;

7
web-client/src/main/java/com/zcloud/edu/dto/resource/TeacherCertificateUpdateCmd.java
View File

@ -50,11 +50,6 @@ public class TeacherCertificateUpdateCmd extends Command {
@ApiModelProperty(value = "证书有效期（结束）", name = "certificateDateEnd")
@JsonFormat(pattern = "yyyy-MM-dd")
private Date certificateDateEnd;
@ApiModelProperty(value = "证书照片", name = "certificateFilepath", required = true)
@NotEmpty(message = "证书照片不能为空")
private String certificateFilepath;
@ApiModelProperty(value = "企业ID", name = "corpinfoId", required = true)
@NotNull(message = "企业ID不能为空")
private Long corpinfoId;
}

19
web-client/src/main/java/com/zcloud/edu/dto/resource/TeacherUpdateCmd.java
View File

@ -10,6 +10,8 @@ import lombok.NoArgsConstructor;
import javax.validation.constraints.*;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.util.Date;
/**
@ -32,23 +34,6 @@ public class TeacherUpdateCmd extends Command {
private String teacherId;
@ApiModelProperty(value = "教师姓名", name = "teacherName", required = true)
@NotEmpty(message = "教师姓名不能为空")
private String teacherName;
@ApiModelProperty(value = "身份证号", name = "identityNumber", required = true)
@NotEmpty(message = "身份证号不能为空")
private String identityNumber;
@ApiModelProperty(value = "文化程度", name = "educationLevel", required = true)
@NotEmpty(message = "文化程度不能为空")
private String educationLevel;
@ApiModelProperty(value = "文化程度名称", name = "educationLevelName", required = true)
@NotEmpty(message = "文化程度名称不能为空")
private String educationLevelName;
@ApiModelProperty(value = "专业", name = "profession", required = true)
@NotEmpty(message = "专业不能为空")
private String profession;

7
web-client/src/main/java/com/zcloud/edu/dto/resource/VideoCoursewareAddCmd.java
View File

@ -41,13 +41,14 @@ public class VideoCoursewareAddCmd extends Command {
@NotEmpty(message = "课件文件路径不能为空")
private String videoFiles;
@ApiModelProperty(value = "课件文件名称", name = "videoName", required = true)
@NotEmpty(message = "课件文件名称不能为空")
private String videoName;
@ApiModelProperty(value = "课件描述", name = "coursewareIntroduce", required = true)
@NotEmpty(message = "课件描述不能为空")
private String coursewareIntroduce;
@ApiModelProperty(value = "课件状态 0未启用, 1-启用", name = "state", required = true)
private Integer state;
@ApiModelProperty(value = "课件时长(视频时间)-秒", name = "videoTime", required = true)
@NotNull(message = "课件时长(视频时间)-秒不能为空")
private BigDecimal videoTime;

3
web-client/src/main/java/com/zcloud/edu/dto/resource/VideoCoursewareUpdateCmd.java
View File

@ -41,6 +41,9 @@ public class VideoCoursewareUpdateCmd extends Command {
@ApiModelProperty(value = "课件文件路径", name = "videoFiles", required = true)
@NotEmpty(message = "课件文件路径不能为空")
private String videoFiles;
@ApiModelProperty(value = "课件文件名称", name = "videoName", required = true)
@NotEmpty(message = "课件文件名称不能为空")
private String videoName;
@ApiModelProperty(value = "课件描述", name = "coursewareIntroduce", required = true)
@NotEmpty(message = "课件描述不能为空")
private String coursewareIntroduce;

10
web-domain/src/main/java/com/zcloud/edu/domain/enums/QuestionTypeEnum.java
View File

@ -8,14 +8,14 @@ import lombok.Getter;
@Getter
public enum QuestionTypeEnum {
CHOICE("1","单选题"),
MULTIPLE("2","多选题"),
JUDGE("3","判断题"),
CHOICE(1,"单选题"),
MULTIPLE(2,"多选题"),
JUDGE(3,"判断题"),
;
private final String code;
private final Integer code;
private final String name;
QuestionTypeEnum(String code, String name) {
QuestionTypeEnum(Integer code, String name) {
this.code = code;
this.name = name;
}

19
web-domain/src/main/java/com/zcloud/edu/domain/enums/TeacherStateEnum.java Normal file
View File

@ -0,0 +1,19 @@
package com.zcloud.edu.domain.enums;
import lombok.Getter;
//状态（0启用,1禁用)
@Getter
public enum TeacherStateEnum {
//0启用,1禁用)
UNABLE(1,"禁用"),
ENABLE(0,"启用"),
;
private final Integer code;
private final String name;
TeacherStateEnum(Integer code, String name) {
this.code = code;
this.name = name;
}
}

2
web-domain/src/main/java/com/zcloud/edu/domain/model/resource/ExamPaperE.java
View File

@ -28,7 +28,7 @@ public class ExamPaperE extends BaseE {
//是否上架（0否 1是）
private Integer sellFlag;
//考试时长（分钟）
private String examTime;
private Integer examTime;
//试卷类型 1-自建试卷 2-班级中自动生成试卷
private Integer type;
//删除标识true false

9
web-domain/src/main/java/com/zcloud/edu/domain/model/resource/QuestionE.java
View File

@ -39,7 +39,7 @@ public class QuestionE extends BaseE {
// //题号
// private Integer questionNumber;
//试题类型（单选题、多选题、判断题、填空题）
private String questionType;
private Integer questionType;
//题干
private String questionDry;
//选项A
@ -77,17 +77,18 @@ public class QuestionE extends BaseE {
throw new RuntimeException("请选择正确的课件类型");
}
if (questionE.getQuestionType().equals("1")) {
if (QuestionTypeEnum.CHOICE.getCode().equals(questionE.getQuestionType())) {
// 单选题
if (questionE.getOptionA() == null || questionE.getOptionB() == null || questionE.getOptionC() == null || questionE.getOptionD() == null) {
throw new RuntimeException("单选题选项不能为空");
}
} else if (questionE.getQuestionType().equals("2")) {
} else if (QuestionTypeEnum.MULTIPLE.getCode().equals(questionE.getQuestionType())) {
// 多选题
if (questionE.getOptionA() == null || questionE.getOptionB() == null || questionE.getOptionC() == null || questionE.getOptionD() == null) {
throw new RuntimeException("多选题选项不能为空");
}
} else if (questionE.getQuestionType().equals("3")) {
} else if (QuestionTypeEnum.JUDGE.getCode().equals(questionE.getQuestionType())) {
// 判断题
if (questionE.getOptionA() == null || questionE.getOptionB() == null) {
throw new RuntimeException("判断题选项不能为空");

8
web-domain/src/main/java/com/zcloud/edu/domain/model/resource/TeacherE.java
View File

@ -4,11 +4,13 @@ import cn.hutool.core.collection.CollUtil;
import com.alibaba.cola.exception.BizException;
import com.jjb.saas.framework.domain.model.BaseE;
import com.zcloud.edu.domain.enums.CommonFlagEnum;
import com.zcloud.edu.domain.enums.TeacherStateEnum;
import com.zcloud.gbscommon.utils.UuidUtil;
import lombok.Data;
import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
/**
@ -36,10 +38,10 @@ public class TeacherE extends BaseE {
//考核部门
private String assessmentDepartment;
//考核时间
private LocalDateTime assessmentTime;
private Date assessmentTime;
//考核结果
private String assessmentResult;
//状态（0-禁用 1-启用）(老项目0启用,1禁用)
//状态（0启用,1禁用)
private Integer state;
/**
@ -59,7 +61,7 @@ public class TeacherE extends BaseE {
teacher.setCorpinfoId(userAddE.getCorpinfoId());
// 默认启用
teacher.setState(CommonFlagEnum.YES.getCode());
teacher.setState(TeacherStateEnum.ENABLE.getCode());
teacherList.add(teacher);
}

4
web-domain/src/main/java/com/zcloud/edu/domain/model/resource/VideoCoursewareE.java
View File

@ -1,8 +1,10 @@
package com.zcloud.edu.domain.model.resource;
import com.jjb.saas.framework.domain.model.BaseE;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.NotEmpty;
import java.math.BigDecimal;
/**
@ -27,6 +29,8 @@ public class VideoCoursewareE extends BaseE {
private String teacherId;
//课件文件路径
private String videoFiles;
private String videoName;
//课件描述
private String coursewareIntroduce;
//课件状态 0未启用, 1-启用

2
web-infrastructure/src/main/java/com/zcloud/edu/persistence/dataobject/ExamPaperDO.java
View File

@ -41,7 +41,7 @@ public class ExamPaperDO extends BaseDO {
private Integer sellFlag;
//考试时长（分钟）
@ApiModelProperty(value = "考试时长（分钟）")
private String examTime;
private Integer examTime;
//试卷类型 1-自建试卷 2-班级中自动生成试卷
@ApiModelProperty(value = "试卷类型 1-自建试卷 2-班级中自动生成试卷")

2
web-infrastructure/src/main/java/com/zcloud/edu/persistence/dataobject/QuestionDO.java
View File

@ -34,7 +34,7 @@ public class QuestionDO extends BaseDO {
private Integer questionNumber;*/
//试题类型（单选题、多选题、判断题、填空题）
@ApiModelProperty(value = "试题类型（1单选题、2多选题、3判断题）")
private String questionType;
private Integer questionType;
//题干
@ApiModelProperty(value = "题干")
private String questionDry;

13
web-infrastructure/src/main/java/com/zcloud/edu/persistence/dataobject/TeacherDO.java
View File

@ -54,14 +54,23 @@ public class TeacherDO extends BaseDO {
//考核结果
@ApiModelProperty(value = "考核结果")
private String assessmentResult;
//状态（0-禁用 1-启用）(老项目0启用,1禁用)
@ApiModelProperty(value = "状态（0-禁用 1-启用）(老项目0启用,1禁用)")
//状态（0启用,1禁用)
@ApiModelProperty(value = "状态（0启用,1禁用)")
private Integer state;
@ApiModelProperty(value = "证书数量")
@TableField(exist = false)
private Integer certificateCount;
@ApiModelProperty(value = "身份证")
@TableField(exist = false)
private String userIdCard;
@ApiModelProperty(value = "文化程度字典")
@TableField(exist = false)
private String culturalLevel;
@ApiModelProperty(value = "文化程度子字典名称")
@TableField(exist = false)
private String culturalLevelName;
public TeacherDO(String teacherId) {
this.teacherId = teacherId;

6
web-infrastructure/src/main/java/com/zcloud/edu/persistence/dataobject/VideoCoursewareDO.java
View File

@ -8,6 +8,7 @@ import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
import javax.validation.constraints.NotEmpty;
import java.math.BigDecimal;
/**
@ -39,6 +40,8 @@ public class VideoCoursewareDO extends BaseDO {
//课件文件路径
@ApiModelProperty(value = "课件文件路径")
private String videoFiles;
@ApiModelProperty(value = "课件文件名称", name = "videoName")
private String videoName;
//课件描述
@ApiModelProperty(value = "课件描述")
private String coursewareIntroduce;
@ -62,6 +65,9 @@ public class VideoCoursewareDO extends BaseDO {
@ApiModelProperty(value = "企业类型")
@TableField(exist = false)
private Integer corpType;
@ApiModelProperty(value = "习题数")
@TableField(exist = false)
private Integer questionCount;
public VideoCoursewareDO(String videoCoursewareId) {
this.videoCoursewareId = videoCoursewareId;

5
web-infrastructure/src/main/resources/mapper/TeacherMapper.xml
View File

@ -50,7 +50,10 @@
<select id="getInfoById" resultType="com.zcloud.edu.persistence.dataobject.TeacherDO">
SELECT a.*,
c.corp_name AS corpinfoName,
u.name as teacherName
u.name as teacherName,
u.user_id_card as userIdCard,
u.cultural_level as culturalLevel,
u.cultural_level_name as culturalLevelName
FROM teacher a
LEFT JOIN corp_info c ON a.corpinfo_id = c.id
left join user u on a.user_id = u.id

11
web-infrastructure/src/main/resources/mapper/VideoCoursewareMapper.xml
View File

@ -24,14 +24,15 @@
a.*,
b.name as trainingTypeName,
u.name as teacherName,
d.corp_name as corpName,
c.corp_name as corpName,
count(q.id) as questionCount,
d.type as corpType
c.type as corpType
from video_courseware a
left join training_type b on a.training_type_id = b.training_type_id and b.delete_enum = 'FALSE'
left join teacher c on a.teacher_id = c.teacher_id and c.delete_enum = 'FALSE'
left join corp_info d on a.corpinfo_id = d.id
left join user u on u.id = c.user_id
left join teacher t on a.teacher_id = t.teacher_id and t.delete_enum = 'FALSE'
left join corp_info c on a.corpinfo_id = c.id
left join user u on u.id = t.user_id
left join department de on de.id = u.department_id
left join question q on a.video_courseware_id = q.video_courseware_id and q.delete_enum = 'FALSE' and q.courseware_type=1
where a.delete_enum = 'FALSE'
<if test="params.inCorpinfoId != null">