From 07c14c428b7ced8b4e4abfa7479f21d7c05f3035 Mon Sep 17 00:00:00 2001 From: zy_Java <654600784@qq.com> Date: Thu, 3 Sep 2020 09:23:08 +0800 Subject: [PATCH] =?UTF-8?q?20200903=E4=BF=AE=E6=94=B9=E8=BF=9C=E7=A8=8B?= =?UTF-8?q?=E6=AF=94=E8=B5=9B=E6=8E=A5=E5=8F=A3=E8=B7=AF=E5=BE=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ccsens/mt/api/CompeteController.java | 26 +++++++++---------- .../com/ccsens/mt/service/CompeteService.java | 2 ++ mt/src/main/resources/application.yml | 4 +-- tall/src/main/resources/application.yml | 4 +-- 4 files changed, 19 insertions(+), 17 deletions(-) diff --git a/mt/src/main/java/com/ccsens/mt/api/CompeteController.java b/mt/src/main/java/com/ccsens/mt/api/CompeteController.java index 250f0727..429c7f21 100644 --- a/mt/src/main/java/com/ccsens/mt/api/CompeteController.java +++ b/mt/src/main/java/com/ccsens/mt/api/CompeteController.java @@ -32,7 +32,7 @@ public class CompeteController { @MustLogin @ApiOperation(value = "查看当前是第几届比赛", notes = "") - @RequestMapping(value = "", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) + @RequestMapping(value = "/competeTime", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) public JsonResponse getCompeteTime(@ApiParam @Validated @RequestBody QueryDto params) { log.info("查看当前是第几届比赛：{}",params); CompeteVo.CompeteTime competeTime = competeService.getCompeteTime(params); @@ -41,7 +41,7 @@ public class CompeteController { @MustLogin @ApiOperation(value = "查看组别信息", notes = "") - @RequestMapping(value = "", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) + @RequestMapping(value = "/group", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) public JsonResponse> queryCompeteGroup(@ApiParam @Validated @RequestBody QueryDto params) { log.info("查看组别信息：{}",params); List competeGroups = competeService.queryCompeteGroup(params); @@ -50,7 +50,7 @@ public class CompeteController { @MustLogin @ApiOperation(value = "模糊查询参赛单位", notes = "") - @RequestMapping(value = "", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) + @RequestMapping(value = "/company", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) public JsonResponse> queryCompeteCompany(@ApiParam @Validated @RequestBody QueryDto params) { log.info("模糊查询参赛单位：{}",params); List competeCompanyList = competeService.queryCompeteCompany(params); @@ -59,7 +59,7 @@ public class CompeteController { @MustLogin @ApiOperation(value = "刷新redis内的参赛单位信息", notes = "") - @RequestMapping(value = "", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) + @RequestMapping(value = "/sync/company", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) public JsonResponse syncCompeteCompany(@ApiParam @Validated @RequestBody QueryDto params) { log.info("刷新redis内的参赛单位信息：{}",params); competeService.syncCompeteCompany(params); @@ -69,7 +69,7 @@ public class CompeteController { @MustLogin @ApiOperation(value = "提交报名基本信息", notes = "") - @RequestMapping(value = "", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) + @RequestMapping(value = "/save/player", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) public JsonResponse saveCompetePlayerInfo(@ApiParam @Validated @RequestBody QueryDto params) { log.info("提交报名基本信息：{}",params); CompeteVo.CompetePlayerInfo competePlayerInfo = competeService.saveCompetePlayerInfo(params); @@ -78,7 +78,7 @@ public class CompeteController { @MustLogin @ApiOperation(value = "查看参赛项目信息", notes = "") - @RequestMapping(value = "", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) + @RequestMapping(value = "/project", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) public JsonResponse> queryCompeteProject(@ApiParam @Validated @RequestBody QueryDto params) { log.info("查看参赛项目信息：{}",params); List competeProjects = competeService.queryCompeteProject(params); @@ -87,7 +87,7 @@ public class CompeteController { @MustLogin @ApiOperation(value = "提交选择的比赛项目", notes = "") - @RequestMapping(value = "", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) + @RequestMapping(value = "/save/project", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) public JsonResponse saveCompeteProject(@ApiParam @Validated @RequestBody QueryDto params) { log.info("提交选择的比赛项目：{}",params); CompeteVo.CompetePlayerInfo competePlayerInfo = competeService.saveCompeteProject(params); @@ -96,7 +96,7 @@ public class CompeteController { @MustLogin @ApiOperation(value = "查看本人所有参赛的项目", notes = "") - @RequestMapping(value = "", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) + @RequestMapping(value = "/projectAll", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) public JsonResponse queryCompeteProjectAllByUser(@ApiParam @Validated @RequestBody QueryDto params) { log.info("查看本人所有参赛的项目：{}",params); CompeteVo.CompeteProjectAllByUser competeProjectAll = competeService.queryCompeteProjectAllByUser(params); @@ -105,7 +105,7 @@ public class CompeteController { @MustLogin @ApiOperation(value = "查看团队比赛的邀请二维码", notes = "") - @RequestMapping(value = "", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) + @RequestMapping(value = "/qrCode", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) public JsonResponse getQrCodeByTeamId(@ApiParam @Validated @RequestBody QueryDto params) { log.info("查看团队比赛的邀请二维码：{}",params); String qrCodeUrl = competeService.getQrCodeByTeamId(params); @@ -114,7 +114,7 @@ public class CompeteController { @MustLogin @ApiOperation(value = "查看个人基本报名信息", notes = "") - @RequestMapping(value = "", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) + @RequestMapping(value = "/playerInfo", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) public JsonResponse getCompetePlayerInfo(@ApiParam @Validated @RequestBody QueryDto params) { log.info("查看个人基本报名信息：{}",params); CompeteVo.GetPlayerInfo getPlayerInfo = competeService.getCompetePlayerInfo(params); @@ -123,10 +123,10 @@ public class CompeteController { @MustLogin - @ApiOperation(value = "查看个人基本报名信息", notes = "") - @RequestMapping(value = "", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) + @ApiOperation(value = "扫码加入团队", notes = "") + @RequestMapping(value = "/joinGroup", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) public JsonResponse joinCompeteGroup(@ApiParam @Validated @RequestBody QueryDto params) { - log.info("查看个人基本报名信息：{}",params); + log.info("扫码加入团队：{}",params); CompeteVo.CompeteTeamProject competeTeamProject = competeService.joinCompeteGroup(params); return JsonResponse.newInstance().ok(competeTeamProject); } diff --git a/mt/src/main/java/com/ccsens/mt/service/CompeteService.java b/mt/src/main/java/com/ccsens/mt/service/CompeteService.java index 2a8c6934..b0553df0 100644 --- a/mt/src/main/java/com/ccsens/mt/service/CompeteService.java +++ b/mt/src/main/java/com/ccsens/mt/service/CompeteService.java @@ -3,12 +3,14 @@ package com.ccsens.mt.service; import com.ccsens.mt.bean.dto.CompeteDto; import com.ccsens.mt.bean.vo.CompeteVo; import com.ccsens.util.bean.dto.QueryDto; +import org.springframework.stereotype.Service; import java.util.List; /** * @author 逗 */ +@Service public class CompeteService implements ICompeteService{ /** diff --git a/mt/src/main/resources/application.yml b/mt/src/main/resources/application.yml index d082c0ea..5c2cd5c4 100644 --- a/mt/src/main/resources/application.yml +++ b/mt/src/main/resources/application.yml @@ -1,4 +1,4 @@ spring: profiles: - active: prod - include: common, util-prod \ No newline at end of file + active: dev + include: common, util-dev \ No newline at end of file diff --git a/tall/src/main/resources/application.yml b/tall/src/main/resources/application.yml index 4fc2efe4..b2acd365 100644 --- a/tall/src/main/resources/application.yml +++ b/tall/src/main/resources/application.yml @@ -1,4 +1,4 @@ spring: profiles: - active: prod - include: util-prod,common + active: dev + include: util-dev,common