repair search logic

Author: windybirth

skill/src/main/java/jp/wicresoft/controller/SearchController.java

@@ -48,9 +48,9 @@ public String loadPage(@Valid SkillSearchInfo skillSearchInfo, Model model) {
 		}
 
 		try {
-			List<Long> conditionList = new ArrayList<Long>();
+			List<Integer> conditionList = new ArrayList<Integer>();
 			for (String skillIdStr : skillSearchInfo.getLsSkill()) {
-				conditionList.add(Long.parseLong(skillIdStr));
+				conditionList.add(Integer.parseInt(skillIdStr));
 			}
 			List<IndexViewInfo> indexViewInfos = searchImpl.getSearchResultBySkill(conditionList);
 			// 結果を出す

skill/src/main/java/jp/wicresoft/impl/SearchImpl.java

@@ -29,7 +29,7 @@ public List<SkillTitleMst> getSkillNameList() {
 		return skillTitleMstRepository.findAll();
 	}
 
-	public List<IndexViewInfo> getSearchResultBySkill(List<Long> titleIds) {
+	public List<IndexViewInfo> getSearchResultBySkill(List<Integer> titleIds) {
 		List<StuffMeta> stuffMetas  = skillSearchJdbcTemplate.findByIds(titleIds);
 		List<IndexViewInfo> indexViewInfos = new ArrayList<>();
 		for (StuffMeta stuffMeta : stuffMetas) {

skill_db/src/main/java/jp/wicresoft/domain/SkillTitleMst.java

@@ -10,9 +10,9 @@
 public class SkillTitleMst {
 
 	@Id
-	private Long skillTitleId;
+	private int skillTitleId;
 
 	private String titleName;
 
-	private Long skillCategory;
+	private int skillCategory;
 }

skill_db/src/main/java/jp/wicresoft/jdbc/SkillSearchJdbcTemplate.java

@@ -1,8 +1,8 @@
 package jp.wicresoft.jdbc;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
-
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.stereotype.Component;
@@ -15,11 +15,40 @@ public class SkillSearchJdbcTemplate extends BasicJdbc{
 	@Autowired
 	JdbcTemplate jdbcTemplate;
 
-	public List<StuffMeta> findByIds(List<Long> titleIds) {
-		String queryStr = "select meta.* "
-				+ "from skill_version_mst v inner join stuff_skill s inner join stuff_meta meta "
-				+ "on v.skill_title in (1) and v.skill_id = s.skill_id and s.stuff_id = meta.id;";
-		List<Map<String, Object>> mapList = jdbcTemplate.queryForList(queryStr);
+	final private int INDEX_START = 1;
+	
+	public List<StuffMeta> findByIds(List<Integer> titleIds) {
+		if (titleIds.isEmpty()) {
+			return new ArrayList<StuffMeta>();
+		}
+		
+		StringBuffer joinBuffer = new StringBuffer();
+		StringBuffer andBuffer = new StringBuffer();
+		StringBuffer paramBuffer = new StringBuffer();
+		for (int currentIndex = INDEX_START; currentIndex <= titleIds.size(); currentIndex++) {
+			joinBuffer.append(" inner join stuff_skill s");
+			joinBuffer.append(currentIndex);
+			
+			if (currentIndex > INDEX_START) {
+				andBuffer.append(" and s");
+				andBuffer.append(currentIndex - 1);
+				andBuffer.append(".stuff_id = s");
+				andBuffer.append(currentIndex);
+				andBuffer.append(".stuff_id");
+			}
+			
+			paramBuffer.append(" and s");
+			paramBuffer.append(currentIndex);
+			paramBuffer.append(".skill_id = ?");
+		}
+		String queryStr = "select meta.* from stuff_meta meta "
+				+ joinBuffer.toString()
+				+ " on meta.id = s"
+				+ INDEX_START
+				+ ".stuff_id "
+				+ andBuffer.toString()
+				+ paramBuffer.toString();
+		List<Map<String, Object>> mapList = jdbcTemplate.queryForList(queryStr, titleIds.toArray());
 		return convertJdbcMapToBean(mapList, StuffMeta.class);
 	}
 }

skill_db/src/main/java/jp/wicresoft/repository/SkillTitleMstRepository.java

@@ -6,7 +6,7 @@
 
 import jp.wicresoft.domain.SkillTitleMst;
 
-public interface SkillTitleMstRepository extends Repository<SkillTitleMst, Long> {
+public interface SkillTitleMstRepository extends Repository<SkillTitleMst, Integer> {
 
 	public List<SkillTitleMst> findAll();
 }

skill_db/src/main/java/jp/wicresoft/repository/StuffMetaRepository.java

@@ -7,7 +7,7 @@
 
 import jp.wicresoft.domain.StuffMeta;
 
-public interface StuffMetaRepository extends Repository<StuffMeta, Long>{
+public interface StuffMetaRepository extends Repository<StuffMeta, Integer>{
 
 	public List<StuffMeta> findAll();