Browse Source

答题卡卡格式列表

xiatian 1 year ago
parent
commit
fe28bbb332

+ 21 - 4
distributed-print/src/main/java/com/qmth/distributed/print/api/mark/ScanAnswerCardController.java

@@ -1,12 +1,21 @@
 package com.qmth.distributed.print.api.mark;
 
 
+import java.util.List;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
 import com.qmth.boot.api.constant.ApiConstant;
 import com.qmth.teachcloud.common.contant.SystemConstant;
-import io.swagger.annotations.Api;
-import org.springframework.web.bind.annotation.RequestMapping;
+import com.qmth.teachcloud.mark.bean.answercard.AnswerCardVo;
+import com.qmth.teachcloud.mark.service.ScanAnswerCardService;
 
-import org.springframework.web.bind.annotation.RestController;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 
 /**
  * <p>
@@ -20,5 +29,13 @@ import org.springframework.web.bind.annotation.RestController;
 @RestController
 @RequestMapping(ApiConstant.DEFAULT_URI_PREFIX + SystemConstant.PREFIX_URL_SCAN + "/answer/card")
 public class ScanAnswerCardController {
-
+	
+	@Autowired
+	private ScanAnswerCardService scanAnswerCardService;
+	
+	@ApiOperation(value = "答题卡卡格式列表")
+    @RequestMapping(value = "list", method = RequestMethod.POST)
+    public List<AnswerCardVo> cardList(@RequestParam Long examId,@RequestParam(required = false) String coursePaperId) {
+        return scanAnswerCardService.cardList(examId,coursePaperId);
+    }
 }

+ 131 - 0
teachcloud-mark/src/main/java/com/qmth/teachcloud/mark/bean/answercard/AnswerCardVo.java

@@ -0,0 +1,131 @@
+package com.qmth.teachcloud.mark.bean.answercard;
+
+import com.qmth.teachcloud.mark.enums.CardSource;
+
+
+public class AnswerCardVo {
+
+    private Integer number;
+
+    private String code;
+    
+    private String courseCode;
+    private String courseName;
+    private String coursePaperNumber;
+    private String coursePaperId;
+    private String remark;
+
+    private Integer paperCount;
+    
+    private CardSource source;
+    
+    private Boolean needAdapte;
+    
+    private String uri;
+
+    private String md5;
+    
+    private Integer dpi;
+    
+    private Long updateTime;
+    private String adapteUri;
+    private String adapteMd5;
+	public Integer getNumber() {
+		return number;
+	}
+	public void setNumber(Integer number) {
+		this.number = number;
+	}
+	public String getCode() {
+		return code;
+	}
+	public void setCode(String code) {
+		this.code = code;
+	}
+	public String getCourseCode() {
+		return courseCode;
+	}
+	public void setCourseCode(String courseCode) {
+		this.courseCode = courseCode;
+	}
+	public String getCourseName() {
+		return courseName;
+	}
+	public void setCourseName(String courseName) {
+		this.courseName = courseName;
+	}
+	public String getCoursePaperNumber() {
+		return coursePaperNumber;
+	}
+	public void setCoursePaperNumber(String coursePaperNumber) {
+		this.coursePaperNumber = coursePaperNumber;
+	}
+	public String getCoursePaperId() {
+		return coursePaperId;
+	}
+	public void setCoursePaperId(String coursePaperId) {
+		this.coursePaperId = coursePaperId;
+	}
+	public String getRemark() {
+		return remark;
+	}
+	public void setRemark(String remark) {
+		this.remark = remark;
+	}
+	public Integer getPaperCount() {
+		return paperCount;
+	}
+	public void setPaperCount(Integer paperCount) {
+		this.paperCount = paperCount;
+	}
+	public CardSource getSource() {
+		return source;
+	}
+	public void setSource(CardSource source) {
+		this.source = source;
+	}
+	public Boolean getNeedAdapte() {
+		return needAdapte;
+	}
+	public void setNeedAdapte(Boolean needAdapte) {
+		this.needAdapte = needAdapte;
+	}
+	public String getUri() {
+		return uri;
+	}
+	public void setUri(String uri) {
+		this.uri = uri;
+	}
+	public String getMd5() {
+		return md5;
+	}
+	public void setMd5(String md5) {
+		this.md5 = md5;
+	}
+	public Integer getDpi() {
+		return dpi;
+	}
+	public void setDpi(Integer dpi) {
+		this.dpi = dpi;
+	}
+	public Long getUpdateTime() {
+		return updateTime;
+	}
+	public void setUpdateTime(Long updateTime) {
+		this.updateTime = updateTime;
+	}
+	public String getAdapteUri() {
+		return adapteUri;
+	}
+	public void setAdapteUri(String adapteUri) {
+		this.adapteUri = adapteUri;
+	}
+	public String getAdapteMd5() {
+		return adapteMd5;
+	}
+	public void setAdapteMd5(String adapteMd5) {
+		this.adapteMd5 = adapteMd5;
+	}
+
+
+}

+ 28 - 0
teachcloud-mark/src/main/java/com/qmth/teachcloud/mark/enums/CardSource.java

@@ -0,0 +1,28 @@
+package com.qmth.teachcloud.mark.enums;
+
+public enum CardSource {
+
+    CLIENT("本地工具"),
+
+    WEB("在线工具");
+
+    private String name;
+
+    CardSource(String name) {
+        this.name = name;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public static CardSource getByName(String name) {
+        for (CardSource r : CardSource.values()) {
+            if (r.getName().equals(name)) {
+                return r;
+            }
+        }
+        return null;
+    }
+
+}

+ 8 - 1
teachcloud-mark/src/main/java/com/qmth/teachcloud/mark/mapper/ScanAnswerCardMapper.java

@@ -1,7 +1,12 @@
 package com.qmth.teachcloud.mark.mapper;
 
-import com.qmth.teachcloud.mark.entity.ScanAnswerCard;
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.qmth.teachcloud.mark.bean.answercard.AnswerCardVo;
+import com.qmth.teachcloud.mark.entity.ScanAnswerCard;
 
 /**
  * <p>
@@ -13,4 +18,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface ScanAnswerCardMapper extends BaseMapper<ScanAnswerCard> {
 
+	List<AnswerCardVo> cardList(@Param("examId")Long examId,@Param("coursePaperId") String coursePaperId);
+
 }

+ 6 - 0
teachcloud-mark/src/main/java/com/qmth/teachcloud/mark/service/ScanAnswerCardService.java

@@ -1,6 +1,10 @@
 package com.qmth.teachcloud.mark.service;
 
+import com.qmth.teachcloud.mark.bean.answercard.AnswerCardVo;
 import com.qmth.teachcloud.mark.entity.ScanAnswerCard;
+
+import java.util.List;
+
 import com.baomidou.mybatisplus.extension.service.IService;
 
 /**
@@ -15,4 +19,6 @@ public interface ScanAnswerCardService extends IService<ScanAnswerCard> {
 
 	ScanAnswerCard findByExamAndNumber(Long examId, Integer cardNumber);
 
+	List<AnswerCardVo> cardList(Long examId, String coursePaperId);
+
 }

+ 8 - 0
teachcloud-mark/src/main/java/com/qmth/teachcloud/mark/service/impl/ScanAnswerCardServiceImpl.java

@@ -1,11 +1,14 @@
 package com.qmth.teachcloud.mark.service.impl;
 
+import java.util.List;
+
 import org.springframework.stereotype.Service;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.qmth.boot.core.exception.ParameterException;
+import com.qmth.teachcloud.mark.bean.answercard.AnswerCardVo;
 import com.qmth.teachcloud.mark.entity.ScanAnswerCard;
 import com.qmth.teachcloud.mark.mapper.ScanAnswerCardMapper;
 import com.qmth.teachcloud.mark.service.ScanAnswerCardService;
@@ -37,4 +40,9 @@ public class ScanAnswerCardServiceImpl extends ServiceImpl<ScanAnswerCardMapper,
 		return baseMapper.selectOne(wrapper);
 	}
 
+	@Override
+	public List<AnswerCardVo> cardList(Long examId, String coursePaperId) {
+		return baseMapper.cardList(examId,coursePaperId);
+	}
+
 }

+ 10 - 1
teachcloud-mark/src/main/resources/mapper/ScanAnswerCardMapper.xml

@@ -22,5 +22,14 @@
         <result column="adapte_md5" property="adapteMd5" />
         <result column="adapte_uri" property="adapteUri" />
     </resultMap>
-
+    
+	<select id="cardList"
+            resultType="com.qmth.teachcloud.mark.bean.answercard.AnswerCardVo">
+        select t.*
+        where t.exam_id=#{examId}
+        <if test="coursePaperId != null and coursePaperId !=''">
+            and t.course_paper_id=#{coursePaperId}
+        </if>
+        order by t.id
+    </select>
 </mapper>