From c384d2c74c59920b3355361077982b1a7c318b99 Mon Sep 17 00:00:00 2001 From: yangzhe123 <2824096059@qq.com> Date: Fri, 30 Jan 2026 10:40:47 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=20=E5=A4=A7=E5=B1=8F-?= =?UTF-8?q?=E5=81=A5=E5=85=A8=E6=9C=BA=E5=88=B6-=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E8=AE=BE=E6=96=BD=20=E7=AE=A1=E7=90=86=E7=94=A8=E6=88=BF?= =?UTF-8?q?=E7=9A=84=E6=96=87=E4=BB=B6=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ss/controller/FundBudgetController.java | 5 ++ .../controller/ManageHouseImgController.java | 65 +++++++++++++++++++ .../gunshi/project/ss/entity/vo/ImgVo.java | 15 +++++ .../project/ss/entity/vo/WholeCycleVo.java | 4 +- .../project/ss/service/WholeCycleService.java | 4 +- 5 files changed, 89 insertions(+), 4 deletions(-) create mode 100644 src/main/java/com/gunshi/project/ss/controller/ManageHouseImgController.java create mode 100644 src/main/java/com/gunshi/project/ss/entity/vo/ImgVo.java diff --git a/src/main/java/com/gunshi/project/ss/controller/FundBudgetController.java b/src/main/java/com/gunshi/project/ss/controller/FundBudgetController.java index bcedd0f..a3a4b53 100644 --- a/src/main/java/com/gunshi/project/ss/controller/FundBudgetController.java +++ b/src/main/java/com/gunshi/project/ss/controller/FundBudgetController.java @@ -28,6 +28,11 @@ public class FundBudgetController extends AbstractCommonFileController { @Autowired private FileAssociationsService fileService; + @Operation(description = "根据年份查询") + @GetMapping("/get/{year}") + public R get(@PathVariable("year") String year){ + + } @Operation(description = "分页") @PostMapping("/page") diff --git a/src/main/java/com/gunshi/project/ss/controller/ManageHouseImgController.java b/src/main/java/com/gunshi/project/ss/controller/ManageHouseImgController.java new file mode 100644 index 0000000..e6b4c27 --- /dev/null +++ b/src/main/java/com/gunshi/project/ss/controller/ManageHouseImgController.java @@ -0,0 +1,65 @@ +package com.gunshi.project.ss.controller; + + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.gunshi.core.result.R; +import com.gunshi.file.model.FileDescriptor; +import com.gunshi.file.model.FileDescriptorAutoMapper; +import com.gunshi.file.service.MinioService; +import com.gunshi.project.ss.entity.vo.ImgVo; +import io.swagger.v3.oas.annotations.tags.Tag; +import lombok.Data; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +@Tag(name = "大屏-管理用房-图片") +@RestController +@RequestMapping(value="/screen/manageHouseImg") +public class ManageHouseImgController extends AbstractCommonFileController{ + + @Autowired + private FileDescriptorAutoMapper fileDescriptorAutoMapper; + + @Autowired + private MinioService minioService; + + + + @GetMapping("/get") + public R get(){ + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper(); + queryWrapper.eq(FileDescriptor::getGroupId,getGroupId()); + List list = fileDescriptorAutoMapper.selectList(queryWrapper); + ImgVo imgVo = new ImgVo(); + imgVo.setFiles(list); + return R.ok(imgVo); + } + + @GetMapping("/del/{id}") + public R del(@PathVariable("id") String id){ + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper(); + queryWrapper.eq(FileDescriptor::getGroupId,getGroupId()); + queryWrapper.eq(FileDescriptor::getFileId,id); + FileDescriptor fileDescriptor = fileDescriptorAutoMapper.selectOne(queryWrapper); + if(fileDescriptor != null){ + try { + minioService.delete("gs-ss",fileDescriptor.getFilePath()); + fileDescriptorAutoMapper.delete(queryWrapper); + } catch (Exception e) { + throw new RuntimeException(e); + } + + } + + return R.ok(true); + } + + + @Override + public String getGroupId() { + return "manageHouseImg"; + } + +} diff --git a/src/main/java/com/gunshi/project/ss/entity/vo/ImgVo.java b/src/main/java/com/gunshi/project/ss/entity/vo/ImgVo.java new file mode 100644 index 0000000..3767f70 --- /dev/null +++ b/src/main/java/com/gunshi/project/ss/entity/vo/ImgVo.java @@ -0,0 +1,15 @@ +package com.gunshi.project.ss.entity.vo; + +import com.gunshi.file.model.FileDescriptor; +import com.gunshi.project.ss.model.FileAssociations; +import jakarta.validation.constraints.PositiveOrZero; +import lombok.Data; + +import java.util.List; + +@Data +public class ImgVo { + + + private List files; +} diff --git a/src/main/java/com/gunshi/project/ss/entity/vo/WholeCycleVo.java b/src/main/java/com/gunshi/project/ss/entity/vo/WholeCycleVo.java index 27c7047..18dafd3 100644 --- a/src/main/java/com/gunshi/project/ss/entity/vo/WholeCycleVo.java +++ b/src/main/java/com/gunshi/project/ss/entity/vo/WholeCycleVo.java @@ -45,10 +45,10 @@ public class WholeCycleVo { private Date dispatchTime; @Schema(description = "调度规程文件Id集合") - private List dispatchFileIds; + private List dispatchFileIds; @Schema(description = "应急预案文件Id集合") - private List emergencyFileIds; + private List emergencyFileIds; @Schema(description="应急预案") diff --git a/src/main/java/com/gunshi/project/ss/service/WholeCycleService.java b/src/main/java/com/gunshi/project/ss/service/WholeCycleService.java index 6864ca5..004ea57 100644 --- a/src/main/java/com/gunshi/project/ss/service/WholeCycleService.java +++ b/src/main/java/com/gunshi/project/ss/service/WholeCycleService.java @@ -84,7 +84,7 @@ public class WholeCycleService { res.setDispatchTime(dispatcher.getPrepTime()); } List dispatcherFile = fileService.getFiles("ResPlanB", dispatcher.getId().toString()); - List dispatcherIds = dispatcherFile.stream().map(o -> o.getFileId()).collect(Collectors.toList()); + List dispatcherIds = dispatcherFile.stream().map(o -> o.getFileId().toString()).collect(Collectors.toList()); res.setDispatchFileIds(dispatcherIds); //应急预案 ResPlanB emergency = resPlanBService.lambdaQuery().eq(ResPlanB::getType, 1).eq(ResPlanB::getIsAvailable, 1).orderByDesc(ResPlanB::getPrepTime).last("limit 1").one(); @@ -94,7 +94,7 @@ public class WholeCycleService { res.setEmergencyTime(emergency.getPrepTime()); } List emergencyFile = fileService.getFiles("ResPlanB", emergency.getId().toString()); - List emergencyFileIds = emergencyFile.stream().map(o -> o.getFileId()).collect(Collectors.toList()); + List emergencyFileIds = emergencyFile.stream().map(o -> o.getFileId().toString()).collect(Collectors.toList()); res.setEmergencyFileIds(emergencyFileIds); return res; }