update

examcloud-core-print-dao/src/main/java/cn/com/qmth/examcloud/core/print/enums/TemplateType.java

@@ -8,49 +8,46 @@
 package cn.com.qmth.examcloud.core.print.enums;
 
 /**
- * Excel模板类型
+ * 模板类型
  */
 public enum TemplateType {
 
-    EXAM_STUDENT_DATA("考生数据表", 1),
+    考生数据表(1),
 
-    EXAMINATION_ROOM_DATA("考场数据表", 2),
+    考场数据表(2),
 
-    PAPER_PACKAGE("卷袋贴模板", 3),
+    卷袋贴模板(3),
 
-    CHECKIN_TABLE("签到表模板", 4),
+    签到表模板(4),
 
-    NORMAL_ANSWER_CARD("常规题卡模板", 5),
+    常规题卡模板(5),
 
-    SPECIAL_ANSWER_CARD("特殊题卡模板", 6),
+    特殊题卡模板(6),
 
-    BACKUP_PAPER_PACKAGE("备份卷贴模板", 7),
+    备份卷贴模板(7),
 
-    PAPER_PACKAGE_STYLE("试卷袋样式", 8);
+    试卷袋样式(8);
 
-    private String name;
+    private int index;
 
-    private Integer num;
-
-    TemplateType(String name, Integer num) {
-        this.name = name;
-        this.num = num;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
+    public static String getNameByIndex(Integer index) {
+        if (index == null) {
+            return null;
+        }
+        for (TemplateType type : TemplateType.values()) {
+            if (type.getIndex() == index) {
+                return type.name();
+            }
+        }
+        return null;
     }
 
-    public Integer getNum() {
-        return num;
+    TemplateType(Integer index) {
+        this.index = index;
     }
 
-    public void setNum(Integer num) {
-        this.num = num;
+    public int getIndex() {
+        return index;
     }
 
 }

examcloud-core-print-provider/src/main/java/cn/com/qmth/examcloud/core/print/api/controller/PrintingTemplateController.java

@@ -8,8 +8,8 @@
 package cn.com.qmth.examcloud.core.print.api.controller;
 
 import cn.com.qmth.examcloud.commons.web.support.ControllerSupport;
-import cn.com.qmth.examcloud.core.print.entity.PrintingTemplate;
 import cn.com.qmth.examcloud.core.print.service.PrintingTemplateService;
+import cn.com.qmth.examcloud.core.print.service.bean.printingtemplate.PrintingTemplateInfo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -18,6 +18,8 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 /**
  * 印刷模板相关接口
  *
@@ -31,9 +33,15 @@ public class PrintingTemplateController extends ControllerSupport {
     @Autowired
     private PrintingTemplateService printingTemplateService;
 
+    @PostMapping("/{orgId}/{examId}")
+    @ApiOperation(value = "获取模板信息列表")
+    public List<PrintingTemplateInfo> list(@PathVariable Long orgId, @PathVariable Long examId) {
+        return printingTemplateService.getPrintingTemplateList(orgId, examId);
+    }
+
     @PostMapping("/{id}")
     @ApiOperation(value = "获取某个模板信息")
-    public PrintingTemplate get(@PathVariable Long id) {
+    public PrintingTemplateInfo get(@PathVariable Long id) {
         return printingTemplateService.getPrintingTemplateById(id);
     }
 

examcloud-core-print-service/src/main/java/cn/com/qmth/examcloud/core/print/service/PrintingTemplateService.java

@@ -7,7 +7,9 @@
 
 package cn.com.qmth.examcloud.core.print.service;
 
-import cn.com.qmth.examcloud.core.print.entity.PrintingTemplate;
+import cn.com.qmth.examcloud.core.print.service.bean.printingtemplate.PrintingTemplateInfo;
+
+import java.util.List;
 
 /**
  * @author: fengdesheng
@@ -15,9 +17,14 @@ import cn.com.qmth.examcloud.core.print.entity.PrintingTemplate;
  */
 public interface PrintingTemplateService {
 
+    /**
+     * 获取模板信息列表
+     */
+    List<PrintingTemplateInfo> getPrintingTemplateList(Long orgId, Long examId);
+
     /**
      * 获取某个模板信息
      */
-    PrintingTemplate getPrintingTemplateById(Long id);
+    PrintingTemplateInfo getPrintingTemplateById(Long id);
 
 }

examcloud-core-print-service/src/main/java/cn/com/qmth/examcloud/core/print/service/bean/printingtemplate/PrintingTemplateInfo.java

@@ -0,0 +1,95 @@
+/*
+ * *************************************************
+ * Copyright (c) 2018 QMTH. All Rights Reserved.
+ * Created by Deason on 2018-11-01 13:54:25.
+ * *************************************************
+ */
+
+package cn.com.qmth.examcloud.core.print.service.bean.printingtemplate;
+
+import cn.com.qmth.examcloud.commons.web.cloud.api.JsonSerializable;
+import cn.com.qmth.examcloud.core.print.enums.TemplateType;
+
+/**
+ * 印刷模板信息
+ */
+public class PrintingTemplateInfo implements JsonSerializable {
+    private static final long serialVersionUID = 1L;
+    private Long id;
+    /**
+     * 学校机构ID
+     */
+    private Long orgId;
+    /**
+     * 考试ID
+     */
+    private Long examId;
+    /**
+     * 模板类型
+     */
+    private Integer templateType;
+    /**
+     * 模板文件名
+     */
+    private String fileName;
+    /**
+     * 模板文件地址
+     */
+    private String fileUrl;
+
+    /**
+     * 模板类型名称
+     */
+    public String getTypeName() {
+        return TemplateType.getNameByIndex(templateType);
+    }
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public Long getOrgId() {
+        return orgId;
+    }
+
+    public void setOrgId(Long orgId) {
+        this.orgId = orgId;
+    }
+
+    public Long getExamId() {
+        return examId;
+    }
+
+    public void setExamId(Long examId) {
+        this.examId = examId;
+    }
+
+    public Integer getTemplateType() {
+        return templateType;
+    }
+
+    public void setTemplateType(Integer templateType) {
+        this.templateType = templateType;
+    }
+
+    public String getFileName() {
+        return fileName;
+    }
+
+    public void setFileName(String fileName) {
+        this.fileName = fileName;
+    }
+
+    public String getFileUrl() {
+        return fileUrl;
+    }
+
+    public void setFileUrl(String fileUrl) {
+        this.fileUrl = fileUrl;
+    }
+
+}

examcloud-core-print-service/src/main/java/cn/com/qmth/examcloud/core/print/service/impl/PrintingTemplateServiceImpl.java

@@ -7,12 +7,14 @@
 
 package cn.com.qmth.examcloud.core.print.service.impl;
 
-import cn.com.qmth.examcloud.core.print.entity.PrintingTemplate;
 import cn.com.qmth.examcloud.core.print.repository.PrintingTemplateRepository;
 import cn.com.qmth.examcloud.core.print.service.PrintingTemplateService;
+import cn.com.qmth.examcloud.core.print.service.bean.printingtemplate.PrintingTemplateInfo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * @author: fengdesheng
  * @since: 2018/10/17
@@ -23,8 +25,12 @@ public class PrintingTemplateServiceImpl implements PrintingTemplateService {
     private PrintingTemplateRepository printingTemplateRepository;
 
     @Override
-    public PrintingTemplate getPrintingTemplateById(Long id) {
-        //todo
+    public List<PrintingTemplateInfo> getPrintingTemplateList(Long orgId, Long examId) {
+        return null;
+    }
+
+    @Override
+    public PrintingTemplateInfo getPrintingTemplateById(Long id) {
         return null;
     }