update

tiku_App/src/com/offcn/api/tk/app3/getEstimate.java

+package com.offcn.api.tk.app3;
+
+import io.restassured.path.json.JsonPath;
+import io.restassured.response.Response;
+
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Statement;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Random;
+
+import org.json.simple.JSONArray;
+
+import com.offcn.TestUnti.Log;
+import com.offcn.TestUnti.MapUtil;
+import com.offcn.TestUnti.MySqlUtil;
+import com.offcn.TestUnti.RequestDataUtils;
+import com.offcn.TestUnti.StringUtils;
+import com.offcn.TestUnti.VerificationMethod;
+import com.offcn.interfaces.API;
+import com.offcn.process.TK;
+import com.offcn.TestUnti.ListUtil;
+
+import net.sf.json.JSONObject;
+
+
+
+/**
+ * 97. 获取单个估分项目
+ * 
+ * @author puhui
+ *
+ */
+public class getEstimate extends TK implements API {
+	public String parameter;//参数集合
+	
+	public String user_id;//用户id
+	public String examine_id;//考试项目id
+	public String question_id;//练习册类别id
+
+	@Override
+	public void initialize(HashMap<String, Object> data) {
+		if (!isProduct && data.get("CleanDB").toString().contains("Y")) {
+			cleanUser_FromDB();//清除注册用户根据user_id
+		}
+	}
+
+	@Override
+	public HashMap<String, Object> handleInput(HashMap<String, Object> data) {
+		// 获取parameter对应的内容
+		parameter = MapUtil.getValue("parameter", data);
+		user_id = MapUtil.getParameter_get(parameter, "user_id").trim();
+		examine_id = MapUtil.getParameter_get(parameter, "examine_id").trim();
+		
+		if ((!user_id.equals("")) && user_id.equals("code")) {
+			user_id=ListUtil.getListValue(user_idList,0);
+			parameter = parameter.replace("user_id=code", "user_id="+ user_id );
+		}
+		if ((!examine_id.equals("")) && examine_id.equals("code")) {
+			examine_id=examine_id_L;
+			parameter = parameter.replace("examine_id=code", "examine_id="+ examine_id);
+		}
+		data.put("parameter", parameter);
+		return data;
+	}
+
+	@Override
+	public Response SendRequest(HashMap<String, Object> data, String Url,
+			String Request) {
+		Response re = RequestDataUtils.Get_token_all(data, Url, tk_token);
+		return re;
+	}
+
+	@Override
+	public String handleOutput(Response re, HashMap<String, Object> data) {
+		JsonPath jp = re.body().jsonPath();
+		boolean result = true;
+		String failReason = "";
+
+		String json = StringUtils.decodeUnicode(re.asString());
+
+		if ((data.get("statusCode") != null)
+				&& (!data.get("statusCode").toString()
+						.equals(String.valueOf(re.getStatusCode())))) {
+			result = result && false;
+			failReason = failReason + "statusCode is expected "
+					+ data.get("statusCode").toString() + " but actually "
+					+ String.valueOf(re.getStatusCode()) + ". ";
+		}
+
+		if (json.length() != 0) {
+			
+			String msg=jp.getString("message");
+			String code=jp.getString("retcode");
+			
+			
+			if ((data.get("code") != null ) && (code != null) && (!code.equals(data.get("code").toString()))) {
+				result = result && false;
+				failReason = failReason + "code is expected "
+						+ data.get("code").toString() + " but actually "
+						+ jp.getString("code") + ".";
+			}
+
+			if ((data.get("msg") != null) && (msg != null) && (!msg.equals(data.get("msg").toString()))) {
+				result = result && false;
+				failReason = failReason + "msg is expected "
+						+ data.get("msg").toString() + " but actually "
+						+ jp.getString("msg") + ".";
+			}
+			
+			if(data.get("custom") != null && json!=null){
+				//如果自定义结果包含多个希望结果，也就是有逗号，那么就切割，包含比较。
+				if(data.get("custom").toString().contains(",")){
+					String [] strCustomStrings=data.get("custom").toString().split(",");
+					for(int i=0;i<strCustomStrings.length;i++){
+						if(!json.contains(strCustomStrings[i])){
+							result = result && false;
+							failReason = failReason + "custom is expected "
+									+ data.get("custom").toString() + " but actually "
+									+ strCustomStrings[i] + ".";
+							break;
+						}
+					}
+				}else{//如果只有一个希望结果，就直接包含比较。
+					if(!json.contains(data.get("custom").toString())){
+						result = result && false;
+						failReason = failReason + "custom is expected "
+								+ data.get("custom").toString() + " but actually "
+								+ data.get("custom").toString() + ".";
+					}
+				}
+			}
+			
+			if("接口响应成功！".equals(msg)){
+			
+			}
+		}
+		if (result)
+			return "Pass";
+		else
+			return "Fail:" + failReason;
+	}
+
+}

tiku_App/src/com/offcn/api/tk/app3/getEstimatePaperReport.java

