zaihui
/
educoder
0
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

delete code comment

This commit is contained in:
waterbeach 2017-01-21 10:15:03 +08:00
parent 5925ddc7c7
commit 5cc72deabb
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
project_match/src/main/java/com/ossean/util/MergeProjectNew2.java
View File

@ -103,7 +103,7 @@ public class MergeProjectNew2 {
String homepage4 = "https://" + prjHomepage + "/";
sameHomepageList = gatherDao.selectGPMBySameHomePage(gatherProjectsTableName, prjHomepage, homepage1, homepage2, homepage3, homepage4, model.getId(),1);
for(GatherProjectsModel m : sameHomepageList){
logger.info("project " + model.getId() + " and " + m.getId() + " match by homepage");
//logger.info("project " + model.getId() + " and " + m.getId() + " match by homepage");
if(!passSet.contains(m.getId()))
matchedList.add(m);
}
@ -113,7 +113,7 @@ public class MergeProjectNew2 {
List<GatherProjectsModel> sameNamePrjList = gatherDao.selectGPMBySameName(gatherProjectsTableName, prjName, prjId,1);
List<GatherProjectsModel> afterNamePrjList = new ArrayList<GatherProjectsModel>();
for(int i = 0;i<sameNamePrjList.size();i++){
logger.info("project " + model.getId() + " and " + sameNamePrjList.get(i).getId() + " match by name");
//logger.info("project " + model.getId() + " and " + sameNamePrjList.get(i).getId() + " match by name");
if(!passSet.contains(sameNamePrjList.get(i).getId()))//未处理的
afterNamePrjList.add(sameNamePrjList.get(i));
}
@ -123,14 +123,14 @@ public class MergeProjectNew2 {
List<GatherProjectsModel> synonymsPrjList = getRelatedGatherProjects(model,synonymList);
List<GatherProjectsModel> afterSynonymsPrjList = new ArrayList<GatherProjectsModel>();
for(int j = 0;j < synonymsPrjList.size();j++){
logger.info("project " + model.getId() + " and " + synonymsPrjList.get(j).getId() + " match by synonyms");
//logger.info("project " + model.getId() + " and " + synonymsPrjList.get(j).getId() + " match by synonyms");
if(!passSet.contains(synonymsPrjList.get(j).getId()) && !afterNamePrjList.contains(model))//未处理的,也不同名，否则会重复计算
afterSynonymsPrjList.add(synonymsPrjList.get(j));
}
afterSynonymsPrjList = returnDupModelList(model,afterSynonymsPrjList,false);
for(GatherProjectsModel m : afterSynonymsPrjList){
logger.info("project " + model.getId() + " and " + m.getId() + " match by synonyms/name and verify");
}
// for(GatherProjectsModel m : afterSynonymsPrjList){
// logger.info("project " + model.getId() + " and " + m.getId() + " match by synonyms/name and verify");
// }
afterSynonymsPrjList = mergeTwoList4Source(afterNamePrjList,afterSynonymsPrjList);
matchedList = mergeTwoList4Source(matchedList,afterSynonymsPrjList);//同一社区的项目相同homepage比名字相同和别名相同优先级更高
relationSet.add(model.getId());