Index: pom.xml
===================================================================
diff -u -re667ae8388e18e283be977dce0f6407aaa217925 -r430b077ed9efbfd868e60cd58b37a72a1f5eb554
--- pom.xml (.../pom.xml) (revision e667ae8388e18e283be977dce0f6407aaa217925)
+++ pom.xml (.../pom.xml) (revision 430b077ed9efbfd868e60cd58b37a72a1f5eb554)
@@ -10,7 +10,7 @@
4.0.0
313devgrp
standard-project
- 21.01.07
+ 21.01.08
pom
standard-project
Index: web-module/pom.xml
===================================================================
diff -u -re667ae8388e18e283be977dce0f6407aaa217925 -r430b077ed9efbfd868e60cd58b37a72a1f5eb554
--- web-module/pom.xml (.../pom.xml) (revision e667ae8388e18e283be977dce0f6407aaa217925)
+++ web-module/pom.xml (.../pom.xml) (revision 430b077ed9efbfd868e60cd58b37a72a1f5eb554)
@@ -7,7 +7,7 @@
313devgrp
standard-project
- 21.01.07
+ 21.01.08
../pom.xml
Index: web-module/src/main/java/egovframework/api/arms/devicelist/service/DeviceListServiceImpl.java
===================================================================
diff -u -rd5de351ee43a30d067dc5d1339b88d788ea02f03 -r430b077ed9efbfd868e60cd58b37a72a1f5eb554
--- web-module/src/main/java/egovframework/api/arms/devicelist/service/DeviceListServiceImpl.java (.../DeviceListServiceImpl.java) (revision d5de351ee43a30d067dc5d1339b88d788ea02f03)
+++ web-module/src/main/java/egovframework/api/arms/devicelist/service/DeviceListServiceImpl.java (.../DeviceListServiceImpl.java) (revision 430b077ed9efbfd868e60cd58b37a72a1f5eb554)
@@ -4,6 +4,7 @@
import egovframework.com.cmm.service.EgovProperties;
import egovframework.com.ext.jstree.springHibernate.core.service.JsTreeHibernateServiceImpl;
import egovframework.com.ext.jstree.support.util.StringUtils;
+import org.apache.commons.lang3.time.DateFormatUtils;
import org.apache.http.client.HttpClient;
import org.apache.http.impl.client.HttpClientBuilder;
import org.hibernate.criterion.Order;
@@ -21,6 +22,7 @@
import java.util.ArrayList;
import java.util.Base64;
+import java.util.Date;
import java.util.List;
/**
@@ -189,6 +191,8 @@
HttpHeaders headers = new HttpHeaders();
headers.setContentType(MediaType.APPLICATION_JSON);
+ Date today = new Date();
+ String dateFormat = DateFormatUtils.format(today, "yyyy-MM-dd");
String postdata = "{\n" +
" \"aggs\": {\n" +
" \"2\": {\n" +
@@ -226,7 +230,16 @@
" \"filter\": [\n" +
" {\n" +
" \"match_all\": {}\n" +
- " }\n" +
+ " },\n" +
+ " {\n" +
+ " \"range\": {\n" +
+ " \"@timestamp\": {\n" +
+ " \"format\": \"strict_date_optional_time\",\n" +
+ " \"gte\": " + dateFormat + "\"T00:00:00.603Z\",\n" +
+ " \"lte\": " + dateFormat + "\"T23:59:59.603Z\"\n" +
+ " }\n" +
+ " }\n" +
+ " }"+
" ],\n" +
" \"should\": [],\n" +
" \"must_not\": []\n" +
Index: web-module/src/test/java/egovframework/com/ext/jstree/support/util/Java8LambdaTest.java
===================================================================
diff -u -rd5de351ee43a30d067dc5d1339b88d788ea02f03 -r430b077ed9efbfd868e60cd58b37a72a1f5eb554
--- web-module/src/test/java/egovframework/com/ext/jstree/support/util/Java8LambdaTest.java (.../Java8LambdaTest.java) (revision d5de351ee43a30d067dc5d1339b88d788ea02f03)
+++ web-module/src/test/java/egovframework/com/ext/jstree/support/util/Java8LambdaTest.java (.../Java8LambdaTest.java) (revision 430b077ed9efbfd868e60cd58b37a72a1f5eb554)
@@ -4,7 +4,9 @@
import egovframework.api.arms.datasourcelist.batch.DataSourceListConst;
import egovframework.api.arms.devicelist.vo.DeviceListDTO;
import egovframework.com.cmm.service.EgovProperties;
+import org.apache.commons.lang3.time.DateFormatUtils;
import org.apache.http.client.HttpClient;
+import org.apache.http.client.utils.*;
import org.apache.http.impl.client.HttpClientBuilder;
import org.json.simple.JSONArray;
import org.json.simple.JSONObject;
@@ -18,10 +20,7 @@
import org.springframework.http.client.HttpComponentsClientHttpRequestFactory;
import org.springframework.web.client.RestTemplate;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Base64;
-import java.util.List;
+import java.util.*;
import java.util.stream.Collectors;
import java.util.stream.IntStream;
import java.util.stream.Stream;
@@ -558,6 +557,10 @@
}else{
logger.info("false");
}
+
+ Date today = new Date();
+ String dateFormat = DateFormatUtils.format(today, "yyyy-MM-dd");
+ System.out.println("yyyy-MM-dd HH:mm:ss = " + dateFormat);
}
private HttpHeaders createHttpHeaders(String user, String password)