From af8dd6eccb0aab770246ae44db1cde4e531416c5 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Thu, 01 Feb 2018 15:10:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/test/java/com/moral/JavaBeanToJsonOutPrint.java | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/src/test/java/com/moral/JavaBeanToJsonOutPrint.java b/src/test/java/com/moral/JavaBeanToJsonOutPrint.java
index fbc1ff3..8b9de9d 100644
--- a/src/test/java/com/moral/JavaBeanToJsonOutPrint.java
+++ b/src/test/java/com/moral/JavaBeanToJsonOutPrint.java
@@ -6,8 +6,11 @@
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;
@@ -15,7 +18,7 @@
public class JavaBeanToJsonOutPrint {
@Test
public void jsonOutPrintTest(){
- DeviceAdjustValue adjustValue = new DeviceAdjustValue();
+ UserContext userContext = UserContext.create("312", LoginMode.Andriod,1,new ArrayList<>());
// adjustValue.setCreateTime(new Date());
// adjustValue.setUpdateTime(new Date());
// adjustValue.setId(0);
@@ -23,12 +26,10 @@
// 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 json = JSON.toJSONString(new Device(),
-// SerializerFeature.WriteMapNullValue
-// );
+// 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