导出结构新增，删除逻辑

cqb-paper/src/main/java/com/qmth/cqb/paper/model/ExamFile.java

@@ -1,203 +1,210 @@
-package com.qmth.cqb.paper.model;
-
-import java.io.Serializable;
-import java.util.Date;
-import java.util.List;
-
-import org.springframework.data.annotation.Id;
-
-import cn.com.qmth.examcloud.common.dto.em.enums.ExamType;
-
-import com.qmth.cqb.paper.dto.ExportPaperInfoModel;
-import com.qmth.cqb.utils.enums.ExamFileType;
-
-/**
- * @author  	chenken
- * @date    	2017年7月13日 下午4:22:24
- * @company 	QMTH
- * @description 考试文件
- */
-public class ExamFile implements Serializable{
-	/**
-	 * 
-	 */
-	private static final long serialVersionUID = 7565454762976257111L;
-
-	@Id
-	private String id;
-	
-	/**
-	 * 机构ID
-	 */
-	private String orgId;
-	/**
-	 * 机构名称
-	 */
-	private String orgName;
-	/**
-	 * 考试ID
-	 */
-	private String examId;
-	/**
-	 * 考试名称
-	 */
-	private String examName;
-	/**
-	 * 考试类型
-	 */
-	private ExamType examType;
-	/**
-	 * 课程ID
-	 */
-	private String courseId;
-	/**
-	 * 课程名称
-	 */
-	private String courseName;
-	/**
-	 * 文件名称
-	 */
-	private String fileName;
-	/**
-	 * 文件类型
-	 * 		试卷
-	 * 		答案
-	 * 		试卷结构
-	 * 		音频文件
-	 * 		加密数据包
-	 */
-	private ExamFileType examFileType;
-	/**
-	 * 文件存储路径
-	 */
-	private String filePath;
-	/**
-	 * 创建人
-	 */
-	private String createUser;
-	/**
-	 * 创建时间
-	 */
-    private Date createTime;
-    
-    public ExamFile(){}
-    
-    public ExamFile(ExtractConfig extractConfig,String fileName,String filePath,ExamFileType examFileType){
-    	this.orgId = extractConfig.getOrgId();
-    	this.orgName = extractConfig.getOrgName();
-    	this.examId = extractConfig.getExamId()+"";
-    	this.examName = extractConfig.getExamName();
-    	this.examType = ExamType.strToEnum(extractConfig.getExamType());
-    	this.courseId = extractConfig.getCourseCode();
-    	this.courseName = extractConfig.getCourseName();
-    	this.fileName = fileName;
-    	this.filePath = filePath;
-    	this.examFileType = examFileType;
-    }
-    
-	public String getId() {
-		return id;
-	}
-
-	public void setId(String id) {
-		this.id = id;
-	}
-
-	public String getOrgName() {
-		return orgName;
-	}
-
-	public void setOrgName(String orgName) {
-		this.orgName = orgName;
-	}
-
-	public String getExamId() {
-		return examId;
-	}
-
-	public void setExamId(String examId) {
-		this.examId = examId;
-	}
-
-	public String getExamName() {
-		return examName;
-	}
-
-	public void setExamName(String examName) {
-		this.examName = examName;
-	}
-
-	public ExamType getExamType() {
-		return examType;
-	}
-
-	public void setExamType(ExamType examType) {
-		this.examType = examType;
-	}
-
-	public String getCourseId() {
-		return courseId;
-	}
-
-	public void setCourseId(String courseId) {
-		this.courseId = courseId;
-	}
-
-	public String getCourseName() {
-		return courseName;
-	}
-
-	public void setCourseName(String courseName) {
-		this.courseName = courseName;
-	}
-
-	public ExamFileType getExamFileType() {
-		return examFileType;
-	}
-
-	public void setExamFileType(ExamFileType examFileType) {
-		this.examFileType = examFileType;
-	}
-
-	public String getFilePath() {
-		return filePath;
-	}
-
-	public void setFilePath(String filePath) {
-		this.filePath = filePath;
-	}
-
-	public String getCreateUser() {
-		return createUser;
-	}
-
-	public void setCreateUser(String createUser) {
-		this.createUser = createUser;
-	}
-
-	public Date getCreateTime() {
-		return createTime;
-	}
-
-	public void setCreateTime(Date createTime) {
-		this.createTime = createTime;
-	}
-
-	public String getFileName() {
-		return fileName;
-	}
-
-	public void setFileName(String fileName) {
-		this.fileName = fileName;
-	}
-
-	public String getOrgId() {
-		return orgId;
-	}
-
-	public void setOrgId(String orgId) {
-		this.orgId = orgId;
-	}
-    
-}
-
+package com.qmth.cqb.paper.model;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+import org.springframework.data.annotation.Id;
+
+import cn.com.qmth.examcloud.common.dto.em.enums.ExamType;
+
+import com.qmth.cqb.paper.dto.ExportPaperInfoModel;
+import com.qmth.cqb.utils.enums.ExamFileType;
+
+/**
+ * @author  	chenken
+ * @date    	2017年7月13日 下午4:22:24
+ * @company 	QMTH
+ * @description 考试文件
+ */
+public class ExamFile implements Serializable{
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 7565454762976257111L;
+
+	@Id
+	private String id;
+	
+	/**
+	 * 机构ID
+	 */
+	private String orgId;
+	/**
+	 * 机构名称
+	 */
+	private String orgName;
+	/**
+	 * 考试ID
+	 */
+	private String examId;
+	/**
+	 * 考试名称
+	 */
+	private String examName;
+	/**
+	 * 考试类型
+	 */
+	private ExamType examType;
+	/**
+	 * 课程ID
+	 */
+	private String courseId;
+	/**
+	 * 课程名称
+	 */
+	private String courseName;
+	/**
+	 * 文件名称
+	 */
+	private String fileName;
+	/**
+	 * 文件类型
+	 * 		试卷
+	 * 		答案
+	 * 		试卷结构
+	 * 		音频文件
+	 * 		加密数据包
+	 */
+	private ExamFileType examFileType;
+	/**
+	 * 文件存储路径
+	 */
+	private String filePath;
+	/**
+	 * 创建人
+	 */
+	private String createUser;
+	/**
+	 * 创建时间
+	 */
+    private Date createTime;
+    
+    public ExamFile(){
+    	
+    }
+    
+    public ExamFile(ExtractConfig extractConfig,String fileName,String filePath,ExamFileType examFileType){
+    	this.orgId = extractConfig.getOrgId();
+    	this.orgName = extractConfig.getOrgName();
+    	this.examId = extractConfig.getExamId()+"";
+    	this.examName = extractConfig.getExamName();
+    	this.examType = ExamType.strToEnum(extractConfig.getExamType());
+    	this.courseId = extractConfig.getCourseCode();
+    	this.courseName = extractConfig.getCourseName();
+    	this.fileName = fileName;
+    	this.filePath = filePath;
+    	this.examFileType = examFileType;
+    }
+    
+    public ExamFile(String examId,ExamType examType){
+    	this.examId = examId;
+    	this.examType = examType;
+    }
+    
+	public String getId() {
+		return id;
+	}
+
+	public void setId(String id) {
+		this.id = id;
+	}
+
+	public String getOrgName() {
+		return orgName;
+	}
+
+	public void setOrgName(String orgName) {
+		this.orgName = orgName;
+	}
+
+	public String getExamId() {
+		return examId;
+	}
+
+	public void setExamId(String examId) {
+		this.examId = examId;
+	}
+
+	public String getExamName() {
+		return examName;
+	}
+
+	public void setExamName(String examName) {
+		this.examName = examName;
+	}
+
+	public ExamType getExamType() {
+		return examType;
+	}
+
+	public void setExamType(ExamType examType) {
+		this.examType = examType;
+	}
+
+	public String getCourseId() {
+		return courseId;
+	}
+
+	public void setCourseId(String courseId) {
+		this.courseId = courseId;
+	}
+
+	public String getCourseName() {
+		return courseName;
+	}
+
+	public void setCourseName(String courseName) {
+		this.courseName = courseName;
+	}
+
+	public ExamFileType getExamFileType() {
+		return examFileType;
+	}
+
+	public void setExamFileType(ExamFileType examFileType) {
+		this.examFileType = examFileType;
+	}
+
+	public String getFilePath() {
+		return filePath;
+	}
+
+	public void setFilePath(String filePath) {
+		this.filePath = filePath;
+	}
+
+	public String getCreateUser() {
+		return createUser;
+	}
+
+	public void setCreateUser(String createUser) {
+		this.createUser = createUser;
+	}
+
+	public Date getCreateTime() {
+		return createTime;
+	}
+
+	public void setCreateTime(Date createTime) {
+		this.createTime = createTime;
+	}
+
+	public String getFileName() {
+		return fileName;
+	}
+
+	public void setFileName(String fileName) {
+		this.fileName = fileName;
+	}
+
+	public String getOrgId() {
+		return orgId;
+	}
+
+	public void setOrgId(String orgId) {
+		this.orgId = orgId;
+	}
+    
+}
+

