From ef3b216bd85ada0b7af1dd25a468e1aa258267fa Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期一, 20 五月 2024 18:10:00 +0800
Subject: [PATCH] 处理冲突
---
ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/controller/PromotionVideoController.java | 28 +++++++++++++++++++++++++++-
1 files changed, 27 insertions(+), 1 deletions(-)
diff --git a/ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/controller/PromotionVideoController.java b/ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/controller/PromotionVideoController.java
index 40830b6..7b9ec22 100644
--- a/ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/controller/PromotionVideoController.java
+++ b/ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/controller/PromotionVideoController.java
@@ -1,8 +1,16 @@
package com.ruoyi.promotion.controller;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.ruoyi.common.core.domain.R;
+import com.ruoyi.promotion.domain.pojo.PromotionVideo;
+import com.ruoyi.promotion.service.IPromotionVideoService;
+import java.util.List;
+import javax.annotation.Resource;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
-
+import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.bind.annotation.RestController;
/**
@@ -17,4 +25,22 @@
@RequestMapping("/promotion-video")
public class PromotionVideoController {
+ @Resource
+ private IPromotionVideoService iPromotionVideoService;
+
+ @PostMapping("/getPromotionVideoList")
+ public R<List<PromotionVideo>> getPromotionVideoList() {
+ List<PromotionVideo> list = iPromotionVideoService.list(new LambdaQueryWrapper<PromotionVideo>().eq(PromotionVideo::getDelFlag,0));
+ return R.ok(list);
+ }
+
+
+ @PostMapping("/getPromotionVideoOne")
+ @ResponseBody
+ public R<PromotionVideo> getPromotionVideoOne(@RequestBody Long promotionVideoId) {
+ PromotionVideo promotionVideoOne=iPromotionVideoService.getById(promotionVideoId);
+ return R.ok(promotionVideoOne);
+
+ }
+
}
--
Gitblit v1.7.1