From c5857a50d688d0c42b3893854e6f30dc45e61ca9 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期一, 11 十一月 2024 22:32:12 +0800
Subject: [PATCH] 代码提交
---
xinquan-modules/xinquan-system/src/main/java/com/xinquan/system/controller/VersionController.java | 45 ++++++++++++++++++++++++++++++++++++++-------
1 files changed, 38 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..3baeeac 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,9 +6,14 @@
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.core.web.domain.BaseModel;
+import com.xinquan.common.security.service.TokenService;
import com.xinquan.common.security.utils.SecurityUtils;
+import com.xinquan.system.api.domain.AppUser;
+import com.xinquan.system.api.domain.NoticeRecord;
import com.xinquan.system.domain.Version;
import com.xinquan.system.service.VersionService;
+import com.xinquan.user.api.feign.RemoteAppUserService;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
@@ -17,6 +22,8 @@
import java.time.LocalDateTime;
import java.util.Arrays;
+import java.util.List;
+import java.util.stream.Collectors;
/**
* <p>
@@ -31,7 +38,20 @@
public class VersionController {
@Autowired
private VersionService versionService;
- @PostMapping("/versionList")
+ @Autowired
+ private TokenService tokenService;
+ @Autowired
+ private RemoteAppUserService remoteAppUserService;
+ @GetMapping("/detailVersionApp")
+ @ApiOperation(value = "查看详情版本管理", tags = "安卓版本管理")
+ public R<Version> detailVersionApp() {
+ List<Version> list = versionService.lambdaQuery().orderByDesc(BaseModel::getCreateTime).list();
+ if (!list.isEmpty()){
+ return R.ok(list.get(0));
+ }
+ return R.ok();
+ }
+ @GetMapping("/versionList")
@ApiOperation(value = "版本管理列表-分页", tags = {"管理后台-版本管理"})
@ApiImplicitParams({
@ApiImplicitParam(value = "分页参数，当前页码", name = "pageCurr", required = true, dataType = "Integer"),
@@ -41,7 +61,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 +74,39 @@
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());
+ List<AppUser> data = remoteAppUserService.getAllUserList().getData();
+ for (AppUser datum : data) {
+ // 给用户添加一条系统消息
+ NoticeRecord noticeRecord = new NoticeRecord();
+ noticeRecord.setAppUserId(datum.getId());
+ noticeRecord.setReadStatus(1);
+ noticeRecord.setNoticeType(1);
+ noticeRecord.setTitle("APP版本升级通知");
+ noticeRecord.setContent("APP已更新至【"+homeBackgroundMusic.getVersionNo()+"】版本，请及时更新！");
+ remoteAppUserService.addNoticeReplay(noticeRecord);
+ }
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