Merge branch 'master' of dd.tall.wiki:ccsens_wiki/vs_test

4 years ago · 1f4958c0f4
5 changed files with 356 additions and 45 deletions
--- a/HT/认知.http
+++ b/HT/认知.http
@ -18,7 +18,7 @@

 ### login
 # @name login
-POST {{localhost_tall}}/users/signin
+POST {{test_tall}}/users/signin
 # POST {{localhost_tall}}/users/signin
 {{type}}

--- a/mt/mt.http
+++ b/mt/mt.http
@ -126,8 +126,8 @@ Authorization: Bearer {{login.response.body.$.data.token}}


 ### 报名表
-# POST https://www.tall.wiki/gateway/mt/down/competeJoin
-POST http://localhost:7060/down/competeJoin
+POST https://www.tall.wiki/gateway/mt/down/competeJoin
+# POST http://localhost:7060/down/competeJoin
 {{type}}
 Authorization: Bearer {{login.response.body.$.data.token}}

@ -139,8 +139,8 @@ Authorization: Bearer {{login.response.body.$.data.token}}
 }

 ### 报名汇总表
-# POST https://www.tall.wiki/gateway/mt/down/competeAllCount
-POST http://localhost:7060/down/competeAllCount
+POST https://www.tall.wiki/gateway/mt/down/competeAllCount
+# POST http://localhost:7060/down/competeAllCount
 {{type}}
 Authorization: Bearer {{login.response.body.$.data.token}}

@ -152,8 +152,8 @@ Authorization: Bearer {{login.response.body.$.data.token}}
 }

 ### 参赛队伍信息表
-# POST https://www.tall.wiki/gateway/mt/down/competitionTeamInformationTable
-POST http://localhost:7060/down/competitionTeamInformationTable
+POST https://www.tall.wiki/gateway/mt/down/competitionTeamInformationTable
+# POST http://localhost:7060/down/competitionTeamInformationTable
 {{type}}
 Authorization: Bearer {{login.response.body.$.data.token}}

@ -165,8 +165,8 @@ Authorization: Bearer {{login.response.body.$.data.token}}
 }

 ### 代表队名单
-# POST https://www.tall.wiki/gateway/mt/down/teamList
-POST http://localhost:7060/down/teamList
+POST https://www.tall.wiki/gateway/mt/down/teamList
+# POST http://localhost:7060/down/teamList
 {{type}}
 Authorization: Bearer {{login.response.body.$.data.token}}

@ -196,8 +196,8 @@ Authorization: Bearer {{login.response.body.$.data.token}}


 ### 出场顺序表
-# POST https://www.tall.wiki/gateway/mt/down/competitionOrder
-POST http://localhost:7060/down/competitionOrder
+POST https://www.tall.wiki/gateway/mt/down/competitionOrder
+# POST http://localhost:7060/down/competitionOrder
 {{type}}
 Authorization: Bearer {{login.response.body.$.data.token}}

@ -345,9 +345,10 @@ Authorization: Bearer {{login.response.body.$.data.token}}

 }

-### 生成出场顺序
-# POST https://www.tall.wiki/gateway/mt/down/competitionOrder
-POST http://localhost:7060/compete/task/update
+
+### 生成出场顺序  类型4
+POST https://www.tall.wiki/gateway/mt/compete/task/update
+# POST http://localhost:7060/compete/task/update
 {{type}}
 Authorization: Bearer {{login.response.body.$.data.token}}