cqb-paper/src/main/java/com/qmth/cqb/paper/model/ExtractConfig.java

@@ -1,250 +1,255 @@
-package com.qmth.cqb.paper.model;
-
-import java.io.Serializable;
-import java.util.List;
-import java.util.Map;
-
-import org.springframework.data.annotation.Id;
-
-import com.qmth.cqb.utils.enums.ExtractPolicy;
-
-/**
- * 调卷规则
- * @author chenken
- *
- */
-public class ExtractConfig implements Serializable {
-
-    private static final long serialVersionUID = -5234564748332601375L;
-    /**
-     * 调卷规则ID
-     */
-    @Id
-    private String id;
-    /**
-     * 考试ID
-     */
-    private Long examId;
-    /**
-     * 考试类型
-     * 		网络考试
-     * 		传统考试
-     */
-    private String examType;
-    /**
-     * 考试名称
-     */
-    private String examName;
-    /**
-     * 课程名称
-     */
-    private String courseName;
-    /**
-     * 课程代码
-     */
-    private String courseCode;
-    /**
-     * 调卷类型
-     * 		成套调用
-     * 		重组调用
-     */
-    private String callType;
-    /**
-     * 是否生成 1:生成 0：没生成
-     */
-    private Short ifFinish;
-    /**
-     * 已经生成的试卷ID Map
-     * 数据结构:
-     * {
-     * 		"A":"0001",
-     * 		"B":"0002"
-     * }
-     * A 类型下生成的paperId为 0001
-     * B 类型下生成的paperId为 0002
-     */
-    private Map<String,String> finishedPaperIdMap;
-    /**
-     * 抽取试卷对象集合
-     */
-    private List<ExamPaper> examPaperList;
-    /**
-     * 小题乱序
-     * 1:乱序
-     * 0：不乱序
-     */
-    private Short scrambling_the_question_order;
-    /**
-     * 选项乱序
-     * 1:乱序
-     * 0：不乱序
-     */
-    private Short scrambling_the_option_order;
-    
-    /**
-     * 抽卷规则
-     */
-    private ExtractPolicy policy;
-    /**
-     * 类型参数
-     */
-    private Map<String,Object> params;
-    /**
-     * 机构ID
-     */
-    private String orgId;
-    
-    private String orgName;
-    
-    public ExtractConfig(){}
-    
-    public ExtractConfig(String id){
-    	this.id = id;
-    }
-    
-    public ExtractConfig(Long exam_id, String course_code) {
-    	this.examId = exam_id;
-    	this.courseCode = course_code;
-	}
-
-	public Long getExamId() {
-        return examId;
-    }
-
-    public String getId() {
-        return id;
-    }
-
-    public void setId(String id) {
-        this.id = id;
-    }
-
-    public void setExamId(Long examId) {
-        this.examId = examId;
-    }
-
-    public String getCourseCode() {
-        return courseCode;
-    }
-
-    public void setCourseCode(String courseCode) {
-        this.courseCode = courseCode;
-    }
-
-    public ExtractPolicy getPolicy() {
-        return policy;
-    }
-
-    public void setPolicy(ExtractPolicy policy) {
-        this.policy = policy;
-    }
-    
-    public String getExamType() {
-		return examType;
-	}
-
-	public void setExamType(String examType) {
-		this.examType = examType;
-	}
-
-	public String getExamName() {
-		return examName;
-	}
-
-	public void setExamName(String examName) {
-		this.examName = examName;
-	}
-
-	public String getCourseName() {
-		return courseName;
-	}
-
-	public void setCourseName(String courseName) {
-		this.courseName = courseName;
-	}
-
-	public String getCallType() {
-		return callType;
-	}
-
-	public void setCallType(String callType) {
-		this.callType = callType;
-	}
-
-	public Short getIfFinish() {
-		return ifFinish;
-	}
-
-	public void setIfFinish(Short ifFinish) {
-		if(ifFinish==null){
-			this.ifFinish = 0;
-		}else{
-			this.ifFinish = ifFinish;
-		}
-	}
-
-	public Map<String,Object> getParams() {
-        return params;
-    }
-
-    public void setParams(Map<String,Object> params) {
-        this.params = params;
-    }
-
-	public String getOrgId() {
-		return orgId;
-	}
-
-	public void setOrgId(String orgId) {
-		this.orgId = orgId;
-	}
-
-	public List<ExamPaper> getExamPaperList() {
-		return examPaperList;
-	}
-
-	public void setExamPaperList(List<ExamPaper> examPaperList) {
-		this.examPaperList = examPaperList;
-	}
-
-	public Short getScrambling_the_question_order() {
-		return scrambling_the_question_order;
-	}
-
-	public void setScrambling_the_question_order(Short scrambling_the_question_order) {
-		if(scrambling_the_question_order==null){
-			this.scrambling_the_question_order = 0;
-		}else{
-			this.scrambling_the_question_order = scrambling_the_question_order;
-		}
-	}
-
-	public Short getScrambling_the_option_order() {
-		return scrambling_the_option_order;
-	}
-
-	public void setScrambling_the_option_order(Short scrambling_the_option_order) {
-		if(scrambling_the_option_order==null){
-			this.scrambling_the_option_order = 0;
-		}else{
-			this.scrambling_the_option_order = scrambling_the_option_order;
-		}
-	}
-
-	public Map<String, String> getFinishedPaperIdMap() {
-		return finishedPaperIdMap;
-	}
-
-	public void setFinishedPaperIdMap(Map<String, String> finishedPaperIdMap) {
-		this.finishedPaperIdMap = finishedPaperIdMap;
-	}
-
-	public String getOrgName() {
-		return orgName;
-	}
-
-	public void setOrgName(String orgName) {
-		this.orgName = orgName;
-	}
-    
-}
+package com.qmth.cqb.paper.model;
+
+import java.io.Serializable;
+import java.util.List;
+import java.util.Map;
+
+import org.springframework.data.annotation.Id;
+
+import com.qmth.cqb.utils.enums.ExtractPolicy;
+
+/**
+ * 调卷规则
+ * @author chenken
+ *
+ */
+public class ExtractConfig implements Serializable {
+
+    private static final long serialVersionUID = -5234564748332601375L;
+    /**
+     * 调卷规则ID
+     */
+    @Id
+    private String id;
+    /**
+     * 考试ID
+     */
+    private Long examId;
+    /**
+     * 考试类型
+     * 		网络考试
+     * 		传统考试
+     */
+    private String examType;
+    /**
+     * 考试名称
+     */
+    private String examName;
+    /**
+     * 课程名称
+     */
+    private String courseName;
+    /**
+     * 课程代码
+     */
+    private String courseCode;
+    /**
+     * 调卷类型
+     * 		成套调用
+     * 		重组调用
+     */
+    private String callType;
+    /**
+     * 是否生成 1:生成 0：没生成
+     */
+    private Short ifFinish;
+    /**
+     * 已经生成的试卷ID Map
+     * 数据结构:
+     * {
+     * 		"A":"0001",
+     * 		"B":"0002"
+     * }
+     * A 类型下生成的paperId为 0001
+     * B 类型下生成的paperId为 0002
+     */
+    private Map<String,String> finishedPaperIdMap;
+    /**
+     * 抽取试卷对象集合
+     */
+    private List<ExamPaper> examPaperList;
+    /**
+     * 小题乱序
+     * 1:乱序
+     * 0：不乱序
+     */
+    private Short scrambling_the_question_order;
+    /**
+     * 选项乱序
+     * 1:乱序
+     * 0：不乱序
+     */
+    private Short scrambling_the_option_order;
+    
+    /**
+     * 抽卷规则
+     */
+    private ExtractPolicy policy;
+    /**
+     * 类型参数
+     */
+    private Map<String,Object> params;
+    /**
+     * 机构ID
+     */
+    private String orgId;
+    
+    private String orgName;
+    
+    public ExtractConfig(){}
+    
+    public ExtractConfig(String id){
+    	this.id = id;
+    }
+    
+    public ExtractConfig(Long exam_id, String course_code) {
+    	this.examId = exam_id;
+    	this.courseCode = course_code;
+	}
+    
+    public ExtractConfig(String examType,Long examId){
+    	this.examType = examType;
+    	this.examId = examId;
+    }
+
+	public Long getExamId() {
+        return examId;
+    }
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public void setExamId(Long examId) {
+        this.examId = examId;
+    }
+
+    public String getCourseCode() {
+        return courseCode;
+    }
+
+    public void setCourseCode(String courseCode) {
+        this.courseCode = courseCode;
+    }
+
+    public ExtractPolicy getPolicy() {
+        return policy;
+    }
+
+    public void setPolicy(ExtractPolicy policy) {
+        this.policy = policy;
+    }
+    
+    public String getExamType() {
+		return examType;
+	}
+
+	public void setExamType(String examType) {
+		this.examType = examType;
+	}
+
+	public String getExamName() {
+		return examName;
+	}
+
+	public void setExamName(String examName) {
+		this.examName = examName;
+	}
+
+	public String getCourseName() {
+		return courseName;
+	}
+
+	public void setCourseName(String courseName) {
+		this.courseName = courseName;
+	}
+
+	public String getCallType() {
+		return callType;
+	}
+
+	public void setCallType(String callType) {
+		this.callType = callType;
+	}
+
+	public Short getIfFinish() {
+		return ifFinish;
+	}
+
+	public void setIfFinish(Short ifFinish) {
+		if(ifFinish==null){
+			this.ifFinish = 0;
+		}else{
+			this.ifFinish = ifFinish;
+		}
+	}
+
+	public Map<String,Object> getParams() {
+        return params;
+    }
+
+    public void setParams(Map<String,Object> params) {
+        this.params = params;
+    }
+
+	public String getOrgId() {
+		return orgId;
+	}
+
+	public void setOrgId(String orgId) {
+		this.orgId = orgId;
+	}
+
+	public List<ExamPaper> getExamPaperList() {
+		return examPaperList;
+	}
+
+	public void setExamPaperList(List<ExamPaper> examPaperList) {
+		this.examPaperList = examPaperList;
+	}
+
+	public Short getScrambling_the_question_order() {
+		return scrambling_the_question_order;
+	}
+
+	public void setScrambling_the_question_order(Short scrambling_the_question_order) {
+		if(scrambling_the_question_order==null){
+			this.scrambling_the_question_order = 0;
+		}else{
+			this.scrambling_the_question_order = scrambling_the_question_order;
+		}
+	}
+
+	public Short getScrambling_the_option_order() {
+		return scrambling_the_option_order;
+	}
+
+	public void setScrambling_the_option_order(Short scrambling_the_option_order) {
+		if(scrambling_the_option_order==null){
+			this.scrambling_the_option_order = 0;
+		}else{
+			this.scrambling_the_option_order = scrambling_the_option_order;
+		}
+	}
+
+	public Map<String, String> getFinishedPaperIdMap() {
+		return finishedPaperIdMap;
+	}
+
+	public void setFinishedPaperIdMap(Map<String, String> finishedPaperIdMap) {
+		this.finishedPaperIdMap = finishedPaperIdMap;
+	}
+
+	public String getOrgName() {
+		return orgName;
+	}
+
+	public void setOrgName(String orgName) {
+		this.orgName = orgName;
+	}
+    
+}

