操作说明和产品参数

fys-admin/src/main/java/com/fuyuanshen/app/controller/AppFileController.java

@@ -1,5 +1,6 @@
 package com.fuyuanshen.app.controller;
 
+import com.fuyuanshen.app.domain.bo.AppBusinessFileBo;
 import com.fuyuanshen.app.domain.dto.AppFileDto;
 import com.fuyuanshen.app.domain.vo.AppFileVo;
 import com.fuyuanshen.app.service.AppFileService;
@@ -27,31 +28,27 @@ public class AppFileController extends BaseController {
      * 查询文件列表
      */
     @GetMapping("/list")
-    public List<AppFileVo> list(AppFileDto bo) {
-        return appFileService.list(bo);
+    public R<List<AppFileVo>> list(AppBusinessFileBo bo) {
+        return R.ok(appFileService.list(bo));
     }
 
     /**
-     * 文件添加
+     * 上传文件
      */
-    @PostMapping("/add")
-    public R<Void> add(@RequestBody AppFileDto bo) {
-        return appFileService.add(bo);
+    @PostMapping("/upload")
+    public R<Void> upload(@Validated @ModelAttribute AppFileDto bo) {
+        return toAjax(appFileService.add(bo));
     }
 
-    /**
-     * 文件编辑
-     */
-    @PostMapping("/edit")
-    public R<Void> edit(@RequestBody AppFileDto bo) {
-        return appFileService.edit(bo);
-    }
 
     /**
      * 文件删除
      */
     @DeleteMapping("/delete")
-    public R<Void> delete(AppFileDto bo) {
-        return appFileService.delete(bo);
+    public R<Void> delete(Long[] ids) {
+        if(ids == null || ids.length == 0){
+            return R.fail("请选择要删除的文件");
+        }
+        return toAjax(appFileService.delete(ids));
     }
 }

fys-admin/src/main/java/com/fuyuanshen/app/domain/dto/AppFileDto.java

@@ -1,13 +1,21 @@
 package com.fuyuanshen.app.domain.dto;
 
 import lombok.Data;
+import org.springframework.web.multipart.MultipartFile;
 
 @Data
 public class AppFileDto {
 
+    private Long deviceId;
+
     /**
-     * 文件类型 1:操作说明 2:产品参数
+     * 文件类型(1:操作说明，2:产品参数)
      */
-    private String type;
+    private Long fileType;
+
+    /**
+     *  文件
+     */
+    private MultipartFile file;
 
 }

fys-admin/src/main/java/com/fuyuanshen/app/domain/vo/AppFileVo.java

@@ -1,9 +0,0 @@
-package com.fuyuanshen.app.domain.vo;
-
-import lombok.Data;
-
-@Data
-public class AppFileVo {
-    private Long fileId;
-    private String fileName;
-}

fys-admin/src/main/java/com/fuyuanshen/app/service/AppFileService.java

@@ -1,8 +1,14 @@
 package com.fuyuanshen.app.service;
 
+import com.fuyuanshen.app.domain.bo.AppBusinessFileBo;
 import com.fuyuanshen.app.domain.dto.AppFileDto;
+import com.fuyuanshen.app.domain.vo.AppBusinessFileVo;
 import com.fuyuanshen.app.domain.vo.AppFileVo;
-import com.fuyuanshen.common.core.domain.R;
+import com.fuyuanshen.common.oss.core.OssClient;
+import com.fuyuanshen.common.oss.factory.OssFactory;
+import com.fuyuanshen.common.satoken.utils.AppLoginHelper;
+import com.fuyuanshen.system.domain.vo.SysOssVo;
+import com.fuyuanshen.system.service.ISysOssService;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
@@ -19,23 +25,44 @@ import java.util.List;
 @Service
 public class AppFileService {
 
-    private final IAppFileService appFileService;
+    private final ISysOssService sysOssService;
 
-    public List<AppFileVo> list(AppFileDto bo) {
+    private final IAppBusinessFileService appBusinessFileService;
 
-        return null;
-    }
-    public R<Void> add(AppFileDto bo) {
-        return R.ok();
+    public List<AppFileVo> list(AppBusinessFileBo bo) {
+        bo.setCreateBy(AppLoginHelper.getUserId());
+        return appBusinessFileService.queryAppFileList(bo);
     }
 
-    public R<Void> edit(AppFileDto bo) {
-        return R.ok();
+    public Boolean add(AppFileDto bo) {
+
+        // 上传文件
+        SysOssVo upload = sysOssService.upload(bo.getFile());
+
+        if (upload == null) {
+            return false;
+        }
+
+        AppBusinessFileBo appBusinessFileBo = new AppBusinessFileBo();
+        appBusinessFileBo.setFileId(upload.getOssId());
+        appBusinessFileBo.setBusinessId(bo.getDeviceId());
+        appBusinessFileBo.setFileType(bo.getFileType());
+        appBusinessFileBo.setCreateBy(AppLoginHelper.getUserId());
+
+        return appBusinessFileService.insertByBo(appBusinessFileBo);
     }
 
-
-
-    public R<Void> delete(AppFileDto bo) {
-        return R.ok();
+    public Boolean delete(Long[] ids) {
+        AppBusinessFileBo bo = new AppBusinessFileBo();
+        bo.setCreateBy(AppLoginHelper.getUserId());
+        bo.setIds(List.of(ids));
+        List<AppBusinessFileVo> appBusinessFileVos = appBusinessFileService.queryList(bo);
+        List<Long> fileIds = appBusinessFileVos.stream().map(AppBusinessFileVo::getFileId).toList();
+        List<SysOssVo> list = sysOssService.listByIds(fileIds);
+        for (SysOssVo sysOss : list) {
+            OssClient storage = OssFactory.instance(sysOss.getService());
+            storage.delete(sysOss.getUrl());
+        }
+        return appBusinessFileService.deleteWithValidByIds(List.of(ids), true);
     }
 }