+package com.offcn.api.tk.app3;
+
+import io.restassured.path.json.JsonPath;
+import io.restassured.response.Response;
+
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Statement;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Random;
+
+import org.json.simple.JSONArray;
+
+import com.offcn.TestUnti.Log;
+import com.offcn.TestUnti.MapUtil;
+import com.offcn.TestUnti.MyDateUtil;
+import com.offcn.TestUnti.MySqlUtil;
+import com.offcn.TestUnti.RequestDataUtils;
+import com.offcn.TestUnti.StringUtils;
+import com.offcn.TestUnti.VerificationMethod;
+import com.offcn.interfaces.API;
+import com.offcn.process.BasicsGM;
+import com.offcn.process.TK;
+import com.offcn.TestUnti.ListUtil;
+
+import net.sf.json.JSONObject;
+
+
+
+/**
+ * 93.获取估分考试报告的接口
+ * 
+ * 返回 recordId
+ *
+ */
+public class getEstimatePaperReport extends TK implements API {
+	public String parameter;//参数集合
+	
+	public String user_id;//用户id
+	public String paper_id;//
+	public String record_id;//
+	public String examine_paper_id;//
+
+	@Override
+	public void initialize(HashMap<String, Object> data) {
+		if (!isProduct && data.get("CleanDB").toString().contains("Y")) {
+			cleanUser_FromDB();//清除注册用户根据user_id
+		}
+		
+	}
+
+	@Override
+	public HashMap<String, Object> handleInput(HashMap<String, Object> data) {
+		// 获取parameter对应的内容
+		parameter = MapUtil.getValue("parameter", data);
+		user_id = MapUtil.getParameter(parameter, "user_id").trim();
+		paper_id = MapUtil.getParameter(parameter, "paper_id").trim();
+		record_id = MapUtil.getParameter(parameter, "record_id").trim();
+		examine_paper_id = MapUtil.getParameter(parameter, "examine_paper_id").trim();
+		
+		
+		
+		if ((!user_id.equals("")) && user_id.equals("code")) {
+			user_id=ListUtil.getListValue(user_idList,0);
+			parameter = parameter.replace("\"user_id\":code", "\"user_id\":\""+ user_id + "\"");
+		}
+		if ((!paper_id.equals("")) && paper_id.equals("code")) {
+			paper_id=paper_id_L;
+			parameter = parameter.replace("\"paper_id\":code", "\"paper_id\":\""+ paper_id + "\"");
+		}
+		if ((!record_id.equals("")) && record_id.equals("code")) {
+			record_id=record_id_L;
+			parameter = parameter.replace("\"record_id\":code", "\"record_id\":\""+ record_id + "\"");
+		}
+		if ((!examine_paper_id.equals("")) && examine_paper_id.equals("code")) {
+			examine_paper_id=examine_paper_id_L;//查询examine_paper表，examine_paper_id列，并且examine_id列存在
+			parameter = parameter.replace("\"examine_paper_id\":code", "\"examine_paper_id\":\""+ examine_paper_id + "\"");
+		}
+		
+		data.put("parameter", parameter);
+		return data;
+	}
+
+	@Override
+	public Response SendRequest(HashMap<String, Object> data, String Url,
+			String Request) {
+		Response re = RequestDataUtils.Post_token(data, Url, tk_token);
+		return re;
+	}
+
+	@Override
+	public String handleOutput(Response re, HashMap<String, Object> data) {
+		JsonPath jp = re.body().jsonPath();
+		boolean result = true;
+		String failReason = "";
+
+		String json = StringUtils.decodeUnicode(re.asString());
+
+		if ((data.get("statusCode") != null)
+				&& (!data.get("statusCode").toString()
+						.equals(String.valueOf(re.getStatusCode())))) {
+			result = result && false;
+			failReason = failReason + "statusCode is expected "
+					+ data.get("statusCode").toString() + " but actually "
+					+ String.valueOf(re.getStatusCode()) + ". ";
+		}
+
+		if (json.length() != 0) {
+			
+			String msg=jp.getString("message");
+			String code=jp.getString("retcode");
+			
+			
+			if ((data.get("code") != null ) && (code != null) && (!code.equals(data.get("code").toString()))) {
+				result = result && false;
+				failReason = failReason + "code is expected "
+						+ data.get("code").toString() + " but actually "
+						+ jp.getString("code") + ".";
+			}
+
+			if ((data.get("msg") != null) && (msg != null) && (!msg.equals(data.get("msg").toString()))) {
+				result = result && false;
+				failReason = failReason + "msg is expected "
+						+ data.get("msg").toString() + " but actually "
+						+ jp.getString("msg") + ".";
+			}
+			
+			if(data.get("custom") != null && json!=null){
+				//如果自定义结果包含多个希望结果，也就是有逗号，那么就切割，包含比较。
+				if(data.get("custom").toString().contains(",")){
+					String [] strCustomStrings=data.get("custom").toString().split(",");
+					for(int i=0;i<strCustomStrings.length;i++){
+						if(!json.contains(strCustomStrings[i])){
+							result = result && false;
+							failReason = failReason + "custom is expected "
+									+ data.get("custom").toString() + " but actually "
+									+ strCustomStrings[i] + ".";
+							break;
+						}
+					}
+				}else{//如果只有一个希望结果，就直接包含比较。
+					if(!json.contains(data.get("custom").toString())){
+						result = result && false;
+						failReason = failReason + "custom is expected "
+								+ data.get("custom").toString() + " but actually "
+								+ data.get("custom").toString() + ".";
+					}
+				}
+			}
+			
+			if("试卷信息查询成功".equals(msg)){
+			}
+		}
+		if (result)
+			return "Pass";
+		else
+			return "Fail:" + failReason;
+	}
+
+}

tiku_App/src/com/offcn/api/tk/app3/getExamineOrder.java

