Merge branch 'master' of https://gitlab.eoffcn.com/ys65701/tiku_APP_APITest.git

tiku_App/src/com/offcn/api/tk/app3/getExpoundingAnswer.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;
+
+
+/**
+ * 
+ * @Description:   44. 人工批改--获取用户作答信息（NWN）
+ * @author: wff    
+ * @date: 2019年8月7日 下午4:13:45   
+ * @version V1.0
+ */
+
+public class getExpoundingAnswer extends TK implements API {
+	public String parameter;//参数集合
+	
+	public String record_id;//试卷使用记录id
+	public String user_id;//用户id
+	public String channel;//平台（1：tiku，2：nwn）
+	public String paper_id;//试卷id
+	public String nwn_paper_id;//试卷在nwn那边的主键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);
+		
+		record_id = MapUtil.getParameter(parameter, "record_id").trim();
+		user_id = MapUtil.getParameter(parameter, "user_id").trim();
+		channel = MapUtil.getParameter(parameter, "channel").trim();
+		paper_id = MapUtil.getParameter(parameter, "paper_id").trim();
+		nwn_paper_id = MapUtil.getParameter(parameter, "nwn_paper_id").trim();
+		
+		if ((!record_id.equals("")) && record_id.equals("code")) {
+			record_id= nwn_record_id;
+			parameter = parameter.replace("\"record_id\":code", "\"record_id\":\""+ record_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 ((!paper_id.equals("")) && paper_id.equals("code")) {
+			paper_id="1";
+			parameter = parameter.replace("\"paper_id\":code", "\"paper_id\":\""+ paper_id + "\"");
+		}
+		if ((!nwn_paper_id.equals("")) && nwn_paper_id.equals("code")) {
+			nwn_paper_id= "123";
+			parameter = parameter.replace("\"nwn_paper_id\":code", "\"nwn_paper_id\":\""+ nwn_paper_id + "\"");
+		}
+		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("record_id", record_id);
+		jsonAsMap.put("user_id", user_id);
+		jsonAsMap.put("channel", channel);
+		jsonAsMap.put("paper_id", paper_id);
+		jsonAsMap.put("nwn_paper_id", nwn_paper_id);
+		jsonAsMap.put("appid", tikuString);
+		
+		MyRequest myRequest=new MyRequest();
+		myRequest.setUrl(Url);
+		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;
+//				if(shelf_id =="" && shelf_id.equals("")){
+//					failReason = "10001";
+//				}
+				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;
+//				if(shelf_id =="" && shelf_id.equals("")){
+//					failReason = "参数接收失败！";
+//				}
+				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)){
+				conn=ConnectionsMap.get("tk");
+			}
+		}
+		if (result)
+			return "Pass";
+		else
+			return "Fail:" + failReason;
+	}
+
+}

tiku_App/src/com/offcn/api/tk/app3/getExpoundingReportInfo.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;
+
+
+/**
+ * 
+ * @Description:   43. 人工批改--获取批改结果（NWN）
+ * @author: wff    
+ * @date: 2019年7月29日 下午4:09:42   
+ * @version V1.0
+ */
+
+public class getExpoundingReportInfo extends TK implements API {
+	public String parameter;//参数集合
+	
+	public String record_id;//试卷使用记录id
+	public String user_id;//用户id
+	public String channel;//平台（1：tiku，2：nwn）
+	public String paper_id;//试卷id
+	public String nwn_paper_id;//试卷在nwn那边的主键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);
+		
+		record_id = MapUtil.getParameter(parameter, "record_id").trim();
+		user_id = MapUtil.getParameter(parameter, "user_id").trim();
+		channel = MapUtil.getParameter(parameter, "channel").trim();
+		paper_id = MapUtil.getParameter(parameter, "paper_id").trim();
+		nwn_paper_id = MapUtil.getParameter(parameter, "nwn_paper_id").trim();
+		
+		if ((!record_id.equals("")) && record_id.equals("code")) {
+			record_id= nwn_record_id;
+			parameter = parameter.replace("\"record_id\":code", "\"record_id\":\""+ record_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 ((!paper_id.equals("")) && paper_id.equals("code")) {
+			paper_id="1";
+			parameter = parameter.replace("\"paper_id\":code", "\"paper_id\":\""+ paper_id + "\"");
+		}
+		if ((!nwn_paper_id.equals("")) && nwn_paper_id.equals("code")) {
+			nwn_paper_id= "123";
+			parameter = parameter.replace("\"nwn_paper_id\":code", "\"nwn_paper_id\":\""+ nwn_paper_id + "\"");
+		}
+		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("record_id", record_id);
+		jsonAsMap.put("user_id", user_id);
+		jsonAsMap.put("channel", channel);
+		jsonAsMap.put("paper_id", paper_id);
+		jsonAsMap.put("nwn_paper_id", nwn_paper_id);
+		jsonAsMap.put("appid", tikuString);
+		
+		MyRequest myRequest=new MyRequest();
+		myRequest.setUrl(Url);
+		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;
+//				if(shelf_id =="" && shelf_id.equals("")){
+//					failReason = "10001";
+//				}
+				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;
+//				if(shelf_id =="" && shelf_id.equals("")){
+//					failReason = "参数接收失败！";
+//				}
+				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)){
+				conn=ConnectionsMap.get("tk");
+			}
+		}
+		if (result)
+			return "Pass";
+		else
+			return "Fail:" + failReason;
+	}
+
+}

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