@ -356,15 +357,168 @@ Authorization: Bearer {{login.response.body.$.data.token}}
      "projectId":5,
      "tallRoleId":2,
      "updateCompeteTaskList":[
-        
        {
-          "projectId":202104410,
+          "projectId":202104323,
+          "duration":180000,
+          "siteNum":1,
+          "startTime":1623461400000,
+          "endTime":1623462600000
+        }
+        ,
+        {
+          "projectId":202104324,
+          "duration":180000,
+          "siteNum":1,
+          "startTime":1623462600000,
+          "endTime":1623463500000
+        }
+        ,
+        {
+          "projectId":202104304,
          "duration":30000,
          "siteNum":4,
-          "startTime":1622269800000,
-          "endTime":1622275200000
+          "startTime":1623464100000,
+          "endTime":1623466500000
+        }
+        ,
+        {
+          "projectId":202104305,
+          "duration":30000,
+          "siteNum":4,
+          "startTime":1623466800000,
+          "endTime":1623468600000
+        }
+         ,
+        {
+          "projectId":202104311,
+          "duration":30000,
+          "siteNum":4,
+          "startTime":1623468600000,
+          "endTime":1623470400000
+        }
+          ,
+        {
+          "projectId":202104306,
+          "duration":30000,
+          "siteNum":4,
+          "startTime":1623479400000,
+          "endTime":1623480000000
+        }
+        ,
+        {
+          "projectId":202104310,
+          "duration":30000,
+          "siteNum":4,
+          "startTime":1623480000000,
+          "endTime":1623481500000
+        }
+        ,
+        {
+          "projectId":202104308,
+          "duration":30000,
+          "siteNum":4,
+          "startTime":1623481800000,
+          "endTime":1623482400000
+        }
+        ,
+        {
+          "projectId":202104312,
+          "duration":30000,
+          "siteNum":4,
+          "startTime":1623482700000,
+          "endTime":1623483300000
+        }
+        ,
+        {
+          "projectId":202104313,
+          "duration":30000,
+          "siteNum":4,
+          "startTime":1623483600000,
+          "endTime":1623484800000
+        }
+        ,
+        {
+          "projectId":202104318,
+          "duration":180000,
+          "siteNum":1,
+          "startTime":1623485400000,
+          "endTime":1623487200000
+        }
+        ,
+         {
+          "projectId":202104319,
+          "duration":180000,
+          "siteNum":1,
+          "startTime":1623485400000,
+          "endTime":1623487200000
+        }
+        ,
+        {
+          "projectId":202104320,
+          "duration":180000,
+          "siteNum":1,
+          "startTime":1623487800000,
+          "endTime":1623488700000
+        }
+        ,
+        {
+          "projectId":202104321,
+          "duration":180000,
+          "siteNum":1,
+          "startTime":1623487800000,
+          "endTime":1623488700000
+        }
+        ,
+        {
+          "projectId":202104315,
+          "duration":180000,
+          "siteNum":1,
+          "startTime":1623489000000,
+          "endTime":1623490200000
+        }
+        ,
+        {
+          "projectId":202104316,
+          "duration":180000,
+          "siteNum":1,
+          "startTime":1623490500000,
+          "endTime":1623491700000
+        }
+        ,
+        {
+          "projectId":202104307,
+          "duration":30000 ,
+          "siteNum":4,
+          "startTime":1623546000000,
+          "endTime":1623551400000
+        }
+          ,
+        {
+          "projectId":202104309,
+          "duration":30000,
+          "siteNum":4,
+          "startTime":1623552000000,
+          "endTime":1623553200000
+        }
+          ,
+        {
+          "projectId":202104317,
+          "duration":180000,
+          "siteNum":1,
+          "startTime":1623553800000,
+          "endTime":1623555000000
+        }
+          ,
+        {
+          "projectId":202104322,
+          "duration":180000,
+          "siteNum":1,
+          "startTime":1623555300000,
+          "endTime":1623556200000
        }
      ]
    }

 }
+
+
--- a/tall/project/ExcelController.http
+++ b/tall/project/ExcelController.http
@ -15,7 +15,7 @@
 ### login

 # @name login
