DBNT
/
FAISP
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

통합검색 작업중.

master
최강석 2023-08-16 18:30:42 +09:00
parent 3cae72979d
commit 17e6613bd7
6 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/com/dbnt/faisp/main/searchEngine/model/SearchParams.java
View File

@ -2,6 +2,7 @@ package com.dbnt.faisp.main.searchEngine.model;
import lombok.Data; import lombok.Data;
import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;
import org.springframework.format.annotation.DateTimeFormat;
import javax.persistence.Transient; import javax.persistence.Transient;
import java.time.LocalDate; import java.time.LocalDate;
@ -11,7 +12,9 @@ import java.time.LocalDate;
public class SearchParams { public class SearchParams {
private String form; private String form;
private String keyword; private String keyword;
@DateTimeFormat(pattern = "yyyy-MM-dd")
private LocalDate startDate; private LocalDate startDate;
@DateTimeFormat(pattern = "yyyy-MM-dd")
private LocalDate endDate; private LocalDate endDate;
private String wrtOrgan; private String wrtOrgan;
private Integer wrtUserSeq; private Integer wrtUserSeq;

3
src/main/java/com/dbnt/faisp/main/searchEngine/service/SearchEngineService.java
View File

@ -149,7 +149,7 @@ public class SearchEngineService {
.encode() .encode()
.build() .build()
.toUri(); .toUri();
System.out.println("uri: " + uri);
ResponseEntity<String> response = requestRestTemplateExchange(uri); ResponseEntity<String> response = requestRestTemplateExchange(uri);
JSONObject jsonObj = null; JSONObject jsonObj = null;
try { try {
@ -183,6 +183,7 @@ public class SearchEngineService {
e.printStackTrace(); e.printStackTrace();
} }
result.setRowList(convertList); result.setRowList(convertList);
System.out.println("rowSize: "+result.getRowList().size());
return result; return result;
} }

2
src/main/java/com/dbnt/faisp/util/Utils.java
View File

@ -6,6 +6,7 @@ import java.io.IOException;
import java.io.PrintWriter; import java.io.PrintWriter;
import java.net.URLEncoder; import java.net.URLEncoder;
import java.text.DecimalFormat; import java.text.DecimalFormat;
import java.time.LocalDate;
import java.time.format.DateTimeFormatter; import java.time.format.DateTimeFormatter;
import java.util.*; 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 Object[]) return 0 == Array.getLength(obj) ? false : true;
else if(obj instanceof Integer) return !(null == obj); else if(obj instanceof Integer) return !(null == obj);
else if(obj instanceof Long) return !(null == obj); else if(obj instanceof Long) return !(null == obj);
else if(obj instanceof LocalDate) return !(null == obj);
else return false; else return false;
} }
} }

4
src/main/resources/application-was1.properties
View File

@ -19,8 +19,8 @@ spring.servlet.multipart.max-request-size=500MB
site.domain=10.187.58.12 site.domain=10.187.58.12
clipReport.print.url=http://10.187.58.47:8085/ClipReport5 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
file.dir.publicBoard=/publicBoard file.dir.publicBoard=/publicBoard

4
src/main/resources/application-was2.properties
View File

@ -19,8 +19,8 @@ spring.servlet.multipart.max-request-size=500MB
site.domain=10.187.58.12 site.domain=10.187.58.12
clipReport.print.url=http://10.187.58.48:8085/ClipReport5 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
file.dir.publicBoard=/publicBoard file.dir.publicBoard=/publicBoard

8
src/main/resources/templates/searchEngine/searchPage.html
View File

@ -61,13 +61,13 @@
</ul> </ul>
<span> <span>
<span class="tie"> <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> </span>
<b>~</b> <b>~</b>
<span class="tie"> <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>
</span> </span>
</li> </li>