Commit: 23 - JCBLScore (svn)

Commit MetaInfo

• Revision: 23 (tree)
• Time: 2015-07-22 22:52:33
• Author: ckoshien

Log Message

個人成績ページの追加
グラフ機能実装

Change Summary

• added: trunk/JCBLScore/src/main/resources/cx/myhome/ckoshien/sql/PersonalPitchingResult.sql
• added: trunk/JCBLScore/src/main/resources/cx/myhome/ckoshien/sql/PersonalBattingResult.sql
• modified: trunk/JCBLScore/src/main/webapp/WEB-INF/view/team/tbresult.jsp
• added: trunk/JCBLScore/src/main/webapp/WEB-INF/view/player/result.jsp
• modified: trunk/JCBLScore/src/main/webapp/WEB-INF/view/result/stats.jsp
• modified: trunk/JCBLScore/src/main/java/cx/myhome/ckoshien/action/PlayerAction.java
• modified: trunk/JCBLScore/src/main/java/cx/myhome/ckoshien/service/BattingSumService.java
• modified: trunk/JCBLScore/src/main/java/cx/myhome/ckoshien/service/PitchingService.java
• modified: trunk/JCBLScore/src/main/java/cx/myhome/ckoshien/SqlFiles.java
• modified: trunk/JCBLScore/src/test/java/cx/myhome/ckoshien/entity/SqlFileTest.java

Incremental Difference

--- trunk/JCBLScore/src/main/resources/cx/myhome/ckoshien/sql/PersonalPitchingResult.sql	(nonexistent)
+++ trunk/JCBLScore/src/main/resources/cx/myhome/ckoshien/sql/PersonalPitchingResult.sql	(revision 23)
@@ -0,0 +1,35 @@
+SELECT
+  name,
+  p.team_id as team_id,
+  player_id,
+  t.short_name as short_name,
+  count(*) as game_count,
+  sum(runs)/sum(inning)*5 as era,
+  (sum(hit)+sum(four_ball))/sum(inning) as WHIP,
+  sum(strike_out)/sum(inning)*5 as strike_avg,
+  sum(inning) as inning,
+  sum(hit) as hit,
+  sum(four_ball) as four_ball,
+  sum(strike_out) as strike_out,
+  sum(runs) as runs,
+  sum(complete) as complete,
+  sum(shutout) as shutout,
+  sum(pc.win) as win,
+  sum(pc.lose) as lose,
+  sum(pc.save) as save,
+  myteam_id,
+  g.league_id as league_id,
+  l.short_title as title
+ FROM pitching pc
+inner join GAME g
+on pc.game_id=g.game_id
+inner join RESULT r
+on pc.myteam_id=r.team_id and g.game_id=r.game_id
+inner join player p
+on p.id=pc.player_id
+inner join team t
+on pc.team_id=t.team_id
+inner join league l
+on g.league_id=l.id
+where player_id=/*playerId*/
+group by league_id with rollup
\ No newline at end of file

--- trunk/JCBLScore/src/main/resources/cx/myhome/ckoshien/sql/PersonalBattingResult.sql	(nonexistent)
+++ trunk/JCBLScore/src/main/resources/cx/myhome/ckoshien/sql/PersonalBattingResult.sql	(revision 23)
@@ -0,0 +1,37 @@
+SELECT
+  name,
+  p.team_id as team_id,
+  player_id,
+  short_name,
+  sum(tpa) as tpa,
+  sum(at_bats)as at_bats,
+  sum(hit) as hit,
+  (sum(hit)/sum(at_bats)) as average,
+  ((sum(hit)+sum(twobase)*1+sum(homerun)*2)/sum(at_bats)) as SLG,
+	((sum(hit)+sum(four_ball))/sum(tpa))+((sum(hit)+sum(twobase)*1+sum(homerun)*2)/sum(at_bats)) as OPS,
+	(sum(hit)+sum(four_ball))/sum(tpa) as OBP,
+	CASE
+    WHEN sum(at_bats)/sum(strike_out) is null THEN 0
+    WHEN sum(at_bats)/sum(strike_out) is not null THEN sum(at_bats)/sum(strike_out)
+  	END as not_strike_out,
+  sum(rbi) as rbi,
+  sum(four_ball) as four_ball,
+  sum(strike_out) as strike_out,
+  sum(twobase) as twobase,
+  sum(homerun) as homerun,
+  myteam_id,
+  g.league_id as league_id,
+  l.short_title as title
+ FROM batting_sum b
+inner join GAME g
+on b.game_id=g.game_id
+inner join RESULT r
+on b.myteam_id=r.team_id and g.game_id=r.game_id
+inner join player p
+on p.id=b.player_id
+inner join team t
+on b.team_id=t.team_id
+inner join league l
+on g.league_id=l.id
+where player_id=/*playerId*/
+group by league_id with rollup
\ No newline at end of file

--- trunk/JCBLScore/src/main/java/cx/myhome/ckoshien/action/PlayerAction.java	(revision 22)
+++ trunk/JCBLScore/src/main/java/cx/myhome/ckoshien/action/PlayerAction.java	(revision 23)
@@ -11,9 +11,14 @@
 import org.seasar.struts.annotation.ActionForm;
 import org.seasar.struts.annotation.Execute;
 
