Prechádzať zdrojové kódy

获得专利附图的guid

lwhhszx 1 rok pred
rodič
commit
3ab52dd180

+ 1 - 1
pom.xml

@@ -73,7 +73,7 @@
     </dependencies>
 
     <build>
-        <finalName>FMS</finalName>
+        <finalName>FMS-weiXin</finalName>
         <plugins>
             <plugin>
                 <groupId>org.springframework.boot</groupId>

+ 20 - 1
src/main/java/com/example/fms/service/File2OssService.java

@@ -16,17 +16,20 @@ import java.util.List;
 
 /**
  * OSS文件管理接口
+ *
  * @Author xiexiang
  * @Date 2024/4/1
  */
 @Slf4j
 @Service
 @RequiredArgsConstructor
-public class File2OssService implements IFileFactory{
+public class File2OssService implements IFileFactory {
     private final FileUtils fileUtils;
+    private final OssService ossService;
 
     /**
      * 上传文件
+     *
      * @param files
      * @param configSettingVO 根据传入的id,选择的配置类,选择的上传路径以及上传方法
      * @return
@@ -54,11 +57,26 @@ public class File2OssService implements IFileFactory{
 
     @Override
     public SystemFileDTO replaceFile(String fileGuid, MultipartFile file, ConfigSettingVO configSettingVO) {
+        try {
+            String directoryName = fileUtils.getDirectoryName();
+            SystemFileDTO systemFileDTO = ossService.upload(configSettingVO.getFilePath() + directoryName, file, configSettingVO);
+            //服务器存储目录位置(1.本地project/pas/prod/file 2.本地project/rms/prod/file 3.生产project/pas/prod/file 4.生产project/rms/prod/file)
+            systemFileDTO.setPType(configSettingVO.getId());
+            //FSS
+            systemFileDTO.setSourceId(configSettingVO.getSourceId());
+            systemFileDTO.setOriginalName(file.getOriginalFilename());
+            systemFileDTO.setGUID(fileGuid);
+            systemFileDTO.setFilePath(configSettingVO.getFilePath() + directoryName + "/" + systemFileDTO.getFileName());
+            return systemFileDTO;
+        } catch (Exception e) {
+
+        }
         return null;
     }
 
     /**
      * 下载文件
+     *
      * @param downloadSysFileDTO
      * @param configSettingVO
      * @return
@@ -75,6 +93,7 @@ public class File2OssService implements IFileFactory{
 
     /**
      * 删除文件
+     *
      * @param filePath
      * @param configSettingVO
      */

+ 4 - 1
src/main/java/com/example/fms/service/FileMangerService.java

@@ -69,7 +69,7 @@ public class FileMangerService {
 
     public String replaceFile(MultipartFile file, String fileGuid, Integer sourceId) {
         List<String> deleteFileGuids = new ArrayList<>();
-        Integer type = 2;
+        Integer type = 1;
         deleteFileGuids.add(fileGuid);
         this.deleteFile(deleteFileGuids, type);
         //1.调用解析配置方法,获取配置信息
@@ -153,6 +153,9 @@ public class FileMangerService {
                 LambdaQueryWrapper<SystemFile> queryWrapper = new LambdaQueryWrapper<>();
                 queryWrapper.eq(SystemFile::getGuid, guIds.get(i));
                 SystemFile systemFileVO = systemFileService.getOne(queryWrapper);
+                if(systemFileVO==null){
+                    continue;
+                }
                 //3.1.3 将对象的是否删除字段置为1
                 systemFileVO.setIsDelete(1);
                 //3.1.4 将查询出来的vo赋值给实体类

+ 3 - 3
src/main/resources/configSetting.json

@@ -38,10 +38,10 @@
     "sourceId": "2",
     "sourceName": "OSS",
     "id": 5,
-    "endPoint": "https://oss-cn-shanghai.aliyuncs.com",
+    "endPoint": "https://oss-cn-shanghai-internal.aliyuncs.com",
     "accessKeyId": "LTAI5tGyG1Q7fKprgg1nWhXj",
     "accessKeySecret": "Y6Erboh5lEFiRPR4XK8oCPMvUzYGLN",
-    "bucketName": "xiaoshi-pas",
-    "filePath": "project/fms/prod/file/"
+    "bucketName": "xiaoshi-ecs",
+    "filePath": "project/ecs/prod/file"
   }
 ]

+ 3 - 3
src/main/resources/mapper/SystemFileMapper.xml

@@ -6,7 +6,7 @@
     <!--int add(SystemFile systemFile);-->
     <insert id="add" useGeneratedKeys="true" keyProperty="id">
         INSERT INTO SYSTEM_FILE(GUID, P_TYPE, SOURCE_ID, FILE_PATH, FILE_NAME, ORIGINAL_NAME, FILE_LENGTH, CREATE_ID, UPDATE_TIME, IS_DELETE)
-        VALUES (#{GUID}, #{pType}, #{sourceId}, #{filePath}, #{fileName}, #{originalName}, #{fileLength},#{createId}, #{updateTime}, #{isDelete})
+        VALUES (#{guid}, #{pType}, #{sourceId}, #{filePath}, #{fileName}, #{originalName}, #{fileLength},#{createId}, #{updateTime}, #{isDelete})
     </insert>
 
 
@@ -15,8 +15,8 @@
     <update id="update">
         UPDATE SYSTEM_FILE
         <set>
-            <if test="GUID != null">
-                GUID = #{GUID},
+            <if test="guid != null">
+                GUID = #{guid},
             </if>
             <if test="pType != null">
                 P_TYPE = #{pType},