修改消息的返回类型

README.md

@@ -11,10 +11,10 @@ YxClient yxClient= new DefaultYxClient(serverUrl, appId, secret);
 ```
 2.  调用接口
 
-```
+```$java
 
 
- /**
+    /**
      * 推送一张视频单或图文单
      */
     private void pushOrderTest() {
@@ -57,18 +57,19 @@ YxClient yxClient= new DefaultYxClient(serverUrl, appId, secret);
         orderRequest.setDeploymentPharmacistId(28);
         orderRequest.setDispensingPharmacistId(383);
         //------- 指定药师部分结束-----
+
         PushOrderResponse response = yxClient.execute(orderRequest);
         System.out.println(response);
         // 房间进行视频通话的相关的信息
         RoomInfo data = response.getData();
-    
+    }
 
     /**
      * 根据处方号发送文本消息
      */
     private void sendTextMsg() {
         TextChatRequest request = new TextChatRequest("C2201121686180076", "医生你好");
-        EmptyResponse response = yxClient.execute(request);
+        ChatResponse response = yxClient.execute(request);
         // 后续需要合作方的接口等待接收回调
     }
 
@@ -80,7 +81,7 @@ YxClient yxClient= new DefaultYxClient(serverUrl, appId, secret);
                 "https://asset.nxk520.com/abc.png");
         request.setImgWidth(60);
         request.setImgHeight(110);
-        EmptyResponse response = yxClient.execute(request);
+        ChatResponse response = yxClient.execute(request);
         // 后续需要合作方的接口等待接收回调
     }
 
@@ -89,7 +90,7 @@ YxClient yxClient= new DefaultYxClient(serverUrl, appId, secret);
      */
     private void sendLiveMsg() {
         LiveChatRequest request = new LiveChatRequest("C2201121686180076");
-        EmptyResponse response = yxClient.execute(request);
+        ChatResponse response = yxClient.execute(request);
         // 后续需要合作方的接口等待接收回调
     }
 
@@ -98,7 +99,7 @@ YxClient yxClient= new DefaultYxClient(serverUrl, appId, secret);
         request.setDuration(20);
         request.setMediaUrl("https://asset.nxk520.com/test.mp4");
         request.setFileFormat("mp4");
-        EmptyResponse response = yxClient.execute(request);
+        ChatResponse response = yxClient.execute(request);
     }
 
     /**
@@ -130,12 +131,8 @@ YxClient yxClient= new DefaultYxClient(serverUrl, appId, secret);
 //        SyncPharmacistStatusRequest request = new SyncPharmacistStatusRequest();
 //        request.setPharmacistId(764);
 //        request.setStatus(0);
-
-// 药师用id & 0 注销，1启用
         SyncPharmacistStatusRequest request = new SyncPharmacistStatusRequest(764,0);
         SyncPharmacistResponse response = yxClient.execute(request);
     }
-
-}
 ```
 

src/main/java/com/github/yxyl120/sdk/domain/Chat.java

