From 501ebd43da6372ee753d422290327e339b04abb5 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Wed, 07 Mar 2018 10:55:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/test/java/com/moral/JavaBeanToJsonOutPrint.java | 26 ++++++++++++++++++++++----
1 files changed, 22 insertions(+), 4 deletions(-)
diff --git a/src/test/java/com/moral/JavaBeanToJsonOutPrint.java b/src/test/java/com/moral/JavaBeanToJsonOutPrint.java
index cb7299d..8b9de9d 100644
--- a/src/test/java/com/moral/JavaBeanToJsonOutPrint.java
+++ b/src/test/java/com/moral/JavaBeanToJsonOutPrint.java
@@ -2,16 +2,34 @@
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.serializer.SerializerFeature;
+import com.moral.common.bean.ResultBean;
+import com.moral.entity.Device;
+import com.moral.entity.DeviceAdjustValue;
+import com.moral.entity.alarm.AlarmConfig;
+import com.moral.security.auth.login.LoginMode;
+import com.moral.security.model.UserContext;
import org.junit.Test;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
public class JavaBeanToJsonOutPrint {
@Test
public void jsonOutPrintTest(){
- String json = JSON.toJSONString(new com.moral.entity.Device(),
- SerializerFeature.WriteMapNullValue
- );
+ UserContext userContext = UserContext.create("312", LoginMode.Andriod,1,new ArrayList<>());
+// adjustValue.setCreateTime(new Date());
+// adjustValue.setUpdateTime(new Date());
+// adjustValue.setId(0);
+// Map<String,Float> value = new HashMap();
+// value.put("e1", (float) 1.2);
+// adjustValue.setValue(value);
+ String json = "{\"createTime\":1516342989358,\"deviceId\":null,\"id\":0,\"updateTime\":1516342989358,\"value\":{\"e1\":1.2}}";
+// Map map = JSON.parseObject("{\"e1\":0.0}");
+ String json1 = JSON.toJSONString(userContext);
System.out.printf("\n\n\n\n");
- System.out.printf(json);
+ System.out.printf(json1);
System.out.printf("\n\n\n\n");
}
}
--
Gitblit v1.8.0