cqb-paper/src/main/java/com/qmth/cqb/paper/service/ExportStructureService.java

@@ -53,5 +53,11 @@ public interface ExportStructureService {
 	 * @return
 	 */
 	public List<String> findExportStructureByExamType(String examType);
+	
+	/**
+	 * 根据导出结构id删除
+	 * @param id
+	 */
+	public void deleteExportStructure(String id);
 }
 

cqb-paper/src/main/java/com/qmth/cqb/paper/service/impl/ExportStructureServiceImpl.java

@@ -6,8 +6,11 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import main.java.com.UpYun;
+
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.data.domain.Example;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageRequest;
@@ -16,9 +19,14 @@ import org.springframework.stereotype.Service;
 import cn.com.qmth.examcloud.common.dto.em.enums.ExamType;
 import cn.com.qmth.examcloud.common.uac.entity.AccessUser;
 
+import com.qmth.cqb.paper.dao.ExamFileRepo;
 import com.qmth.cqb.paper.dao.ExportStructureRepo;
+import com.qmth.cqb.paper.dao.ExtractConfigRepo;
+import com.qmth.cqb.paper.model.ExamFile;
 import com.qmth.cqb.paper.model.ExportStructure;
+import com.qmth.cqb.paper.model.ExtractConfig;
 import com.qmth.cqb.paper.model.QuestionTypeNum;
