insomniaLee 4 роки тому
батько
коміт
2e202c4ba2
1 змінених файлів з 21 додано та 5 видалено
  1. 21 5
      src/main/java/edu/nju/controller/AnalyzeController.java

+ 21 - 5
src/main/java/edu/nju/controller/AnalyzeController.java

@@ -359,7 +359,7 @@ public class AnalyzeController {
 	 */
 	@RequestMapping(value = "/analysePeople")
 	@ResponseBody
-	public void analyseTask(String caseId, String taskId, String workId , HttpServletResponse response){
+	public void analysePeople(String caseId, String taskId, String workId , HttpServletResponse response){
 		try {
 			response.setCharacterEncoding("utf-8");
 			response.setContentType("text/html;charset=utf-8");
@@ -380,9 +380,11 @@ public class AnalyzeController {
 	}
 
 	@RequestMapping(value = "/analyse/task")
-	public String analyseTask(String token, HttpServletResponse response ){
+	public void analyseTask(String token, HttpServletResponse response ){
 		String realUrl = AESUtil.decrypt(token);
-		return "redirect:/analyze/analyseExam2?"+realUrl;
+		String [] decoder = url2decode(realUrl);
+		analyseExam2(decoder[0],decoder[1],response);
+//		return "redirect:/analyze/analyseExam2?"+realUrl;
 	}
 
 	/**
@@ -391,9 +393,11 @@ public class AnalyzeController {
 	 * @param response
 	 */
 	@RequestMapping(value = "/analyse/people")
-	public String analyseSinglePeople(String token, String workId , HttpServletResponse response){
+	public void analyseSinglePeople(String token, String workId , HttpServletResponse response){
 		String realUrl = AESUtil.decrypt(token);
-		return "redirect:/analyze/analysePeople?"+realUrl+"&workId="+workId;
+		String [] decoder = url2decode(realUrl);
+		analysePeople(decoder[1],decoder[0],workId,response);
+//		return "redirect:/analyze/analysePeople?"+realUrl+"&workId="+workId;
 	}
 
 	@RequestMapping(value = "/historicalData")
@@ -487,4 +491,16 @@ public class AnalyzeController {
 	}
 
 
+	private String [] url2decode(String str){
+		String [] res = new String[2];
+		String []  temp = str.split("&");
+		if(temp[0].startsWith("taskId=")){
+			res[0]  = temp[0].substring(7);
+		}
+		if(temp[1].startsWith("caseId=")){
+			res[1] = temp[1].substring(7);
+		}
+		return res;
+	}
+
 }