From c468e6806b0f1108ca73671dffb7ee3d72d9f94c Mon Sep 17 00:00:00 2001 From: wany <13995595726@qq.com> Date: Wed, 9 Oct 2024 16:48:38 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E5=BA=A6=E8=AE=B0=E5=BD=95=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E9=99=84=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/DispatchRecordController.java | 18 +++++----- .../project/xyt/model/DispatchRecord.java | 5 +++ .../xyt/service/DispatchRecordService.java | 35 +++++++++++++++++++ 3 files changed, 48 insertions(+), 10 deletions(-) diff --git a/src/main/java/com/gunshi/project/xyt/controller/DispatchRecordController.java b/src/main/java/com/gunshi/project/xyt/controller/DispatchRecordController.java index 16583d2..df43e22 100644 --- a/src/main/java/com/gunshi/project/xyt/controller/DispatchRecordController.java +++ b/src/main/java/com/gunshi/project/xyt/controller/DispatchRecordController.java @@ -1,6 +1,5 @@ package com.gunshi.project.xyt.controller; -import com.baomidou.mybatisplus.core.toolkit.IdWorker; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.gunshi.core.result.R; import com.gunshi.project.xyt.entity.so.DispatchRecordPageSo; @@ -18,7 +17,6 @@ import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import java.util.Date; import java.util.List; /** @@ -29,7 +27,7 @@ import java.util.List; @Tag(name = "调度记录") @RestController @RequestMapping(value="/dispatchRecord") -public class DispatchRecordController { +public class DispatchRecordController extends AbstractCommonFileController{ @Autowired private DispatchRecordService service; @@ -38,23 +36,19 @@ public class DispatchRecordController { @Operation(summary = "新增") @PostMapping("/insert") public R insert(@Validated(Insert.class) @RequestBody DispatchRecord dto) { - dto.setId(IdWorker.getId()); - dto.setCreateTime(new Date()); - boolean result = service.save(dto); - return R.ok(result ? dto : null); + return R.ok(service.saveData(dto)); } @Operation(summary = "修改") @PostMapping("/update") public R update(@Validated(Update.class) @RequestBody DispatchRecord dto) { - boolean result = service.updateById(dto); - return R.ok(result ? dto : null); + return R.ok(service.updateData(dto)); } @Operation(summary = "删除") @PostMapping("/del") public R del(@RequestBody @Validated List ids) { - return R.ok(service.removeBatchByIds(ids)); + return R.ok(service.delData(ids)); } @@ -70,4 +64,8 @@ public class DispatchRecordController { service.export(page,response); } + @Override + public String getGroupId() { + return "dispatchRecord"; + } } \ No newline at end of file diff --git a/src/main/java/com/gunshi/project/xyt/model/DispatchRecord.java b/src/main/java/com/gunshi/project/xyt/model/DispatchRecord.java index ed968e1..4e3ca8a 100644 --- a/src/main/java/com/gunshi/project/xyt/model/DispatchRecord.java +++ b/src/main/java/com/gunshi/project/xyt/model/DispatchRecord.java @@ -17,6 +17,7 @@ import lombok.Data; import java.io.Serializable; import java.util.Date; +import java.util.List; /** * 描述: 调度记录 @@ -102,4 +103,8 @@ public class DispatchRecord implements Serializable { @JsonFormat(pattern = DateFormatString.YYYY_MM_DD_HH_MM_SS, timezone = "GMT+8") private Date createTime; + @TableField(exist = false) + @Schema(description = "附件") + private List files; + } \ No newline at end of file diff --git a/src/main/java/com/gunshi/project/xyt/service/DispatchRecordService.java b/src/main/java/com/gunshi/project/xyt/service/DispatchRecordService.java index b73b049..4d8d887 100644 --- a/src/main/java/com/gunshi/project/xyt/service/DispatchRecordService.java +++ b/src/main/java/com/gunshi/project/xyt/service/DispatchRecordService.java @@ -1,6 +1,7 @@ package com.gunshi.project.xyt.service; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.IdWorker; import com.baomidou.mybatisplus.core.toolkit.StringUtils; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -13,10 +14,14 @@ import com.gunshi.project.xyt.util.ExcelUtil; import com.gunshi.project.xyt.util.MyBeanUtil; import jakarta.servlet.http.HttpServletResponse; import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import java.util.Date; import java.util.List; +import java.util.Objects; +import java.util.stream.Collectors; /** * 描述: 调度记录 @@ -28,6 +33,8 @@ import java.util.List; @Transactional(rollbackFor = Exception.class) public class DispatchRecordService extends ServiceImpl { + @Autowired + private FileAssociationsService fileService; public Page pageQuery(DispatchRecordPageSo page) { return this.page(page.getPageSo().toPage(),commonWrapper(page)); @@ -56,6 +63,34 @@ public class DispatchRecordService extends ServiceImpl dispatchRecordVos = MyBeanUtil.collectionCopy(list, DispatchRecordVo.class); ExcelUtil.exportExcel(dispatchRecordVos,"调度指令", DispatchRecordVo.class,response,"调度指令"); } + + public DispatchRecord saveData(DispatchRecord dto) { + dto.setId(IdWorker.getId()); + dto.setCreateTime(new Date()); + this.save(dto); + fileService.saveFile(dto.getFiles(), getGroupId(), dto.getId().toString()); + return dto; + } + + public String getGroupId() { + return "dispatchRecord"; + } + + public DispatchRecord updateData(DispatchRecord dto) { + if (Objects.isNull(this.getById(dto.getId()))) { + throw new IllegalArgumentException("当前数据不存在"); + } + boolean result = this.updateById(dto); + if (result) { + fileService.saveFile(dto.getFiles(), getGroupId(), String.valueOf(dto.getId())); + } + return dto; + } + + public Boolean delData(List ids) { + fileService.removeByBzIds(ids.stream().map(Objects::toString).collect(Collectors.toList())); + return this.removeBatchByIds(ids); + } }