+import com.qmth.cqb.paper.service.ExamFileService;
 import com.qmth.cqb.paper.service.ExportStructureService;
 import com.qmth.cqb.utils.enums.ExportType;
 
@@ -34,6 +42,24 @@ public class ExportStructureServiceImpl implements ExportStructureService {
 	@Autowired
 	private ExportStructureRepo exportStructureRepo;
 	
+	@Autowired
+	private ExamFileRepo examFileRepo;
+	
+	@Autowired
+	private ExamFileService examFileService;
+	
+	@Autowired
+	private ExtractConfigRepo extractConfigRepo;
+	
+	@Value("${upyun.bucketName}")
+	protected String bucketName;
+	
+	@Value("${upyun.userName}")
+	protected String userName;
+	
+	@Value("${upyun.password}")
+	protected String password;
+	
 	@Override
 	public void saveExportStructure(ExportStructure exportStructure,AccessUser user) {
 		if(StringUtils.isBlank(exportStructure.getId())){
@@ -95,6 +121,38 @@ public class ExportStructureServiceImpl implements ExportStructureService {
 		}
 		return null;
 	}
+
+	@Override
+	public void deleteExportStructure(String id) {
+		//首先根据id，查询到  exportStructure 对象
+		ExportStructure exportStructure = exportStructureRepo.findOne(id);
+		if(exportStructure != null){
+			//1.首先删除ExamFile表       根据  examId 和    examType  查询   ExamFile对象
+			List<ExamFile> list = examFileService.findExamFileListByExamFile(new ExamFile(exportStructure.getExamId(),exportStructure.getExamType()));
+			if(list.size()>0){
+				//根据 ExamFile 对象查询  filePath ，并删除又拍云上的文件 , 然后在删除表里面的数据
+				UpYun upyun = new UpYun(bucketName,userName,password);
+				for(int i=0;i<list.size();i++){
+					upyun.deleteFile(list.get(i).getFilePath());
+					//examFileRepo.delete(list.get(i));
+				}
+				examFileRepo.delete(list);
+			}
+			//2.然后修改ExtractConfig表      根据 examId 和    examType
+			ExtractConfig extractConfig = new ExtractConfig(exportStructure.getExamType().name(),Long.valueOf(exportStructure.getExamId()));
+			List<ExtractConfig> extractConfigList = extractConfigRepo.findAll(Example.of(extractConfig));
+			if(extractConfigList.size()>0){
+				//获取每个对象， 并修改isFinish  和   finishedPaperIdMap
+				for(int i=0;i<extractConfigList.size();i++){
+					extractConfigList.get(i).setIfFinish((short) 0);
+					extractConfigList.get(i).setFinishedPaperIdMap(null);
+					//extractConfigRepo.save(extractConfigList.get(i));
+				}
+				extractConfigRepo.save(extractConfigList);
+			}
+			exportStructureRepo.delete(exportStructure);
+		}
+	}
 	
 	
 	

cqb-paper/src/main/java/com/qmth/cqb/paper/web/ExportStructureController.java

@@ -11,6 +11,7 @@ import org.springframework.data.domain.Page;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -75,5 +76,12 @@ public class ExportStructureController {
 		List<String> list = exportStructureService.findExportStructureByExamType(examType);
 		return new ResponseEntity(list,HttpStatus.OK);
 	}
+	
+	@ApiOperation(value="根据导出结构id删除",notes="根据导出结构删除")
+	@DeleteMapping(value="/deleteExportStructure/{id}")
+	public ResponseEntity deleteExportStructure(@PathVariable String id){
+		exportStructureService.deleteExportStructure(id);
+		return new ResponseEntity(HttpStatus.OK);
+	}
 }