代码报错修改提交

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

@@ -13,6 +13,7 @@ import cn.com.qmth.examcloud.common.uac.entity.AccessUser;
 
 import com.qmth.cqb.paper.dto.PaperDetailUnitExp;
 import com.qmth.cqb.paper.dto.PaperExp;
+import com.qmth.cqb.paper.dto.QuestionAllTypeDto;
 import com.qmth.cqb.paper.model.Paper;
 import com.qmth.cqb.paper.model.PaperDetail;
 import com.qmth.cqb.paper.model.PaperDetailUnit;
@@ -262,4 +263,17 @@ public interface PaperService {
      * @return
      */
     public Map<String, Object> getPaperPDF(String paperId) throws Exception;
+
+	/**
+	 * pdf路径传至印刷平台
+	 * @param paperId
+	 * @param paperHtmlUrl
+	 */
+	public String sendPrint(String paperId, String paperHtmlUrl, String examId, AccessUser user);
+
+	/**
+	 * 根据试卷id查询主观题与客观题的数量
+	 * @param paperId
+	 */
+	public Map<String, QuestionAllTypeDto> findQuestionStructure(String paperId,AccessUser user) throws Exception;
 }

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

@@ -1307,19 +1307,6 @@ public class PaperServiceImpl implements PaperService{
 		return map;
 	}
 
-	@Override
-	public PaperExp findByNameAndOrgId(String paperName, String orgId, AccessUser accessUser) throws Exception {
-		//查询paper对象
-		Paper paper = paperRepo.findByNameAndOrgIdAndPaperType(paperName, orgId, PaperType.PREVIEW);
-		ExportServiceManage esm = exportServiceManageRepo.findByOrgName(accessUser.getRootOrgName());
-		if(esm == null){
-			esm = exportServiceManageRepo.findByOrgName("陕西师范大学");
-		}
-    	ExportPaperAbstractService exportPaperAbstractService = (ExportPaperAbstractService) SpringContextUtils.getBeanById(esm.getExportServiceName());
-    	PaperExp paperExp = exportPaperAbstractService.initPaperExp(paper.getId());
-		return paperExp;
-	}
-
 	@Override
 	public String sendPrint(String paperId, String paperHtmlUrl, String examId, AccessUser user) {
 		//查询原paper对象

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

@@ -26,6 +26,7 @@ import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.PutMapping;
 import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestHeader;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
@@ -36,6 +37,7 @@ import com.qmth.cqb.paper.dao.PaperRepo;
 import com.qmth.cqb.paper.dto.PaperDetailExp;
 import com.qmth.cqb.paper.dto.PaperDetailUnitExp;
 import com.qmth.cqb.paper.dto.PaperExp;
+import com.qmth.cqb.paper.dto.QuestionAllTypeDto;
 import com.qmth.cqb.paper.model.Paper;
 import com.qmth.cqb.paper.model.PaperSearchInfo;
 import com.qmth.cqb.paper.service.PaperService;
@@ -601,4 +603,26 @@ public class PaperController {
 			return new ResponseEntity<Object>(e.getMessage(),HttpStatus.OK);
 		}
     }
+    
+    @ApiOperation(value="传送到印刷平台", notes="传送到印刷平台")
+    @GetMapping(value="/sendPrint/{paperId}/{paperHtmlUrl}/{examId}")
+    public ResponseEntity<Object> sendPrint(HttpServletRequest request,
+    										@PathVariable String paperId,
+    										@PathVariable String paperHtmlUrl,
+    										@PathVariable String examId){
+    	AccessUser user = (AccessUser) request.getAttribute("accessUser");
+    	if(user == null){
+    		return new ResponseEntity<Object>(HttpStatus.NOT_FOUND);
+    	}
+    	String message = paperService.sendPrint(paperId,paperHtmlUrl,examId,user);
+    	return new ResponseEntity<Object>(message,HttpStatus.OK);
+    }
+    
+    @ApiOperation(value="根据试卷id查询主观题与客观题数量", notes="根据试卷id查询主观题与客观题数量")
+    @GetMapping(value="/questionStructure")
+    public Map<String, QuestionAllTypeDto> findQuestionStructure(HttpServletRequest request,@RequestParam("paperId") String paperId, @RequestHeader("user_token") String user_token) throws Exception{
+    	AccessUser user = (AccessUser) request.getAttribute("accessUser");
+    	Map<String, QuestionAllTypeDto> map = paperService.findQuestionStructure(paperId,user);
+		return map;
+    }
 }