修改文件信息

yudao-module-infra/yudao-module-infra-api/src/main/java/cn/iocoder/yudao/module/infra/api/file/FileApi.java

@@ -1,5 +1,7 @@
 package cn.iocoder.yudao.module.infra.api.file;
 
+import cn.iocoder.yudao.module.infra.api.file.dto.InfraFileInfoDTO;
+
 import java.util.List;
 import java.util.Map;
 
@@ -16,7 +18,7 @@ public interface FileApi {
      * @param content 文件内容
      * @return 文件路径
      */
-    default Map<String, String> createFile(byte[] content) {
+    default InfraFileInfoDTO createFile(byte[] content) {
         return createFile(null, null, content);
     }
 
@@ -27,7 +29,7 @@ public interface FileApi {
      * @param content 文件内容
      * @return 文件路径
      */
-    default Map<String, String> createFile(String path, byte[] content) {
+    default InfraFileInfoDTO createFile(String path, byte[] content) {
         return createFile(null, path, content);
     }
 
@@ -39,8 +41,10 @@ public interface FileApi {
      * @param content 文件内容
      * @return 文件路径
      */
-    Map<String, String>  createFile(String name, String path, byte[] content);
+    InfraFileInfoDTO  createFile(String name, String path, byte[] content);
+
+    List<InfraFileInfoDTO> listFile(List<Long> ids);
 
-    List<Map<String, String>> listFile(List<Long> ids);
 
+    void deleteFile(Long id) throws Exception;
 }

yudao-module-infra/yudao-module-infra-api/src/main/java/cn/iocoder/yudao/module/infra/api/file/dto/InfraFileInfoDTO.java

@@ -0,0 +1,9 @@
+package cn.iocoder.yudao.module.infra.api.file.dto;
+
+import lombok.Data;
+
+@Data
+public class InfraFileInfoDTO {
+    private String url;
+    private Long id;
+}

yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/api/file/FileApiImpl.java

@@ -1,5 +1,6 @@
 package cn.iocoder.yudao.module.infra.api.file;
 
+import cn.iocoder.yudao.module.infra.api.file.dto.InfraFileInfoDTO;
 import cn.iocoder.yudao.module.infra.service.file.FileService;
 import org.springframework.stereotype.Service;
 import org.springframework.validation.annotation.Validated;
@@ -21,14 +22,20 @@ public class FileApiImpl implements FileApi {
     private FileService fileService;
 
     @Override
-    public Map<String, String> createFile(String name, String path, byte[] content) {
+    public InfraFileInfoDTO createFile(String name, String path, byte[] content) {
         return fileService.createFile(name, path, content);
     }
 
     @Override
-    public List<Map<String, String>> listFile(List<Long> ids) {
+    public List<InfraFileInfoDTO> listFile(List<Long> ids) {
         return fileService.listFile(ids);
     }
 
 
+    @Override
+    public void deleteFile(Long id) throws Exception {
+        fileService.deleteFile(id);
+    }
+
+
 }

yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/file/FileController.java

@@ -6,6 +6,7 @@ import cn.hutool.core.util.URLUtil;
 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+import cn.iocoder.yudao.module.infra.api.file.dto.InfraFileInfoDTO;
 import cn.iocoder.yudao.module.infra.controller.admin.file.vo.file.*;
 import cn.iocoder.yudao.module.infra.dal.dataobject.file.FileDO;
 import cn.iocoder.yudao.module.infra.service.file.FileService;
@@ -42,7 +43,7 @@ public class FileController {
 
     @PostMapping("/upload")
     @Operation(summary = "上传文件", description = "模式一：后端上传文件")
-    public CommonResult<Map<String, String>> uploadFile(FileUploadReqVO uploadReqVO) throws Exception {
+    public CommonResult<InfraFileInfoDTO> uploadFile(FileUploadReqVO uploadReqVO) throws Exception {
         MultipartFile file = uploadReqVO.getFile();
         String path = uploadReqVO.getPath();
         return success(fileService.createFile(file.getOriginalFilename(), path, IoUtil.readBytes(file.getInputStream())));

yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/app/file/AppFileController.java

@@ -2,6 +2,7 @@ package cn.iocoder.yudao.module.infra.controller.app.file;
 
 import cn.hutool.core.io.IoUtil;
 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
+import cn.iocoder.yudao.module.infra.api.file.dto.InfraFileInfoDTO;
 import cn.iocoder.yudao.module.infra.controller.admin.file.vo.file.FileCreateReqVO;
 import cn.iocoder.yudao.module.infra.controller.admin.file.vo.file.FilePresignedUrlRespVO;
 import cn.iocoder.yudao.module.infra.controller.app.file.vo.AppFileUploadReqVO;
@@ -17,6 +18,7 @@ import javax.annotation.Resource;
 import javax.annotation.security.PermitAll;
 import javax.validation.Valid;
 
+import java.util.List;
 import java.util.Map;
 
 import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
@@ -34,7 +36,7 @@ public class AppFileController {
     @PostMapping("/upload")
     @Operation(summary = "上传文件")
     @PermitAll
-    public CommonResult<Map<String, String>> uploadFile(AppFileUploadReqVO uploadReqVO) throws Exception {
+    public CommonResult<InfraFileInfoDTO> uploadFile(AppFileUploadReqVO uploadReqVO) throws Exception {
         MultipartFile file = uploadReqVO.getFile();
         String path = uploadReqVO.getPath();
         return success(fileService.createFile(file.getOriginalFilename(), path, IoUtil.readBytes(file.getInputStream())));

yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/file/FileService.java

@@ -1,6 +1,7 @@
 package cn.iocoder.yudao.module.infra.service.file;
 
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.module.infra.api.file.dto.InfraFileInfoDTO;
 import cn.iocoder.yudao.module.infra.controller.admin.file.vo.file.FileCreateReqVO;
 import cn.iocoder.yudao.module.infra.controller.admin.file.vo.file.FilePageReqVO;
 import cn.iocoder.yudao.module.infra.controller.admin.file.vo.file.FilePresignedUrlRespVO;
@@ -32,7 +33,7 @@ public interface FileService {
      * @param content 文件内容
      * @return 文件路径
      */
-    Map<String, String> createFile(String name, String path, byte[] content);
+    InfraFileInfoDTO createFile(String name, String path, byte[] content);
 
     /**
      * 创建文件
@@ -66,5 +67,5 @@ public interface FileService {
      */
     FilePresignedUrlRespVO getFilePresignedUrl(String path) throws Exception;
 
-    List<Map<String,String>> listFile(List<Long> ids);
+    List<InfraFileInfoDTO>  listFile(List<Long> ids);
 }

yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/file/FileServiceImpl.java

@@ -5,6 +5,7 @@ import cn.hutool.core.util.StrUtil;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.common.util.io.FileUtils;
 import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+import cn.iocoder.yudao.module.infra.api.file.dto.InfraFileInfoDTO;
 import cn.iocoder.yudao.module.infra.framework.file.core.client.FileClient;
 import cn.iocoder.yudao.module.infra.framework.file.core.client.s3.FilePresignedUrlRespDTO;
 import cn.iocoder.yudao.module.infra.framework.file.core.utils.FileTypeUtils;
@@ -23,7 +24,6 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
-import java.util.stream.Stream;
 
 import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
 import static cn.iocoder.yudao.module.infra.enums.ErrorCodeConstants.FILE_NOT_EXISTS;
@@ -49,7 +49,7 @@ public class FileServiceImpl implements FileService {
 
     @Override
     @SneakyThrows
-    public Map<String, String> createFile(String name, String path, byte[] content) {
+    public InfraFileInfoDTO createFile(String name, String path, byte[] content) {
         // 计算默认的 path 名
         String type = FileTypeUtils.getMineType(content, name);
         if (StrUtil.isEmpty(path)) {
@@ -75,9 +75,9 @@ public class FileServiceImpl implements FileService {
         file.setSize(content.length);
         fileMapper.insert(file);
 
-        Map<String, String> map = new HashMap<>();
-        map.put("url", url);
-        map.put("file_id", file.getId().toString());
+        InfraFileInfoDTO map = new InfraFileInfoDTO();
+        map.setUrl( url);
+        map.setId(file.getId());
         return map;
     }
 
@@ -126,15 +126,15 @@ public class FileServiceImpl implements FileService {
     }
 
     @Override
-    public List<Map<String, String>> listFile(List<Long> ids) {
+    public List<InfraFileInfoDTO> listFile(List<Long> ids) {
         LambdaQueryWrapper<FileDO> wrapper = new LambdaQueryWrapper<>();
         wrapper.in(FileDO::getId, ids);
 
         final List<FileDO> fileDOS = fileMapper.selectList(wrapper);
         return fileDOS.stream().map(fileDO -> {
-            Map<String, String> map = new HashMap<>();
-            map.put("id", fileDO.getId().toString());
-            map.put("url", fileDO.getUrl());
+            InfraFileInfoDTO map = new InfraFileInfoDTO();
+            map.setId(fileDO.getId());
+            map.setUrl(fileDO.getUrl());
             return map;
         }).collect(Collectors.toList());
     }

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/enterprise/EnterpriseController.java

@@ -2,6 +2,7 @@ package cn.iocoder.yudao.module.system.controller.admin.enterprise;
 
 import cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils;
 import cn.iocoder.yudao.module.infra.api.file.FileApi;
+import cn.iocoder.yudao.module.infra.api.file.dto.InfraFileInfoDTO;
 import cn.iocoder.yudao.module.system.controller.admin.taglibrary.vo.TagLibraryPageReqVO;
 import cn.iocoder.yudao.module.system.controller.admin.taglibrary.vo.TagLibraryRespVO;
 import cn.iocoder.yudao.module.system.dal.dataobject.dept.DeptDO;
@@ -16,6 +17,7 @@ import cn.iocoder.yudao.module.system.dal.mysql.enterprisetag.EnterpriseTagMappe
 import cn.iocoder.yudao.module.system.dal.mysql.fileInfo.FileInfoMapper;
 import cn.iocoder.yudao.module.system.dal.mysql.qualification.EnterpriseQualificationMapper;
 import cn.iocoder.yudao.module.system.dal.mysql.taglibrary.TagLibraryMapper;
+import cn.iocoder.yudao.module.system.service.enterprise.EnterpriseServiceImpl;
 import cn.iocoder.yudao.module.system.service.enterprisetag.EnterpriseTagService;
 import cn.iocoder.yudao.module.system.service.fileInfo.FileInfoService;
 import cn.iocoder.yudao.module.system.service.qualification.EnterpriseQualificationService;
@@ -124,16 +126,17 @@ public class EnterpriseController {
     @Parameter(name = "id", description = "编号", required = true, example = "1024")
 //    @PreAuthorize("@ss.hasPermission('system:enterprise:query')")
     public CommonResult<EnterpriseRespVO> getEnterprise(@RequestParam("id") Long id) {
-        EnterpriseDO enterprise = enterpriseService.getEnterprise(id);
+        EnterpriseDO bean = enterpriseService.getEnterprise(id);
+        EnterpriseRespVO  enterprise= BeanUtils.toBean(bean, EnterpriseRespVO.class);
         if (enterprise != null) {
             LambdaQueryWrapper<FileInfoDO> wrapper = new LambdaQueryWrapper<>();
-            wrapper.eq(FileInfoDO::getDictType, 644l);
-            wrapper.eq(FileInfoDO::getDictData, 1l);
+            wrapper.eq(FileInfoDO::getDictType, EnterpriseServiceImpl.DEFAULT_DICT_TYPE);
+            wrapper.eq(FileInfoDO::getDictData, EnterpriseServiceImpl.DEFAULT_DICT_DATA_QY);
             wrapper.eq(FileInfoDO::getUnitId, enterprise.getId());
             final List<Long> collect = fileInfoMapper.selectList(wrapper).stream().map(res -> res.getInfraFileId()).collect(Collectors.toList());
 
             if (!collect.isEmpty()) {
-                final List<Map<String,String>> list = fileApi.listFile(collect);
+                final List<InfraFileInfoDTO> list = fileApi.listFile(collect);
                 enterprise.setFiles(list);
             }
 
@@ -153,7 +156,6 @@ public class EnterpriseController {
             }
 
 
-
             //通过userID获取专管人
             if (enterprise.getUserId() != null) {
                 final AdminUserDO user = adminUserService.getUser(Long.valueOf(enterprise.getUserId()));
@@ -186,7 +188,7 @@ public class EnterpriseController {
         }
 
 
-        return success(BeanUtils.toBean(enterprise, EnterpriseRespVO.class));
+        return success(enterprise);
     }
 
     @GetMapping("/pcpage")
@@ -208,7 +210,7 @@ public class EnterpriseController {
         PageResult<EnterpriseDO> pageResult = enterpriseService.getEnterprisePage(pageReqVO);
         pageResult.getList().forEach(item->{
             //企业图片
-            final List<Map<String, String>> fileList = fileInfoService.getFileList("664", "1", item.getId().toString());
+            final List<InfraFileInfoDTO> fileList = fileInfoService.getFileList(EnterpriseServiceImpl.DEFAULT_DICT_TYPE, EnterpriseServiceImpl.DEFAULT_DICT_DATA_QY, item.getId().toString());
             item.setFiles(fileList);
 
             // 企业标签
@@ -228,7 +230,7 @@ public class EnterpriseController {
         final PageResult<EnterpriseDO> pageResult = enterpriseService.getEnterpriseByUserId(pageReqVO);
         pageResult.getList().forEach(item->{
             //企业图片
-            final List<Map<String, String>> fileList = fileInfoService.getFileList("664", "1", item.getId().toString());
+            final List<InfraFileInfoDTO> fileList = fileInfoService.getFileList(EnterpriseServiceImpl.DEFAULT_DICT_TYPE, EnterpriseServiceImpl.DEFAULT_DICT_DATA_QY, item.getId().toString());
             item.setFiles(fileList);
 
             // 企业标签

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/enterprise/vo/EnterpriseRespVO.java

@@ -1,5 +1,6 @@
 package cn.iocoder.yudao.module.system.controller.admin.enterprise.vo;
 
+import cn.iocoder.yudao.module.infra.api.file.dto.InfraFileInfoDTO;
 import cn.iocoder.yudao.module.system.dal.dataobject.qualification.EnterpriseQualificationDO;
 import cn.iocoder.yudao.module.system.dal.dataobject.taglibrary.TagLibraryDO;
 import io.swagger.v3.oas.annotations.media.Schema;
@@ -101,7 +102,7 @@ public class EnterpriseRespVO {
     private Integer audit;
 
     @Schema(description = "企业图片", example = "26433")
-    private List<Map<String,String>> files;
+    private List<InfraFileInfoDTO> files;
 
     @Schema(description = "企业资质列表", example = "26433")
     private List<EnterpriseQualificationDO> qualificationList;

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/inspectionslog/InspectionsLogController.java

@@ -1,6 +1,8 @@
 package cn.iocoder.yudao.module.system.controller.admin.inspectionslog;
 
+import cn.iocoder.yudao.module.infra.api.file.dto.InfraFileInfoDTO;
 import cn.iocoder.yudao.module.system.controller.admin.enterpriseinspections.vo.PassOnSaveVO;
+import cn.iocoder.yudao.module.system.service.enterprise.EnterpriseServiceImpl;
 import cn.iocoder.yudao.module.system.service.fileInfo.FileInfoService;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import lombok.extern.slf4j.Slf4j;
@@ -91,7 +93,7 @@ public class InspectionsLogController {
     public CommonResult<InspectionsLogRespVO> getInspectionsLog(@RequestParam("id") Long id) {
         InspectionsLogDO inspectionsLog = inspectionsLogService.getInspectionsLog(id);
         //查图片
-        final List<Map<String, String>> fileList = fileInfoService.getFileList("644", "2", inspectionsLog.getId().toString());
+        final List<InfraFileInfoDTO> fileList = fileInfoService.getFileList(EnterpriseServiceImpl.DEFAULT_DICT_TYPE, 2L,inspectionsLog.getId().toString());
         inspectionsLog.setFileList(fileList);
 
         return success(BeanUtils.toBean(inspectionsLog, InspectionsLogRespVO.class));
@@ -114,7 +116,7 @@ public class InspectionsLogController {
         if (pageResult != null && pageResult.size() > 0) {
             pageResult.forEach(item->{
                 //图片相关
-                final List<Map<String, String>> fileList = fileInfoService.getFileList("644", "2", item.getId().toString());
+                final List<InfraFileInfoDTO> fileList = fileInfoService.getFileList(644l, 2l, item.getId().toString());
                 item.setFileList(fileList);
             });
         }
@@ -130,7 +132,7 @@ public class InspectionsLogController {
         if (list != null && list.size() > 0) {
             list.forEach(item->{
                 //图片相关
-                final List<Map<String, String>> fileList = fileInfoService.getFileList("644", "2", item.getId().toString());
+                final List<InfraFileInfoDTO> fileList = fileInfoService.getFileList(644l, 2l, item.getId().toString());
                 item.setFileList(fileList);
             });
         }

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/inspectionslog/vo/InspectionsLogSaveReqVO.java

@@ -42,7 +42,7 @@ public class InspectionsLogSaveReqVO {
     private Long inspectId;
 
     @Schema(description = "文件id", example = "26433")
-    private Long[] fileIds;
+    private List<Long> fileIds;
 
     //整改截至日期
     private LocalDateTime correctionTime;

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/qualification/EnterpriseQualificationController.java

@@ -1,7 +1,11 @@
 package cn.iocoder.yudao.module.system.controller.admin.qualification;
 
+import cn.iocoder.yudao.module.infra.api.file.dto.InfraFileInfoDTO;
 import cn.iocoder.yudao.module.system.dal.dataobject.enterprise.EnterpriseDO;
 import cn.iocoder.yudao.module.system.service.enterprise.EnterpriseService;
+import cn.iocoder.yudao.module.system.service.enterprise.EnterpriseServiceImpl;
+import cn.iocoder.yudao.module.system.service.fileInfo.FileInfoService;
+import cn.iocoder.yudao.module.system.service.qualification.EnterpriseQualificationServiceImpl;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -42,6 +46,9 @@ public class EnterpriseQualificationController {
     @Resource
     private EnterpriseService enterpriseService;
 
+    @Resource
+    private FileInfoService fileInfoService;
+
 
     @PostMapping("/create")
     @Operation(summary = "创建企业资质")
@@ -73,7 +80,10 @@ public class EnterpriseQualificationController {
 //    @PreAuthorize("@ss.hasPermission('system:enterprise-qualification:query')")
     public CommonResult<EnterpriseQualificationRespVO> getEnterpriseQualification(@RequestParam("id") Long id) {
         EnterpriseQualificationDO enterpriseQualification = enterpriseQualificationService.getEnterpriseQualification(id);
-        return success(BeanUtils.toBean(enterpriseQualification, EnterpriseQualificationRespVO.class));
+        EnterpriseQualificationRespVO bean = BeanUtils.toBean(enterpriseQualification, EnterpriseQualificationRespVO.class);
+        List<InfraFileInfoDTO> fileList = fileInfoService.getFileList(EnterpriseServiceImpl.DEFAULT_DICT_TYPE, EnterpriseQualificationServiceImpl.DEFAULT_DICT_DATA_QYZZ, id.toString());
+        bean.setFiles(fileList);
+        return success(bean);
     }
 
     @GetMapping("/page")

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/qualification/vo/EnterpriseQualificationRespVO.java

@@ -1,5 +1,6 @@
 package cn.iocoder.yudao.module.system.controller.admin.qualification.vo;
 
+import cn.iocoder.yudao.module.infra.api.file.dto.InfraFileInfoDTO;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;
 
@@ -59,4 +60,6 @@ public class EnterpriseQualificationRespVO {
     @ExcelProperty("资质编号")
     private String enterpriseAuth;
 
+    @Schema(description = "企业图片", example = "26433")
+    private List<InfraFileInfoDTO> files;
 }

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/qualification/vo/EnterpriseQualificationSaveReqVO.java

@@ -39,4 +39,7 @@ public class EnterpriseQualificationSaveReqVO {
     @Schema(description = "资质编号")
     private String enterpriseAuth;
 
+    @Schema(description = "图片信息")
+    private List<Long> files;
+
 }

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/enterprise/EnterpriseDO.java

@@ -1,5 +1,6 @@
 package cn.iocoder.yudao.module.system.dal.dataobject.enterprise;
 
+import cn.iocoder.yudao.module.infra.api.file.dto.InfraFileInfoDTO;
 import cn.iocoder.yudao.module.system.dal.dataobject.qualification.EnterpriseQualificationDO;
 import cn.iocoder.yudao.module.system.dal.dataobject.taglibrary.TagLibraryDO;
 import io.swagger.v3.oas.annotations.media.Schema;
@@ -94,7 +95,7 @@ public class EnterpriseDO extends BaseDO {
     private String signRadius;
 
     @TableField(exist = false)
-    private List<Map<String, String>> files;
+    private List<InfraFileInfoDTO> files;
 
     @TableField(exist = false)
     private List<EnterpriseQualificationDO> qualificationList;

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/inspectionslog/InspectionsLogDO.java

@@ -1,5 +1,6 @@
 package cn.iocoder.yudao.module.system.dal.dataobject.inspectionslog;
 
+import cn.iocoder.yudao.module.infra.api.file.dto.InfraFileInfoDTO;
 import cn.iocoder.yudao.module.system.controller.admin.inspectionslog.vo.InspectionsLogAppListVO;
 import com.sun.xml.bind.v2.TODO;
 import lombok.*;
@@ -63,5 +64,5 @@ public class InspectionsLogDO extends BaseDO {
     //协同人员是否可以看到任务记录
     //相关文件
     @TableField(exist = false)
-    private List<Map<String, String>> fileList;
+    private List<InfraFileInfoDTO> fileList;
 }

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/enterprise/EnterpriseServiceImpl.java

@@ -1,5 +1,6 @@
 package cn.iocoder.yudao.module.system.service.enterprise;
 
+import cn.iocoder.yudao.module.infra.api.file.FileApi;
 import cn.iocoder.yudao.module.system.controller.admin.user.vo.user.UserSaveReqVO;
 import cn.iocoder.yudao.module.system.dal.dataobject.enterpriseauditlog.EnterpriseAuditLogDO;
 import cn.iocoder.yudao.module.system.dal.dataobject.enterprisetag.EnterpriseTagDO;
@@ -65,6 +66,11 @@ public class EnterpriseServiceImpl implements EnterpriseService {
     private AdminUserService adminUserService;
     @Resource
     private AdminUserMapper adminUserMapper;
+    //企业图片
+    public final static Long DEFAULT_DICT_DATA_QY = 1L;
+
+    public final static Long DEFAULT_DICT_TYPE = 644L;
+
 
     @Override
     @Transactional
@@ -109,8 +115,8 @@ public class EnterpriseServiceImpl implements EnterpriseService {
         if (createReqVO.getFileIds() != null && createReqVO.getFileIds().length > 0) {
             for (Long fileId : createReqVO.getFileIds()) {
                 FileInfoDO fileInfoDO = new FileInfoDO();
-                fileInfoDO.setDictData(1l);  //文件类型
-                fileInfoDO.setDictType(644l);
+                fileInfoDO.setDictData(DEFAULT_DICT_DATA_QY);
+                fileInfoDO.setDictType(DEFAULT_DICT_TYPE);
                 fileInfoDO.setUnitId(enterprise.getId().toString());
                 fileInfoDO.setInfraFileId(fileId);
                 fileInfoMapper.insert(fileInfoDO);
@@ -138,8 +144,8 @@ public class EnterpriseServiceImpl implements EnterpriseService {
         if (createReqVO.getFileIds() != null && createReqVO.getFileIds().length > 0) {
             for (Long fileId : createReqVO.getFileIds()) {
                 FileInfoDO fileInfoDO = new FileInfoDO();
-                fileInfoDO.setDictData(1l);  //文件类型
-                fileInfoDO.setDictType(644l);
+                fileInfoDO.setDictData(DEFAULT_DICT_DATA_QY);  //文件类型
+                fileInfoDO.setDictType(DEFAULT_DICT_TYPE);
                 fileInfoDO.setUnitId(enterprise.getId().toString());
                 fileInfoDO.setInfraFileId(fileId);
                 fileInfoMapper.insert(fileInfoDO);

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/fileInfo/FileInfoService.java

@@ -1,6 +1,8 @@
 package cn.iocoder.yudao.module.system.service.fileInfo;
 
 import java.util.*;
+
+import cn.iocoder.yudao.module.infra.api.file.dto.InfraFileInfoDTO;
 import cn.iocoder.yudao.module.system.controller.admin.fileInfo.vo.*;
 import cn.iocoder.yudao.module.system.dal.dataobject.fileInfo.FileInfoDO;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
@@ -52,7 +54,7 @@ public interface FileInfoService {
      */
     PageResult<FileInfoDO> getFileInfoPage(FileInfoPageReqVO pageReqVO);
 
-    List<Map<String,String>> getFileList(String dictType, String dictData, String unitId);
+    List<InfraFileInfoDTO> getFileList(Long dictType, Long dictData, String unitId);
 
     /**
      * 根据字典类型和字典数据保存附件信息
@@ -63,6 +65,8 @@ public interface FileInfoService {
      * @Author  dx
      * @Date  2025-02-16 上午9:34
      **/
-    void saveFilesByDictData(Long[] fileIds, Long dictType, Long dictData, String unitId);
+    void saveFilesByDictData(Collection<Long> fileIds, Long dictType, Long dictData, String unitId);
+
 
+    void deleteFilesByDictData(Long dictType, Long dictData, String unitId);
 }

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/fileInfo/FileInfoServiceImpl.java

@@ -1,10 +1,12 @@
 package cn.iocoder.yudao.module.system.service.fileInfo;
 
+import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils;
+import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
 import cn.iocoder.yudao.module.infra.api.file.FileApi;
+import cn.iocoder.yudao.module.infra.api.file.dto.InfraFileInfoDTO;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import org.springframework.stereotype.Service;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.transaction.annotation.Transactional;
 
 import java.util.*;
 import java.util.stream.Collectors;
@@ -12,7 +14,6 @@ import java.util.stream.Collectors;
 import cn.iocoder.yudao.module.system.controller.admin.fileInfo.vo.*;
 import cn.iocoder.yudao.module.system.dal.dataobject.fileInfo.FileInfoDO;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.framework.common.pojo.PageParam;
 import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
 
 import cn.iocoder.yudao.module.system.dal.mysql.fileInfo.FileInfoMapper;
@@ -80,9 +81,9 @@ public class FileInfoServiceImpl implements FileInfoService {
     }
 
     @Override
-    public List<Map<String, String>> getFileList(String dictType, String dictData, String unitId) {
+    public List<InfraFileInfoDTO>  getFileList(Long dictType, Long dictData, String unitId) {
 
-        List<Map<String, String>> mapList = new ArrayList<>();
+        List<InfraFileInfoDTO>  mapList = new ArrayList<>();
 
         LambdaQueryWrapper<FileInfoDO> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(FileInfoDO::getDictType, dictType);
@@ -91,7 +92,7 @@ public class FileInfoServiceImpl implements FileInfoService {
         final List<Long> collect = fileInfoMapper.selectList(wrapper).stream().map(res -> res.getInfraFileId()).collect(Collectors.toList());
 
         if (!collect.isEmpty()) {
-            final List<Map<String,String>> list = fileApi.listFile(collect);
+            final List<InfraFileInfoDTO> list = fileApi.listFile(collect);
             mapList.addAll(list);
         }
 
@@ -109,8 +110,8 @@ public class FileInfoServiceImpl implements FileInfoService {
      * @Date 2025-02-16 上午9:34
      **/
     @Override
-    public void saveFilesByDictData(Long[] fileIds, Long dictType, Long dictData, String unitId) {
-        if (fileIds != null && fileIds.length > 0) {
+    public void saveFilesByDictData(Collection<Long> fileIds, Long dictType, Long dictData, String unitId) {
+        if (!CollectionUtils.isAnyEmpty(fileIds)) {
             List<FileInfoDO> list = new ArrayList<>();
             for (Long fileId : fileIds) {
                 FileInfoDO fileInfoDO = new FileInfoDO();
@@ -124,4 +125,13 @@ public class FileInfoServiceImpl implements FileInfoService {
         }
     }
 
+    @Override
+    public void deleteFilesByDictData(Long dictType, Long dictData, String unitId) {
+        LambdaQueryWrapperX<FileInfoDO> list=new LambdaQueryWrapperX<FileInfoDO>();
+        list.eq(FileInfoDO::getDictType,dictType);
+        list.eq(FileInfoDO::getDictData,dictData);
+        list.eq(FileInfoDO::getUnitId,unitId);
+            fileInfoMapper.delete(list);
+    }
+
 }

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/qualification/EnterpriseQualificationServiceImpl.java

@@ -1,5 +1,10 @@
 package cn.iocoder.yudao.module.system.service.qualification;
 
+import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils;
+import cn.iocoder.yudao.module.system.dal.dataobject.fileInfo.FileInfoDO;
+import cn.iocoder.yudao.module.system.dal.mysql.fileInfo.FileInfoMapper;
+import cn.iocoder.yudao.module.system.service.enterprise.EnterpriseServiceImpl;
+import cn.iocoder.yudao.module.system.service.fileInfo.FileInfoService;
 import org.springframework.stereotype.Service;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.transaction.annotation.Transactional;
@@ -17,6 +22,8 @@ import javax.annotation.Resource;
 
 import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
 import static cn.iocoder.yudao.module.system.enums.ErrorCodeConstants.*;
+import static cn.iocoder.yudao.module.system.service.enterprise.EnterpriseServiceImpl.DEFAULT_DICT_DATA_QY;
+import static cn.iocoder.yudao.module.system.service.enterprise.EnterpriseServiceImpl.DEFAULT_DICT_TYPE;
 
 
 /**
@@ -30,22 +37,38 @@ public class EnterpriseQualificationServiceImpl implements EnterpriseQualificati
 
     @Resource
     private EnterpriseQualificationMapper enterpriseQualificationMapper;
+    //企业资质
+    public final static Long DEFAULT_DICT_DATA_QYZZ = 3L;
+
+    @Resource
+    private FileInfoService fileInfoService;
 
     @Override
     public Long createEnterpriseQualification(EnterpriseQualificationSaveReqVO createReqVO) {
         // 插入
         EnterpriseQualificationDO enterpriseQualification = BeanUtils.toBean(createReqVO, EnterpriseQualificationDO.class);
         enterpriseQualificationMapper.insert(enterpriseQualification);
+
+        fileInfoService.saveFilesByDictData(createReqVO.getFiles(),DEFAULT_DICT_TYPE ,DEFAULT_DICT_DATA_QYZZ, enterpriseQualification.getId().toString());
+
         // 返回
         return enterpriseQualification.getId();
     }
 
+
+
+
+
+
     @Override
     public void updateEnterpriseQualification(EnterpriseQualificationSaveReqVO updateReqVO) {
         // 校验存在
         validateEnterpriseQualificationExists(updateReqVO.getId());
         // 更新
         EnterpriseQualificationDO updateObj = BeanUtils.toBean(updateReqVO, EnterpriseQualificationDO.class);
+        fileInfoService.deleteFilesByDictData(DEFAULT_DICT_TYPE ,DEFAULT_DICT_DATA_QYZZ, updateObj.getId().toString());
+
+        fileInfoService.saveFilesByDictData(updateReqVO.getFiles(), DEFAULT_DICT_TYPE ,DEFAULT_DICT_DATA_QYZZ, updateObj.getId().toString());
         enterpriseQualificationMapper.updateById(updateObj);
     }
 
@@ -53,6 +76,8 @@ public class EnterpriseQualificationServiceImpl implements EnterpriseQualificati
     public void deleteEnterpriseQualification(Long id) {
         // 校验存在
         validateEnterpriseQualificationExists(id);
+        fileInfoService.deleteFilesByDictData(DEFAULT_DICT_TYPE ,DEFAULT_DICT_DATA_QYZZ, id.toString());
+
         // 删除
         enterpriseQualificationMapper.deleteById(id);
     }

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/social/SocialClientServiceImpl.java

@@ -305,7 +305,7 @@ public class SocialClientServiceImpl implements SocialClientService {
                     ObjUtil.defaultIfNull(reqVO.getCheckPath(), SocialWxQrcodeReqDTO.CHECK_PATH),
                     envVersion,
                     ObjUtil.defaultIfNull(reqVO.getWidth(), SocialWxQrcodeReqDTO.WIDTH),
-                    ObjUtil.defaultIfNull(reqVO.getAutoColor(), SocialWxQrcodeReqDTO.AUTO_COLOR),
+                    ObjUtil.defaultIfNull(reqVO.getAutoColor(), false),
                     null,
                     ObjUtil.defaultIfNull(reqVO.getHyaline(), SocialWxQrcodeReqDTO.HYALINE));
         } catch (WxErrorException e) {

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/user/AdminUserServiceImpl.java

@@ -13,6 +13,7 @@ import cn.iocoder.yudao.framework.common.util.validation.ValidationUtils;
 import cn.iocoder.yudao.framework.datapermission.core.util.DataPermissionUtils;
 import cn.iocoder.yudao.module.infra.api.config.ConfigApi;
 import cn.iocoder.yudao.module.infra.api.file.FileApi;
+import cn.iocoder.yudao.module.infra.api.file.dto.InfraFileInfoDTO;
 import cn.iocoder.yudao.module.system.api.social.dto.SocialUserRespDTO;
 import cn.iocoder.yudao.module.system.controller.admin.auth.vo.AuthRegisterReqVO;
 import cn.iocoder.yudao.module.system.controller.admin.user.vo.profile.UserProfileUpdatePasswordReqVO;
@@ -224,13 +225,13 @@ public class AdminUserServiceImpl implements AdminUserService {
     public String updateUserAvatar(Long id, InputStream avatarFile) {
         validateUserExists(id);
         // 存储文件
-        final Map<String, String> file = fileApi.createFile(IoUtil.readBytes(avatarFile));
+        final InfraFileInfoDTO file = fileApi.createFile(IoUtil.readBytes(avatarFile));
         // 更新路径
         AdminUserDO sysUserDO = new AdminUserDO();
         sysUserDO.setId(id);
-        sysUserDO.setAvatar(file.get("url"));
+        sysUserDO.setAvatar(file.getUrl());
         userMapper.updateById(sysUserDO);
-        return file.get("url");
+        return file.getUrl();
     }
 
     @Override