@@ -20,6 +20,7 @@ import com.offcn.TestUnti.ListUtil;
 /**
  * 
  * @Description:   17.智能批改-获取主观题解析
+ *                 55.智能批改-获取主观题解析（该接口只给nwn使用）
  * @author: wff    
  * @date: 2019年6月12日 下午4:45:27   
  * @version V1.0
@@ -33,6 +34,8 @@ public class getExpoundingStepExplain extends TK implements API {
 	public String exam_id;//考试id
 	public String channel;//1题库 2nwn
 	public String origin_id;//试卷或者练习册id
+//	public String show_part_id;//用于控制某部分的显示与隐藏 1：作答内容 2:作答内容和解析 3：作答内容、解析、智能批改
+//	public String paper_release;//试卷是否为人工批改，1：是，0：否（默认值为0）
 
 	@Override
 	public void initialize(HashMap<String, Object> data) {
@@ -58,7 +61,7 @@ public class getExpoundingStepExplain extends TK implements API {
 			parameter = parameter.replace("\"user_id\":code", "\"user_id\":\""+ user_id + "\"");
 		}
 		if ((!record_id.equals("")) && record_id.equals("code")) {
-			record_id = record_id_L;
+			record_id = nwn_record_id;
 			parameter = parameter.replace("\"record_id\":code", "\"record_id\":\""+ record_id + "\"");
 		}
 		if ((!exam_id.equals("")) && exam_id.equals("code")) {

tiku_App/src/com/offcn/api/tk/app3/getNWNUserPracticeList.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;
+
+
+/**
+ * 
+ * @Description:   39. 学员管理--练习组件详情（NWN使用）
+ * @author: wff    
+ * @date: 2019年7月29日 下午2:10:05   
+ * @version V1.0
+ */
+
+public class getNWNUserPracticeList extends TK implements API {
+	public String parameter;//参数集合
+	
+	public String sso_id;//该学习包内所有用户的sso_id，多个sso_id中间用英文逗号间隔
+	public String user_sso_id;//当前用户的sso_id
+	public String practice_id;//该学习包内所有练习册id，多个练习册id中间用英文逗号间隔（paper_id与practice_id参数至少需要一个，不可同时为空）
+	public String paper_id;//该学习包内所有试卷id，多个试卷id中间用英文逗号间隔（paper_id与practice_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);
+		practice_id = MapUtil.getParameter(parameter, "practice_id").trim();
+		sso_id = MapUtil.getParameter(parameter, "sso_id").trim();
+		paper_id = MapUtil.getParameter(parameter, "paper_id").trim();
+		user_sso_id = MapUtil.getParameter(parameter, "user_sso_id").trim();
+		
+		if ((!sso_id.equals("")) && sso_id.equals("code")) {
+			sso_id= "1" + new Random().nextInt(9000000);
+			parameter = parameter.replace("\"sso_id\":code", "\"sso_id\":\""+ sso_id + "\"");
+		}
+		if ((!user_sso_id.equals("")) && user_sso_id.equals("code")) {
+			user_sso_id= "1" + new Random().nextInt(9000000);
+			parameter = parameter.replace("\"user_sso_id\":code", "\"user_sso_id\":\""+ user_sso_id + "\"");
+		}
+		if ((!practice_id.equals("")) && practice_id.equals("code")) {
+			practice_id="597";
+			parameter = parameter.replace("\"practice_id\":code", "\"practice_id\":\""+ practice_id + "\"");
+		}
+		if ((!paper_id.equals("")) && paper_id.equals("code")) {
+			paper_id= paper_id_L;
+			parameter = parameter.replace("\"paper_id\":code", "\"paper_id\":\""+ paper_id + "\"");
+		}
+		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("sso_id", sso_id);
+		jsonAsMap.put("practice_id", practice_id);
+		jsonAsMap.put("paper_id", paper_id);
+		jsonAsMap.put("user_sso_id", user_sso_id);
+		jsonAsMap.put("appid", tikuString);
+		
+		MyRequest myRequest=new MyRequest();
+		myRequest.setUrl(Url);
+		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;
+//				if(shelf_id =="" && shelf_id.equals("")){
+//					failReason = "10001";
+//				}
+				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;
+//				if(shelf_id =="" && shelf_id.equals("")){
+//					failReason = "参数接收失败！";
+//				}
+				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)){
+				conn=ConnectionsMap.get("tk");
+			}
+		}
+		if (result)
+			return "Pass";
+		else
+			return "Fail:" + failReason;
+	}
+
+}