+package com.offcn.api.tk.app3;
+
+import io.restassured.path.json.JsonPath;
+import io.restassured.response.Response;
+
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Statement;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Random;
+
+import org.json.simple.JSONArray;
+
+import com.offcn.TestUnti.Log;
+import com.offcn.TestUnti.MapUtil;
+import com.offcn.TestUnti.MySqlUtil;
+import com.offcn.TestUnti.RequestDataUtils;
+import com.offcn.TestUnti.StringUtils;
+import com.offcn.TestUnti.VerificationMethod;
+import com.offcn.interfaces.API;
+import com.offcn.process.TK;
+import com.offcn.TestUnti.ListUtil;
+
+import net.sf.json.JSONObject;
+
+
+
+/**
+ * 94. 估分排名
+ * 
+ * @author puhui
+ *
+ */
+public class getExamineOrder extends TK implements API {
+	public String parameter;//参数集合
+	
+	public String user_id;//用户id
+	public String examine_id;//考试项目id
+	public String question_id;//练习册类别id
+
+	@Override
+	public void initialize(HashMap<String, Object> data) {
+		if (!isProduct && data.get("CleanDB").toString().contains("Y")) {
+			cleanUser_FromDB();//清除注册用户根据user_id
+		}
+	}
+
+	@Override
+	public HashMap<String, Object> handleInput(HashMap<String, Object> data) {
+		// 获取parameter对应的内容
+		parameter = MapUtil.getValue("parameter", data);
+		user_id = MapUtil.getParameter_get(parameter, "user_id").trim();
+		examine_id = MapUtil.getParameter_get(parameter, "examine_id").trim();
+		
+		if ((!user_id.equals("")) && user_id.equals("code")) {
+			user_id=ListUtil.getListValue(user_idList,0);
+			parameter = parameter.replace("user_id=code", "user_id="+ user_id );
+		}
+		if ((!examine_id.equals("")) && examine_id.equals("code")) {
+			examine_id=examine_id_L;
+			parameter = parameter.replace("examine_id=code", "examine_id="+ examine_id);
+		}
+		data.put("parameter", parameter);
+		return data;
+	}
+
+	@Override
+	public Response SendRequest(HashMap<String, Object> data, String Url,
+			String Request) {
+		Response re = RequestDataUtils.Get_token_all(data, Url, tk_token);
+		return re;
+	}
+
+	@Override
+	public String handleOutput(Response re, HashMap<String, Object> data) {
+		JsonPath jp = re.body().jsonPath();
+		boolean result = true;
+		String failReason = "";
+
+		String json = StringUtils.decodeUnicode(re.asString());
+
+		if ((data.get("statusCode") != null)
+				&& (!data.get("statusCode").toString()
+						.equals(String.valueOf(re.getStatusCode())))) {
+			result = result && false;
+			failReason = failReason + "statusCode is expected "
+					+ data.get("statusCode").toString() + " but actually "
+					+ String.valueOf(re.getStatusCode()) + ". ";
+		}
+
+		if (json.length() != 0) {
+			
+			String msg=jp.getString("message");
+			String code=jp.getString("retcode");
+			
+			
+			if ((data.get("code") != null ) && (code != null) && (!code.equals(data.get("code").toString()))) {
+				result = result && false;
+				failReason = failReason + "code is expected "
+						+ data.get("code").toString() + " but actually "
+						+ jp.getString("code") + ".";
+			}
+
+			if ((data.get("msg") != null) && (msg != null) && (!msg.equals(data.get("msg").toString()))) {
+				result = result && false;
+				failReason = failReason + "msg is expected "
+						+ data.get("msg").toString() + " but actually "
+						+ jp.getString("msg") + ".";
+			}
+			
+			if(data.get("custom") != null && json!=null){
+				//如果自定义结果包含多个希望结果，也就是有逗号，那么就切割，包含比较。
+				if(data.get("custom").toString().contains(",")){
+					String [] strCustomStrings=data.get("custom").toString().split(",");
+					for(int i=0;i<strCustomStrings.length;i++){
+						if(!json.contains(strCustomStrings[i])){
+							result = result && false;
+							failReason = failReason + "custom is expected "
+									+ data.get("custom").toString() + " but actually "
+									+ strCustomStrings[i] + ".";
+							break;
+						}
+					}
+				}else{//如果只有一个希望结果，就直接包含比较。
+					if(!json.contains(data.get("custom").toString())){
+						result = result && false;
+						failReason = failReason + "custom is expected "
+								+ data.get("custom").toString() + " but actually "
+								+ data.get("custom").toString() + ".";
+					}
+				}
+			}
+			
+			if("接口响应成功！".equals(msg)){
+			
+			}
+		}
+		if (result)
+			return "Pass";
+		else
+			return "Fail:" + failReason;
+	}
+
+}

tiku_App/src/com/offcn/api/tk/app3/getExpoundingPaperBlocks.java

@@ -58,17 +58,21 @@ public class getExpoundingPaperBlocks extends TK implements API {
 			parameter = parameter.replace("\"user_id\":code", "\"user_id\":\""+ user_id + "\"");
 		}	
 		if ((!paper_id.equals("")) && paper_id.equals("code")) {
-			paper_id = paper_id_L;
+			paper_id = "4108";
 			parameter = parameter.replace("\"paper_id\":code", "\"paper_id\":\""+ paper_id + "\"");
 		}
 		if ((!exam_id.equals("")) && exam_id.equals("code")) {
-			exam_id= L_exam_id;
+			exam_id= "71";
 			parameter = parameter.replace("\"exam_id\":code", "\"exam_id\":\""+ exam_id + "\"");
 		}
 		if ((!nwn_paper_id.equals("")) && nwn_paper_id.equals("code")) {
 			nwn_paper_id= "4321";
 			parameter = parameter.replace("\"nwn_paper_id\":code", "\"nwn_paper_id\":\""+ nwn_paper_id + "\"");
 		}
