Updata DDL for JDBC

windybirth · windybirth · commit 26c7eafb3d65 · 2016-10-07T23:54:24.000+09:00
diff --git a/skill/src/main/java/jp/wicresoft/impl/SearchImpl.java b/skill/src/main/java/jp/wicresoft/impl/SearchImpl.java
@@ -9,6 +9,7 @@
 import jp.wicresoft.domain.SkillTitleMst;
 import jp.wicresoft.domain.StuffMeta;
 import jp.wicresoft.info.IndexViewInfo;
+import jp.wicresoft.jdbc.SkillSearchJdbcTemplate;
 import jp.wicresoft.repository.SkillTitleMstRepository;
 import jp.wicresoft.repository.StuffMetaRepository;
 
@@ -21,12 +22,15 @@ public class SearchImpl {
 	@Autowired
 	StuffMetaRepository stuffMetaRepository;
 	
+	@Autowired
+	SkillSearchJdbcTemplate skillSearchJdbcTemplate;
+	
 	public List<SkillTitleMst> getSkillNameList() {
 		return skillTitleMstRepository.findAll();
 	}
 	
 	public List<IndexViewInfo> getSearchResultBySkill(List<Long> titleIds) {
-		List<StuffMeta> stuffMetas  = stuffMetaRepository.findByIds(titleIds);
+		List<StuffMeta> stuffMetas  = skillSearchJdbcTemplate.findByIds(titleIds);
 		List<IndexViewInfo> indexViewInfos = new ArrayList<>();
 		for (StuffMeta stuffMeta : stuffMetas) {
 			indexViewInfos.add(new IndexViewInfo(stuffMeta));
diff --git a/skill/src/main/java/jp/wicresoft/info/IndexViewInfo.java b/skill/src/main/java/jp/wicresoft/info/IndexViewInfo.java
@@ -45,11 +45,11 @@ public class IndexViewInfo {
 	 */
 	public IndexViewInfo(StuffMeta stuffMeta) {
 		
-		setId(stuffMeta.getId().toString());
+		setId(String.valueOf(stuffMeta.getId()));
 		
 		setName(stuffMeta.getName());
 		
-		setAge(stuffMeta.getAge().toString());
+		setAge(String.valueOf(stuffMeta.getAge()));
 		
 		setSex(stuffMeta.isSex() ? "true" : "false");
 		
@@ -70,11 +70,11 @@ public StuffMeta toStuffMeta() {
 		StuffMeta stuffMeta = new StuffMeta();
 		
 		stuffMeta.setName(getName());
-		stuffMeta.setAge(Long.parseLong(getAge()));
+		stuffMeta.setAge(Integer.parseInt(getAge()));
 		// TODO
 		stuffMeta.setSex(false);
-		stuffMeta.setExperienceYear(Long.parseLong(getExperienceYear()));
-		stuffMeta.setPrice(Long.parseLong(getPrice()));
+		stuffMeta.setExperienceYear(Integer.parseInt(getExperienceYear()));
+		stuffMeta.setPrice(Integer.parseInt(getPrice()));
 		stuffMeta.setNationality(getNationality());
 		stuffMeta.setMember(isMember());
 		
diff --git a/skill_db/src/main/java/jp/wicresoft/domain/StuffMeta.java b/skill_db/src/main/java/jp/wicresoft/domain/StuffMeta.java
@@ -19,19 +19,20 @@ public class StuffMeta implements Serializable{
 
 	@Id
 	@GeneratedValue
-	private Long id;
+	private int id;
 	
 	private String name;
 	
-	private Long age;
+	private int age;
 	
 	private boolean sex;
 	
 	private String nationality;
 	
-	private Long experienceYear;
+	private int experienceYear;
 	
-	private Long price;
+	private int price;
 	
 	private boolean isMember;
+	
 }
diff --git a/skill_db/src/main/java/jp/wicresoft/jdbc/BasicJdbc.java b/skill_db/src/main/java/jp/wicresoft/jdbc/BasicJdbc.java
@@ -27,7 +27,6 @@ public <T> List<T> convertJdbcMapToBean(List<Map<String, Object>> mapList, Class
 				}
 				resultList.add(object);
 			} catch (SecurityException | IllegalAccessException | IllegalArgumentException | InvocationTargetException | InstantiationException e) {
-				// TODO Auto-generated catch block
 				e.printStackTrace();
 			}
 		}
diff --git a/skill_db/src/main/java/jp/wicresoft/jdbc/SkillSearchJdbcTemplate.java b/skill_db/src/main/java/jp/wicresoft/jdbc/SkillSearchJdbcTemplate.java
@@ -0,0 +1,25 @@
+package jp.wicresoft.jdbc;
+
+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;
+
+import jp.wicresoft.domain.StuffMeta;
+
+@Component
+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);
+		return convertJdbcMapToBean(mapList, StuffMeta.class);
+	}
+}
diff --git a/sql/skill_db.sql b/sql/skill_db.sql
@@ -16,7 +16,18 @@ ALTER DATABASE `skill` COLLATE 'utf8mb4_general_ci';
 USE `skill`;
 
 
+-- Dumping structure for ビュー skill.license_view
+DROP VIEW IF EXISTS `license_view`;
+-- Creating temporary table to overcome VIEW dependency errors
+CREATE TABLE `license_view` (
+	`skill_id` INT(11) NOT NULL,
+	`title_name` VARCHAR(50) NOT NULL COLLATE 'utf8mb4_general_ci',
+	`version_name` VARCHAR(50) NOT NULL COLLATE 'utf8mb4_general_ci'
+) ENGINE=MyISAM;
+
+
 -- Dumping structure for テーブル skill.skill_category_mst
+DROP TABLE IF EXISTS `skill_category_mst`;
 CREATE TABLE IF NOT EXISTS `skill_category_mst` (
   `skill_category_id` int(11) NOT NULL AUTO_INCREMENT,
   `category_name` varchar(50) NOT NULL,
@@ -27,6 +38,7 @@ CREATE TABLE IF NOT EXISTS `skill_category_mst` (
 
 
 -- Dumping structure for テーブル skill.skill_title_mst
+DROP TABLE IF EXISTS `skill_title_mst`;
 CREATE TABLE IF NOT EXISTS `skill_title_mst` (
   `skill_title_id` int(11) NOT NULL AUTO_INCREMENT,
   `title_name` varchar(50) NOT NULL,
@@ -40,10 +52,11 @@ CREATE TABLE IF NOT EXISTS `skill_title_mst` (
 
 
 -- Dumping structure for テーブル skill.skill_version_mst
+DROP TABLE IF EXISTS `skill_version_mst`;
 CREATE TABLE IF NOT EXISTS `skill_version_mst` (
   `skill_id` int(11) NOT NULL AUTO_INCREMENT,
   `skill_title` int(11) NOT NULL,
-  `version_name` varchar(50) NOT NULL,
+  `version_name` varchar(50) NOT NULL DEFAULT '',
   PRIMARY KEY (`skill_id`),
   UNIQUE KEY `name_version` (`skill_title`,`version_name`),
   CONSTRAINT `SKILL_VERSION_MST_SKILL_TITLE_FK` FOREIGN KEY (`skill_title`) REFERENCES `skill_title_mst` (`skill_title_id`)
@@ -52,7 +65,18 @@ CREATE TABLE IF NOT EXISTS `skill_version_mst` (
 -- エクスポートするデータが選択されていません
 
 
+-- Dumping structure for ビュー skill.stuff_db
+DROP VIEW IF EXISTS `stuff_db`;
+-- Creating temporary table to overcome VIEW dependency errors
+CREATE TABLE `stuff_db` (
+	`id` INT(11) NOT NULL,
+	`stuff_id` INT(11) NOT NULL,
+	`db_name` VARCHAR(101) NOT NULL COLLATE 'utf8mb4_general_ci'
+) ENGINE=MyISAM;
+
+
 -- Dumping structure for テーブル skill.stuff_db_back
+DROP TABLE IF EXISTS `stuff_db_back`;
 CREATE TABLE IF NOT EXISTS `stuff_db_back` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
   `stuff_id` int(11) NOT NULL COMMENT '社員ナンバー',
@@ -66,7 +90,18 @@ CREATE TABLE IF NOT EXISTS `stuff_db_back` (
 -- エクスポートするデータが選択されていません
 
 
+-- Dumping structure for ビュー skill.stuff_develop_language
+DROP VIEW IF EXISTS `stuff_develop_language`;
+-- Creating temporary table to overcome VIEW dependency errors
+CREATE TABLE `stuff_develop_language` (
+	`id` INT(11) NOT NULL,
+	`stuff_id` INT(11) NOT NULL,
+	`develop_language_name` VARCHAR(101) NOT NULL COLLATE 'utf8mb4_general_ci'
+) ENGINE=MyISAM;
+
+
 -- Dumping structure for テーブル skill.stuff_develop_language_back
+DROP TABLE IF EXISTS `stuff_develop_language_back`;
 CREATE TABLE IF NOT EXISTS `stuff_develop_language_back` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
   `stuff_id` int(11) NOT NULL COMMENT '社員ナンバー',
@@ -79,7 +114,18 @@ CREATE TABLE IF NOT EXISTS `stuff_develop_language_back` (
 -- エクスポートするデータが選択されていません
 
 
+-- Dumping structure for ビュー skill.stuff_license
+DROP VIEW IF EXISTS `stuff_license`;
+-- Creating temporary table to overcome VIEW dependency errors
+CREATE TABLE `stuff_license` (
+	`id` INT(11) NOT NULL,
+	`stuff_id` INT(11) NOT NULL,
+	`license_name` VARCHAR(101) NOT NULL COLLATE 'utf8mb4_general_ci'
+) ENGINE=MyISAM;
+
+
 -- Dumping structure for テーブル skill.stuff_license_back
+DROP TABLE IF EXISTS `stuff_license_back`;
 CREATE TABLE IF NOT EXISTS `stuff_license_back` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
   `stuff_id` int(11) NOT NULL COMMENT '社員ナンバー',
@@ -93,22 +139,34 @@ CREATE TABLE IF NOT EXISTS `stuff_license_back` (
 
 
 -- Dumping structure for テーブル skill.stuff_meta
+DROP TABLE IF EXISTS `stuff_meta`;
 CREATE TABLE IF NOT EXISTS `stuff_meta` (
   `id` int(11) NOT NULL AUTO_INCREMENT COMMENT 'ID',
   `name` varchar(50) NOT NULL COMMENT '名前',
   `age` int(11) NOT NULL COMMENT '年齢',
-  `sex` tinyint(4) NOT NULL COMMENT '性別 1:男 0:女',
+  `sex` tinyint(1) NOT NULL COMMENT '性別 1:男 0:女',
   `nationality` varchar(50) NOT NULL COMMENT '国籍',
   `experience_year` int(11) NOT NULL COMMENT '経験年数',
   `price` int(11) NOT NULL COMMENT '単価',
-  `is_member` tinyint(4) NOT NULL COMMENT '自社社員 1:自社 0:他社',
+  `is_member` tinyint(1) NOT NULL COMMENT '自社社員 1:自社 0:他社',
   PRIMARY KEY (`id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
 
 -- エクスポートするデータが選択されていません
 
 
+-- Dumping structure for ビュー skill.stuff_os
+DROP VIEW IF EXISTS `stuff_os`;
+-- Creating temporary table to overcome VIEW dependency errors
+CREATE TABLE `stuff_os` (
+	`id` INT(11) NOT NULL,
+	`stuff_id` INT(11) NOT NULL,
+	`os_name` VARCHAR(101) NOT NULL COLLATE 'utf8mb4_general_ci'
+) ENGINE=MyISAM;
+
+
 -- Dumping structure for テーブル skill.stuff_os_back
+DROP TABLE IF EXISTS `stuff_os_back`;
 CREATE TABLE IF NOT EXISTS `stuff_os_back` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
   `stuff_id` int(11) NOT NULL COMMENT '社員ナンバー',
@@ -122,6 +180,7 @@ CREATE TABLE IF NOT EXISTS `stuff_os_back` (
 
 
 -- Dumping structure for テーブル skill.stuff_skill
+DROP TABLE IF EXISTS `stuff_skill`;
 CREATE TABLE IF NOT EXISTS `stuff_skill` (
   `stuff_id` int(11) NOT NULL,
   `skill_id` int(11) NOT NULL,
@@ -135,75 +194,35 @@ CREATE TABLE IF NOT EXISTS `stuff_skill` (
 
 
 -- Dumping structure for ビュー skill.license_view
--- Creating temporary table to overcome VIEW dependency errors
-CREATE TABLE `license_view` (
-	`skill_id` INT(11) NOT NULL,
-	`title_name` VARCHAR(50) NOT NULL COLLATE 'utf8mb4_general_ci',
-	`version_name` VARCHAR(50) NOT NULL COLLATE 'utf8mb4_general_ci'
-) ENGINE=MyISAM;
-
-
--- Dumping structure for ビュー skill.stuff_db
--- Creating temporary table to overcome VIEW dependency errors
-CREATE TABLE `stuff_db` (
-	`id` INT(11) NOT NULL,
-	`stuff_id` INT(11) NOT NULL,
-	`db_name` VARCHAR(101) NOT NULL COLLATE 'utf8mb4_general_ci'
-) ENGINE=MyISAM;
-
-
--- Dumping structure for ビュー skill.stuff_develop_language
--- Creating temporary table to overcome VIEW dependency errors
-CREATE TABLE `stuff_develop_language` (
-	`id` INT(11) NOT NULL,
-	`stuff_id` INT(11) NOT NULL,
-	`develop_language_name` VARCHAR(101) NOT NULL COLLATE 'utf8mb4_general_ci'
-) ENGINE=MyISAM;
-
-
--- Dumping structure for ビュー skill.stuff_license
--- Creating temporary table to overcome VIEW dependency errors
-CREATE TABLE `stuff_license` (
-	`id` INT(11) NOT NULL,
-	`stuff_id` INT(11) NOT NULL,
-	`license_name` VARCHAR(101) NOT NULL COLLATE 'utf8mb4_general_ci'
-) ENGINE=MyISAM;
-
-
--- Dumping structure for ビュー skill.stuff_os
--- Creating temporary table to overcome VIEW dependency errors
-CREATE TABLE `stuff_os` (
-	`id` INT(11) NOT NULL,
-	`stuff_id` INT(11) NOT NULL,
-	`os_name` VARCHAR(101) NOT NULL COLLATE 'utf8mb4_general_ci'
-) ENGINE=MyISAM;
-
-
--- Dumping structure for ビュー skill.license_view
+DROP VIEW IF EXISTS `license_view`;
 -- Removing temporary table and create final VIEW structure
 DROP TABLE IF EXISTS `license_view`;
 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `license_view` AS select `v`.`skill_id` AS `skill_id`,`t`.`title_name` AS `title_name`,`v`.`version_name` AS `version_name` from (`skill_title_mst` `t` join `skill_version_mst` `v` on((`t`.`skill_title_id` = `v`.`skill_title`)));
 
 
 -- Dumping structure for ビュー skill.stuff_db
+DROP VIEW IF EXISTS `stuff_db`;
 -- Removing temporary table and create final VIEW structure
 DROP TABLE IF EXISTS `stuff_db`;
 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `stuff_db` AS select `v`.`skill_id` AS `id`,`s`.`stuff_id` AS `stuff_id`,concat(`t`.`title_name`,' ',`v`.`version_name`) AS `db_name` from ((`skill_title_mst` `t` join `skill_version_mst` `v`) join `stuff_skill` `s` on(((`t`.`skill_category` = 3) and (`t`.`skill_title_id` = `v`.`skill_title`) and (`v`.`skill_id` = `s`.`skill_id`))));
 
 
 -- Dumping structure for ビュー skill.stuff_develop_language
+DROP VIEW IF EXISTS `stuff_develop_language`;
 -- Removing temporary table and create final VIEW structure
 DROP TABLE IF EXISTS `stuff_develop_language`;
 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `stuff_develop_language` AS select `v`.`skill_id` AS `id`,`s`.`stuff_id` AS `stuff_id`,concat(`t`.`title_name`,' ',`v`.`version_name`) AS `develop_language_name` from ((`skill_title_mst` `t` join `skill_version_mst` `v`) join `stuff_skill` `s` on(((`t`.`skill_category` = 4) and (`t`.`skill_title_id` = `v`.`skill_title`) and (`v`.`skill_id` = `s`.`skill_id`))));
 
 
 -- Dumping structure for ビュー skill.stuff_license
+DROP VIEW IF EXISTS `stuff_license`;
 -- Removing temporary table and create final VIEW structure
 DROP TABLE IF EXISTS `stuff_license`;
 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `stuff_license` AS select `v`.`skill_id` AS `id`,`s`.`stuff_id` AS `stuff_id`,concat(`t`.`title_name`,' ',`v`.`version_name`) AS `license_name` from ((`skill_title_mst` `t` join `skill_version_mst` `v`) join `stuff_skill` `s` on(((`t`.`skill_category` = 1) and (`t`.`skill_title_id` = `v`.`skill_title`) and (`v`.`skill_id` = `s`.`skill_id`))));
 
 
 -- Dumping structure for ビュー skill.stuff_os
+DROP VIEW IF EXISTS `stuff_os`;
 -- Removing temporary table and create final VIEW structure
 DROP TABLE IF EXISTS `stuff_os`;
 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `stuff_os` AS select `v`.`skill_id` AS `id`,`s`.`stuff_id` AS `stuff_id`,concat(`t`.`title_name`,' ',`v`.`version_name`) AS `os_name` from ((`skill_title_mst` `t` join `skill_version_mst` `v`) join `stuff_skill` `s` on(((`t`.`skill_category` = 2) and (`t`.`skill_title_id` = `v`.`skill_title`) and (`v`.`skill_id` = `s`.`skill_id`))));

Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,6 @@ public <T> List<T> convertJdbcMapToBean(List<Map<String, Object>> mapList, Class`
`27`	`27`	`}`
`28`	`28`	`resultList.add(object);`
`29`	`29`	`} catch (SecurityException \| IllegalAccessException \| IllegalArgumentException \| InvocationTargetException \| InstantiationException e) {`
`30`		`- // TODO Auto-generated catch block`
`31`	`30`	`e.printStackTrace();`
`32`	`31`	`}`
`33`	`32`	`}`