From f7410364109ebb426a5e0184683a10fb1efdd0a0 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Wed, 22 Dec 2021 14:59:27 +0800
Subject: [PATCH] Merge branch 'master' of http://120.27.238.55:7000/r/xc-video

---
 src/main/java/cc/mrbird/febs/video/controller/AdminVideoMemberController.java |   69 +++++++++++++++++++++++++++++++++-
 1 files changed, 66 insertions(+), 3 deletions(-)

diff --git a/src/main/java/cc/mrbird/febs/video/controller/AdminVideoMemberController.java b/src/main/java/cc/mrbird/febs/video/controller/AdminVideoMemberController.java
index 1abf8a2..32d18c3 100644
--- a/src/main/java/cc/mrbird/febs/video/controller/AdminVideoMemberController.java
+++ b/src/main/java/cc/mrbird/febs/video/controller/AdminVideoMemberController.java
@@ -4,12 +4,15 @@
 import cc.mrbird.febs.common.controller.BaseController;
 import cc.mrbird.febs.common.entity.FebsResponse;
 import cc.mrbird.febs.common.entity.QueryRequest;
+import cc.mrbird.febs.video.dto.AdminSetVipDto;
+import cc.mrbird.febs.video.entity.AppVersion;
 import cc.mrbird.febs.video.service.IAdminVideoMemberService;
 import cc.mrbird.febs.video.entity.VideoMemberEntity;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.*;
 
+import javax.validation.Valid;
 import javax.validation.constraints.NotNull;
 import java.util.Map;
 
@@ -31,7 +34,7 @@
     }
 
     @PostMapping("resetPwd/{id}")
-    @ControllerEndpoint(operation = "会员列表---重置密码", exceptionMessage = "重置密码失败")
+    @ControllerEndpoint(operation = "会员列表---重置密码", exceptionMessage = "操作失败")
     public FebsResponse resetPwd(@PathVariable("id") Long id) {
         return adminVideoMemberService.resetPwd(id);
     }
@@ -42,7 +45,7 @@
      * @return
      */
     @GetMapping("closeAccount/{id}")
-    @ControllerEndpoint(operation = "会员列表---禁止", exceptionMessage = "禁止失败")
+    @ControllerEndpoint(operation = "会员列表---禁止", exceptionMessage = "操作失败")
     public FebsResponse closeAccount(@NotNull(message = "{required}") @PathVariable Long id) {
         return adminVideoMemberService.closeAccount(id);
     }
@@ -53,11 +56,71 @@
      * @return
      */
     @GetMapping("openAccount/{id}")
-    @ControllerEndpoint(operation = "会员列表---开启", exceptionMessage = "开启失败")
+    @ControllerEndpoint(operation = "会员列表---开启", exceptionMessage = "操作失败")
     public FebsResponse openAccount(@NotNull(message = "{required}") @PathVariable Long id) {
         return adminVideoMemberService.openAccount(id);
     }
 
+    /**
+     * 会员列表-会员VIP设置
+     */
+    @PostMapping("setVip")
+    @ControllerEndpoint(operation = "会员列表-会员VIP设置", exceptionMessage = "操作失败")
+    public FebsResponse setVip(@Valid AdminSetVipDto adminSetVipDto) {
+        return adminVideoMemberService.setVip(adminSetVipDto);
+    }
+
+
+    /**
+     * 会员列表-取消会员资格
+     */
+    @GetMapping("cancelVip/{id}")
+    @ControllerEndpoint(operation = "会员列表---取消会员资格", exceptionMessage = "操作失败")
+    public FebsResponse cancelVip(@PathVariable("id") Long id) {
+        return adminVideoMemberService.cancelVip(id);
+    }
+
+
+
+    /**
+     * App版本-列表
+     * @param appVersion
+     * @param request
+     * @return
+     */
+    @GetMapping("getAppVersionList")
+    public FebsResponse getAppVersionList(AppVersion appVersion, QueryRequest request) {
+        Map<String, Object> data = getDataTable(adminVideoMemberService.getAppVersionList(appVersion, request));
+        return new FebsResponse().success().data(data);
+    }
+
+    /**
+     * App版本-删除
+     */
+    @GetMapping("delAppVersion/{id}")
+    @ControllerEndpoint(operation = " App版本-删除", exceptionMessage = "操作失败")
+    public FebsResponse delAppVersion(@NotNull(message = "{required}") @PathVariable Long id) {
+        return adminVideoMemberService.delCategary(id);
+    }
+
+    /**
+     * App版本-新增
+     */
+    @PostMapping("addAppVersion")
+    @ControllerEndpoint(operation = " App版本-新增", exceptionMessage = "操作失败")
+    public FebsResponse addAppVersion(@Valid AppVersion appVersion) {
+        return adminVideoMemberService.addAppVersion(appVersion);
+    }
+
+    /**
+     * App版本-更新
+     */
+    @PostMapping("updateAppVersion")
+    @ControllerEndpoint(operation = "App版本-更新", exceptionMessage = "操作失败")
+    public FebsResponse updateAppVersion(@Valid AppVersion appVersion) {
+        return adminVideoMemberService.updateAppVersion(appVersion);
+    }
+
 
 
 }

--
Gitblit v1.9.1