Merge branch 'dev' of http://git.qmth.com.cn/themis/backend-service.git into dev

themis-business/src/main/java/com/qmth/themis/business/dao/TIeExamInvigilateCallMapper.java

@@ -0,0 +1,18 @@
+package com.qmth.themis.business.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.qmth.themis.business.entity.TIeExamInvigilateCall;
+import com.qmth.themis.business.entity.TIeExamInvigilateCallLog;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * @Description: 监考 监控通话申请 Mapper 接口
+ * @Param:
+ * @return:
+ * @Author: wangliang
+ * @Date: 2020/6/25
+ */
+@Mapper
+public interface TIeExamInvigilateCallMapper extends BaseMapper<TIeExamInvigilateCall> {
+
+}

themis-business/src/main/java/com/qmth/themis/business/entity/TIeExamInvigilateCall.java

@@ -0,0 +1,116 @@
+package com.qmth.themis.business.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.qmth.themis.business.base.BaseEntity;
+import com.qmth.themis.business.enums.MonitorStatusSourceEnum;
+import com.qmth.themis.business.enums.MonitorVideoSourceEnum;
+import com.qmth.themis.common.contanst.Constants;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * @Description: 监考 监控通话申请
+ * @Param:
+ * @return:
+ * @Author: wangliang
+ * @Date: 2020/8/7
+ */
+@ApiModel(value = "t_ie_exam_invigilate_call", description = "监控观看地址和通话申请")
+public class TIeExamInvigilateCall extends BaseEntity {
+
+    @ApiModelProperty(value = "考试记录ID")
+    @TableField(value = "exam_record_id")
+    private Long examRecordId;
+
+    @ApiModelProperty(value = "考试ID")
+    @TableField(value = "exam_id")
+    private Long examId;
+
+    @ApiModelProperty(value = "场次ID")
+    @TableField(value = "exam_activity_id")
+    private Long examActivityId;
+
+    @ApiModelProperty(value = "考生ID")
+    @TableField(value = "exam_student_id")
+    private Long examStudentId;
+
+    @ApiModelProperty(value = "监考视频源")
+    @TableField(value = "source")
+    private MonitorVideoSourceEnum source;
+
+    @ApiModelProperty(value = "观看地址")
+    @TableField(value = "live_url")
+    private String liveUrl;
+
+    @ApiModelProperty(value = "状态")
+    @TableField(value = "status")
+    private MonitorStatusSourceEnum status;
+
+    public TIeExamInvigilateCall() {
+
+    }
+
+    public TIeExamInvigilateCall(Long examRecordId, MonitorVideoSourceEnum source, String liveUrl, MonitorStatusSourceEnum status) {
+        setId(Constants.idGen.next());
+        this.examRecordId = examRecordId;
+        this.source = source;
+        this.liveUrl = liveUrl;
+        this.status = status;
+    }
+
+    public Long getExamRecordId() {
+        return examRecordId;
+    }
+
+    public void setExamRecordId(Long examRecordId) {
+        this.examRecordId = examRecordId;
+    }
+
+    public MonitorVideoSourceEnum getSource() {
+        return source;
+    }
+
+    public void setSource(MonitorVideoSourceEnum source) {
+        this.source = source;
+    }
+
+    public String getLiveUrl() {
+        return liveUrl;
+    }
+
+    public void setLiveUrl(String liveUrl) {
+        this.liveUrl = liveUrl;
+    }
+
+    public MonitorStatusSourceEnum getStatus() {
+        return status;
+    }
+
+    public void setStatus(MonitorStatusSourceEnum status) {
+        this.status = status;
+    }
+
+    public Long getExamId() {
+        return examId;
+    }
+
+    public void setExamId(Long examId) {
+        this.examId = examId;
+    }
+
+    public Long getExamActivityId() {
+        return examActivityId;
+    }
+
+    public void setExamActivityId(Long examActivityId) {
+        this.examActivityId = examActivityId;
+    }
+
+    public Long getExamStudentId() {
+        return examStudentId;
+    }
+
+    public void setExamStudentId(Long examStudentId) {
+        this.examStudentId = examStudentId;
+    }
+}

