Commit f618315a by caosy

miss some file

parent 257908e8
......@@ -726,6 +726,12 @@ public class GameController {
return null;
}
/**
* 开始记分
* @param token
* @param gameId
* @return
*/
@Security
@ResponseBody
@RequestMapping(value = "/startScore/{token}", method = RequestMethod.GET, params = {"gameId"})
......
......@@ -66,6 +66,13 @@ public class ScoreMatchMController {
return scoreMatchMService.list(query);
}
/**
* 我参与的赛事列表
* @param token
* @param pagerOffset
* @param pagerPerPage
* @return
*/
@Security
@ResponseBody
@RequestMapping(value = "/myRegisterList/{token}", method = RequestMethod.GET, params = { "pagerOffset", "pagerPerPage" })
......
......@@ -45,59 +45,74 @@ public class ScoreCardController {
@Autowired
private ScoreService scoreService;
/**
* 开始打球
*
*/
@RequestMapping("/start/{token}")
@RequestMapping("/checkStart/{token}")
@ResponseBody
public Response<GameScoreBean> start(@PathVariable("token") String token,
public Response<Integer> checkStart(@PathVariable("token") String token,
@RequestBody StartScoreVO vo) {
Response<GameScoreBean> response = new Response<GameScoreBean>();
// 校验参数
if (vo.getCourseId() < 1) {
response.setMessage("请选择球场");
response.setStatus(-1);
return response;
Response response = checkParam(token, vo);
UserBean userBean = null;
try {
userBean = userMService.getUserBean(token);
} catch (Exception e) {
}
if (userBean == null || StringUtils.isEmpty(userBean.getUid())) {
return new Response(-1,"非法token",null);
}
vo.setUid(userBean.getUid());
return scoreService.checkStart(vo);
}
@SuppressWarnings({ "unchecked", "rawtypes" })
private Response checkParam(String token, StartScoreVO vo) {
// 校验参数
if (vo.getCourseId() < 1) {
return new Response(-1,"请选择球场",null);
}
if (vo.getZone1() < 1 || vo.getZone2() < 1) {
response.setMessage("请选择2个球区");
response.setStatus(-1);
return response;
return new Response(-1,"请选择2个球区",null);
}
if (StringUtils.isEmpty(vo.getLocalPlayer())) {
response.setMessage("请输入打球人姓名");
response.setStatus(-1);
return response;
return new Response(-1,"请输入打球人姓名",null);
}
for (GamePlayerVO player : vo.getPlayers()) {
if (player == null) {
response.setMessage("请完善打球人信息");
response.setStatus(-1);
return response;
return new Response(-1,"请完善打球人信息",null);
}
if (StringUtils.isEmpty(player.getName())) {
response.setMessage("打球人姓名不能为空");
response.setStatus(-1);
return response;
return new Response(-1,"打球人姓名不能为空",null);
}
if (!StringUtils.isEmpty(player.getPhone()) && !MatcherUtil.isPhone(player.getPhone())) {
response.setMessage("手机号码格式不正确");
response.setStatus(-1);
return response;
return new Response(-1,"手机号码格式不正确",null);
}
if (player.getTee()==null) {
response.setMessage("参与球员没有选择发球台");
response.setStatus(-1);
return response;
return new Response(-1,"参与球员没有选择发球台",null);
}
if (!MatcherUtil.isTee(player.getTee())) {
response.setMessage("您选择了非法的发球台:"+player.getTee());
response.setStatus(-1);
return response;
return new Response(-1,"您选择了非法的发球台:"+player.getTee(),null);
}
}
return null;
}
/**
* 开始打球
*
*/
@SuppressWarnings({ "unchecked", "rawtypes" })
@RequestMapping("/start/{token}")
@ResponseBody
public Response<GameScoreBean> start(@PathVariable("token") String token,
@RequestBody StartScoreVO vo) {
// Response<GameScoreBean> response = new Response<GameScoreBean>();
Response response = checkParam(token, vo);
if(response == null){
response = new Response<GameScoreBean>();
}
UserBean userBean = null;
try {
userBean = userMService.getUserBean(token);
......
......@@ -30,6 +30,24 @@ public class ScoreService extends BaseService {
// private static Logger logger = LoggerFactory.getLogger(ScoreService.class);
/**
* 检查开始打球
*
* @param uid
* 用户编号
*
* @param vo
* 开始打球人和球洞信息
* @return
*/
public Response<Integer> checkStart(StartScoreVO vo) {
Request<StartScoreVO> request = new Request<StartScoreVO>(vo.getUid(), vo);
HttpEntity<Request<StartScoreVO>> entity = new HttpEntity<Request<StartScoreVO>>(request);
Response<Integer> response = super.exchange(this.getServiceUri("uri.scores.checkStart"),
HttpMethod.POST, entity, new ParameterizedTypeReference<Response<Integer>>() {
}).getBody();
return response;
}
/**
* 开始打球
*
* @param uid
......
......@@ -206,6 +206,7 @@ uri.integral.goods=/fun-golf-service/integralGoods/list
uri.scores.uploadTempScore=/fun-golf-service/scores/uploadTempScore
uri.scores.getUserStat=/fun-golf-service/scores/getUserStat
uri.scores.checkStart=/fun-golf-service/scores/checkStart
uri.scores.start=/fun-golf-service/scores/start
uri.scores.record=/fun-golf-service/scores/record
uri.scores.finish=/fun-golf-service/scores/finish
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment