• R/O
  • SSH
  • HTTPS

Commit

Tags
No Tags

Frequently used words (click to add to your profile)

javac++androidlinuxc#windowsobjective-ccocoa誰得qtpythonphprubygameguibathyscaphec計画中(planning stage)翻訳omegatframeworktwitterdomtestvb.netdirectxゲームエンジンbtronarduinopreviewer

Commit MetaInfo

Revision16 (tree)
Time2015-07-15 23:33:16
Authorckoshien

Log Message

ログイン時log出力追加。
非ログイン時試合詳細表示追加。

Change Summary

Incremental Difference

--- trunk/JCBLScore/src/main/java/cx/myhome/ckoshien/action/GameSummaryAction.java (revision 15)
+++ trunk/JCBLScore/src/main/java/cx/myhome/ckoshien/action/GameSummaryAction.java (revision 16)
@@ -3,15 +3,20 @@
33 import java.util.List;
44 import java.sql.Date;
55 import javax.annotation.Resource;
6+import javax.servlet.http.HttpServletRequest;
7+import javax.servlet.http.HttpSession;
68
9+import org.apache.struts.Globals;
710 import org.apache.struts.action.ActionErrors;
811 import org.apache.struts.action.ActionMessage;
912 import org.apache.struts.action.ActionMessages;
1013 import org.seasar.framework.beans.util.Beans;
1114 import org.seasar.framework.container.annotation.tiger.Aspect;
15+import org.seasar.framework.container.factory.SingletonS2ContainerFactory;
1216 import org.seasar.struts.annotation.ActionForm;
1317 import org.seasar.struts.annotation.Execute;
1418 import org.seasar.struts.enums.SaveType;
19+import org.seasar.struts.util.RequestUtil;
1520
1621 import cx.myhome.ckoshien.dto.BattingResultDto;
1722 import cx.myhome.ckoshien.dto.GameListDto;
@@ -76,6 +81,8 @@
7681 public List<GameListDto> gameListDtos;
7782 public Integer leagueId;
7883 public League league;
84+public Team firstTeam;
85+public Team lastTeam;
7986
8087 @Execute(validator = false)
8188 public String index(){
@@ -88,6 +95,13 @@
8895 @Aspect(value="loginConfInterceptor")
8996 @Execute(validator = false)
9097 public String create(){
98+// HttpSession session =
99+// (HttpSession) SingletonS2ContainerFactory
100+// .getContainer()
101+// .getExternalContext()
102+// .getSession();
103+ //session.removeAttribute("gameSummaryForm");
104+
91105 teamList=teamService.findAllOrderById();
92106 playerList=playerService.findAllOrderById();
93107 return "create.jsp";
@@ -95,9 +109,8 @@
95109
96110 @Aspect(value="loginConfInterceptor")
97111 //@Execute(validator = true,input="create?redirect=true")
98- @Execute(validator = true,input="create?redirect=true",
112+ @Execute(validator = true,input="create",
99113 stopOnValidationError=false,
100- saveErrors=SaveType.SESSION,
101114 validate="dateValidate",
102115 removeActionForm=true)
103116 public String createComplete(){
@@ -200,13 +213,25 @@
200213 return "index&redirect=true";
201214 }
202215
216+ @Execute(urlPattern="show/{id}",validator = false)
217+ public String show(){
218+ gameId=Integer.parseInt(gameSummaryForm.id);
219+ game=gameService.findById(gameId);
220+ //playerList=playerService.findAllOrderById();
221+ firstTeam=teamService.findById(game.firstTeam);
222+ lastTeam=teamService.findById(game.lastTeam);
223+ //teamList=teamService.findAllOrderById();
224+ firstPitchingList=pitchingService.findByGameId(gameId,game.firstTeam);
225+ lastPitchingList=pitchingService.findByGameId(gameId,game.lastTeam);
226+ firstBattingSumList=battingSumService.findByGameId(gameId,game.firstTeam);
227+ lastBattingSumList=battingSumService.findByGameId(gameId,game.lastTeam);
228+ //logic= new GameSummaryLogic();
229+ //gameSummaryForm=logic.convert2GameSummary(game,firstBattingSumList,lastBattingSumList,gameSummaryForm,firstPitchingList,lastPitchingList);
230+ return "show.jsp";
231+ }
232+
203233 @Aspect(value="loginConfInterceptor")
204- @Execute(urlPattern="edit/{id}",
205- validator = true,input="edit/{id}?redirect=true",
206- stopOnValidationError=false,
207- saveErrors=SaveType.SESSION,
208- validate="dateValidate",
209- removeActionForm=true)
234+ @Execute(urlPattern="edit/{id}",validator = false)
210235 public String edit(){
211236 gameId=Integer.parseInt(gameSummaryForm.id);
212237 game=gameService.findById(gameId);
@@ -222,7 +247,10 @@
222247 }
223248
224249 @Aspect(value="loginConfInterceptor")
225- @Execute(validator=true,input="edit.jsp")
250+ @Execute(validator=true,input="edit/{id}",
251+ stopOnValidationError=false,
252+ validate="dateValidate",
253+ removeActionForm=true)
226254 public String updateComplete(){
227255 StringBuilder sb = new StringBuilder();
228256 //日付を連結
--- trunk/JCBLScore/src/main/java/cx/myhome/ckoshien/action/LoginAction.java (revision 15)
+++ trunk/JCBLScore/src/main/java/cx/myhome/ckoshien/action/LoginAction.java (revision 16)
@@ -2,6 +2,7 @@
22
33 import javax.annotation.Resource;
44
5+import org.apache.log4j.Logger;
56 import org.apache.struts.action.ActionMessage;
67 import org.apache.struts.action.ActionMessages;
78 import org.seasar.framework.beans.util.Beans;
@@ -26,6 +27,8 @@
2627
2728 public Player player;
2829
30+ static Logger logger = Logger.getLogger("rootLogger");
31+
2932 @Execute(validator = false)
3033 public String index() {
3134 return "/login/index.jsp";
@@ -55,9 +58,12 @@
5558
5659 //パスワード照合エラー
5760 player = playerService.findByLoginId(playerForm.loginId);
61+ logger.info("ログインID:"+playerForm.loginId);
62+ logger.info("パスワード:"+playerForm.password);
5863 if (player!=null){
5964 if (!player.password.equals(playerForm.password)) {
6065 errors.add("login", new ActionMessage("errors.login"));
66+ logger.warn("一致しないパスワード:"+playerForm.password);
6167 }
6268 if (player.authority!=1) {
6369 errors.add("login", new ActionMessage("errors.login"));
@@ -64,6 +70,7 @@
6470 }
6571 }else{
6672 errors.add("login", new ActionMessage("errors.login"));
73+ logger.warn("存在しないログインID:"+playerForm.loginId);
6774 }
6875
6976 return errors;
--- trunk/JCBLScore/src/main/java/cx/myhome/ckoshien/service/PitchingService.java (revision 15)
+++ trunk/JCBLScore/src/main/java/cx/myhome/ckoshien/service/PitchingService.java (revision 16)
@@ -49,7 +49,7 @@
4949 }
5050
5151 public List<Pitching> findByGameId(Integer gameId,Integer myTeamId) {
52- list=select().where("gameId=? AND myTeamId=?",gameId,myTeamId).orderBy(asc(id())).getResultList();
52+ list=select().innerJoin(player()).where("gameId=? AND myTeamId=?",gameId,myTeamId).orderBy(asc(id())).getResultList();
5353 return list;
5454 }
5555 public List<Pitching> findByGameIdAll(Integer gameId) {
--- trunk/JCBLScore/src/main/java/cx/myhome/ckoshien/service/PlayerService.java (revision 15)
+++ trunk/JCBLScore/src/main/java/cx/myhome/ckoshien/service/PlayerService.java (revision 16)
@@ -31,7 +31,7 @@
3131 * @return エンティティのリスト
3232 */
3333 public List<Player> findAllOrderById() {
34- return select().orderBy(asc(teamId())).getResultList();
34+ return select().innerJoin(team()).orderBy(asc(teamId())).getResultList();
3535 }
3636
3737 public Player findByLoginId(String loginId) {
--- trunk/JCBLScore/src/main/java/cx/myhome/ckoshien/service/BattingSumService.java (revision 15)
+++ trunk/JCBLScore/src/main/java/cx/myhome/ckoshien/service/BattingSumService.java (revision 16)
@@ -48,7 +48,7 @@
4848 }
4949
5050 public List<BattingSum> findByGameId(Integer gameId,Integer myTeamId) {
51- list=select().where("gameId=? AND myTeamId=?",gameId,myTeamId).orderBy(asc(id())).getResultList();
51+ list=select().innerJoin(player()).where("gameId=? AND myTeamId=?",gameId,myTeamId).orderBy(asc(id())).getResultList();
5252 return list;
5353 }
5454 public List<BattingSum> findByGameIdAll(Integer gameId) {
--- trunk/JCBLScore/src/main/java/cx/myhome/ckoshien/form/GameSummaryForm.java (revision 15)
+++ trunk/JCBLScore/src/main/java/cx/myhome/ckoshien/form/GameSummaryForm.java (revision 16)
@@ -7,7 +7,7 @@
77 import org.seasar.framework.container.annotation.tiger.InstanceType;
88 import org.seasar.struts.annotation.Required;
99
10-@Component(instance=InstanceType.SESSION)
10+//@Component(instance=InstanceType.SESSION)
1111 public class GameSummaryForm implements Serializable{
1212 private static final long serialVersionUID = 1L;
1313