电子档案接口提交

service-vpp/service-vpp-biz/pom.xml

@@ -85,6 +85,12 @@
             <artifactId>taos-jdbcdriver</artifactId>
             <version>3.6.3</version>
         </dependency>
+
+        <dependency>
+            <groupId>com.usky</groupId>
+            <artifactId>service-file</artifactId>
+            <version>0.0.1</version>
+        </dependency>
     </dependencies>
 
     <build>

service-vpp/service-vpp-biz/src/main/java/com/usky/vpp/VppApplication.java

@@ -22,7 +22,7 @@ import java.net.UnknownHostException;
  */
 @EnableCustomSwagger2
 @EnableFeignClients(basePackages = "com.usky")
-@MapperScan(value = "com.usky.vpp.mapper")
+@MapperScan({"com.usky.vpp.mapper","com.ruoyi.file.mapper"})
 @ComponentScan("com.usky")
 @SpringBootApplication
 @EnableScheduling

service-vpp/service-vpp-biz/src/main/java/com/usky/vpp/controller/web/ArchiveController.java

@@ -1,7 +1,10 @@
 package com.usky.vpp.controller.web;
 
 import com.usky.common.core.bean.ApiResult;
+import com.usky.common.core.bean.CommonPage;
 import com.usky.vpp.service.VppArchiveService;
