From 11ec7ac8f4832c4274cf61a19cc35cda3de9e0e5 Mon Sep 17 00:00:00 2001
From: huliguo <2023611923@qq.com>
Date: 星期三, 09 七月 2025 16:04:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/linghu/controller/PlatformController.java | 31 +++++++++++++++++++++----------
1 files changed, 21 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/linghu/controller/PlatformController.java b/src/main/java/com/linghu/controller/PlatformController.java
index e71fb80..5dcb8ff 100644
--- a/src/main/java/com/linghu/controller/PlatformController.java
+++ b/src/main/java/com/linghu/controller/PlatformController.java
@@ -3,8 +3,10 @@
import com.alibaba.excel.EasyExcel;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.linghu.mapper.ReferenceMapper;
import com.linghu.model.common.ResponseResult;
import com.linghu.model.entity.Platform;
+import com.linghu.model.entity.Reference;
import com.linghu.model.entity.Type;
import com.linghu.model.excel.PlatformExcel;
import com.linghu.service.PlatformService;
@@ -23,6 +25,7 @@
import java.io.ByteArrayOutputStream;
import java.io.IOException;
+import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
@@ -37,6 +40,8 @@
private PlatformService platformService;
@Autowired
private TypeService typeService;
+ @Autowired
+ private ReferenceMapper referenceMapper;
@PostMapping
@ApiOperation(value = "添加平台")
@@ -57,7 +62,13 @@
}
@DeleteMapping("/{platformId}")
+ @ApiOperation(value = "删除平台")
public ResponseResult<Void> delete(@PathVariable Integer platformId) {
+ //平台被引用了没
+ Integer count = referenceMapper.selectCount(new LambdaQueryWrapper<Reference>().eq(Reference::getPlatform_id, platformId));
+ if (count > 0) {
+ return ResponseResult.error("该平台被引用中，不能删除");
+ }
boolean success = platformService.removeById(platformId);
if (success) {
return ResponseResult.success();
@@ -66,6 +77,7 @@
}
@PutMapping
+ @ApiOperation(value = "更新平台")
public ResponseResult<Void> update(@RequestBody Platform platform) {
// 校验平台名称和域名不能为空
if (!StringUtils.hasText(platform.getPlatform_name())) {
@@ -83,6 +95,7 @@
}
@GetMapping("/{platformId}")
+ @ApiOperation("根据id获取平台")
public ResponseResult<Platform> getById(@PathVariable Integer platformId) {
Platform platform = platformService.getById(platformId);
if (platform != null) {
@@ -92,17 +105,15 @@
}
@GetMapping("/list")
- public ResponseResult<List<Platform>> list(
- @RequestParam(required = false) Integer page,
- @RequestParam(required = false) Integer pageSize) {
- if (page != null && pageSize != null) {
+ @ApiOperation("查询平台列表")
+ public ResponseResult<Page<Platform>> list(
+ @RequestParam(required = false,defaultValue = "1") Integer page,
+ @RequestParam(required = false,defaultValue = "10") Integer pageSize) {
+
Page<Platform> pageInfo = new Page<>(page, pageSize);
Page<Platform> result = platformService.page(pageInfo);
- return ResponseResult.success(result.getRecords());
- } else {
- List<Platform> list = platformService.list();
- return ResponseResult.success(list);
- }
+ return ResponseResult.success(result);
+
}
@GetMapping("/download")
@@ -165,7 +176,7 @@
platform.setType_id(typeByName.getType_id());
// 设置创建时间（解决之前的数据库错误）
- platform.setCreate_time(new Date());
+ platform.setCreate_time(LocalDateTime.now());
platforms.add(platform);
}
--
Gitblit v1.7.1