记得上下班打卡 | git大法好，push需谨慎

Skip to content

L
liquidnet-bus-v1
Commit e4e0ac27 authored by jiangxiulong's avatar jiangxiulong
Browse files
Options

Merge remote-tracking branch 'origin/dev' into dev

parents 4a00c844 e96d8f5e
Hide whitespace changes
Inline Side-by-side
Showing with 45 additions and 45 deletions
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/controller/admin/KylinPerformancesAdminController.java
View file @ e4e0ac27
......@@ -30,7 +30,7 @@ import java.util.List;
* @author liquidnet
* @since 2021-05-05
*/
@Api(tags = "后端-演出")
@Api(tags = "后端-演出",position = 2001)
@RestController
@RequestMapping("admin/performance")
public class KylinPerformancesAdminController {
......@@ -39,7 +39,7 @@ public class KylinPerformancesAdminController {
private KylinPerformancesAdminServiceImpl performancesAdminService;
@PostMapping(value = "list")
@ApiOperation(value = "获取列表")
@ApiOperation(value = "获取列表",position = 1)
@ApiResponse(response = PerformanceAdminListDao.class, code = 200, message = "接口返回对象参数")
public ResponseDto<PageInfo<PerformanceAdminListDao>> getList(@RequestBody @Valid PerformanceAdminListParam performanceAdminListParam) {
PageInfo<PerformanceAdminListDao> result = null;
......@@ -52,7 +52,7 @@ public class KylinPerformancesAdminController {
}
@GetMapping(value = "details")
@ApiOperation(value = "获取演出详情")
@ApiOperation(value = "获取演出详情",position = 2)
@ApiResponse(response = PerformanceMisVo.class, code = 200, message = "接口返回对象参数")
public ResponseDto<PerformanceMisVo> performanceDetails(@RequestParam("performancesId") String performancesId) {
PerformanceMisVo result = null;
......@@ -65,7 +65,7 @@ public class KylinPerformancesAdminController {
}
@PostMapping(value = "audit")
@ApiOperation(value = "演出审核")
@ApiOperation(value = "演出审核",position = 3)
@ApiResponse(code = 200, message = "接口返回对象参数")
public ResponseDto<String> performanceAudit(@RequestParam("performancesId") String performancesId, @RequestParam("status") int status, @RequestParam(value = "rejectTxt", required = false) String rejectTxt) {
boolean result = performancesAdminService.performanceAudit(performancesId, status, rejectTxt);
......@@ -77,7 +77,7 @@ public class KylinPerformancesAdminController {
}
@GetMapping(value = "list/roadshow")
@ApiOperation(value = "列表根据巡演id")
@ApiOperation(value = "列表根据巡演id",position = 4)
@ApiResponse(code = 200, message = "接口返回对象参数")
public ResponseDto<List<PerformanceTitleDao>> getListByRoadShowId(@RequestParam("roadShowId") String roadShowId) {
List<PerformanceTitleDao> result = performancesAdminService.getListByRoadShowId(roadShowId);
......@@ -89,7 +89,7 @@ public class KylinPerformancesAdminController {
}
@GetMapping(value = "list/status")
@ApiOperation(value = "列表根据演出状态")
@ApiOperation(value = "列表根据演出状态",position = 5)
@ApiResponse(code = 200, message = "接口返回对象参数")
public ResponseDto<List<PerformanceTitleDao>> getListByStatus(@RequestParam("status") String status) {
List<PerformanceTitleDao> result = performancesAdminService.getListByStatus(status);
......@@ -101,7 +101,7 @@ public class KylinPerformancesAdminController {
}
@GetMapping(value = "roadShow/relation")
@ApiOperation(value = "修改演出巡演关联")
@ApiOperation(value = "修改演出巡演关联",position = 6)
@ApiResponse(code = 200, message = "接口返回对象参数")
public ResponseDto<String> changeRoadShowId(@RequestParam("performanceId") String performanceId, @RequestParam("roadShowId") String roadShowId) {
boolean result = performancesAdminService.changeRoadShowId(performanceId, roadShowId);
......@@ -113,7 +113,7 @@ public class KylinPerformancesAdminController {
}
@PutMapping(value = "performance/recommend")
@ApiOperation(value = "演出推荐编辑")
@ApiOperation(value = "演出推荐编辑",position = 7)
@ApiResponse(code = 200, message = "接口返回对象参数")
public ResponseDto<String> setRecommend(@RequestBody @Valid List<PerformanceRecommendAdminParam> performanceRecommendAdminParam) {
boolean result = performancesAdminService.setRecommend(performanceRecommendAdminParam);
......@@ -125,7 +125,7 @@ public class KylinPerformancesAdminController {
}
@GetMapping(value = "performance/recommend/list")
@ApiOperation(value = "演出推荐列表")
@ApiOperation(value = "演出推荐列表",position = 8)
@ApiResponse(code = 200, message = "接口返回对象参数")
public ResponseDto<PageInfo<PerformanceRecommendAdminDao>> listRecommend() {
PageInfo<PerformanceRecommendAdminDao> result = performancesAdminService.listRecommend();
......@@ -137,7 +137,7 @@ public class KylinPerformancesAdminController {
}
@GetMapping(value = "performance/member/details")
@ApiOperation(value = "演出会员信息")
@ApiOperation(value = "演出会员信息",position = 9)
@ApiResponse(code = 200, message = "接口返回对象参数")
public ResponseDto<PerformanceMemberAuditDao> performanceMemberInfo(@RequestParam("performanceId") @NotNull String performanceId) {
PerformanceMemberAuditDao result = performancesAdminService.performanceMemberInfo(performanceId);
......@@ -149,7 +149,7 @@ public class KylinPerformancesAdminController {
}
@PutMapping(value = "performance/member/change")
@ApiOperation(value = "修改演出会员数据")
@ApiOperation(value = "修改演出会员数据",position = 10)
@ApiResponse(code = 200, message = "接口返回对象参数")
public ResponseDto<String> performanceMemberChange(@RequestBody PerformanceMemberAuditParam performanceMemberAuditParam) {
boolean result = performancesAdminService.performanceMemberChange(performanceMemberAuditParam);
......@@ -161,7 +161,7 @@ public class KylinPerformancesAdminController {
}
@GetMapping(value = "performance/member/list")
@ApiOperation(value = "待审核会员演出列表")
@ApiOperation(value = "待审核会员演出列表",position = 11)
@ApiResponse(code = 200, message = "接口返回对象参数")
public ResponseDto<PageInfo<PerformanceTitleDao>> performanceMemberList(@RequestParam("title") @NotNull String title,
@RequestParam("page") @NotNull int page,
......@@ -175,7 +175,7 @@ public class KylinPerformancesAdminController {
}
@GetMapping(value = "performance/member/details/audit")
@ApiOperation(value = "演出会员信息(根据status 1待审核 2已拒绝 3已通过)")
@ApiOperation(value = "演出会员信息(根据status 1待审核 2已拒绝 3已通过)",position = 12)
@ApiResponse(code = 200, message = "接口返回对象参数")
public ResponseDto<PerformanceMemberAuditDao> performanceMemberAuditInfo(@RequestParam("performanceId") @NotNull String performanceId,
@RequestParam(value = "status") @NotNull int status) {
......@@ -188,7 +188,7 @@ public class KylinPerformancesAdminController {
}
@PostMapping(value = "performance/member/audit")
@ApiOperation(value = "审核演出会员信息")
@ApiOperation(value = "审核演出会员信息",position = 13)
@ApiResponse(code = 200, message = "接口返回对象参数")
public ResponseDto<String> performanceMemberAudit(@RequestParam("performanceId") @NotNull String performanceId,
@RequestParam("status") @NotNull int status,
......
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/controller/admin/KylinRoadShowsAdminController.java
View file @ e4e0ac27
......@@ -24,7 +24,7 @@ import java.util.Map;
* @author liquidnet
* @since 2021-05-11
*/
@Api(tags = "后端-巡演")
@Api(tags = "后端-巡演",position = 2002)
@RestController
@RequestMapping("/admin/roadshow")
public class KylinRoadShowsAdminController {
......@@ -33,7 +33,7 @@ public class KylinRoadShowsAdminController {
private KylinRoadShowsAdminServiceImpl roadShowsService;
@GetMapping(value = "list")
@ApiOperation(value = "获取列表")
@ApiOperation(value = "获取列表",position = 1)
@ApiResponse(response = RoadShowAdminListDao.class, code = 200, message = "接口返回对象参数")
public ResponseDto<PageInfo<RoadShowAdminListDao>> listRoadShow(@RequestParam(value = "title",required = false) String title,
@RequestParam(value = "page") int page,
......@@ -48,7 +48,7 @@ public class KylinRoadShowsAdminController {
}
@PostMapping(value = "")
@ApiOperation(value = "创建")
@ApiOperation(value = "创建",position = 2)
@ApiResponse(code = 200, message = "接口返回对象参数")
public ResponseDto<Map<String,String>> createRoadShow(@RequestBody CreateRoadShowParam createRoadShowParam) {
String result = roadShowsService.createRoadShow(createRoadShowParam);
......@@ -62,7 +62,7 @@ public class KylinRoadShowsAdminController {
}
@PutMapping(value = "")
@ApiOperation(value = "修改")
@ApiOperation(value = "修改",position = 3)
@ApiResponse(code = 200, message = "接口返回对象参数")
public ResponseDto<String> updateRoadShow(@RequestBody CreateRoadShowParam createRoadShowParam) {
boolean result = roadShowsService.updateRoadShow(createRoadShowParam);
......@@ -74,7 +74,7 @@ public class KylinRoadShowsAdminController {
}
@DeleteMapping(value = "")
@ApiOperation(value = "删除")
@ApiOperation(value = "删除",position = 4)
@ApiResponse( code = 200, message = "接口返回对象参数")
public ResponseDto<String> deleteRoadShow(@RequestParam("roadShowId") String roadShowId, @RequestParam("status") int status) {
boolean result = roadShowsService.deleteRoadShow(roadShowId, status);
......@@ -86,7 +86,7 @@ public class KylinRoadShowsAdminController {
}
@GetMapping(value = "details")
@ApiOperation(value = "详情")
@ApiOperation(value = "详情",position = 5)
@ApiResponse(response = RoadShowAdminVo.class, code = 200, message = "接口返回对象参数")
public ResponseDto<RoadShowAdminVo> detailsRoadShow(@RequestParam("roadShowId") String roadShowId) {
RoadShowAdminVo result = null;
......
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/controller/partner/KylinBuyNoticeParnterController.java
View file @ e4e0ac27
......@@ -23,7 +23,7 @@ import java.util.Map;
* @author liquidnet
* @since 2021-05-18
*/
@Api(tags = "第三方-购票须知")
@Api(tags = "第三方-购票须知",position = 1004)
@RestController
@RequestMapping("partner/buyNotice")
public class KylinBuyNoticeParnterController {
......@@ -32,7 +32,7 @@ public class KylinBuyNoticeParnterController {
private KylinBuyNoticePartnerServiceImpl buyNoticePartnerService;
@GetMapping(value = "")
@ApiOperation(value = "购票须知列表")
@ApiOperation(value = "购票须知列表",position = 1)
@ApiResponse(code = 200, message = "接口返回对象参数")
public ResponseDto<PageInfo<BuyNoticeVo>> copyPerformance() {
PageInfo<BuyNoticeVo> result = buyNoticePartnerService.getBuyNotice();
......
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/controller/partner/KylinTicketTimesPartnerController.java
View file @ e4e0ac27
......@@ -21,7 +21,7 @@ import javax.validation.Valid;
* @author liquidnet
* @since 2021-05-06
*/
@Api(tags = "第三方-场次")
@Api(tags = "第三方-场次",position = 1002)
@RestController
@RequestMapping("partner/times")
public class KylinTicketTimesPartnerController {
......@@ -30,28 +30,28 @@ public class KylinTicketTimesPartnerController {
private KylinTicketTimesPartnerServiceImpl ticketTimesPartnerService;
@PostMapping(value = "")
@ApiOperation(value = "创建场次")
@ApiOperation(value = "创建场次",position = 1)
@ApiResponse(response = TicketTimesPartnerVo.class, code = 200, message = "接口返回对象参数")
public ResponseDto<TicketTimesPartnerVo> createTimesSummary(@RequestBody @Valid CreateTicketTimesParam createTicketTimesParam) {
return ticketTimesPartnerService.createTimesSummary(createTicketTimesParam);
}
@DeleteMapping(value = "")
@ApiOperation(value = "删除场次")
@ApiOperation(value = "删除场次",position = 2)
@ApiResponse(response = TicketTimesPartnerVo.class, code = 200, message = "接口返回对象参数")
public ResponseDto<String> deleteTimes(@RequestParam("ticketTimesId") String ticketTimesId) {
return ticketTimesPartnerService.deleteTimes(ticketTimesId);
}
@PutMapping(value = "")
@ApiOperation(value = "修改场次")
@ApiOperation(value = "修改场次",position = 3)
@ApiResponse(response = TicketTimesPartnerVo.class, code = 200, message = "接口返回对象参数")
public ResponseDto<TicketTimesPartnerVo> changeTimes(@RequestBody @Valid CreateTicketTimesParam createTicketTimesParam) {
return ticketTimesPartnerService.changeTimes(createTicketTimesParam);
}
@GetMapping(value = "/details")
@ApiOperation(value = "获取场次详情")
@ApiOperation(value = "获取场次详情",position = 4)
@ApiResponse(response = TicketTimesPartnerVo.class, code = 200, message = "接口返回对象参数")
public ResponseDto<TicketTimesPartnerVo> getTimesMongo(@RequestParam("ticketTimesId") String ticketTimesId) {
TicketTimesPartnerVo result = null;
......
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/controller/partner/KylinTicketsPartnerController.java
View file @ e4e0ac27
......@@ -21,7 +21,7 @@ import javax.validation.Valid;
* @author liquidnet
* @since 2021-05-06
*/
@Api(tags = "第三方-票")
@Api(tags = "第三方-票",position = 1003)
@RestController
@RequestMapping("partner/ticket")
public class KylinTicketsPartnerController {
......@@ -30,35 +30,35 @@ public class KylinTicketsPartnerController {
private KylinTicketsPartnerServiceImpl ticketsPartnerService;
@PostMapping(value = "")
@ApiOperation(value = "创建票务")
@ApiOperation(value = "创建票务",position = 1 )
@ApiResponse(response = TicketPartnerVo.class, code = 200, message = "接口返回对象参数")
public ResponseDto<TicketPartnerVo> createTicketSummary(@RequestBody @Valid TicketCreateParam ticketCreateParam) {
return ticketsPartnerService.createTicketSummary(ticketCreateParam);
}
@PutMapping(value = "")
@ApiOperation(value = "修改票务")
@ApiOperation(value = "修改票务",position = 2)
@ApiResponse(response = TicketPartnerVo.class, code = 200, message = "接口返回对象参数")
public ResponseDto<TicketPartnerVo> updateTicket(@RequestBody @Valid TicketCreateParam ticketCreateParam) {
return ticketsPartnerService.updateTicket(ticketCreateParam);
}
@DeleteMapping(value = "")
@ApiOperation(value = "删除票务")
@ApiOperation(value = "删除票务",position = 3)
@ApiResponse( code = 200, message = "接口返回对象参数")
public ResponseDto<String> deleteTicket(@RequestParam("ticketsId") String ticketsId) {
return ticketsPartnerService.deleteTicket(ticketsId);
}
@PostMapping(value = "/copy")
@ApiOperation(value = "复制票务")
@ApiOperation(value = "复制票务",position = 4)
@ApiResponse(response = TicketPartnerVo.class, code = 200, message = "接口返回对象参数")
public ResponseDto<TicketPartnerVo> copyTicket(@RequestParam("ticketsId") String ticketsId) {
return ticketsPartnerService.copyTicket(ticketsId);
}
@GetMapping(value = "/details")
@ApiOperation(value = "获取票务详情")
@ApiOperation(value = "获取票务详情",position = 5)
@ApiResponse(response = TicketPartnerVo.class, code = 200, message = "接口返回对象参数")
public ResponseDto<TicketPartnerVo> getTicketsMongo(@RequestParam("ticketsId") String ticketsId) {
TicketPartnerVo result = null;
......@@ -71,14 +71,14 @@ public class KylinTicketsPartnerController {
}
@PostMapping(value = "/onLine")
@ApiOperation(value = "票上线")
@ApiOperation(value = "票上线",position = 6)
@ApiResponse(code = 200, message = "接口返回对象参数")
public ResponseDto<String> onLine(@RequestParam("ticketsId") String ticketsId) {
return ticketsPartnerService.onLine(ticketsId);
}
@PostMapping(value = "/outLine")
@ApiOperation(value = "票下线")
@ApiOperation(value = "票下线",position = 7)
@ApiResponse(code = 200, message = "接口返回对象参数")
public ResponseDto<String> outLine(@RequestParam("ticketsId") String ticketsId) {
return ticketsPartnerService.outLine(ticketsId);
......
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/controller/partner/PerformancePartnerController.java
View file @ e4e0ac27
......@@ -15,7 +15,7 @@ import javax.validation.Valid;
import java.util.HashMap;
import java.util.Map;
@Api(tags = "第三方-演出")
@Api(tags = "第三方-演出",position = 1001)
@RestController
@RequestMapping("partner/performance")
public class PerformancePartnerController {
......@@ -24,14 +24,14 @@ public class PerformancePartnerController {
private KylinPerformancesPartnerServiceImpl performancesPartnerService;
@PostMapping(value = "list")
@ApiOperation(value = "演出列表")
@ApiOperation(value = "演出列表",position = 1)
@ApiResponse(code = 200, message = "接口返回对象参数")
public ResponseDto<PageInfo<PerformancePartnerListDao>> getList(@RequestBody @Valid PerformancePartnerListParam performancePartnerListParam) {
return performancesPartnerService.getList(performancePartnerListParam);
}
@PostMapping(value = "copy")
@ApiOperation(value = "复制演出")
@ApiOperation(value = "复制演出",position = 6)
@ApiResponse(code = 200, message = "接口返回对象参数")
public ResponseDto<Map<String, String>> copyPerformance(@RequestParam("performancesId") String performancesId) {
String result = performancesPartnerService.copyPerformance(performancesId);
......@@ -46,14 +46,14 @@ public class PerformancePartnerController {
@GetMapping(value = "step1")
@ApiOperation(value = "获取演出第一步数据")
@ApiOperation(value = "获取演出第一步数据",position = 3)
@ApiResponse(code = 200, message = "接口返回对象参数")
public ResponseDto<PerformancePartnerVo> getStep1(@RequestParam("performancesId") String performancesId) {
return performancesPartnerService.getStep1(performancesId);
}
@PostMapping(value = "step1")
@ApiOperation(value = "操作演出第一步")
@ApiOperation(value = "操作演出第一步",position = 2)
@ApiResponse(code = 200, message = "接口返回对象参数")
public ResponseDto<Map<String, String>> Step1(@RequestBody @Valid PerformanceStep1Param performanceStep1Param) {
String result = performancesPartnerService.step1(performanceStep1Param);
......@@ -70,35 +70,35 @@ public class PerformancePartnerController {
@PostMapping(value = "step2")
@ApiOperation(value = "操作演出第二步")
@ApiOperation(value = "操作演出第二步",position = 4)
@ApiResponse(code = 200, message = "接口返回对象参数")
public ResponseDto<String> step2(@RequestBody @Valid PerformanceStep2Param performanceStep2Param) {
return performancesPartnerService.step2(performanceStep2Param);
}
@GetMapping(value = "step2")
@ApiOperation(value = "获取演出第二步数据")
@ApiOperation(value = "获取演出第二步数据",position = 5)
@ApiResponse(code = 200, message = "接口返回对象参数")
public ResponseDto<PerformanceStep2Param> getStep2(@RequestParam("performancesId") String performancesId) {
return performancesPartnerService.getStep2(performancesId);
}
@PostMapping(value = "online")
@ApiOperation(value = "演出上线")
@ApiOperation(value = "演出上线",position = 7)
@ApiResponse(code = 200, message = "接口返回对象参数")
public ResponseDto<String> onLinePerformance(@RequestParam("performancesId") String performancesId) {
return performancesPartnerService.onLinePerformance(performancesId);
}
@PostMapping(value = "outline")
@ApiOperation(value = "演出下线")
@ApiOperation(value = "演出下线",position = 8)
@ApiResponse(code = 200, message = "接口返回对象参数")
public ResponseDto<String> outLinePerformance(@RequestParam("performancesId") String performancesId) {
return performancesPartnerService.outLinePerformance(performancesId);
}
@PostMapping(value = "withdraw")
@ApiOperation(value = "演出撤回")
@ApiOperation(value = "演出撤回",position = 9)
@ApiResponse(code = 200, message = "接口返回对象参数")
public ResponseDto<String> withdraw(@RequestParam("performancesId") String performancesId) {
return performancesPartnerService.withdraw(performancesId);
......
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 to comment