rainbowfast/muscipro
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

完善c端接口

Browse Source
This commit is contained in:
menxipeng
2025-07-22 22:10:50 +08:00
parent 2fdda69c61
commit 6fecee904b
17 changed files with 128 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
ruoyi-admin/src/main/java/com/ruoyi/web/controller/back/ActivityInfoController.java
View File

@@ -36,7 +36,7 @@ public class ActivityInfoController extends BaseController
/**
* 查询【请填写功能名称】列表
*/
@PreAuthorize("@ss.hasPermi('system:info:list')")
// @PreAuthorize("@ss.hasPermi('system:info:list')")
@GetMapping("/list")
public TableDataInfo list(ActivityInfo activityInfo)
{
@@ -74,20 +74,14 @@ public class ActivityInfoController extends BaseController
// @PreAuthorize("@ss.hasPermi('system:info:add')")
// @Log(title = "【请填写功能名称】", businessType = BusinessType.INSERT)
@PostMapping("/addActivity")
public AjaxResult add(
@RequestParam("name") String name,
@RequestParam("content") String content,
@RequestParam("startTime") String startTime,
@RequestParam("endTime") String endTime,
@RequestParam("file") MultipartFile file
) throws IOException {
ActivityInfo activityInfo = new ActivityInfo();
String imgAddr = AliConfig.ossUp("config/" , Objects.requireNonNull(file.getOriginalFilename()), file.getInputStream());
activityInfo.setImg("");
activityInfo.setName(name);
activityInfo.setContent(content);
activityInfo.setStartTime(DateUtil.parseDateTime(startTime));
activityInfo.setEndTime(DateUtil.parseDateTime(endTime));
public AjaxResult add(@RequestBody ActivityInfo activityInfo) throws IOException {
// ActivityInfo activityInfo = new ActivityInfo();
// String imgAddr = AliConfig.ossUp("config/" , Objects.requireNonNull(file.getOriginalFilename()), file.getInputStream());
// activityInfo.setImg("");
// activityInfo.setName(name);
// activityInfo.setContent(content);
// activityInfo.setStartTime(DateUtil.parseDateTime(startTime));
// activityInfo.setEndTime(DateUtil.parseDateTime(endTime));
return toAjax(activityInfoService.insertActivityInfo(activityInfo));
}

25
ruoyi-admin/src/main/java/com/ruoyi/web/controller/back/MusicInfoController.java
View File

@@ -3,7 +3,6 @@ package com.ruoyi.web.controller.back;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.domain.entity.BannerInfo;
import com.ruoyi.common.core.domain.entity.MusicInfo;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
@@ -12,7 +11,6 @@ import com.ruoyi.system.service.IMusicInfoService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import javax.servlet.http.HttpServletResponse;
import java.util.List;
@@ -122,26 +120,7 @@ public class MusicInfoController extends BaseController
//@PreAuthorize("@ss.hasPermi('system:info:add')")
//@Log(title = "音乐信息", businessType = BusinessType.INSERT)
@PostMapping("/addMusic")
public AjaxResult add(
@RequestParam("name") String name,
@RequestParam("author") String author,
@RequestParam("vip") long vip,
@RequestParam("label") String label,
@RequestParam("img") MultipartFile img,
@RequestParam("music") MultipartFile music
) {
// 1. 处理文件上传
if (music != null && !music.isEmpty()) {
// 保存文件逻辑
// String url = fileService.save(file);
// bannerInfo.setImageUrl(url);
}
// 2. 保存bannerInfo
MusicInfo musicInfo = new MusicInfo();
musicInfo.setName(name);
musicInfo.setAuthor(author);
musicInfo.setVip(vip);
musicInfo.setLabel(label);
return toAjax(musicInfoService.insertMusicInfo(musicInfo,img,music));
public AjaxResult add(@RequestBody MusicInfo musicInfo) {
return toAjax(musicInfoService.insertMusicInfo(musicInfo));
}
}

2
ruoyi-admin/src/main/java/com/ruoyi/web/controller/back/MusicSceneController.java
View File

@@ -31,7 +31,7 @@ public class MusicSceneController extends BaseController
/**
* 查询【请填写功能名称】列表
*/
@PreAuthorize("@ss.hasPermi('system:scene:list')")
// @PreAuthorize("@ss.hasPermi('system:scene:list')")
@GetMapping("/list")
public TableDataInfo list(MusicScene musicScene)
{

4
ruoyi-admin/src/main/java/com/ruoyi/web/controller/client/ClientShopUserController.java
View File

@@ -47,8 +47,8 @@ public class ClientShopUserController {
{
AjaxResult ajax = AjaxResult.success();
ShopUser shopUser = shopUserService.login(userResq);
if (shopUser.getMsg() != null){
return AjaxResult.error(shopUser.getMsg());
if (shopUser == null || shopUser.getMsg() != null){
return new AjaxResult(999,"登录失败");
}else {
// 生成令牌
String token = loginService.shopUserLogin(shopUser.getUsername(), shopUser.getPassword());