diff --git a/src/main/java/com/dbnt/faisp/main/searchEngine/model/SearchParams.java b/src/main/java/com/dbnt/faisp/main/searchEngine/model/SearchParams.java index df4c5269..ba84dadf 100644 --- a/src/main/java/com/dbnt/faisp/main/searchEngine/model/SearchParams.java +++ b/src/main/java/com/dbnt/faisp/main/searchEngine/model/SearchParams.java @@ -2,6 +2,7 @@ package com.dbnt.faisp.main.searchEngine.model; import lombok.Data; import lombok.NoArgsConstructor; +import org.springframework.format.annotation.DateTimeFormat; import javax.persistence.Transient; import java.time.LocalDate; @@ -11,7 +12,9 @@ import java.time.LocalDate; public class SearchParams { private String form; private String keyword; + @DateTimeFormat(pattern = "yyyy-MM-dd") private LocalDate startDate; + @DateTimeFormat(pattern = "yyyy-MM-dd") private LocalDate endDate; private String wrtOrgan; private Integer wrtUserSeq; diff --git a/src/main/java/com/dbnt/faisp/main/searchEngine/service/SearchEngineService.java b/src/main/java/com/dbnt/faisp/main/searchEngine/service/SearchEngineService.java index b0b9600b..db50e998 100644 --- a/src/main/java/com/dbnt/faisp/main/searchEngine/service/SearchEngineService.java +++ b/src/main/java/com/dbnt/faisp/main/searchEngine/service/SearchEngineService.java @@ -149,7 +149,7 @@ public class SearchEngineService { .encode() .build() .toUri(); - + System.out.println("uri: " + uri); ResponseEntity response = requestRestTemplateExchange(uri); JSONObject jsonObj = null; try { @@ -183,6 +183,7 @@ public class SearchEngineService { e.printStackTrace(); } result.setRowList(convertList); + System.out.println("rowSize: "+result.getRowList().size()); return result; } diff --git a/src/main/java/com/dbnt/faisp/util/Utils.java b/src/main/java/com/dbnt/faisp/util/Utils.java index fbf1cbe8..ea0dc5ea 100644 --- a/src/main/java/com/dbnt/faisp/util/Utils.java +++ b/src/main/java/com/dbnt/faisp/util/Utils.java @@ -6,6 +6,7 @@ import java.io.IOException; import java.io.PrintWriter; import java.net.URLEncoder; import java.text.DecimalFormat; +import java.time.LocalDate; import java.time.format.DateTimeFormatter; import java.util.*; @@ -54,6 +55,7 @@ public class Utils { // else if(obj instanceof Object[]) return 0 == Array.getLength(obj) ? false : true; else if(obj instanceof Integer) return !(null == obj); else if(obj instanceof Long) return !(null == obj); + else if(obj instanceof LocalDate) return !(null == obj); else return false; } } diff --git a/src/main/resources/application-was1.properties b/src/main/resources/application-was1.properties index 0cc628ff..0c7be192 100644 --- a/src/main/resources/application-was1.properties +++ b/src/main/resources/application-was1.properties @@ -19,8 +19,8 @@ spring.servlet.multipart.max-request-size=500MB site.domain=10.187.58.12 clipReport.print.url=http://10.187.58.47:8085/ClipReport5 -search.engine.default=http://10.187.58.47:7577 -search.engine.suggest=http://10.187.58.47:7614 +search.engine.default=http://10.187.58.49:7577 +search.engine.suggest=http://10.187.58.49:7614 #file file.dir.publicBoard=/publicBoard diff --git a/src/main/resources/application-was2.properties b/src/main/resources/application-was2.properties index a2eb2f9e..0b9c4060 100644 --- a/src/main/resources/application-was2.properties +++ b/src/main/resources/application-was2.properties @@ -19,8 +19,8 @@ spring.servlet.multipart.max-request-size=500MB site.domain=10.187.58.12 clipReport.print.url=http://10.187.58.48:8085/ClipReport5 -search.engine.default=http://10.187.58.48:7577 -search.engine.suggest=http://10.187.58.48:7614 +search.engine.default=http://10.187.58.50:7577 +search.engine.suggest=http://10.187.58.50:7614 #file file.dir.publicBoard=/publicBoard diff --git a/src/main/resources/templates/searchEngine/searchPage.html b/src/main/resources/templates/searchEngine/searchPage.html index 76cbc531..0e9772f5 100644 --- a/src/main/resources/templates/searchEngine/searchPage.html +++ b/src/main/resources/templates/searchEngine/searchPage.html @@ -61,13 +61,13 @@ - - + + ~ - - + +