|
@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSON;
|
|
|
import com.alibaba.fastjson.JSONArray;
|
|
|
import com.alibaba.fastjson.JSONObject;
|
|
|
import com.alibaba.fastjson.annotation.JSONField;
|
|
|
+import com.fasterxml.jackson.annotation.JsonProperty;
|
|
|
import com.ym.mec.biz.dal.enums.ETencentGroupType;
|
|
|
import com.ym.mec.biz.dal.enums.ETencentImCallbackCommand;
|
|
|
import com.ym.mec.biz.dal.enums.ETencentTRTCCallbackCommand;
|
|
@@ -456,37 +457,64 @@ public class TencentData {
|
|
|
}
|
|
|
|
|
|
|
|
|
- @NoArgsConstructor
|
|
|
@Data
|
|
|
- public static class TRTCEventInfo {
|
|
|
+ @NoArgsConstructor
|
|
|
+ @AllArgsConstructor
|
|
|
+ @ApiModel("腾讯云回调事件")
|
|
|
+ public static class TRTCEventInfo implements Serializable {
|
|
|
|
|
|
+ @JsonProperty("EventGroupId")
|
|
|
@ApiModelProperty("事件组")
|
|
|
private String eventGroupId;
|
|
|
+
|
|
|
+ @JsonProperty("EventType")
|
|
|
@ApiModelProperty("事件类型")
|
|
|
private ETencentTRTCCallbackCommand eventType;
|
|
|
+
|
|
|
+ @JsonProperty("CallbackTs")
|
|
|
@ApiModelProperty("事件时间")
|
|
|
- private Date callbackTs;
|
|
|
+ private Long callbackTs;
|
|
|
+
|
|
|
+ @JsonProperty("EventInfo")
|
|
|
@ApiModelProperty("事件消息")
|
|
|
private EventInfo eventInfo;
|
|
|
|
|
|
+ public String jsonString() {
|
|
|
+ return JSON.toJSONString(this);
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
@Data
|
|
|
+ @NoArgsConstructor
|
|
|
+ @AllArgsConstructor
|
|
|
@ApiModel("事件消息")
|
|
|
- public static class EventInfo {
|
|
|
+ public static class EventInfo implements Serializable {
|
|
|
|
|
|
+ @JsonProperty("RoomId")
|
|
|
@ApiModelProperty("房间号")
|
|
|
private String roomId;
|
|
|
+
|
|
|
+ @JsonProperty("EventTs")
|
|
|
@ApiModelProperty("事件发生时间")
|
|
|
- private Date eventTs;
|
|
|
+ private Long eventTs;
|
|
|
+
|
|
|
+ @JsonProperty("UserId")
|
|
|
@ApiModelProperty("事件发生用户")
|
|
|
private String userId;
|
|
|
+
|
|
|
+ @JsonProperty("Role")
|
|
|
@ApiModelProperty("用户角色")
|
|
|
private String role;
|
|
|
+
|
|
|
+ @JsonProperty("TerminalType")
|
|
|
@ApiModelProperty("终端类型")
|
|
|
private String terminalType;
|
|
|
+
|
|
|
+ @JsonProperty("UserType")
|
|
|
@ApiModelProperty("用户类型")
|
|
|
private String userType;
|
|
|
+
|
|
|
+ @JsonProperty("Reason")
|
|
|
@ApiModelProperty("原因")
|
|
|
private String reason;
|
|
|
}
|