fangyeqing / xkl-interface-example-all · Commits

Go to a project

Authored by zhaoyue
Commit 3c48f5b110344e0e90bd0691f3302cbaeca5b451 1 parent e6b6518b

Fix little bug

Inline Side-by-side
Showing 6 changed files with 4 additions and 7 deletions
@@ -27,7 +27,6 @@ @@ -27,7 +27,6 @@
27 <artifactId>json</artifactId> 27 <artifactId>json</artifactId>
28 <version>20160810</version> 28 <version>20160810</version>
29 </dependency> 29 </dependency>
30 -  
31 </dependencies> 30 </dependencies>
32 31
33 </project> 32 </project>
1 git add --all src/* 1 git add --all src/*
2 git add push.sh 2 git add push.sh
3 git add pom.xml 3 git add pom.xml
4 -git commit -m "Add test code for uspih" 4 +git commit -m "Fix little bug"
5 git push origin master 5 git push origin master
6 git status 6 git status
@@ -7,6 +7,6 @@ public interface Constants { @@ -7,6 +7,6 @@ public interface Constants {
7 7
8 // String URL_PREFIX = "http://127.0.0.1:8090"; 8 // String URL_PREFIX = "http://127.0.0.1:8090";
9 String URL_PREFIX = "http://139.129.166.85:8090"; 9 String URL_PREFIX = "http://139.129.166.85:8090";
10 - 10 +//
11 String KEY = "weixin"; 11 String KEY = "weixin";
12 } 12 }
1 package com.xkl.upsoft; 1 package com.xkl.upsoft;
2 2
3 3
4 -import org.json.JSONArray;  
5 import org.json.JSONObject; 4 import org.json.JSONObject;
6 import org.junit.Test; 5 import org.junit.Test;
7 6
@@ -14,7 +13,6 @@ public class Data { @@ -14,7 +13,6 @@ public class Data {
14 public static final String ADMIN_ACCOUNT = "user1"; 13 public static final String ADMIN_ACCOUNT = "user1";
15 public static final String ADMIN_PWD = "pass1"; 14 public static final String ADMIN_PWD = "pass1";
16 public static final String USR_ACCOUNT = "15211112222"; 15 public static final String USR_ACCOUNT = "15211112222";
17 - // "{\"ABD\":\"35.66\",\"LAC\":\"36.23\",\"LCA\":\"32.94\",\"RAC\":\"35.84\",\"RCA\":\"33.05\",\"age\":\"24\",\"atmospheric_pressure\":\"756.58\",\"basic_result\":\"初步检测结果(仅供参考):\\n\\n低渗性血管张力异常 \\n\\n有必要排除血凝异常 血凝升高 \\n\\n建议向胃肠病专家（精于胃十二指肠炎）进一步咨询 \\n\\n血管张力异常，静脉循环障碍 酒精性高血压 \\n\\n第三脑室宽度=6.42 \\n\\n建议向妇科医生进一步咨询 其它器官血流量占=4.1 \\n\\nTiffeneau指数持续减少83.6 (Tiffeneau测试) \\n\\n----------------------------------------------------------------------------------------------------------\\n\\n\\n\",\"basic_result_ids\":[1,2,3,4],\"detail\":{\"1\":\"117.54\",\"10\":\"01.29\",\"100\":\"5.06\",\"101\":\"250.60\",\"102\":\"8.61\",\"103\":\"0.319\",\"104\":\"370.02\",\"105\":\"45.98\",\"106\":\"62.96\",\"107\":\"325.68\",\"108\":\"3.750\",\"109\":\"71.52\",\"11\":\"02.13\",\"110\":\"0.136\",\"111\":\"0.392\",\"112\":\"0.079\",\"113\":\"67.78\",\"114\":\"113.66\",\"115\":\"71.55\",\"116\":\"6.42\",\"117\":\"0.91\",\"118\":\"78.4\",\"119\":\"66.0\",\"12\":\"245.28\",\"120\":\"31\",\"121\":\"90\",\"122\":\"340\",\"123\":\"0.93\",\"124\":\"0.97\",\"125\":\"15\",\"13\":\"2.45\",\"14\":\"0.86\",\"15\":\"4.06\",\"16\":\"134.78\",\"17\":\"1.56\",\"18\":\"7.33\",\"19\":\"5.18\",\"2\":\"3.81\",\"20\":\"42.62\",\"21\":\"5.21\",\"22\":\"0.26\",\"23\":\"0.26\",\"24\":\"13.12\",\"25\":\"14.87\",\"26\":\"1.01\",\"27\":\"10.52\",\"28\":\"2.83\",\"29\":\"7.69\",\"3\":\"36.87\",\"30\":\"61.82\",\"31\":\"82.57\",\"32\":\"28.00\",\"33\":\"1.41\",\"34\":\"5.53\",\"35\":\"5.00\",\"36\":\"38.19\",\"37\":\"4.01\",\"38\":\"2.34\",\"39\":\"0.30\",\"4\":\"7.34\",\"40\":\"1.13\",\"41\":\"0.80\",\"42\":\"4.77\",\"43\":\"14.55\",\"44\":\"21.39\",\"45\":\"40.28\",\"46\":\"56.21\",\"47\":\"8.04\",\"48\":\"162.71\",\"49\":\"75.6\",\"5\":\"46.70\",\"50\":\"25.41\",\"51\":\"86.24\",\"52\":\"251.45\",\"53\":\"0.0050\",\"54\":\"1.68\",\"55\":\"475.35\",\"56\":\"35.47\",\"57\":\"3.8396\",\"58\":\"1052.84\",\"59\":\"64.17\",\"6\":\"5.07\",\"60\":\"3.82\",\"61\":\"265.63\",\"62\":\"3953.54\",\"63\":\"58.44\",\"64\":\"4.52\",\"65\":\"18.93\",\"66\":\"14.01\",\"67\":\"25.61\",\"68\":\"26.05\",\"69\":\"6.66\",\"7\":\"5.36\",\"70\":\"4.08\",\"71\":\"261.67\",\"72\":\"1209.45\",\"73\":\"819.37\",\"74\":\"2134.08\",\"75\":\"1726.00\",\"76\":\"421.24\",\"77\":\"265.40\",\"78\":\"140.33\",\"79\":\"72.37\",\"8\":\"7.35\",\"80\":\"19.51\",\"81\":\"4.78\",\"82\":\"53.24\",\"83\":\"3.94\",\"84\":\"3.19\",\"85\":\"160.94\",\"86\":\"2.22\",\"87\":\"80.94\",\"88\":\"34.53\",\"89\":\"3607.41\",\"9\":\"3.72\",\"90\":\"7.38\",\"91\":\"1922.57\",\"92\":\"85.16\",\"93\":\"83.59\",\"94\":\"71.95\",\"95\":\"6.64\",\"96\":\"0.96\",\"97\":\"1135.53\",\"98\":\"2.48\",\"99\":\"96.97\"},\"name\":\"测试\",\"number\":\"12345678901\",\"pulse\":\"79\",\"report_date\":\"2014-12-17 17:01:40\",\"respiratory_rate\":\"18\",\"sex\":0,\"stable\":\"99999\",\"total\":\"173.62\",\"weight\":\"45\",\"title\":\"AMP TITLE\",\"account\":\"user1\",\"machine_num\":\"10311212\"}";  
18 public static String AMP_REPORT = ""; 16 public static String AMP_REPORT = "";
19 17
20 18
@@ -45,7 +45,7 @@ public class ReportTest { @@ -45,7 +45,7 @@ public class ReportTest {
45 public void testDelReport() { 45 public void testDelReport() {
46 String token = loginAndGetToken(Data.ADMIN_ACCOUNT, Data.ADMIN_PWD); 46 String token = loginAndGetToken(Data.ADMIN_ACCOUNT, Data.ADMIN_PWD);
47 Map<String, String> params = new HashMap<String, String>(); 47 Map<String, String> params = new HashMap<String, String>();
48 - params.put("report_id", "99"); 48 + params.put("report_id", "107");
49 String response = HttpTools.requestByMapWithToken(URL_REPORT, "DELETE", params, token); 49 String response = HttpTools.requestByMapWithToken(URL_REPORT, "DELETE", params, token);
50 System.out.println("delete report:" + response); 50 System.out.println("delete report:" + response);
51 } 51 }
@@ -46,7 +46,7 @@ public class ReportTest { @@ -46,7 +46,7 @@ public class ReportTest {
46 public void testDelReport() { 46 public void testDelReport() {
47 String token = loginAndGetToken(Data.ADMIN_ACCOUNT, Data.ADMIN_PWD); 47 String token = loginAndGetToken(Data.ADMIN_ACCOUNT, Data.ADMIN_PWD);
48 Map<String, String> params = new HashMap<String, String>(); 48 Map<String, String> params = new HashMap<String, String>();
49 - params.put("report_id", "101"); 49 + params.put("report_id", "121");
50 String response = HttpTools.requestByMapWithToken(URL_REPORT, "DELETE", params, token); 50 String response = HttpTools.requestByMapWithToken(URL_REPORT, "DELETE", params, token);
51 System.out.println("delete report:" + response); 51 System.out.println("delete report:" + response);
52 } 52 }