Authored by zhaoyue

No change

git add --all src/*
git add push.sh
git add pom.xml
git commit -m "Upsoft pass testingfix little bug"
git commit -m "No change"
git push origin zhaoyue-dev
git status
\ No newline at end of file
git status
... ...
... ... @@ -6,6 +6,6 @@ package com.xkl.upsoft;
public interface Data {
public static final String ADMIN_ACCOUNT= "user1";
public static final String ADMIN_PWD= "pass1";
public static final String AMP_REPORT= "{\"ABD\":\"35.66\",\"LAC\":\"36.13\",\"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\",\"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\"},\"id_card_number\":\"\",\"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\":\"machine_num\"}";
public static final String AMP_REPORT= "{\"ABD\":\"35.64\",\"LAC\":\"36.13\",\"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\",\"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\"},\"id_card_number\":\"\",\"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\":\"machine_num\"}";
}
... ...
... ... @@ -45,7 +45,7 @@ public class ReportTest {
public void testDelReport() {
String token = loginAndGetToken(Data.ADMIN_ACCOUNT, Data.ADMIN_PWD);
Map<String, String> params = new HashMap<String, String>();
params.put("report_id", "51");
params.put("report_id", "73");
String response = HttpTools.requestByMapWithToken(URL_REPORT, "DELETE", params, token);
System.out.println("delete report:" + response);
}
... ...