1 增加对TimeInterval 的序列化

bulezeng(曾卫进) · bulezeng(曾卫进) · commit a34926235290 · 2018-11-06T17:45:30.000+08:00
diff --git a/src/main/java/com/tencent/xinge/bean/TimeInterval.java b/src/main/java/com/tencent/xinge/bean/TimeInterval.java
@@ -1,7 +1,14 @@
 package com.tencent.xinge.bean;
 
+import com.fasterxml.jackson.core.JsonGenerator;
+import com.fasterxml.jackson.databind.JsonSerializer;
+import com.fasterxml.jackson.databind.SerializerProvider;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import org.json.JSONObject;
 
+import java.io.IOException;
+
+@JsonSerialize(using = TimeIntervalSerializer.class)
 public class TimeInterval {
   
   public TimeInterval(int startHour, int startMin, int endHour, int endMin) {
@@ -33,9 +40,35 @@ public JSONObject toJsonObject() {
     return json;
   }
 
-  private int m_startHour;
-  private int m_startMin;
-  private int m_endHour;
-  private int m_endMin;
+  protected int m_startHour;
+  protected int m_startMin;
+  protected int m_endHour;
+  protected int m_endMin;
+
+
+
 }
 
+
+class TimeIntervalSerializer extends JsonSerializer<TimeInterval>{
+
+  @Override
+  public void serialize(TimeInterval timeInterval, JsonGenerator jsonGenerator, SerializerProvider serializerProvider) throws IOException {
+    jsonGenerator.writeStartObject();
+    jsonGenerator.writeFieldName("start");
+    jsonGenerator.writeStartObject();
+    jsonGenerator.writeFieldName("hour");
+    jsonGenerator.writeString(String.valueOf(timeInterval.m_startHour));
+    jsonGenerator.writeFieldName("min");
+    jsonGenerator.writeString(String.valueOf(timeInterval.m_startMin));
+    jsonGenerator.writeEndObject();
+
+    jsonGenerator.writeFieldName("end");
+    jsonGenerator.writeStartObject();
+    jsonGenerator.writeFieldName("hour");
+    jsonGenerator.writeString(String.valueOf(timeInterval.m_endHour));
+    jsonGenerator.writeFieldName("min");
+    jsonGenerator.writeString(String.valueOf(timeInterval.m_endMin));
+    jsonGenerator.writeEndObject();
+  }
+}
diff --git a/src/test/java/com/tencent/xinge/push/app/PushAccountListIOSTest.java b/src/test/java/com/tencent/xinge/push/app/PushAccountListIOSTest.java
@@ -35,6 +35,9 @@ public void testPushAccountListIOS() {
         accountList.add("xg_account");
         accountList.add("xg_account1");
 
+        TimeInterval accepTime = new TimeInterval(0,0,23,59);
+        message.setAccept_time(accepTime);
+
         PushAppRequest pushAppRequest = new PushAppRequest();
         pushAppRequest.setPlatform(Platform.ios);
         pushAppRequest.setEnvironment(Environment.dev);