@@ -1,11 +1,14 @@
 package com.github.yxyl120.sdk.domain;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.github.yxyl120.sdk.annotation.ApiFieldProperty;
 
 public class Chat {
 
+    @ApiFieldProperty(value = "消息类型", required = true)
     private int chatType;
 
+    @ApiFieldProperty(value = "消息关联的处方单号", required = true)
     private String orderSn;
 
     public Chat(int chatType, String orderSn) {

src/main/java/com/github/yxyl120/sdk/request/ImageChatRequest.java

@@ -1,6 +1,7 @@
 package com.github.yxyl120.sdk.request;
 
 import com.github.yxyl120.sdk.domain.Chat;
+import com.github.yxyl120.sdk.response.ChatResponse;
 import com.github.yxyl120.sdk.response.EmptyResponse;
 
 import java.util.Map;
@@ -8,7 +9,7 @@ import java.util.Map;
 /**
  * 发送图片消息到医生
  */
-public class ImageChatRequest extends Chat implements YxRequest<EmptyResponse> {
+public class ImageChatRequest extends Chat implements YxRequest<ChatResponse> {
 
     private String imgUrl;
 
@@ -27,8 +28,8 @@ public class ImageChatRequest extends Chat implements YxRequest<EmptyResponse> {
     }
 
     @Override
-    public Class<EmptyResponse> getResponseClass() {
-        return EmptyResponse.class;
+    public Class<ChatResponse> getResponseClass() {
+        return ChatResponse.class;
     }
 
     public String getImgUrl() {

src/main/java/com/github/yxyl120/sdk/request/LiveChatRequest.java

@@ -1,6 +1,7 @@
 package com.github.yxyl120.sdk.request;
 
 import com.github.yxyl120.sdk.domain.Chat;
+import com.github.yxyl120.sdk.response.ChatResponse;
 import com.github.yxyl120.sdk.response.EmptyResponse;
 
 import java.util.Map;
@@ -8,7 +9,7 @@ import java.util.Map;
 /**
  * 发起视频聊天
  */
-public class LiveChatRequest extends Chat implements YxRequest<EmptyResponse>{
+public class LiveChatRequest extends Chat implements YxRequest<ChatResponse>{
     /**
      * 发起的时间戳
      */
@@ -25,8 +26,8 @@ public class LiveChatRequest extends Chat implements YxRequest<EmptyResponse>{
     }
 
     @Override
-    public Class<EmptyResponse> getResponseClass() {
-        return EmptyResponse.class;
+    public Class<ChatResponse> getResponseClass() {
+        return ChatResponse.class;
     }
 
     public long getTimeStamp() {

src/main/java/com/github/yxyl120/sdk/request/MediaChatRequest.java

@@ -2,6 +2,7 @@ package com.github.yxyl120.sdk.request;
 
 import com.github.yxyl120.sdk.annotation.ApiFieldProperty;
 import com.github.yxyl120.sdk.domain.Chat;
+import com.github.yxyl120.sdk.response.ChatResponse;
 import com.github.yxyl120.sdk.response.EmptyResponse;
 
 import java.util.Map;
@@ -9,7 +10,7 @@ import java.util.Map;
 /**
  * 媒体消息请求类
  */
-public class MediaChatRequest extends Chat implements YxRequest<EmptyResponse> {
+public class MediaChatRequest extends Chat implements YxRequest<ChatResponse> {
 
     @ApiFieldProperty(value = "媒体播放地址", required = true)
     private String mediaUrl;
@@ -51,8 +52,8 @@ public class MediaChatRequest extends Chat implements YxRequest<EmptyResponse> {
     }
 
     @Override
-    public Class<EmptyResponse> getResponseClass() {
-        return EmptyResponse.class;
+    public Class<ChatResponse> getResponseClass() {
+        return ChatResponse.class;
     }
 
     public String getMediaUrl() {

src/main/java/com/github/yxyl120/sdk/request/TextChatRequest.java

@@ -2,11 +2,11 @@ package com.github.yxyl120.sdk.request;
 
 import com.github.yxyl120.sdk.annotation.ApiFieldProperty;
 import com.github.yxyl120.sdk.domain.Chat;
-import com.github.yxyl120.sdk.response.EmptyResponse;
+import com.github.yxyl120.sdk.response.ChatResponse;
 
 import java.util.Map;
 
-public class TextChatRequest extends Chat implements YxRequest<EmptyResponse> {
+public class TextChatRequest extends Chat implements YxRequest<ChatResponse> {
 
     @ApiFieldProperty(value = "消息内容", required = true)
     private String content;
@@ -22,7 +22,15 @@ public class TextChatRequest extends Chat implements YxRequest<EmptyResponse> {
     }
 
     @Override
-    public Class<EmptyResponse> getResponseClass() {
-        return EmptyResponse.class;
+    public Class<ChatResponse> getResponseClass() {
+        return ChatResponse.class;
+    }
+
+    public String getContent() {
+        return content;
+    }
+
+    public void setContent(String content) {
+        this.content = content;
     }
 }

src/main/java/com/github/yxyl120/sdk/response/ChatResponse.java

@@ -0,0 +1,40 @@
+package com.github.yxyl120.sdk.response;
+
+import com.github.yxyl120.sdk.annotation.ApiFieldProperty;
+
+public class ChatResponse extends AbstractResponse {
+
+    @ApiFieldProperty("合作方的处方单号")
+    private String orderSnThird;
+
+    @ApiFieldProperty("一线平台的处方单号")
+    private String orderSn;
+
+    @ApiFieldProperty("消息id")
+    private String msgId;
+
+
+    public String getOrderSnThird() {
+        return orderSnThird;
+    }
+
+    public void setOrderSnThird(String orderSnThird) {
+        this.orderSnThird = orderSnThird;
+    }
+
+    public String getOrderSn() {
+        return orderSn;
+    }
+
+    public void setOrderSn(String orderSn) {
+        this.orderSn = orderSn;
+    }
+
+    public String getMsgId() {
+        return msgId;
+    }
+
+    public void setMsgId(String msgId) {
+        this.msgId = msgId;
+    }
+}

src/test/java/com/yxyl120/APITest.java

@@ -7,6 +7,7 @@ import com.github.yxyl120.sdk.domain.DrugInfo;
 import com.github.yxyl120.sdk.domain.PatientInfo;
 import com.github.yxyl120.sdk.domain.RoomInfo;
 import com.github.yxyl120.sdk.request.*;
+import com.github.yxyl120.sdk.response.ChatResponse;
 import com.github.yxyl120.sdk.response.EmptyResponse;
 import com.github.yxyl120.sdk.response.PushOrderResponse;
 import com.github.yxyl120.sdk.response.SyncPharmacistResponse;
@@ -84,7 +85,7 @@ public class APITest {
      */
     private void sendTextMsg() {
         TextChatRequest request = new TextChatRequest("C2201121686180076", "医生你好");
-        EmptyResponse response = yxClient.execute(request);
+        ChatResponse response = yxClient.execute(request);
         // 后续需要合作方的接口等待接收回调
     }
 
@@ -96,7 +97,7 @@ public class APITest {
                 "https://asset.nxk520.com/abc.png");
         request.setImgWidth(60);
         request.setImgHeight(110);
-        EmptyResponse response = yxClient.execute(request);
+        ChatResponse response = yxClient.execute(request);
         // 后续需要合作方的接口等待接收回调
     }
 
@@ -105,7 +106,7 @@ public class APITest {
      */
     private void sendLiveMsg() {
         LiveChatRequest request = new LiveChatRequest("C2201121686180076");
-        EmptyResponse response = yxClient.execute(request);
+        ChatResponse response = yxClient.execute(request);
         // 后续需要合作方的接口等待接收回调
     }
 
@@ -114,7 +115,7 @@ public class APITest {
         request.setDuration(20);
         request.setMediaUrl("https://asset.nxk520.com/test.mp4");
         request.setFileFormat("mp4");
-        EmptyResponse response = yxClient.execute(request);
+        ChatResponse response = yxClient.execute(request);
     }
 
     /**