-POST {{loaclhost}}{{tallLocal}}/users/signin
+POST {{www}}{{tall}}/users/signin
 {{type}}

 {
@ -43,7 +43,7 @@ Authorization: Bearer {{login.response.body.$.data.token}}

 //Excel
 ### 导入WBS
-POST {{loaclhost}}{{tallLocal}}/projects/wbs
+POST {{www}}{{tall}}/projects/wbs
 # POST {{loaclhost}}{{tallLocal}}/projects/wbs
 Content-Type: multipart/form-data; boundary=----WebKitFormBoundary7MA4YWxkTrZu0gW
 Authorization: Bearer {{login.response.body.$.data.token}}
--- a/智慧平车/智慧平车接口测试.http
+++ b/智慧平车/智慧平车接口测试.http
@ -1,4 +1,4 @@
-@www = https://test.tall.wiki/gateway/logistics/
+@www = https://www.tall.wiki/gateway/wisdomcar2/
@green = https://www.sxwikionline.com/gateway/greenvalley
@wiki = https://www.sxwikionline.com/gateway/wiki
@type = content-type: application/json;charset=utf-8
@ -23,7 +23,7 @@ POST {{testTall}}/users/signin
  "client": 1,
  "data": {
    "credential": "123456",
-	"identifier": "mazhuang"
+	"identifier": "zb11"
  },
  "scene": 0,
  "type": 3
@ -31,16 +31,16 @@ POST {{testTall}}/users/signin

 #创建病例
 ###
-POST http://192.168.4.113:7120/car/createCase
-# POST {{www}}mbps/selAllMbps
+# POST http://localhost:7120/car/createCase
+POST {{www}}car/createCase
 {{type}}
 Authorization: Bearer {{login.response.body.$.data.token}}

 {
  "param":{
-      "patientName":"张三",
-      "familyName":"张三家长",
-      "familyPhone":"13233032293"
+      "patientName":"张大斌",
+      "familyName":"张斌",
+      "familyPhone":"110"
    }
 }

@ -82,13 +82,15 @@ Authorization: Bearer {{login.response.body.$.data.token}}
 }

 ### 点击开始
-POST {{localhostCar}}/project/start
+POST {{www}}/project/start
 {{type}}
 Authorization: Bearer {{login.response.body.$.data.token}}

 {
  "param":{
-      "taskSubId":1400297473502744576
+
+      "taskSubId":1400763879319015424
+
    }
 }

@ -180,4 +182,121 @@ POST http://127.0.0.1:7120/debug/record
    "type": "2",
    "value": "2"
    }
-}
+}
+
+### 补录患者和家属信息
+POST http://localhost:7120/patientAndFamily/updatePatientInfo
+# POST {{www}}mbps/selAllMbps
+{{type}}
+Authorization: Bearer {{login.response.body.$.data.token}}
+
+{
+  "param":{
+    "id":"1399919046887219200",
+    "name":"法外狂徒",
+    "sex":"1",
+    "age":"32",
+    "idCard":"142602199908292511",
+    "phone":"10086",
+    "familyName":"父亲",
+    "familyPhone":"1008611"
+    }
+}
+
+
+#查看环节状态
+###F
+POST http://localhost:7120/step/findStepIsOver
+# POST {{www}}mbps/selAllMbps
+{{type}}
+Authorization: Bearer {{login.response.body.$.data.token}}
+
+{
+  "param":{
+      "patientCarId":"1"
+    }
+}
+
+
+#查看患者历史记录
+###F
+POST http://localhost:7120/patientAndFamily/findOldPatient
+# POST {{www}}mbps/selAllMbps
+{{type}}
+Authorization: Bearer {{login.response.body.$.data.token}}
+
+{
+  "param":{
+    }
+}
+
+#创建病例
+###F
+POST http://localhost:7120/car/createCase
+# POST {{www}}car/createCase
+{{type}}
+Authorization: Bearer {{login.response.body.$.data.token}}
+
+{
+  "param":{
+      "patientName":"马家家",
+      "patientSex":"0",
+      "patientAge":"22",
+      "patientIdCard":"142602199908292111",
+      "patientPhone":"13233032293",
+      "familyName":"马家家家长",
+      "familyPhone":"13233032294"
+    }
+}
+
+
+#测试
+###F
+POST http://localhost:7120/statistics/get/selResult
+# POST {{www}}mbps/selAllMbps
+{{type}}
+
+{
+  "param":{
+      "year":2020,
+      "hospitalId":0
+
+    }
+}
+
+
+
+#修改补录患者和家属信息
+###F
+POST http://localhost:7120/patientAndFamily/updatePatientInfo
+# POST {{www}}patientAndFamily/updatePatientInfo
+{{type}}
+Authorization: Bearer {{login.response.body.$.data.token}}
+
+{
+  "param":{
+    "id":"1",
+      "name":"张三",
+      "sex":"0",
+      "age":"18",
+      "idCard":"142602199908292111",
+      "phone":"13233032293",
+      "familyName":"张三家长",
+      "familyPhone":"13233032293"
+    }
+}
+
+
+
+### 切换项目
+POST {{www}}/project/switchProject
+{{type}}
+Authorization: Bearer {{login.response.body.$.data.token}}
+
+{
+  "param":{
+      "projectId":1400763879319015424
+    }
+}
+
+>>>>>>> 163f75ccb9867ed03755e8bbf0eb48e37b1a2a47
--- a/远程康复/recovery.http
+++ b/远程康复/recovery.http
@ -1,12 +1,14 @@
@test = https://test.tall.wiki/gateway/tall/v1.0
+@www = https://www.tall.wiki/gateway/tall/v1.0
@testRE = https://test.tall.wiki/gateway/recovery
+@wwwRE = https://www.tall.wiki/gateway/recovery
@localhost = http://localhost:7030/v1.0
@localhost_re = http://localhost:7190
@type = content-type: application/json;charset=utf-8

 ### 登录
 # @name login
