From 418c45624cbc5b078f67f7e595f93bb933df80ab Mon Sep 17 00:00:00 2001 From: xjm Date: Wed, 14 Aug 2024 14:30:19 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B0=B4=E5=BA=93=E6=9C=88=E6=A0=B8=E5=AE=9A?= =?UTF-8?q?=E7=94=9F=E6=80=81=E6=B5=81=E9=87=8F=E6=89=B9=E9=87=8F=E4=BF=AE?= =?UTF-8?q?=E6=94=B9,=E6=B0=B4=E5=BA=93=E8=B4=A3=E4=BB=BB=E4=BD=93?= =?UTF-8?q?=E7=B3=BB=E6=96=B0=E5=A2=9E=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/IaCBsnssinfoController.java | 39 +++++++++++++++++++ .../controller/ResMonthEcoFlowController.java | 11 ++++++ .../controller/ResSafePersonBController.java | 2 + .../project/xyt/model/ResMonthEcoFlow.java | 2 + 4 files changed, 54 insertions(+) diff --git a/src/main/java/com/gunshi/project/xyt/controller/IaCBsnssinfoController.java b/src/main/java/com/gunshi/project/xyt/controller/IaCBsnssinfoController.java index 3c05d12..35ebab0 100644 --- a/src/main/java/com/gunshi/project/xyt/controller/IaCBsnssinfoController.java +++ b/src/main/java/com/gunshi/project/xyt/controller/IaCBsnssinfoController.java @@ -1,13 +1,17 @@ package com.gunshi.project.xyt.controller; +import com.google.common.collect.Lists; import com.gunshi.core.result.R; +import com.gunshi.file.model.FileDescriptor; import com.gunshi.project.xyt.entity.vo.HomeIaCBsnssinfoVo; +import com.gunshi.project.xyt.model.FileAssociations; import com.gunshi.project.xyt.model.IaCBsnssinfo; import com.gunshi.project.xyt.service.FileAssociationsService; import com.gunshi.project.xyt.service.IaCBsnssinfoService; import com.gunshi.project.xyt.validate.markers.Insert; import com.gunshi.project.xyt.validate.markers.Update; import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.tags.Tag; import org.apache.commons.collections4.CollectionUtils; @@ -15,6 +19,7 @@ import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; import java.io.Serializable; import java.util.List; @@ -105,8 +110,42 @@ public class IaCBsnssinfoController extends AbstractCommonFileController{ return R.ok(list); } + @Operation(summary = "上传相关图片文件") + @PostMapping(path = "/setImgFile", consumes = "multipart/form-data") + public R setImgFile(@Parameter(description = "文件") @RequestPart("files") MultipartFile[] files) throws Exception { + + for (MultipartFile file : files) { + + String fileName = file.getOriginalFilename(); + String eicd = fileName.split("\\.")[0]; + + FileDescriptor fd = new FileDescriptor(); + fd.setBusinessType(getBusinessType()); + fd.setGroupId(getGroupId()); + fd.setUserId(1L); + fd.setAccessGroup(getService().getAccessGroup()); + fd.setFilePath(generateFilePath(getProperty().getAppCode(), getBusinessType(), 1L, getGroupId(), fileName)); + fd.setFileName(fileName); + fd.setFileLength(file.getSize()); + + getService().upload(fd, file.getInputStream()); + + FileAssociations fileAssociations = new FileAssociations(); + fileAssociations.setFileId(fd.getFileId()); + + fileService.saveFile(Lists.newArrayList(fileAssociations), getGroupId(), eicd); + } + + + return R.ok(); + } + + + @Override public String getGroupId() { return "iaCBsnssinfo"; } + + } \ No newline at end of file diff --git a/src/main/java/com/gunshi/project/xyt/controller/ResMonthEcoFlowController.java b/src/main/java/com/gunshi/project/xyt/controller/ResMonthEcoFlowController.java index ab7f5c1..df92526 100644 --- a/src/main/java/com/gunshi/project/xyt/controller/ResMonthEcoFlowController.java +++ b/src/main/java/com/gunshi/project/xyt/controller/ResMonthEcoFlowController.java @@ -18,6 +18,7 @@ import java.time.LocalDateTime; import java.util.Date; import java.util.List; import java.util.Objects; +import java.util.stream.Collectors; /** * 描述: 水库月核定生态流量表 @@ -51,6 +52,16 @@ public class ResMonthEcoFlowController { return R.ok(result ? dto : null); } + @Operation(summary = "批量修改") + @PostMapping("/updates") + public R updates(@Validated(Update.class) @RequestBody List dto) { + + dto = dto.stream().map(x -> x.setModitime(new Date())).collect(Collectors.toList()); + boolean result = service.updateBatchById(dto); + + return R.ok(result); + } + @Operation(summary = "删除") @GetMapping("/del/{id}") public R del(@Schema(name = "id") @PathVariable("id") Serializable id) { diff --git a/src/main/java/com/gunshi/project/xyt/controller/ResSafePersonBController.java b/src/main/java/com/gunshi/project/xyt/controller/ResSafePersonBController.java index 92564a8..f645da0 100644 --- a/src/main/java/com/gunshi/project/xyt/controller/ResSafePersonBController.java +++ b/src/main/java/com/gunshi/project/xyt/controller/ResSafePersonBController.java @@ -1,5 +1,6 @@ package com.gunshi.project.xyt.controller; +import com.baomidou.mybatisplus.core.toolkit.IdWorker; import com.gunshi.core.result.R; import com.gunshi.project.xyt.entity.so.ResCodeSo; import com.gunshi.project.xyt.model.ResSafePersonB; @@ -42,6 +43,7 @@ public class ResSafePersonBController { throw new RuntimeException("当前水库不存在"); } dto.setModitime(new Date()); + dto.setId(IdWorker.getId()); boolean result = service.save(dto); return R.ok(result ? dto : null); } diff --git a/src/main/java/com/gunshi/project/xyt/model/ResMonthEcoFlow.java b/src/main/java/com/gunshi/project/xyt/model/ResMonthEcoFlow.java index 8c82c25..37356b3 100644 --- a/src/main/java/com/gunshi/project/xyt/model/ResMonthEcoFlow.java +++ b/src/main/java/com/gunshi/project/xyt/model/ResMonthEcoFlow.java @@ -14,6 +14,7 @@ import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; import jakarta.validation.constraints.Size; import lombok.Data; +import lombok.experimental.Accessors; import java.io.Serializable; import java.math.BigDecimal; @@ -27,6 +28,7 @@ import java.util.Date; @Schema(description="水库月核定生态流量表") @Data @TableName("public.res_month_eco_flow") +@Accessors(chain = true) // chain = true 实现链式调用 public class ResMonthEcoFlow implements Serializable {