themis-business/src/main/java/com/qmth/themis/business/entity/TIeExamInvigilateCallLog.java

@@ -1,7 +1,6 @@
 package com.qmth.themis.business.entity;
 
 import com.baomidou.mybatisplus.annotation.TableField;
-import com.qmth.themis.business.base.BaseEntity;
 import com.qmth.themis.business.enums.MonitorStatusSourceEnum;
 import com.qmth.themis.business.enums.MonitorVideoSourceEnum;
 import com.qmth.themis.common.contanst.Constants;
@@ -16,35 +15,7 @@ import io.swagger.annotations.ApiModelProperty;
  * @Date: 2020/8/7
  */
 @ApiModel(value = "t_ie_exam_invigilate_call_log", description = "监控观看地址和通话申请日志")
-public class TIeExamInvigilateCallLog extends BaseEntity {
-
-    @ApiModelProperty(value = "考试记录ID")
-    @TableField(value = "exam_record_id")
-    private Long examRecordId;
-
-    @ApiModelProperty(value = "考试ID")
-    @TableField(value = "exam_id")
-    private Long examId;
-
-    @ApiModelProperty(value = "场次ID")
-    @TableField(value = "exam_activity_id")
-    private Long examActivityId;
-
-    @ApiModelProperty(value = "考生ID")
-    @TableField(value = "exam_student_id")
-    private Long examStudentId;
-
-    @ApiModelProperty(value = "监考视频源")
-    @TableField(value = "source")
-    private MonitorVideoSourceEnum source;
-
-    @ApiModelProperty(value = "观看地址")
-    @TableField(value = "live_url")
-    private String liveUrl;
-
-    @ApiModelProperty(value = "状态")
-    @TableField(value = "status")
-    private MonitorStatusSourceEnum status;
+public class TIeExamInvigilateCallLog extends TIeExamInvigilateCall {
 
     @ApiModelProperty(value = "备注")
     @TableField(value = "remark")
@@ -56,51 +27,19 @@ public class TIeExamInvigilateCallLog extends BaseEntity {
 
     public TIeExamInvigilateCallLog(Long examRecordId, MonitorVideoSourceEnum source, String liveUrl, MonitorStatusSourceEnum status) {
         setId(Constants.idGen.next());
-        this.examRecordId = examRecordId;
-        this.source = source;
-        this.liveUrl = liveUrl;
-        this.status = status;
+        setExamRecordId(examRecordId);
+        setSource(source);
+        setLiveUrl(liveUrl);
+        setStatus(status);
     }
 
     public TIeExamInvigilateCallLog(Long examRecordId, MonitorVideoSourceEnum source, String liveUrl, MonitorStatusSourceEnum status, String remark) {
         setId(Constants.idGen.next());
-        this.examRecordId = examRecordId;
-        this.source = source;
-        this.liveUrl = liveUrl;
+        setExamRecordId(examRecordId);
+        setSource(source);
+        setLiveUrl(liveUrl);
+        setStatus(status);
         this.remark = remark;
-        this.status = status;
-    }
-
-    public Long getExamRecordId() {
-        return examRecordId;
-    }
-
-    public void setExamRecordId(Long examRecordId) {
-        this.examRecordId = examRecordId;
-    }
-
-    public MonitorVideoSourceEnum getSource() {
-        return source;
-    }
-
-    public void setSource(MonitorVideoSourceEnum source) {
-        this.source = source;
-    }
-
-    public String getLiveUrl() {
-        return liveUrl;
-    }
-
-    public void setLiveUrl(String liveUrl) {
-        this.liveUrl = liveUrl;
-    }
-
-    public MonitorStatusSourceEnum getStatus() {
-        return status;
-    }
-
-    public void setStatus(MonitorStatusSourceEnum status) {
-        this.status = status;
     }
 
     public String getRemark() {
@@ -110,28 +49,4 @@ public class TIeExamInvigilateCallLog extends BaseEntity {
     public void setRemark(String remark) {
         this.remark = remark;
     }
-
-    public Long getExamId() {
-        return examId;
-    }
-
-    public void setExamId(Long examId) {
-        this.examId = examId;
-    }
-
-    public Long getExamActivityId() {
-        return examActivityId;
-    }
-
-    public void setExamActivityId(Long examActivityId) {
-        this.examActivityId = examActivityId;
-    }
-
-    public Long getExamStudentId() {
-        return examStudentId;
-    }
-
-    public void setExamStudentId(Long examStudentId) {
-        this.examStudentId = examStudentId;
-    }
 }

themis-business/src/main/java/com/qmth/themis/business/service/TIeExamInvigilateCallService.java

@@ -0,0 +1,16 @@
+package com.qmth.themis.business.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.qmth.themis.business.entity.TIeExamInvigilateCall;
+import com.qmth.themis.business.entity.TIeExamInvigilateCallLog;
+
+/**
+ * @Description: 监考监控通话申请 服务类
+ * @Param:
+ * @return:
+ * @Author: wangliang
+ * @Date: 2020/6/25
+ */
+public interface TIeExamInvigilateCallService extends IService<TIeExamInvigilateCall> {
+
+}

themis-business/src/main/java/com/qmth/themis/business/service/impl/TIeExamInvigilateCallServiceImpl.java

@@ -0,0 +1,19 @@
+package com.qmth.themis.business.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.qmth.themis.business.dao.TIeExamInvigilateCallMapper;
+import com.qmth.themis.business.entity.TIeExamInvigilateCall;
+import com.qmth.themis.business.service.TIeExamInvigilateCallService;
+import org.springframework.stereotype.Service;
+
+/**
+ * @Description: 监考监控通话申请 服务实现类
+ * @Param:
+ * @return:
+ * @Author: wangliang
+ * @Date: 2020/6/25
+ */
+@Service
+public class TIeExamInvigilateCallServiceImpl extends ServiceImpl<TIeExamInvigilateCallMapper, TIeExamInvigilateCall> implements TIeExamInvigilateCallService {
+
+}

themis-business/src/main/resources/mapper/TIeExamInvigilateCallMapper.xml

@@ -0,0 +1,5 @@
+<?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.qmth.themis.business.dao.TIeExamInvigilateCallMapper">
+
+</mapper>

themis-exam/src/main/java/com/qmth/themis/exam/api/TIeInvigilateCallLogMobileController.java → themis-exam/src/main/java/com/qmth/themis/exam/api/TIeInvigilateCallMobileController.java

@@ -40,8 +40,8 @@ import java.util.Objects;
 @Api(tags = "mobile监考监控通话信息Controller")
 @RestController
 @RequestMapping("/${prefix.url.mobile}/monitor")
-public class TIeInvigilateCallLogMobileController {
-    private final static Logger log = LoggerFactory.getLogger(TIeInvigilateCallLogOeController.class);
+public class TIeInvigilateCallMobileController {
+    private final static Logger log = LoggerFactory.getLogger(TIeInvigilateCallOeController.class);
 
     @Resource
     TIeExamInvigilateCallLogService tIeExamInvigilateCallLogService;

themis-exam/src/main/java/com/qmth/themis/exam/api/TIeInvigilateCallLogOeController.java → themis-exam/src/main/java/com/qmth/themis/exam/api/TIeInvigilateCallOeController.java

@@ -40,8 +40,8 @@ import java.util.Objects;
 @Api(tags = "oe监考监控通话信息Controller")
 @RestController
 @RequestMapping("/${prefix.url.exam}/monitor")
-public class TIeInvigilateCallLogOeController {
-    private final static Logger log = LoggerFactory.getLogger(TIeInvigilateCallLogOeController.class);
+public class TIeInvigilateCallOeController {
+    private final static Logger log = LoggerFactory.getLogger(TIeInvigilateCallOeController.class);
 
     @Resource
     TIeExamInvigilateCallLogService tIeExamInvigilateCallLogService;