From 2d4d397ce9ea8e53d4a63b6463c02a7586fb27ea Mon Sep 17 00:00:00 2001
From: ZhuDongming <773644075@qq.com>
Date: Thu, 08 Aug 2019 17:03:55 +0800
Subject: [PATCH] Merge branch 'master' of http://blit.7drlb.com:8888/r/screen_api_v2
---
src/test/java/com/moral/JavaBeanToJsonOutPrint.java | 52 ++++++++++++++++++++++++++++++++++++----------------
1 files changed, 36 insertions(+), 16 deletions(-)
diff --git a/src/test/java/com/moral/JavaBeanToJsonOutPrint.java b/src/test/java/com/moral/JavaBeanToJsonOutPrint.java
index fbc1ff3..e639249 100644
--- a/src/test/java/com/moral/JavaBeanToJsonOutPrint.java
+++ b/src/test/java/com/moral/JavaBeanToJsonOutPrint.java
@@ -6,29 +6,49 @@
import com.moral.entity.Device;
import com.moral.entity.DeviceAdjustValue;
import com.moral.entity.alarm.AlarmConfig;
+import com.moral.entity.charts.*;
+import com.moral.security.auth.login.LoginMode;
+import com.moral.security.model.UserContext;
import org.junit.Test;
+import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Map;
+import javax.annotation.Resource;
+import java.util.*;
public class JavaBeanToJsonOutPrint {
@Test
public void jsonOutPrintTest(){
- DeviceAdjustValue adjustValue = new DeviceAdjustValue();
-// 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 json = JSON.toJSONString(new 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}}";
+// LineChartCriteria lineChartCriteria = new LineChartCriteria();
+// List<DataCondition> dataConditions = new ArrayList<>();
+// DataCondition dataCondition = new DataCondition();
+// dataCondition.setActualTime(1);
+// dataCondition.setAreaRange(AreaRange.AREA);
+// dataCondition.setAreaRangeId(1);
+// dataCondition.setTimeUnits(TimeUnits.DAY);
+// dataConditions.add(dataCondition);
+// lineChartCriteria.setDataConditions(dataConditions);
+// lineChartCriteria.setSensorKey("e1");
+// TimePeriod timePeriod = new TimePeriod();
+// timePeriod.setEndTime(new Date());
+// timePeriod.setStartTime(new Date());
+// timePeriod.setTimeUnits(TimeUnits.DAY);
+// lineChartCriteria.setTimePeriod(timePeriod);
+// Map map = JSON.parseObject("{\"e1\":0.0}");
+ String str = "{\"sensorKey\":\"e1\",\"timePeriod\":{\"startTime\":\"2018-03-09T07:53:53.463Z\",\"endTime\":\"2018-03-09T07:53:53.463Z\",\"timeUnits\":\"DAY\"},\"dataConditions\":[{\"timeUnits\":\"DAY\",\"actualTime\":null,\"areaRange\":\"AREA\",\"areaRangeId\":320583}]}";
+ LineChartCriteria lineChartCriteria = JSON.parseObject(str,LineChartCriteria.class);
+// TimePeriod timePeriod = JSON.parseObject(str,TimePeriod.class);
+ String json1 = JSON.toJSONString(lineChartCriteria);
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