Merge remote-tracking branch 'origin/main' into dyf-device

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 null;
+    public R<List<AppFileVo>> list(AppBusinessFileBo bo) {
+        return R.ok(appFileService.list(bo));
     }
 
     /**
-     * 文件添加
+     * 上传文件
      */
-    @PostMapping("/add")
-    public R<Void> add(@RequestBody AppFileDto bo) {
-        return null;
+    @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 null;
-    }
 
     /**
      * 文件删除
      */
     @DeleteMapping("/delete")
-    public R<Void> delete(AppFileDto bo) {
-        return null;
+    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,8 +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:产品参数)
+     */
+    private Long fileType;
+
+    /**
+     *  文件
+     */
+    private MultipartFile file;
+
 }

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

@@ -1,8 +0,0 @@
-package com.fuyuanshen.app.domain.vo;
-
-import lombok.Data;
-
-@Data
-public class AppFileVo {
-
-}

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

@@ -1,13 +1,20 @@
 package com.fuyuanshen.app.service;
 
-import com.fuyuanshen.app.domain.bo.AppUserBo;
-import com.fuyuanshen.app.domain.vo.DeviceVo;
-import com.fuyuanshen.common.mybatis.core.page.PageQuery;
-import com.fuyuanshen.common.mybatis.core.page.TableDataInfo;
+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.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;
 
+import java.util.List;
+
 /**
  * 登录校验方法
  *
@@ -18,8 +25,44 @@ import org.springframework.stereotype.Service;
 @Service
 public class AppFileService {
 
+    private final ISysOssService sysOssService;
 
-    public TableDataInfo<DeviceVo> queryPageList(AppUserBo bo, PageQuery pageQuery) {
-        return null;
+    private final IAppBusinessFileService appBusinessFileService;
+
+    public List<AppFileVo> list(AppBusinessFileBo bo) {
+        bo.setCreateBy(AppLoginHelper.getUserId());
+        return appBusinessFileService.queryAppFileList(bo);
+    }
+
+    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 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);
     }
 }

fys-admin/src/main/resources/application-dev.yml

@@ -49,9 +49,9 @@ spring:
           driverClassName: com.mysql.cj.jdbc.Driver
           # jdbc 所有参数配置参考 https://lionli.blog.csdn.net/article/details/122018562
           # rewriteBatchedStatements=true 批处理优化 大幅提升批量插入更新删除性能(对数据库有性能损耗 使用批量操作应考虑性能问题)
-          url: jdbc:mysql://120.79.224.186:3366/fys-vue?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true
+          url: jdbc:mysql://47.120.79.150:3306/fys-vue?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true
           username: root
-          password: 1fys@QWER..
+          password: Jq_123456#
 #        # 从库数据源
 #        slave:
 #          lazy: true
@@ -98,13 +98,13 @@ spring:
 spring.data:
   redis:
     # 地址
-    host: 120.79.224.186
+    host: 47.120.79.150
     # 端口，默认为6379
-    port: 26379
+    port: 6379
     # 数据库索引
     database: 2
     # redis 密码必须配置
-    password: 1fys@QWER..
+    password: xhYc_djkl382^#780!
     # 连接超时时间
     timeout: 10s
     # 是否开启ssl