somang4819/itsm_ysm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

소스 이상 충돌 정리

Browse Source
This commit is contained in:
KNKIM 2021-11-17 12:27:07 +09:00
parent 0f84dc08fd
commit 4b44dc0acf
1 changed files with 307 additions and 302 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/nlib/sch/service/impl/NlibSearchServiceImpl.java
View File

@ -194,7 +194,8 @@ public class NlibSearchServiceImpl implements NlibSearchService{
{ {
//주제분야 , 자료유형 ,생산기관 별 카운트 //주제분야 , 자료유형 ,생산기관 별 카운트
tmpList = (JsonArray) tmp.get("CategoryGroup"); tmpList = (JsonArray) tmp.get("CategoryGroup");
if(tmpList != null)
{
for( k=0; k < tmpList.size(); k++){ for( k=0; k < tmpList.size(); k++){
filterObject = (JsonObject) tmpList.get(k); filterObject = (JsonObject) tmpList.get(k);
@ -267,11 +268,14 @@ public class NlibSearchServiceImpl implements NlibSearchService{
orgMap.add(temp); orgMap.add(temp);
} }
} }
}
tmp = (JsonObject) tmp.get("DocumentSet"); tmp = (JsonObject) tmp.get("DocumentSet");
searchVO.setTotalCount(tmp.get("TotalCount").getAsString()); searchVO.setTotalCount(tmp.get("TotalCount").getAsString());
colArray = (JsonArray) tmp.get("Document"); colArray = (JsonArray) tmp.get("Document");
if(colArray != null)
{
//vo list로 json list 파싱 //vo list로 json list 파싱
for(j=0;j<colArray.size();j++){ for(j=0;j<colArray.size();j++){
tmp = (JsonObject)colArray.get(j); tmp = (JsonObject)colArray.get(j);
@ -288,6 +292,7 @@ public class NlibSearchServiceImpl implements NlibSearchService{
vo.setMasterId(tmp.get); = gson.fromJson(tmp, NlibSearchCollectionVO.class);*/ vo.setMasterId(tmp.get); = gson.fromJson(tmp, NlibSearchCollectionVO.class);*/
} }
} }
}
}; };
searchVO.setResultList(list); searchVO.setResultList(list);
searchVO.setSubjectCountList(subjectMap); searchVO.setSubjectCountList(subjectMap);