+		if ((!channel.equals("")) && channel.equals("code")) {
+			channel= "1";
+			parameter = parameter.replace("\"channel\":code", "\"channel\":\""+ channel + "\"");
+		}
 		data.put("parameter", parameter);
 		return data;
 	}

tiku_App/src/com/offcn/api/tk/app3/getExpoundingStepExplain.java

@@ -67,12 +67,12 @@ public class getExpoundingStepExplain extends TK implements API {
 		}
 		if ((!exam_id.equals("")) && exam_id.equals("code")) {
 			exam_id = L_exam_id;
-//			exam_id = "1";
+//			exam_id = "4321";
 			parameter = parameter.replace("\"exam_id\":code", "\"exam_id\":\""+ exam_id + "\"");
 		}
 		if ((!origin_id.equals("")) && origin_id.equals("code")) {
-			origin_id = paper_id_L;
-//			origin_id = "1";
+			origin_id = L_exam_id;
+//			origin_id = "4321";
 			parameter = parameter.replace("\"origin_id\":code", "\"origin_id\":\""+ origin_id + "\"");
 		}
 		data.put("parameter", parameter);

tiku_App/src/com/offcn/api/tk/app3/getItemOrder.java

+package com.offcn.api.tk.app3;
+
+import io.restassured.path.json.JsonPath;
+import io.restassured.response.Response;
+
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Statement;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Random;
+
+import org.json.simple.JSONArray;
+
+import com.offcn.TestUnti.Log;
+import com.offcn.TestUnti.MapUtil;
+import com.offcn.TestUnti.MySqlUtil;
+import com.offcn.TestUnti.RequestDataUtils;
+import com.offcn.TestUnti.StringUtils;
+import com.offcn.TestUnti.VerificationMethod;
+import com.offcn.interfaces.API;
+import com.offcn.process.TK;
+import com.offcn.TestUnti.ListUtil;
+
+import net.sf.json.JSONObject;
+
+
+
+/**
+ * 98.获取单项排名
+ * 
+ * @author puhui
+ *
+ */
+public class getItemOrder extends TK implements API {
+	public String parameter;//参数集合
+	
+	public String user_id;//用户id
+	public String examine_id;//考试项目id
+	public String examine_paper_id;//练习册类别id
+
+	@Override
+	public void initialize(HashMap<String, Object> data) {
+		if (!isProduct && data.get("CleanDB").toString().contains("Y")) {
+			cleanUser_FromDB();//清除注册用户根据user_id
+		}
+	}
+
+	@Override
+	public HashMap<String, Object> handleInput(HashMap<String, Object> data) {
+		// 获取parameter对应的内容
+		parameter = MapUtil.getValue("parameter", data);
+		user_id = MapUtil.getParameter_get(parameter, "user_id").trim();
+		examine_id = MapUtil.getParameter_get(parameter, "examine_id").trim();
+		examine_paper_id = MapUtil.getParameter_get(parameter, "examine_paper_id").trim();
+		
+		if ((!user_id.equals("")) && user_id.equals("code")) {
+			user_id=ListUtil.getListValue(user_idList,0);
+			parameter = parameter.replace("user_id=code", "user_id="+ user_id );
+		}
+		if ((!examine_id.equals("")) && examine_id.equals("code")) {
+			examine_id=examine_id_L;
+			parameter = parameter.replace("examine_id=code", "examine_id="+ examine_id);
+		}
+		if ((!examine_paper_id.equals("")) && examine_paper_id.equals("code")) {
+			examine_paper_id=examine_paper_id_L;
+			parameter = parameter.replace("examine_paper_id=code", "examine_paper_id="+ examine_paper_id);
+		}
+		data.put("parameter", parameter);
+		return data;
+	}
+
+	@Override
+	public Response SendRequest(HashMap<String, Object> data, String Url,
+			String Request) {
+		Response re = RequestDataUtils.Get_token_all(data, Url, tk_token);
+		return re;
+	}
+
+	@Override
+	public String handleOutput(Response re, HashMap<String, Object> data) {
+		JsonPath jp = re.body().jsonPath();
+		boolean result = true;
+		String failReason = "";
+
+		String json = StringUtils.decodeUnicode(re.asString());
+
+		if ((data.get("statusCode") != null)
+				&& (!data.get("statusCode").toString()
+						.equals(String.valueOf(re.getStatusCode())))) {
+			result = result && false;
+			failReason = failReason + "statusCode is expected "
+					+ data.get("statusCode").toString() + " but actually "
+					+ String.valueOf(re.getStatusCode()) + ". ";
+		}
+
+		if (json.length() != 0) {
+			
+			String msg=jp.getString("message");
+			String code=jp.getString("retcode");
+			
+			
+			if ((data.get("code") != null ) && (code != null) && (!code.equals(data.get("code").toString()))) {
+				result = result && false;
+				failReason = failReason + "code is expected "
+						+ data.get("code").toString() + " but actually "
+						+ jp.getString("code") + ".";
+			}
+
+			if ((data.get("msg") != null) && (msg != null) && (!msg.equals(data.get("msg").toString()))) {
+				result = result && false;
+				failReason = failReason + "msg is expected "
+						+ data.get("msg").toString() + " but actually "
+						+ jp.getString("msg") + ".";
+			}
+			
+			if(data.get("custom") != null && json!=null){
+				//如果自定义结果包含多个希望结果，也就是有逗号，那么就切割，包含比较。
+				if(data.get("custom").toString().contains(",")){
+					String [] strCustomStrings=data.get("custom").toString().split(",");
+					for(int i=0;i<strCustomStrings.length;i++){
+						if(!json.contains(strCustomStrings[i])){
+							result = result && false;
+							failReason = failReason + "custom is expected "
+									+ data.get("custom").toString() + " but actually "
+									+ strCustomStrings[i] + ".";
+							break;
+						}
+					}
+				}else{//如果只有一个希望结果，就直接包含比较。
+					if(!json.contains(data.get("custom").toString())){
+						result = result && false;
+						failReason = failReason + "custom is expected "
+								+ data.get("custom").toString() + " but actually "
+								+ data.get("custom").toString() + ".";
+					}
+				}
+			}
+			
+			if("接口响应成功！".equals(msg)){
+			
+			}
+		}
+		if (result)
+			return "Pass";
+		else
+			return "Fail:" + failReason;
+	}
+
+}