+import com.usky.vpp.service.vo.VppFileArchiveRequestVO;
+import com.usky.vpp.service.vo.VppFileArchiveResponseVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -16,16 +19,37 @@ public class ArchiveController {
     @Autowired
     private VppArchiveService vppArchiveService;
 
+    /**
+     * 创建电子档案
+     */
+    @PostMapping
+    public ApiResult<String> create(@RequestBody VppFileArchiveRequestVO vo) {
+        return ApiResult.success(vppArchiveService.create(vo));
+    }
+
+    /**
+     * 获取电子档案列表
+     * 只传参 archiveName、 siteId、 pageNum（默认1）、 pageSize（默认20），并且都是非必填项
+     */
     @GetMapping
-    public ApiResult<Object> page() {
-        return ApiResult.success(null);
+    public ApiResult<CommonPage<VppFileArchiveResponseVO>> page(@RequestBody VppFileArchiveRequestVO vo) {
+        return ApiResult.success(vppArchiveService.page(vo));
     }
-    @PostMapping
-    public ApiResult<Object> upload() {
-        return ApiResult.success(null);
+
+    /**
+     * 更新电子档案
+     * version 字段自增，每次更新+0.1
+     */
+    @PutMapping
+    public ApiResult<String> upload(@RequestBody VppFileArchiveRequestVO vo) {
+        return ApiResult.success(vppArchiveService.upload(vo));
     }
+
+    /**
+     * 删除电子档案
+     */
     @DeleteMapping(value = "/{id}")
-    public ApiResult<Void> delete(@PathVariable("id") Long id) {
-        return ApiResult.success();
+    public ApiResult<String> delete(@PathVariable("id") Long id) {
+        return ApiResult.success(vppArchiveService.delete(id));
     }
 }

service-vpp/service-vpp-biz/src/main/java/com/usky/vpp/domain/VppFileArchive.java

@@ -8,6 +8,8 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
 import java.io.Serializable;
 import java.time.LocalDateTime;
 
@@ -30,21 +32,25 @@ public class VppFileArchive implements Serializable {
     /**
      * 档案名称
      */
+    @NotBlank(message = "档案名称不能为空！")
     private String archiveName;
 
     /**
      * 原始文件名
      */
+    @NotBlank(message = "原始文件名不能为空！")
     private String fileName;
 
     /**
      * 存储路径
      */
+    @NotBlank(message = "文件路径不能为空！")
     private String fileUrl;
 
     /**
      * 档案类型 1图纸 2文档 3设计稿 4验收报告 5其他
      */
+    @NotNull(message = "请选择档案类型！")
     private Integer archiveType;
 
     /**
@@ -70,6 +76,7 @@ public class VppFileArchive implements Serializable {
     /**
      * 站点id
      */
+    @NotNull(message = "站点不能为空！")
     private Long siteId;
 
     /**
@@ -102,13 +109,13 @@ public class VppFileArchive implements Serializable {
     /**
      * 软删除标识 0未删除 1已删除
      */
-    private Integer isDelete;
+    private Integer delFlag;
 
     /**
      * 软删除时间
      */
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private LocalDateTime deleteTime;
+    private LocalDateTime deletedTime;
 
     /**
      * 版本号 默认V1.0

service-vpp/service-vpp-biz/src/main/java/com/usky/vpp/service/VppArchiveService.java

@@ -1,6 +1,8 @@
 package com.usky.vpp.service;
 
 import com.usky.common.core.bean.CommonPage;
+import com.usky.vpp.service.vo.VppFileArchiveRequestVO;
+import com.usky.vpp.service.vo.VppFileArchiveResponseVO;
 
 import java.util.Map;
 
@@ -12,4 +14,12 @@ public interface VppArchiveService {
     default Object stub(String action, Map<String, Object> params) {
         return null;
     }
+
+    String create(VppFileArchiveRequestVO vo);
+
+    CommonPage<VppFileArchiveResponseVO> page(VppFileArchiveRequestVO vo);
+
+    String upload(VppFileArchiveRequestVO vo);
+
+    String delete(Long id);
 }

service-vpp/service-vpp-biz/src/main/java/com/usky/vpp/service/impl/VppArchiveServiceImpl.java

@@ -1,11 +1,206 @@
 package com.usky.vpp.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.file.domain.FilesUpload;
+import com.ruoyi.file.mapper.FilesMapper;
+import com.usky.common.core.bean.CommonPage;
+import com.usky.common.security.utils.SecurityUtils;
+import com.usky.vpp.domain.VppFileArchive;
+import com.usky.vpp.mapper.VppFileArchiveMapper;
 import com.usky.vpp.service.VppArchiveService;
+import com.usky.vpp.service.vo.VppFileArchiveRequestVO;
+import com.usky.vpp.service.vo.VppFileArchiveResponseVO;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.time.LocalDateTime;
+import java.util.List;
+
 /**
  * VppArchiveService 默认实现（待按业务完善）
  */
 @Service
 public class VppArchiveServiceImpl implements VppArchiveService {
+
+    @Autowired
+    private FilesMapper filesMapper;
+    @Autowired
+    private VppFileArchiveMapper vppFileArchiveMapper;
+
+    @Override
+    public String create(VppFileArchiveRequestVO vo) {
+        String username = SecurityUtils.getUsername();
+        Integer tenantId = SecurityUtils.getTenantId();
+
+        LambdaQueryWrapper<FilesUpload> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(FilesUpload::getFilesName, vo.getName())
+                .eq(FilesUpload::getUrl, vo.getUrl())
+                //.eq(FilesUpload::getEnable, "1")
+                .eq(FilesUpload::getIsDelete, 0);
+        FilesUpload filesUpload = filesMapper.selectOne(queryWrapper);
+
+        VppFileArchive vppFileArchive = new VppFileArchive();
+        vppFileArchive.setArchiveName(vo.getArchiveName());
+        vppFileArchive.setArchiveType(vo.getArchiveType());
+        vppFileArchive.setFileName(filesUpload.getFilesName());
+        vppFileArchive.setFileUrl(filesUpload.getUrl());
+        vppFileArchive.setFileType(filesUpload.getType());
+        vppFileArchive.setFileSize(filesUpload.getSize());
+        vppFileArchive.setBizId(vo.getBizId() != null ? vo.getBizId() : 0L);
+        vppFileArchive.setBizType(StringUtils.isNotBlank(vo.getBizType()) ? vo.getBizType() : "");
+        vppFileArchive.setSiteId(vo.getSiteId());
+        vppFileArchive.setCreateTime(LocalDateTime.now());
+        vppFileArchive.setCreatedBy(username);
+        vppFileArchive.setVersion("V1.0");
+        vppFileArchive.setTenantId(tenantId);
+        vppFileArchive.setRemark(StringUtils.isNotBlank(vo.getRemark()) ? vo.getRemark() : "");
+        vppFileArchive.setDelFlag(0);
+        int insert = vppFileArchiveMapper.insert(vppFileArchive);
+
+        return insert > 0 ? "新增成功！" : "新增失败！";
+    }
+
+    @Override
+    public CommonPage<VppFileArchiveResponseVO> page(VppFileArchiveRequestVO vo) {
+        Integer pageNum = vo.getPageNum() != null && vo.getPageNum() > 0 ? vo.getPageNum() : 1;
+        Integer pageSize = vo.getPageSize() != null && vo.getPageSize() > 0 ? vo.getPageSize() : 20;
+        IPage<VppFileArchive> page = new Page<>(pageNum, pageSize);
+
+        LambdaQueryWrapper<VppFileArchive> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(VppFileArchive::getDelFlag, 0)
+                .eq(VppFileArchive::getTenantId, SecurityUtils.getTenantId())
+                .like(StringUtils.isNotBlank(vo.getArchiveName()), VppFileArchive::getArchiveName, vo.getArchiveName())
+                .eq(vo.getSiteId() != null, VppFileArchive::getSiteId, vo.getSiteId())
+                .eq(vo.getArchiveType() != null, VppFileArchive::getArchiveType, vo.getArchiveType())
+                .orderByDesc(VppFileArchive::getCreateTime);
+        page = vppFileArchiveMapper.selectPage(page, queryWrapper);
+
+        List<VppFileArchiveResponseVO> list = page.getRecords().stream().map(entity -> {
+            VppFileArchiveResponseVO responseVO = new VppFileArchiveResponseVO();
+            responseVO.setId(entity.getId());
+            responseVO.setArchiveName(entity.getArchiveName());
+            responseVO.setFileName(entity.getFileName());
+            responseVO.setFileUrl(entity.getFileUrl());
+            responseVO.setArchiveType(entity.getArchiveType());
+            responseVO.setFileType(entity.getFileType());
+            responseVO.setFileSize(convertFileSize(entity.getFileSize()));
+            responseVO.setBizType(entity.getBizType());
+            responseVO.setBizId(entity.getBizId());
+            responseVO.setSiteId(entity.getSiteId());
+            responseVO.setRemark(entity.getRemark());
+            responseVO.setCreatedBy(entity.getCreatedBy());
+            responseVO.setCreateTime(entity.getCreateTime());
+            responseVO.setUpdateTime(entity.getUpdateTime());
+            responseVO.setUpdatedBy(entity.getUpdatedBy());
+            responseVO.setVersion(entity.getVersion());
+            // TODO 查询站点名称
+            // responseVO.setSiteName();
+            return responseVO;
+        }).collect(java.util.stream.Collectors.toList());
+
+        return new CommonPage<>(list, page.getTotal(), pageSize, pageNum);
+    }
+
+    @Override
+    public String upload(VppFileArchiveRequestVO vo) {
+        if (vo.getId() == null) {
+            throw new RuntimeException("主键ID不能为空！");
+        }
+
+        LambdaQueryWrapper<VppFileArchive> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(VppFileArchive::getId, vo.getId())
+                .eq(VppFileArchive::getTenantId, SecurityUtils.getTenantId())
+                .eq(VppFileArchive::getDelFlag, 0);
+        VppFileArchive existingRecord = vppFileArchiveMapper.selectOne(queryWrapper);
+
+        if (existingRecord == null) {
+            throw new RuntimeException("档案记录不存在或已被删除！");
+        }
+
+        // 根据 name + url 关联 FilesUpload 表，同步更新文件信息
+        if (StringUtils.isNotBlank(vo.getName()) && StringUtils.isNotBlank(vo.getUrl())) {
+            LambdaQueryWrapper<FilesUpload> fileQueryWrapper = new LambdaQueryWrapper<>();
+            fileQueryWrapper.eq(FilesUpload::getFilesName, vo.getName())
+                    .eq(FilesUpload::getUrl, vo.getUrl())
+                    .eq(FilesUpload::getIsDelete, 0);
+            FilesUpload filesUpload = filesMapper.selectOne(fileQueryWrapper);
+
+            if (filesUpload != null) {
+                existingRecord.setFileName(filesUpload.getFilesName());
+                existingRecord.setFileUrl(filesUpload.getUrl());
+                existingRecord.setFileType(filesUpload.getType());
+                existingRecord.setFileSize(filesUpload.getSize());
+            } else {
+                throw new RuntimeException("未找到匹配的文件记录，请确认文件名与路径是否正确！");
+            }
+        }
+
+        // 仅更新非空字段
+        if (StringUtils.isNotBlank(vo.getArchiveName())) {
+            existingRecord.setArchiveName(vo.getArchiveName());
+        }
+        if (vo.getArchiveType() != null) {
+            existingRecord.setArchiveType(vo.getArchiveType());
+        }
+        if (StringUtils.isNotBlank(vo.getRemark())) {
+            existingRecord.setRemark(vo.getRemark());
+        }
+        if (vo.getSiteId() != null) {
+            existingRecord.setSiteId(vo.getSiteId());
+        }
+
+        // 版本号自增 +0.1
+        String currentVersion = existingRecord.getVersion();
+        if (StringUtils.isNotBlank(currentVersion) && currentVersion.startsWith("V")) {
+            try {
+                double versionNum = Double.parseDouble(currentVersion.substring(1));
+                versionNum += 0.1;
+                existingRecord.setVersion("V" + String.format("%.1f", versionNum));
+            } catch (NumberFormatException e) {
+                existingRecord.setVersion(currentVersion + ".1");
+            }
+        }
+
+        existingRecord.setUpdateTime(LocalDateTime.now());
+        existingRecord.setUpdatedBy(SecurityUtils.getUsername());
+
+        int update = vppFileArchiveMapper.updateById(existingRecord);
+        return update > 0 ? "更新成功！" : "更新失败！";
+    }
+
+    @Override
+    public String delete(Long id) {
+        LambdaQueryWrapper<VppFileArchive> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(VppFileArchive::getId, id)
+                .eq(VppFileArchive::getTenantId, SecurityUtils.getTenantId());
+        VppFileArchive vppFileArchive = vppFileArchiveMapper.selectOne(queryWrapper);
+        vppFileArchive.setDelFlag(1);
+        vppFileArchive.setDeletedTime(LocalDateTime.now());
+        vppFileArchive.setUpdatedBy(SecurityUtils.getUsername());
+        int i = vppFileArchiveMapper.updateById(vppFileArchive);
+        return i > 0 ? "删除成功！" : "删除失败！";
+    }
+
+    /**
+     * 文件大小格式转换工具方法
+     * 按1024进制自动递进换算单位（KB → MB → GB → TB）
+     * @param size 数值型文件大小
+     * @return 带单位后缀的格式化字符串
+     */
+    private String convertFileSize(Double size) {
+        if (size == null || size <= 0) {
+            return "0 B";
+        }
+        final String[] units = {"B", "KB", "MB", "GB", "TB"};
+        int unitIndex = 0;
+        double result = size;
+        while (result >= 1024 && unitIndex < units.length - 1) {
+            result /= 1024;
+            unitIndex++;
+        }
+        return String.format("%.2f %s", result, units[unitIndex]);
+    }
 }

service-vpp/service-vpp-biz/src/main/java/com/usky/vpp/service/vo/VppFileArchiveRequestVO.java

@@ -13,15 +13,70 @@ import javax.validation.constraints.NotBlank;
 @Data
 public class VppFileArchiveRequestVO {
 
+    /**
+     * 主键
+     */
+    private Long id;
+
     /**
      * 文件名
      */
-    @NotBlank(message = "文件名称不能为空")
     private String name;
 
     /**
      * 文件路径
      */
-    @NotBlank(message = "文件路径不能为空")
     private String url;
+
+    /**
+     * 站点主键ID
+     */
+    private Long siteId;
+
+    /**
+     * 档案名称
+     */
+    private String archiveName;
+
+    /**
+     * 档案类型 1图纸 2文档 3设计稿 4验收报告 5其他
+     */
+    private Integer archiveType;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 业务类型
+     */
+    private String bizType;
+
+    /**
+     * 业务主键
+     */
+    private Long bizId;
+
+    /**
+     * 页码
+     */
+    private Integer pageNum;
+
+    /**
+     * 页大小
+     */
+    private Integer pageSize;
+
+    /**
+     * 校验档案类型是否合法
+     * 合法值：1图纸 2文档 3设计稿 4验收报告 5其他
+     * @return true-合法 false-非法
+     */
+    public boolean isValidArchiveType() {
+        if (this.archiveType == null) {
+            return false;
+        }
+        return this.archiveType >= 1 && this.archiveType <= 5;
+    }
 }

service-vpp/service-vpp-biz/src/main/java/com/usky/vpp/service/vo/VppFileArchiveResponseVO.java

@@ -0,0 +1,124 @@
+package com.usky.vpp.service.vo;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.time.LocalDateTime;
+
+/**
+ *
+ * @author fyc
+ * @email yuchuan.fu@chinausky.com
+ * @date 2026/7/1
+ */
+@Data
+public class VppFileArchiveResponseVO {
+
+    /**
+     * 主键
+     */
+    private Long id;
+
+    /**
+     * 档案名称
+     */
+    private String archiveName;
+
+    /**
+     * 原始文件名
+     */
+    private String fileName;
+
+    /**
+     * 存储路径
+     */
+    private String fileUrl;
+
+    /**
+     * 档案类型 1图纸 2文档 3设计稿 4验收报告 5其他
+     */
+    private Integer archiveType;
+
+    /**
+     * 文件类型
+     */
+    private String fileType;
+
+    /**
+     * 文件大小kb
+     */
+    private String fileSize;
+
+    /**
+     * 业务类型
+     */
+    private String bizType;
+
+    /**
+     * 业务主键
+     */
+    private Long bizId;
+
+    /**
+     * 站点id
+     */
+    private Long siteId;
+
+    /**
+     * 站点名称
+     */
+    private String siteName;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 上传人
+     */
+    private String createdBy;
+
+    /**
+     * 创建时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime createTime;
+
+    /**
+     * 更新时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime updateTime;
+
+    /**
+     * 更新人
+     */
+    private String updatedBy;
+
+    /**
+     * 软删除标识 0未删除 1已删除
+     */
+    private Integer isDelete;
+
+    /**
+     * 软删除时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime deleteTime;
+
+    /**
+     * 版本号 默认V1.0
+     */
+    private String version;
+
+    /**
+     * 租户id
+     */
+    private Integer tenantId;
+}