+import cx.myhome.ckoshien.dto.BattingResultDto;
+import cx.myhome.ckoshien.dto.TeamBattingResultDto;
+import cx.myhome.ckoshien.dto.TeamPitchingResultDto;
 import cx.myhome.ckoshien.entity.Player;
 import cx.myhome.ckoshien.entity.Team;
 import cx.myhome.ckoshien.form.PlayerForm;
+import cx.myhome.ckoshien.service.BattingSumService;
+import cx.myhome.ckoshien.service.PitchingService;
 import cx.myhome.ckoshien.service.PlayerService;
 import cx.myhome.ckoshien.service.TeamService;
 
@@ -32,6 +37,12 @@
 	public List<Team> teamList;
 	public List<Player> playerList;
 	public Player player;
+	@Resource
+	public BattingSumService battingSumService;
+	public List<TeamBattingResultDto> pbrList;
+	@Resource
+	public PitchingService pitchingService;
+	public List<TeamPitchingResultDto> pprList;
 
 	@Execute(validator = false)
 	public String index() {
@@ -77,6 +88,13 @@
         return "index&redirect=true";
 	}
 
+	@Execute(urlPattern="show/{id}",validator = false)
+	public String show(){
+		pbrList=battingSumService.findPBRById(Integer.parseInt(playerForm.id));
+        pprList=pitchingService.findPPRById(Integer.parseInt(playerForm.id));
+		return "result.jsp";
+	}
+
 	public ActionMessages createValidate(){
 		ActionMessages errors = new ActionMessages();
 		player=playerService.findByNameAndTeamId(playerForm.name, Integer.parseInt(playerForm.teamId));

--- trunk/JCBLScore/src/main/java/cx/myhome/ckoshien/service/BattingSumService.java	(revision 22)
+++ trunk/JCBLScore/src/main/java/cx/myhome/ckoshien/service/BattingSumService.java	(revision 23)
@@ -74,4 +74,12 @@
 		teamBattingResultDtos=jdbcManager.selectBySqlFile(TeamBattingResultDto.class, "cx.myhome.ckoshien.sql.TeamBattingResult.sql",param).getResultList();
 		return teamBattingResultDtos;
 	}
+
+	public List<TeamBattingResultDto> findPBRById(Integer playerId){
+		teamBattingResultDtos=new ArrayList<TeamBattingResultDto>();
+		Map<String, Object> param = new HashMap<String, Object>();
+		param.put("playerId", playerId);
+		teamBattingResultDtos=jdbcManager.selectBySqlFile(TeamBattingResultDto.class, "cx.myhome.ckoshien.sql.PersonalBattingResult.sql",param).getResultList();
+		return teamBattingResultDtos;
+	}
 }
\ No newline at end of file

--- trunk/JCBLScore/src/main/java/cx/myhome/ckoshien/service/PitchingService.java	(revision 22)
+++ trunk/JCBLScore/src/main/java/cx/myhome/ckoshien/service/PitchingService.java	(revision 23)
@@ -75,4 +75,11 @@
 		teamPitchingResultDtos=jdbcManager.selectBySqlFile(TeamPitchingResultDto.class, "cx.myhome.ckoshien.sql.TeamPitchingResult.sql",param).getResultList();
 		return teamPitchingResultDtos;
 	}
+
+    public List<TeamPitchingResultDto> findPPRById(Integer playerId){
+    	Map<String, Object> param = new HashMap<String, Object>();
+		param.put("playerId", playerId);
+		teamPitchingResultDtos=jdbcManager.selectBySqlFile(TeamPitchingResultDto.class, "cx.myhome.ckoshien.sql.PersonalPitchingResult.sql",param).getResultList();
+		return teamPitchingResultDtos;
+	}
 }
\ No newline at end of file

--- trunk/JCBLScore/src/main/java/cx/myhome/ckoshien/SqlFiles.java	(revision 22)
+++ trunk/JCBLScore/src/main/java/cx/myhome/ckoshien/SqlFiles.java	(revision 23)
@@ -6,6 +6,6 @@
  * SQLファイルの定数クラスです。
  * 
  */
-@Generated(value = {"S2JDBC-Gen 2.4.46", "org.seasar.extension.jdbc.gen.internal.model.SqlFileConstantsModelFactoryImpl"}, date = "2015/07/10 16:39:39")
+@Generated(value = {"S2JDBC-Gen 2.4.46", "org.seasar.extension.jdbc.gen.internal.model.SqlFileConstantsModelFactoryImpl"}, date = "2015/07/22 16:23:21")
 public final class SqlFiles {
 }
\ No newline at end of file

--- trunk/JCBLScore/src/test/java/cx/myhome/ckoshien/entity/SqlFileTest.java	(revision 22)
+++ trunk/JCBLScore/src/test/java/cx/myhome/ckoshien/entity/SqlFileTest.java	(revision 23)
@@ -25,7 +25,7 @@
  * </p>
  *
  */
-@Generated(value = {"S2JDBC-Gen 2.4.46", "org.seasar.extension.jdbc.gen.internal.model.SqlFileTestModelFactoryImpl"}, date = "2015/07/10 16:39:45")
+@Generated(value = {"S2JDBC-Gen 2.4.46", "org.seasar.extension.jdbc.gen.internal.model.SqlFileTestModelFactoryImpl"}, date = "2015/07/22 16:23:27")
 public class SqlFileTest extends S2TestCase {
 
     private JdbcManager jdbcManager;