-POST {{localhost}}/users/signin
+POST {{www}}/users/signin
 {{type}}

 {
@ -18,19 +20,27 @@ POST {{localhost}}/users/signin
  }
 }
 ### 开始一个训练
-POST {{localhost_re}}/patient/start
+POST {{localhost_re}}/debug/http
+{{type}}
+
+{
+
+}
+
+### 开始一个训练
+POST {{wwwRE}}/patient/start
 {{type}}
 Authorization: Bearer {{login.response.body.$.data.token}}

 {
  "param":{
    "patientId":"1",
-    "subTaskId":"1",
+    "subTaskId":"1400686177719292060",
    "recipeProjectId":"1",
    "gameId":"1",
-    "sceneDoctorId":"1",
-    "remoteGuidance":"1",
-    "remoteDoctorId":"1"
+    "sceneDoctorId":"",
+    "remoteGuidance":"0",
+    "remoteDoctorId":""
  }
 }

@ -47,9 +57,9 @@ Authorization: Bearer {{login.response.body.$.data.token}}
 }

 ### 结束一个训练
-POST {{localhost_re}}/patient/end
+# POST {{localhost_re}}/patient/end
+POST {{testRE}}/patient/end
 {{type}}
-Authorization: Bearer {{login.response.body.$.data.token}}

 {
  "param":{
@ -58,6 +68,7 @@ Authorization: Bearer {{login.response.body.$.data.token}}
  }
 }

+{"toDomain":"Server","data":"{\"type\":\"Auth\",\"data\":{\"userId\":\"1399952569681448962\"},\"major\":1,\"minor\":1}"}
 ### 动作反馈
 POST {{localhost_re}}/patient/feedback
 {{type}}
@ -65,19 +76,19 @@ Authorization: Bearer {{login.response.body.$.data.token}}

 {
  "param":{
-    "recordId":"1",
-    "result":""
+    "recordId":"1400643708008927232",
+    "result":"true"
  }
 }

 ### 竖屏全屏后查看患者的详细信息
-POST {{localhost_re}}/patient/fullScreen
+POST {{wwwRE}}/patient/fullScreen
 {{type}}
 Authorization: Bearer {{login.response.body.$.data.token}}

 {
  "param":{
-    "detailId":"11"
+    "detailId":"1400051983783694336"
  }
 }

@ -128,14 +139,41 @@ Authorization: Bearer {{login.response.body.$.data.token}}
 }


+
 ### 启动康复流程
-POST {{testRE}}/patient/choose
+POST {{localhost_re}}/patient/choose
 {{type}}
 Authorization: Bearer {{login.response.body.$.data.token}}

 {
  "param":{
-    "id": "123",
+    "id": "1",
    "robotId":"1"
  }
-}
+}
+
+
+{"toDomain":"Server","data":"{\"type\":\"Auth\",\"data\":{\"userId\":\"1399952569681448962\"},\"major\":1,\"minor\":1}"}
+
+
+{"ackId":"User_1218763410024566784_{}_null","messageSet":[{"id":"60b9928d8448b303d6751c31","time":"1622774413","fromDomain":"Queue","from":"tall_message_1","data":"{\"time\":\"1622774413135\",\"type\":\"switchoverProject\",\"event\":\"switchoverProject\",\"data\":{\"projectId\":\"1400051975156011008\"}}","authMessage":"null"}]}
+
+
+
+康复机器人
+  账号：kfjqr
+  密码：123456
+  1399952569681448962
+
+传小控（患者）
+  账号：chuanxiaokong
+  密码：123456
+  1399952569681448961
+
+康复医生
+  账号：kfys
+  密码：123456
+  1399952569681448963
+
+
+