调度记录增加附件

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<DispatchRecord> insert(@Validated(Insert.class) @RequestBody DispatchRecord dto) {
-        dto.setId(IdWorker.getId());
+        return R.ok(service.saveData(dto));
-        dto.setCreateTime(new Date());
-        boolean result = service.save(dto);
-        return R.ok(result ? dto : null);
     }
 
     @Operation(summary = "修改")
     @PostMapping("/update")
     public R<DispatchRecord> update(@Validated(Update.class) @RequestBody DispatchRecord dto) {
-        boolean result = service.updateById(dto);
+        return R.ok(service.updateData(dto));
-        return R.ok(result ? dto : null);
     }
 
     @Operation(summary = "删除")
     @PostMapping("/del")
     public R<Boolean> del(@RequestBody @Validated List<Long> 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";
+    }
 }

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<FileAssociations> files;
+
 }

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<DispatchRecordMapper, DispatchRecord>
 {
+    @Autowired
+    private FileAssociationsService fileService;
 
     public Page<DispatchRecord> pageQuery(DispatchRecordPageSo page) {
         return this.page(page.getPageSo().toPage(),commonWrapper(page));
@@ -56,6 +63,34 @@ public class DispatchRecordService extends ServiceImpl<DispatchRecordMapper, Dis
         List<DispatchRecordVo> 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<Long> ids) {
+        fileService.removeByBzIds(ids.stream().map(Objects::toString).collect(Collectors.toList()));
+        return this.removeBatchByIds(ids);
+    }
 }