tiku_App/src/com/offcn/api/tk/app3/getPaperMaterialInfo.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;
+
+
+/**
+ * 
+ * @Description:   45. 人工批改--获取试卷材料信息（NWN）
+ * @author: wff    
+ * @date: 2019年8月7日 下午4:50:44   
+ * @version V1.0
+ */
+
+public class getPaperMaterialInfo extends TK implements API {
+	public String parameter;//参数集合
+	
+	public String paper_id;//试卷id
+	public String nwn_paper_id;//试卷在nwn那边的主键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);
+		
+		paper_id = MapUtil.getParameter(parameter, "paper_id").trim();
+		nwn_paper_id = MapUtil.getParameter(parameter, "nwn_paper_id").trim();
+		
+		if ((!paper_id.equals("")) && paper_id.equals("code")) {
+			paper_id="1";
+			parameter = parameter.replace("\"paper_id\":code", "\"paper_id\":\""+ paper_id + "\"");
+		}
+		if ((!nwn_paper_id.equals("")) && nwn_paper_id.equals("code")) {
+			nwn_paper_id= "123";
+			parameter = parameter.replace("\"nwn_paper_id\":code", "\"nwn_paper_id\":\""+ nwn_paper_id + "\"");
+		}
+		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("paper_id", paper_id);
+		jsonAsMap.put("nwn_paper_id", nwn_paper_id);
+		jsonAsMap.put("appid", tikuString);
+		
+		MyRequest myRequest=new MyRequest();
+		myRequest.setUrl(Url);
+		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;
+//				if(shelf_id =="" && shelf_id.equals("")){
+//					failReason = "10001";
+//				}
+				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;
+//				if(shelf_id =="" && shelf_id.equals("")){
+//					failReason = "参数接收失败！";
+//				}
+				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)){
+				conn=ConnectionsMap.get("tk");
+			}
+		}
+		if (result)
+			return "Pass";
+		else
+			return "Fail:" + failReason;
+	}
+
+}

tiku_App/src/com/offcn/api/tk/app3/getPaperStatusNwn.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;
+
+
+
+/**
+ * 
+ * @Description:   54. 人工批改--判断试卷状态
+ * @author: wff    
+ * @date: 2019年8月8日 上午10:50:09   
+ * @version V1.0
+ */
+public class getPaperStatusNwn extends TK implements API {
+	public String parameter;//参数集合
+	
+	public String record_id;//试卷使用记录id
+	public String status;//试卷状态（默认值：0）
+
+	@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);
+		record_id = MapUtil.getParameter(parameter, "record_id").trim();
+		status = MapUtil.getParameter(parameter, "status").trim();
+		
+		if ((!record_id.equals("")) && record_id.equals("code")) {
+			record_id= nwn_record_id;
+			parameter = parameter.replace("\"record_id\":code", "\"record_id\":\""+ record_id + "\"");
+		}
+		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("record_id", record_id);
+		jsonAsMap.put("status", status);
+		jsonAsMap.put("appid", tikuString);
+		
+		MyRequest myRequest=new MyRequest();
+		myRequest.setUrl("/apiv3/api/api/getPaperStatus");
+		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/api/tk/app3/getPastMockDetail.java

