From 64f7ccb9ef8b5a0618e65cddc14b981c1f108ba3 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期一, 04 十一月 2024 09:01:59 +0800
Subject: [PATCH] 代码提交
---
xinquan-modules/xinquan-system/src/main/java/com/xinquan/system/controller/VersionController.java | 18 +++++++++++-------
1 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/xinquan-modules/xinquan-system/src/main/java/com/xinquan/system/controller/VersionController.java b/xinquan-modules/xinquan-system/src/main/java/com/xinquan/system/controller/VersionController.java
index 15311f6..a19ab92 100644
--- a/xinquan-modules/xinquan-system/src/main/java/com/xinquan/system/controller/VersionController.java
+++ b/xinquan-modules/xinquan-system/src/main/java/com/xinquan/system/controller/VersionController.java
@@ -6,6 +6,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.xinquan.common.core.domain.R;
import com.xinquan.common.core.utils.page.PageDTO;
+import com.xinquan.common.security.service.TokenService;
import com.xinquan.common.security.utils.SecurityUtils;
import com.xinquan.system.domain.Version;
import com.xinquan.system.service.VersionService;
@@ -17,6 +18,7 @@
import java.time.LocalDateTime;
import java.util.Arrays;
+import java.util.stream.Collectors;
/**
* <p>
@@ -31,7 +33,9 @@
public class VersionController {
@Autowired
private VersionService versionService;
- @PostMapping("/versionList")
+ @Autowired
+ private TokenService tokenService;
+ @GetMapping("/versionList")
@ApiOperation(value = "版本管理列表-分页", tags = {"管理后台-版本管理"})
@ApiImplicitParams({
@ApiImplicitParam(value = "分页参数，当前页码", name = "pageCurr", required = true, dataType = "Integer"),
@@ -41,7 +45,7 @@
@RequestParam(value = "pageCurr", defaultValue = "1") Integer pageCurr,
@RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize) {
Long userId = SecurityUtils.getUserId();
- if (userId == 0)return R.tokenError("登录失效");
+ if(userId ==null || userId == 0)return R.tokenError("登录失效");
Page<Version> page = versionService.lambdaQuery()
.orderByDesc(Version::getCreateTime)
.page(new Page<>(pageCurr, pageSize));
@@ -54,28 +58,28 @@
return R.ok(PageDTO.of(page, Version.class));
}
@PostMapping("/addVersion")
- @ApiOperation(value = "新增版本管理", notes = "管理后台-版本管理")
+ @ApiOperation(value = "新增版本管理", tags = "管理后台-版本管理")
public R addVersion(@RequestBody Version homeBackgroundMusic) {
homeBackgroundMusic.setCreateBy(SecurityUtils.getUsername());
homeBackgroundMusic.setCreateTime(LocalDateTime.now());
return R.ok(versionService.save(homeBackgroundMusic));
}
@GetMapping("/detailVersion")
- @ApiOperation(value = "查看详情版本管理", notes = "管理后台-版本管理")
+ @ApiOperation(value = "查看详情版本管理", tags = "管理后台-版本管理")
public R<Version> detailVersion(String uid) {
return R.ok(versionService.getById(uid));
}
@PostMapping("/updateVersion")
- @ApiOperation(value = "修改版本管理", notes = "管理后台-版本管理")
+ @ApiOperation(value = "修改版本管理", tags = "管理后台-版本管理")
public R updateVersion(@RequestBody Version homeBackgroundMusic) {
homeBackgroundMusic.setUpdateBy(SecurityUtils.getUsername());
homeBackgroundMusic.setUpdateTime(LocalDateTime.now());
return R.ok(versionService.updateById(homeBackgroundMusic));
}
@PostMapping("/deleteVersion")
- @ApiOperation(value = "批量删除", notes = "管理后台-版本管理")
+ @ApiOperation(value = "批量删除", tags = "管理后台-版本管理")
public R deleteVersion(String ids) {
- return R.ok(versionService.removeBatchByIds(Arrays.asList(ids.split(","))));
+ return R.ok(versionService.removeBatchByIds(Arrays.asList(ids.split(",")).stream().map(Long::valueOf).collect(Collectors.toList())));
}
}
--
Gitblit v1.7.1