tiku_App/src/com/offcn/api/tk/app3/getMockPaperReport.java

@@ -69,10 +69,12 @@ public class getMockPaperReport extends TK implements API {
 //		}
 		if ((!record_sub_id.equals("")) && record_sub_id.equals("code")) {
 			record_sub_id= L_record_sub_id;
+//			record_sub_id= "324";
 			parameter = parameter.replace("\"record_sub_id\":code", "\"record_sub_id\":\""+ record_sub_id + "\"");
 		}
 		if ((!mock_subject_id.equals("")) && mock_subject_id.equals("code")) {
 			mock_subject_id=  L_mock_subject_id;
+//			mock_subject_id=  "800";
 			parameter = parameter.replace("\"mock_subject_id\":code", "\"mock_subject_id\":\""+ mock_subject_id + "\"");
 		}
 		if ((!position_id.equals("")) && position_id.equals("code")) {

tiku_App/src/com/offcn/api/tk/app3/getPaperQuestionsJson.java

@@ -65,7 +65,7 @@ public class getPaperQuestionsJson extends TK implements API {
 			parameter = parameter.replace("\"user_id\":code", "\"user_id\":\""+ user_id + "\"");
 		}
 		if ((!paper_id.equals("")) && paper_id.equals("code")) {
-			paper_id= paper_id_L;
+			paper_id= L_exam_id;
 			parameter = parameter.replace("\"paper_id\":code", "\"paper_id\":\""+ paper_id + "\"");
 		}
 		if ((!record_sub_id.equals("")) && record_sub_id.equals("code")) {

tiku_App/src/com/offcn/api/tk/app3/getPracticeDetail.java

@@ -63,21 +63,25 @@ public class getPracticeDetail extends TK implements API {
 		//appid = MapUtil.getParameter_get(parameter, "appid").trim();
 		
 		if ((!exam_id.equals("")) && exam_id.equals("code")) {
-			exam_id=L_exam_id;
+			exam_id="88";
 			parameter = parameter.replace("\"exam_id\":code", "\"exam_id\":\""+ exam_id + "\"");
 		}
 		if ((!user_id.equals("")) && user_id.equals("code")) {
 			user_id=ListUtil.getListValue(user_idList,0);
 			parameter = parameter.replace("\"user_id\":code", "\"user_id\":\""+ user_id + "\"");
 		}
-		if ((!package_id.equals("")) && package_id.equals("code")) {
-			package_id="";
-			parameter = parameter.replace("\"package_id\":code", "\"package_id\":\""+ package_id + "\"");
+		if ((!practice_id.equals("")) && practice_id.equals("code")) {
+			practice_id="37";
+			parameter = parameter.replace("\"practice_id\":code", "\"practice_id\":\""+ practice_id + "\"");
 		}
 		if ((!channel.equals("")) && channel.equals("code")) {
-			channel="";
+			channel="2";
 			parameter = parameter.replace("\"channel\":code", "\"channel\":\""+ channel + "\"");
 		}
+		if ((!package_id.equals("")) && package_id.equals("code")) {
+			package_id="1";
+			parameter = parameter.replace("\"package_id\":code", "\"package_id\":\""+ package_id + "\"");
+		}
 		
 		data.put("parameter", parameter);
 		return data;
@@ -99,6 +103,7 @@ public class getPracticeDetail extends TK implements API {
 		jsonAsMap.put("user_id", user_id);
 		jsonAsMap.put("channel", channel);
 		jsonAsMap.put("practice_id", practice_id);
+		jsonAsMap.put("exam_id", exam_id);
 		jsonAsMap.put("package_id", package_id);
 		jsonAsMap.put("appid", tikuString);
 		

tiku_App/src/com/offcn/api/tk/app3/getSubject.java

@@ -56,7 +56,7 @@ public class getSubject extends TK implements API {
 		
 		if ((!mock_subject_id.equals("")) && mock_subject_id.equals("code")) {
 //			mock_subject_id="123";
-			mock_subject_id= L_mock_id;
+			mock_subject_id= L_mock_subject_id;
 			parameter = parameter.replace("\"mock_subject_id\":code", "\"mock_subject_id\":\""+ mock_subject_id + "\"");
 		}
 		data.put("parameter", parameter);

tiku_App/src/com/offcn/api/tk/app3/joinMock.java

@@ -66,14 +66,17 @@ public class joinMock extends TK implements API {
 		}
 		if ((!mock_subject_id.equals("")) && mock_subject_id.equals("code")) {
 			mock_subject_id=L_mock_subject_id;
+//			mock_subject_id="43";
 			parameter = parameter.replace("\"mock_subject_id\":code", "\"mock_subject_id\":\""+ mock_subject_id + "\"");
 		}
 		if ((!mock_id.equals("")) && mock_id.equals("code")) {
 			mock_id=L_mock_id;
+//			mock_id="43";
 			parameter = parameter.replace("\"mock_id\":code", "\"mock_id\":\""+ mock_id + "\"");
 		}
 		if ((!mock_sub_id.equals("")) && mock_sub_id.equals("code")) {
 			mock_sub_id=L_mock_sub_id;
+//			mock_sub_id="0";
 			parameter = parameter.replace("\"mock_sub_id\":code", "\"mock_sub_id\":\""+ mock_sub_id + "\"");
 		}
 		data.put("parameter", parameter);

tiku_App/src/com/offcn/api/tk/app3/office.java

@@ -144,6 +144,8 @@ public class office extends TK implements API {
 			}
 			
 			if("接口响应成功！".equals(msg)){
+				exam_id = MapUtil.killQuotes(exam_id, "\"");
+				L_exam_id=exam_id;
 				List<String> list=jp.getList("data.offices.list");
 				if (list!=null && list.size()>0 && list.get(0)!=null) {
 						L_office_id=jp.getString("data.offices.list[0].id[0]");

tiku_App/src/com/offcn/api/tk/app3/position.java

@@ -149,6 +149,9 @@ public class position extends TK implements API {
 			}
 			
 			if("0".equals(code)){
+				L_position_id=jp.getString("data.positions.list.id");
+				L_position_id = L_position_id.replace("[", "").replace("]", "").trim();
+				System.out.println(L_position_id);
 				conn=ConnectionsMap.get("tk");
 			}
 		}

tiku_App/src/com/offcn/api/tk/app3/signUpMock.java

@@ -62,6 +62,7 @@ public class signUpMock extends TK implements API {
 		
 		if ((!exam_id.equals("")) && exam_id.equals("code")) {
 			exam_id=L_exam_id;
+//			exam_id="83";
 			parameter = parameter.replace("\"exam_id\":code", "\"exam_id\":\""+ exam_id + "\"");
 		}
 		if ((!user_id.equals("")) && user_id.equals("code")) {
@@ -70,10 +71,12 @@ public class signUpMock extends TK implements API {
 		}
 		if ((!mock_sub_id.equals("")) && mock_sub_id.equals("code")){
 			mock_sub_id = L_mock_sub_id;
+//			mock_sub_id = "43";
 			parameter = parameter.replace("\"mock_sub_id\":code","\"mock_sub_id\":\""+mock_sub_id+"\"" );
 		}
 		if ((!mock_id.equals("")) && mock_id.equals("code")) {
 			mock_id=L_mock_id;
+//			mock_id="43";
 			parameter = parameter.replace("\"mock_id\":code", "\"mock_id\":\""+ mock_id + "\"");
 		}
 		data.put("parameter", parameter);

tiku_App/src/com/offcn/api/tk/app3/submitEstimatePaper.java

+package com.offcn.api.tk.app3;
+
+import io.restassured.path.json.JsonPath;
+import io.restassured.response.Response;
+
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Statement;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Random;
+
+import org.json.simple.JSONArray;
+
+import com.offcn.TestUnti.Log;
+import com.offcn.TestUnti.MapUtil;
+import com.offcn.TestUnti.MyDateUtil;
+import com.offcn.TestUnti.MySqlUtil;
+import com.offcn.TestUnti.RequestDataUtils;
+import com.offcn.TestUnti.StringUtils;
+import com.offcn.TestUnti.VerificationMethod;
+import com.offcn.interfaces.API;
+import com.offcn.process.BasicsGM;
+import com.offcn.process.TK;
+import com.offcn.TestUnti.ListUtil;
+
+import net.sf.json.JSONObject;
+
+
+
+/**
+ * 93.获取估分考试报告的接口
+ * 
+ * 返回 recordId
+ *
+ */
+public class submitEstimatePaper extends TK implements API {
+	public String parameter;//参数集合
+	
+	public String user_id;//用户id
+	public String paper_id;//
+	public String record_id;//
+	public String examine_paper_id;//
+
+	@Override
+	public void initialize(HashMap<String, Object> data) {
+		if (!isProduct && data.get("CleanDB").toString().contains("Y")) {
+			cleanUser_FromDB();//清除注册用户根据user_id
+		}
+		
+	}
+
+	@Override
+	public HashMap<String, Object> handleInput(HashMap<String, Object> data) {
+		// 获取parameter对应的内容
+		parameter = MapUtil.getValue("parameter", data);
+		user_id = MapUtil.getParameter(parameter, "user_id").trim();
+		paper_id = MapUtil.getParameter(parameter, "paper_id").trim();
+		record_id = MapUtil.getParameter(parameter, "record_id").trim();
+		examine_paper_id = MapUtil.getParameter(parameter, "examine_paper_id").trim();
+		
+		
+		
+		if ((!user_id.equals("")) && user_id.equals("code")) {
+			user_id=ListUtil.getListValue(user_idList,0);
+			parameter = parameter.replace("\"user_id\":code", "\"user_id\":\""+ user_id + "\"");
+		}
+		if ((!paper_id.equals("")) && paper_id.equals("code")) {
+			paper_id=paper_id_L;
+			parameter = parameter.replace("\"paper_id\":code", "\"paper_id\":\""+ paper_id + "\"");
+		}
+		if ((!record_id.equals("")) && record_id.equals("code")) {
+			record_id=record_id_L;
+			parameter = parameter.replace("\"record_id\":code", "\"record_id\":\""+ record_id + "\"");
+		}
+		if ((!examine_paper_id.equals("")) && examine_paper_id.equals("code")) {
+			examine_paper_id=examine_paper_id_L;//查询examine_paper表，examine_paper_id列，并且examine_id列存在
+			parameter = parameter.replace("\"examine_paper_id\":code", "\"examine_paper_id\":\""+ examine_paper_id + "\"");
+		}
+		
+		data.put("parameter", parameter);
+		return data;
+	}
+
+	@Override
+	public Response SendRequest(HashMap<String, Object> data, String Url,
+			String Request) {
+		Response re = RequestDataUtils.Post_token(data, Url, tk_token);
+		return re;
+	}
+
+	@Override
+	public String handleOutput(Response re, HashMap<String, Object> data) {
+		JsonPath jp = re.body().jsonPath();
+		boolean result = true;
+		String failReason = "";
+
+		String json = StringUtils.decodeUnicode(re.asString());
+
+		if ((data.get("statusCode") != null)
+				&& (!data.get("statusCode").toString()
+						.equals(String.valueOf(re.getStatusCode())))) {
+			result = result && false;
+			failReason = failReason + "statusCode is expected "
+					+ data.get("statusCode").toString() + " but actually "
+					+ String.valueOf(re.getStatusCode()) + ". ";
+		}
+
+		if (json.length() != 0) {
+			
+			String msg=jp.getString("message");
+			String code=jp.getString("retcode");
+			
+			
+			if ((data.get("code") != null ) && (code != null) && (!code.equals(data.get("code").toString()))) {
+				result = result && false;
+				failReason = failReason + "code is expected "
+						+ data.get("code").toString() + " but actually "
+						+ jp.getString("code") + ".";
+			}
+
+			if ((data.get("msg") != null) && (msg != null) && (!msg.equals(data.get("msg").toString()))) {
+				result = result && false;
+				failReason = failReason + "msg is expected "
+						+ data.get("msg").toString() + " but actually "
+						+ jp.getString("msg") + ".";
+			}
+			
+			if(data.get("custom") != null && json!=null){
+				//如果自定义结果包含多个希望结果，也就是有逗号，那么就切割，包含比较。
+				if(data.get("custom").toString().contains(",")){
+					String [] strCustomStrings=data.get("custom").toString().split(",");
+					for(int i=0;i<strCustomStrings.length;i++){
+						if(!json.contains(strCustomStrings[i])){
+							result = result && false;
+							failReason = failReason + "custom is expected "
+									+ data.get("custom").toString() + " but actually "
+									+ strCustomStrings[i] + ".";
+							break;
+						}
+					}
+				}else{//如果只有一个希望结果，就直接包含比较。
+					if(!json.contains(data.get("custom").toString())){
+						result = result && false;
+						failReason = failReason + "custom is expected "
+								+ data.get("custom").toString() + " but actually "
+								+ data.get("custom").toString() + ".";
+					}
+				}
+			}
+			
+			if("试卷信息查询成功".equals(msg)){
+			}
+		}
+		if (result)
+			return "Pass";
+		else
+			return "Fail:" + failReason;
+	}
+
+}

tiku_App/src/com/offcn/api/tk/app3/submitExpoundingExercise.java

@@ -66,8 +66,8 @@ public class submitExpoundingExercise extends TK implements API {
 			data1 = data1.replace("\"user_id\":code", "\"user_id\":\""+ user_id + "\"");
 			data1 = data1.replace("\"item_id\":code", "\"item_id\":\""+ item_id_L + "\"");
 			data1 = data1.replace("\"orgin\":code", "\"orgin\":\""+ 1 + "\"");
-			data1 = data1.replace("\"orgin_id\":code", "\"orgin_id\":\""+ paper_id_L + "\"");
-			data1 = data1.replace("\"record_id\":code", "\"record_id\":\""+ recordId_L + "\"");
+			data1 = data1.replace("\"orgin_id\":code", "\"orgin_id\":\""+ "4108" + "\"");
+			data1 = data1.replace("\"record_id\":code", "\"record_id\":\""+ L_record_id + "\"");
 			
 			parameter = parameter.replace("\"data\":code", "\"data\":{"+ data1 +"}");
 		}

tiku_App/src/com/offcn/api/tk/app3/submitMock.java

+package com.offcn.api.tk.app3;
+
+import io.restassured.path.json.JsonPath;
+import io.restassured.response.Response;
+
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Statement;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Random;
+
+import org.json.simple.JSONArray;
+
+import com.offcn.TestUnti.Log;
+import com.offcn.TestUnti.MapUtil;
+import com.offcn.TestUnti.MySqlUtil;
+import com.offcn.TestUnti.RequestDataUtils;
+import com.offcn.TestUnti.StringUtils;
+import com.offcn.TestUnti.VerificationMethod;
+import com.offcn.interfaces.API;
+import com.offcn.process.TK;
+import com.offcn.system.MyRequest;
+import com.offcn.TestUnti.ListUtil;
+
+import net.sf.json.JSONObject;
+
+
+
+/**
+ * 80. 模考交卷
+ * 
+ * @author puhui
+ *
+ */
+public class submitMock extends TK implements API {
+	public String parameter;//参数集合
+	
+	public String user_id;//用户id
+	public String mock_id;//用户id
+	public String channel;//考试项目id
+	public String mock_subject_id;//考试项目id
+
+	@Override
+	public void initialize(HashMap<String, Object> data) {
+		if (!isProduct && data.get("CleanDB").toString().contains("Y")) {
+			cleanUser_FromDB();//清除注册用户根据user_id
+		}
+	}
+
+	@Override
+	public HashMap<String, Object> handleInput(HashMap<String, Object> data) {
+		// 获取parameter对应的内容
+		parameter = MapUtil.getValue("parameter", data);
+		user_id = MapUtil.getParameter(parameter, "user_id").trim();
+		mock_subject_id = MapUtil.getParameter(parameter, "mock_subject_id").trim();
+		mock_id = MapUtil.getParameter(parameter, "mock_id").trim();
+		channel = MapUtil.getParameter(parameter, "channel").trim();
+		
+		if ((!user_id.equals("")) && user_id.equals("code")) {
+			user_id=ListUtil.getListValue(user_idList,0);
+			parameter = parameter.replace("\"user_id\":code", "\"user_id\":\""+ user_id + "\"");
+		}
+		if ((!mock_subject_id.equals("")) && mock_subject_id.equals("code")) {
+//			mock_subject_id="383";
+			mock_subject_id= L_mock_subject_id;
+			parameter = parameter.replace("\"mock_subject_id\":code", "\"mock_subject_id\":\""+ mock_subject_id + "\"");
+		}
+		if ((!mock_id.equals("")) && mock_id.equals("code")) {
+//			mock_id="179";
+			mock_id= L_mock_id;
+			parameter = parameter.replace("\"mock_id\":code", "\"mock_id\":\""+ mock_id + "\"");
+		}
+		if ((!channel.equals("")) && channel.equals("code")) {
+			channel="1";
+			parameter = parameter.replace("\"channel\":code", "\"channel\":\""+ channel + "\"");
+		}
+		data.put("parameter", parameter);
+		return data;
+	}
+
+	@Override
+	public Response SendRequest(HashMap<String, Object> data, String Url,
+			String Request) {
+		Map<String, String> headers=new HashMap<String, String>();
+		headers.put("Authorization", tk_token);
+		
+		Map<String, String>  jsonAsMap=new HashMap<String, String>();
+		parameter = MapUtil.getValue("parameter", data);
+		String tikuString= MapUtil.getParameter(parameter, "appid").trim();
+		tikuString = MapUtil.killQuotes(tikuString, "\"");
+		
+		jsonAsMap.put("user_id", user_id);
+		jsonAsMap.put("mock_subject_id", mock_subject_id);
+		jsonAsMap.put("mock_id", mock_id);
+		jsonAsMap.put("channel", channel);
+		jsonAsMap.put("appid", tikuString);
+		
+		MyRequest myRequest=new MyRequest();
+		myRequest.setUrl("/apiv3/mock/submit/submitPaper");
+		myRequest.setHeaders(headers);
+		myRequest.setFormParameter(jsonAsMap);		
+		myRequest.setRequest(Request);
+		Response re = RequestDataUtils.RestAssuredApi(data, myRequest);
+		return re;
+	}
+
+	@Override
+	public String handleOutput(Response re, HashMap<String, Object> data) {
+		JsonPath jp = re.body().jsonPath();
+		boolean result = true;
+		String failReason = "";
+
+		String json = StringUtils.decodeUnicode(re.asString());
+
+		if ((data.get("statusCode") != null)
+				&& (!data.get("statusCode").toString()
+						.equals(String.valueOf(re.getStatusCode())))) {
+			result = result && false;
+			failReason = failReason + "statusCode is expected "
+					+ data.get("statusCode").toString() + " but actually "
+					+ String.valueOf(re.getStatusCode()) + ". ";
+		}
+
+		if (json.length() != 0) {
+			
+			String msg=jp.getString("message");
+			String code=jp.getString("retcode");
+			
+			
+			if ((data.get("code") != null ) && (code != null) && (!code.equals(data.get("code").toString()))) {
+				result = result && false;
+				failReason = failReason + "code is expected "
+						+ data.get("code").toString() + " but actually "
+						+ jp.getString("retcode") + ".";
+			}
+
+			if ((data.get("msg") != null) && (msg != null) && (!msg.equals(data.get("msg").toString()))) {
+				result = result && false;
+				failReason = failReason + "msg is expected "
+						+ data.get("msg").toString() + " but actually "
+						+ jp.getString("retcode") + ".";
+			}
+			
+			if(data.get("custom") != null && json!=null){
+				//如果自定义结果包含多个希望结果，也就是有逗号，那么就切割，包含比较。
+				if(data.get("custom").toString().contains(",")){
+					String [] strCustomStrings=data.get("custom").toString().split(",");
+					for(int i=0;i<strCustomStrings.length;i++){
+						if(!json.contains(strCustomStrings[i])){
+							result = result && false;
+							failReason = failReason + "custom is expected "
+									+ data.get("custom").toString() + " but actually "
+									+ strCustomStrings[i] + ".";
+							break;
+						}
+					}
+				}else{//如果只有一个希望结果，就直接包含比较。
+					if(!json.contains(data.get("custom").toString())){
+						result = result && false;
+						failReason = failReason + "custom is expected "
+								+ data.get("custom").toString() + " but actually "
+								+ data.get("custom").toString() + ".";
+					}
+				}
+			}
+			
+			if("0".equals(code)){
+				
+			}
+		}
+		if (result)
+			return "Pass";
+		else
+			return "Fail:" + failReason;
+	}
+
+}

tiku_App/src/com/offcn/test/APITest_tk.java

@@ -90,7 +90,7 @@ public class APITest_tk extends BasicsGM{
 	  
 	  //数据回写
 //	  HashMap<String, Object> ExpectResult=MapUtil.Expect(data);
-//	  SheetUtils sheet = new SheetUtils("DataAllWff.xls", "Output");
+//	  SheetUtils sheet = new SheetUtils("DataAllMr.xls", "Output");
 //	  sheet.writeExcel(
 //			  		data.get("NO").toString(),
 //				  	data.get("TCNO").toString() + "_Step" + data.get("Step").toString(),