통합검색 작업중.

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;

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<String> 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;
   }
   

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;
     }
   }

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.default=http://10.187.58.49:7577
-search.engine.suggest=http://10.187.58.47:7614
+search.engine.suggest=http://10.187.58.49:7614
 
 #file
 file.dir.publicBoard=/publicBoard

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.default=http://10.187.58.50:7577
-search.engine.suggest=http://10.187.58.48:7614
+search.engine.suggest=http://10.187.58.50:7614
 
 #file
 file.dir.publicBoard=/publicBoard

src/main/resources/templates/searchEngine/searchPage.html

@@ -61,13 +61,13 @@
                 </ul>
                 <span>
                   <span class="tie">
-                    <label class="hide" for="beginDay">시작일</label>
+                    <label class="hide" for="startDate">시작일</label>
-                    <input id="beginDay" name="beginDay" type="date" value="" maxlength="250" class="shortText" />
+                    <input id="startDate" name="startDate" type="date" th:value="${searchParams.startDate}" maxlength="250" class="shortText" />
                   </span>
                   <b>~</b>
                   <span class="tie">
-                    <label class="hide" for="endDay">종료일</label>
+                    <label class="hide" for="endDate">종료일</label>
-                    <input id="endDay" name="endDay" type="date" value="" maxlength="250" class="shortText" />
+                    <input id="endDate" name="endDate" type="date" th:value="${searchParams.endDate}" maxlength="250" class="shortText" />
                   </span>
                 </span>
               </li>