소스 이상 충돌 정리
This commit is contained in:
parent
0f84dc08fd
commit
4b44dc0acf
@ -194,98 +194,103 @@ public class NlibSearchServiceImpl implements NlibSearchService{
|
||||
{
|
||||
//주제분야 , 자료유형 ,생산기관 별 카운트
|
||||
tmpList = (JsonArray) tmp.get("CategoryGroup");
|
||||
|
||||
for( k=0; k < tmpList.size(); k++){
|
||||
filterObject = (JsonObject) tmpList.get(k);
|
||||
|
||||
if(filterObject.get("SUBJECT_CATE") != null)
|
||||
{
|
||||
subjectList = (JsonArray) filterObject.get("SUBJECT_CATE");
|
||||
}
|
||||
if(filterObject.get("DIV_CATE") != null)
|
||||
{
|
||||
typeList = (JsonArray) filterObject.get("DIV_CATE");
|
||||
}
|
||||
if(filterObject.get("ORG_NM") != null)
|
||||
{
|
||||
orgList = (JsonArray) filterObject.get("ORG_NM");
|
||||
}
|
||||
}
|
||||
if(subjectList.size()>0)
|
||||
if(tmpList != null)
|
||||
{
|
||||
filterObject =(JsonObject) subjectList.get(0);
|
||||
filterObject = (JsonObject) filterObject.get("Categories");
|
||||
subjectList = (JsonArray) filterObject.get("Category");
|
||||
};
|
||||
if(typeList.size()>0)
|
||||
{
|
||||
filterObject =(JsonObject) typeList.get(0);
|
||||
filterObject = (JsonObject) filterObject.get("Categories");
|
||||
typeList = (JsonArray) filterObject.get("Category");
|
||||
};
|
||||
if(orgList.size()>0)
|
||||
{
|
||||
filterObject =(JsonObject) orgList.get(0);
|
||||
filterObject = (JsonObject) filterObject.get("Categories");
|
||||
orgList = (JsonArray) filterObject.get("Category");
|
||||
};
|
||||
for(k = 0; k < subjectList.size(); k++){
|
||||
HashMap<String,String> temp = new HashMap<String,String>();
|
||||
filterObject = (JsonObject)subjectList.get(k);
|
||||
nameTemp = filterObject.get("Name").getAsString();
|
||||
//상위코드값
|
||||
code_up = nameTemp.substring(nameTemp.indexOf("@")+1,nameTemp.indexOf("^"));
|
||||
temp.put("category_nm_up",code_up);
|
||||
for( k=0; k < tmpList.size(); k++){
|
||||
filterObject = (JsonObject) tmpList.get(k);
|
||||
|
||||
//코드값
|
||||
code = nameTemp.substring(nameTemp.lastIndexOf("@")+1);
|
||||
temp.put("category_nm",code);
|
||||
temp.put("category_cnt",filterObject.get("Count").getAsString());
|
||||
subjectMap.add(temp);
|
||||
}
|
||||
for(k = 0; k < typeList.size(); k++){
|
||||
HashMap<String,String> temp = new HashMap<String,String>();
|
||||
filterObject = (JsonObject)typeList.get(k);
|
||||
nameTemp = filterObject.get("Name").getAsString();
|
||||
//상위코드값
|
||||
code_up = nameTemp.substring(nameTemp.indexOf("@")+1,nameTemp.indexOf("^"));
|
||||
temp.put("class_nm_up",code_up);
|
||||
if(filterObject.get("SUBJECT_CATE") != null)
|
||||
{
|
||||
subjectList = (JsonArray) filterObject.get("SUBJECT_CATE");
|
||||
}
|
||||
if(filterObject.get("DIV_CATE") != null)
|
||||
{
|
||||
typeList = (JsonArray) filterObject.get("DIV_CATE");
|
||||
}
|
||||
if(filterObject.get("ORG_NM") != null)
|
||||
{
|
||||
orgList = (JsonArray) filterObject.get("ORG_NM");
|
||||
}
|
||||
}
|
||||
if(subjectList.size()>0)
|
||||
{
|
||||
filterObject =(JsonObject) subjectList.get(0);
|
||||
filterObject = (JsonObject) filterObject.get("Categories");
|
||||
subjectList = (JsonArray) filterObject.get("Category");
|
||||
};
|
||||
if(typeList.size()>0)
|
||||
{
|
||||
filterObject =(JsonObject) typeList.get(0);
|
||||
filterObject = (JsonObject) filterObject.get("Categories");
|
||||
typeList = (JsonArray) filterObject.get("Category");
|
||||
};
|
||||
if(orgList.size()>0)
|
||||
{
|
||||
filterObject =(JsonObject) orgList.get(0);
|
||||
filterObject = (JsonObject) filterObject.get("Categories");
|
||||
orgList = (JsonArray) filterObject.get("Category");
|
||||
};
|
||||
for(k = 0; k < subjectList.size(); k++){
|
||||
HashMap<String,String> temp = new HashMap<String,String>();
|
||||
filterObject = (JsonObject)subjectList.get(k);
|
||||
nameTemp = filterObject.get("Name").getAsString();
|
||||
//상위코드값
|
||||
code_up = nameTemp.substring(nameTemp.indexOf("@")+1,nameTemp.indexOf("^"));
|
||||
temp.put("category_nm_up",code_up);
|
||||
|
||||
//코드값
|
||||
code = nameTemp.substring(nameTemp.lastIndexOf("@")+1);
|
||||
temp.put("class_nm",code);
|
||||
temp.put("class_cnt",filterObject.get("Count").getAsString());
|
||||
typeMap.add(temp);
|
||||
}
|
||||
for(k = 0; k < orgList.size(); k++){
|
||||
HashMap<String,String> temp = new HashMap<String,String>();
|
||||
filterObject = (JsonObject)orgList.get(k);
|
||||
nameTemp = filterObject.get("Name").getAsString();
|
||||
if(!"null".equals(nameTemp)) {
|
||||
temp.put("org_nm",nameTemp);
|
||||
temp.put("org_cnt",filterObject.get("Count").getAsString());
|
||||
orgMap.add(temp);
|
||||
}
|
||||
//코드값
|
||||
code = nameTemp.substring(nameTemp.lastIndexOf("@")+1);
|
||||
temp.put("category_nm",code);
|
||||
temp.put("category_cnt",filterObject.get("Count").getAsString());
|
||||
subjectMap.add(temp);
|
||||
}
|
||||
for(k = 0; k < typeList.size(); k++){
|
||||
HashMap<String,String> temp = new HashMap<String,String>();
|
||||
filterObject = (JsonObject)typeList.get(k);
|
||||
nameTemp = filterObject.get("Name").getAsString();
|
||||
//상위코드값
|
||||
code_up = nameTemp.substring(nameTemp.indexOf("@")+1,nameTemp.indexOf("^"));
|
||||
temp.put("class_nm_up",code_up);
|
||||
|
||||
//코드값
|
||||
code = nameTemp.substring(nameTemp.lastIndexOf("@")+1);
|
||||
temp.put("class_nm",code);
|
||||
temp.put("class_cnt",filterObject.get("Count").getAsString());
|
||||
typeMap.add(temp);
|
||||
}
|
||||
for(k = 0; k < orgList.size(); k++){
|
||||
HashMap<String,String> temp = new HashMap<String,String>();
|
||||
filterObject = (JsonObject)orgList.get(k);
|
||||
nameTemp = filterObject.get("Name").getAsString();
|
||||
if(!"null".equals(nameTemp)) {
|
||||
temp.put("org_nm",nameTemp);
|
||||
temp.put("org_cnt",filterObject.get("Count").getAsString());
|
||||
orgMap.add(temp);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
tmp = (JsonObject) tmp.get("DocumentSet");
|
||||
searchVO.setTotalCount(tmp.get("TotalCount").getAsString());
|
||||
colArray = (JsonArray) tmp.get("Document");
|
||||
|
||||
//vo list로 json list 파싱
|
||||
for(j=0;j<colArray.size();j++){
|
||||
tmp = (JsonObject)colArray.get(j);
|
||||
tmp = (JsonObject) tmp.get("Field");
|
||||
if(colArray != null)
|
||||
{
|
||||
//vo list로 json list 파싱
|
||||
for(j=0;j<colArray.size();j++){
|
||||
tmp = (JsonObject)colArray.get(j);
|
||||
tmp = (JsonObject) tmp.get("Field");
|
||||
|
||||
CollectionVO vo = new CollectionVO();
|
||||
vo.setMasterId(tmp.get("MASTER_ID").getAsString());
|
||||
CollectionVO vo = new CollectionVO();
|
||||
vo.setMasterId(tmp.get("MASTER_ID").getAsString());
|
||||
|
||||
|
||||
list.add(vo);
|
||||
list.add(vo);
|
||||
|
||||
/*vo = gson.fromJson(tmp, NlibSearchCollectionVO.class);*/
|
||||
/* NlibSearchCollectionVO vo = new NlibSearchCollectionVO();
|
||||
vo.setMasterId(tmp.get); = gson.fromJson(tmp, NlibSearchCollectionVO.class);*/
|
||||
/*vo = gson.fromJson(tmp, NlibSearchCollectionVO.class);*/
|
||||
/* NlibSearchCollectionVO vo = new NlibSearchCollectionVO();
|
||||
vo.setMasterId(tmp.get); = gson.fromJson(tmp, NlibSearchCollectionVO.class);*/
|
||||
}
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
Loading…
Reference in New Issue
Block a user