@@ -31,7 +31,7 @@ import net.sf.json.JSONObject;
 
 /**
  * 2. 模考大赛-补考获取模考详情 （v3 . 41）
- * 
+ * 41.模考大赛-补考获取模考详情
  */
 
 public class getPastMockDetail extends TK implements API {

tiku_App/src/com/offcn/api/tk/app3/releaseScoreToStudent.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;
+
+
+/**
+ * 
+ * @Description:   47. 人工批改--发布给学员（NWN）
+ * @author: wff    
+ * @date: 2019年8月8日 上午9:43:14   
+ * @version V1.0
+ */
+
+public class releaseScoreToStudent extends TK implements API {
+	public String parameter;//参数集合
+	
+	public String record_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);
+		
+		record_id = MapUtil.getParameter(parameter, "record_id").trim();
+		
+		if ((!record_id.equals("")) && record_id.equals("code")) {
+			record_id= nwn_record_id;
+			parameter = parameter.replace("\"record_id\":code", "\"record_id\":\""+ record_id + "\"");
+		}
+		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("record_id", record_id);
+		jsonAsMap.put("appid", tikuString);
+		
+		MyRequest myRequest=new MyRequest();
+		myRequest.setUrl(Url);
+		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;
+//				if(shelf_id =="" && shelf_id.equals("")){
+//					failReason = "10001";
+//				}
+				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;
+//				if(shelf_id =="" && shelf_id.equals("")){
+//					failReason = "参数接收失败！";
+//				}
+				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)){
+				conn=ConnectionsMap.get("tk");
+			}
+		}
+		if (result)
+			return "Pass";
+		else
+			return "Fail:" + failReason;
+	}
+
+}

tiku_App/src/com/offcn/api/tk/app3/subjectivePaperList.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;
+
+
+/**
+ * 
+ * @Description:   53. 人工批改--试卷批改列表
+ * @author: wff    
+ * @date: 2019年8月7日 上午10:19:02   
+ * @version V1.0
+ */
+
+public class subjectivePaperList extends TK implements API {
+	public String parameter;//参数集合
+	
+	public String page;//页码（默认1）
+	public String pagesize;//每页数量（默认15）
+	public String exer_id;//练习册id或试卷id
+	public String type;//类型（1：练习册，2：试卷）
+	public String sso_id;//用户sso_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);
+		
+		page = MapUtil.getParameter(parameter, "page").trim();
+		pagesize = MapUtil.getParameter(parameter, "pagesize").trim();
+		exer_id = MapUtil.getParameter(parameter, "exer_id").trim();
+		type = MapUtil.getParameter(parameter, "type").trim();
+		sso_id = MapUtil.getParameter(parameter, "sso_id").trim();
+		
+		if ((!exer_id.equals("")) && exer_id.equals("code")) {
+			exer_id= "";//试卷id
+			parameter = parameter.replace("\"exer_id\":code", "\"exer_id\":\""+ exer_id + "\"");
+		}
+		if ((!sso_id.equals("")) && sso_id.equals("code")) {
+//			sso_id= "1" + new Random().nextInt(9000000);
+			sso_id= "";
+			parameter = parameter.replace("\"sso_id\":code", "\"sso_id\":\""+ sso_id + "\"");
+		}
+		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("page", page);
+		jsonAsMap.put("pagesize", pagesize);
+		jsonAsMap.put("type", type);
+		jsonAsMap.put("exer_id", exer_id);
+		jsonAsMap.put("sso_id", sso_id);
+		jsonAsMap.put("appid", tikuString);
+		
+		MyRequest myRequest=new MyRequest();
+		myRequest.setUrl(Url);
+		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;
+//				if(shelf_id =="" && shelf_id.equals("")){
+//					failReason = "10001";
+//				}
+				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;
+//				if(shelf_id =="" && shelf_id.equals("")){
+//					failReason = "参数接收失败！";
+//				}
+				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)){
+				conn=ConnectionsMap.get("tk");
+				
+				nwn_record_id = jp.getString("data.question_list[0].record_id");
+			}
+		}
+		if (result)
+			return "Pass";
+		else
+			return "Fail:" + failReason;
+	}
+
+}

tiku_App/src/com/offcn/process/TK.java

@@ -71,6 +71,7 @@ public class TK extends BasicsGM{
 	public static String L_tab_id="";//各层级的唯一标识id
 //	tiku3接口数据
 	public static String L_shelf_id="";//书架id
+	public static String nwn_record_id="";//nwn使用的   试卷使用记录id