电子文档接口调整

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

@@ -23,17 +23,29 @@ public class ArchiveController {
      * 创建电子档案
      */
     @PostMapping
-    public ApiResult<String> create(@RequestBody VppFileArchiveRequestVO vo) {
-        return ApiResult.success(vppArchiveService.create(vo));
+    public ApiResult<Boolean> create(@RequestBody VppFileArchiveRequestVO vo) {
+        return vppArchiveService.create(vo) ? ApiResult.success(true) : ApiResult.error("创建电子档案失败！请重试！");
     }
 
     /**
-     * 获取电子档案列表
-     * 只传参 archiveName、 siteId、 pageNum（默认1）、 pageSize（默认20），并且都是非必填项
+     * 查询电子档案
+     * archiveName 档案名称 模糊匹配
+     * archiveType 档案类型 1图纸 2文档 3设计稿 4验收报告 5其他
+     * siteId 站点id
+     * bizType 业务类型
+     * bizId 业务主键
+     * pageNum 页码
+     * pageSize 页大小
      */
     @GetMapping
-    public ApiResult<CommonPage<VppFileArchiveResponseVO>> page(@RequestBody VppFileArchiveRequestVO vo) {
-        return ApiResult.success(vppArchiveService.page(vo));
+    public ApiResult<CommonPage<VppFileArchiveResponseVO>> page(@RequestParam(value = "archiveName", required = false) String archiveName,
+                                                                @RequestParam(value = "archiveType", required = false) Integer archiveType,
+                                                                @RequestParam(value = "siteId", required = false) Long siteId,
+                                                                @RequestParam(value = "bizType", required = false) String bizType,
+                                                                @RequestParam(value = "bizId", required = false) Long bizId,
+                                                                @RequestParam(value = "pageNum", required = false, defaultValue = "1") Integer pageNum,
+                                                                @RequestParam(value = "pageSize", required = false, defaultValue = "20") Integer pageSize) {
+        return ApiResult.success(vppArchiveService.page(archiveName, archiveType, siteId, bizType, bizId, pageNum, pageSize));
     }
 
     /**
@@ -41,15 +53,15 @@ public class ArchiveController {
      * version 字段自增，每次更新+0.1
      */
     @PutMapping
-    public ApiResult<String> upload(@RequestBody VppFileArchiveRequestVO vo) {
-        return ApiResult.success(vppArchiveService.upload(vo));
+    public ApiResult<Boolean> upload(@RequestBody VppFileArchiveRequestVO vo) {
+        return vppArchiveService.upload(vo) ? ApiResult.success(true) : ApiResult.error("更新电子档案失败！请重试！");
     }
 
     /**
      * 删除电子档案
      */
     @DeleteMapping(value = "/{id}")
-    public ApiResult<String> delete(@PathVariable("id") Long id) {
-        return ApiResult.success(vppArchiveService.delete(id));
+    public ApiResult<Boolean> delete(@PathVariable("id") Long id) {
+        return vppArchiveService.delete(id) ? ApiResult.success(true) : ApiResult.error("删除电子档案失败！请重试！");
     }
 }

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

@@ -109,7 +109,7 @@ public class VppFileArchive implements Serializable {
     /**
      * 软删除标识 0未删除 1已删除
      */
-    private Integer delFlag;
+    private Integer deleteFlag;
 
     /**
      * 软删除时间

service-vpp/service-vpp-biz/src/main/java/com/usky/vpp/job/VppUnPollScheduler.java

@@ -22,7 +22,7 @@ public class VppUnPollScheduler {
     @Autowired
     private VppUnIntegrationService integrationService;
 
-    @Scheduled(fixedDelayString = "#{${vpp.un.poll-interval-sec:10} * 1000}")
+    //@Scheduled(fixedDelayString = "#{${vpp.un.poll-interval-sec:10} * 1000}")
     public void pollUn() {
         if (!properties.isPollActive()) {
             return;

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

@@ -15,11 +15,11 @@ public interface VppArchiveService {
         return null;
     }
 
-    String create(VppFileArchiveRequestVO vo);
+    Boolean create(VppFileArchiveRequestVO vo);
 
-    CommonPage<VppFileArchiveResponseVO> page(VppFileArchiveRequestVO vo);
+    CommonPage<VppFileArchiveResponseVO> page(String archiveName, Integer archiveType, Long siteId, String bizType, Long bizId, Integer pageNum, Integer pageSize);
 
-    String upload(VppFileArchiveRequestVO vo);
+    Boolean upload(VppFileArchiveRequestVO vo);
 
-    String delete(Long id);
+    Boolean delete(Long id);
 }

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

@@ -31,7 +31,7 @@ public class VppArchiveServiceImpl implements VppArchiveService {
     private VppFileArchiveMapper vppFileArchiveMapper;
 
     @Override
-    public String create(VppFileArchiveRequestVO vo) {
+    public Boolean create(VppFileArchiveRequestVO vo) {
         String username = SecurityUtils.getUsername();
         Integer tenantId = SecurityUtils.getTenantId();
 
@@ -57,24 +57,24 @@ public class VppArchiveServiceImpl implements VppArchiveService {
         vppFileArchive.setVersion("V1.0");
         vppFileArchive.setTenantId(tenantId);
         vppFileArchive.setRemark(StringUtils.isNotBlank(vo.getRemark()) ? vo.getRemark() : "");
-        vppFileArchive.setDelFlag(0);
+        vppFileArchive.setDeleteFlag(0);
         int insert = vppFileArchiveMapper.insert(vppFileArchive);
 
-        return insert > 0 ? "新增成功！" : "新增失败！";
+        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;
+    public CommonPage<VppFileArchiveResponseVO> page(String archiveName, Integer archiveType, Long siteId, String bizType, Long bizId, Integer pageNum, Integer pageSize) {
         IPage<VppFileArchive> page = new Page<>(pageNum, pageSize);
 
         LambdaQueryWrapper<VppFileArchive> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.eq(VppFileArchive::getDelFlag, 0)
+        queryWrapper.eq(VppFileArchive::getDeleteFlag, 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())
+                .eq(siteId != null, VppFileArchive::getSiteId, siteId)
+                .eq(archiveType != null, VppFileArchive::getArchiveType, archiveType)
+                .eq(StringUtils.isNotBlank(bizType), VppFileArchive::getBizType, bizType)
+                .eq(bizId != null, VppFileArchive::getBizId, bizId)
+                .like(StringUtils.isNotBlank(archiveName), VppFileArchive::getArchiveName, archiveName)
                 .orderByDesc(VppFileArchive::getCreateTime);
         page = vppFileArchiveMapper.selectPage(page, queryWrapper);
 
@@ -105,7 +105,7 @@ public class VppArchiveServiceImpl implements VppArchiveService {
     }
 
     @Override
-    public String upload(VppFileArchiveRequestVO vo) {
+    public Boolean upload(VppFileArchiveRequestVO vo) {
         if (vo.getId() == null) {
             throw new RuntimeException("主键ID不能为空！");
         }
@@ -113,7 +113,7 @@ public class VppArchiveServiceImpl implements VppArchiveService {
         LambdaQueryWrapper<VppFileArchive> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(VppFileArchive::getId, vo.getId())
                 .eq(VppFileArchive::getTenantId, SecurityUtils.getTenantId())
-                .eq(VppFileArchive::getDelFlag, 0);
+                .eq(VppFileArchive::getDeleteFlag, 0);
         VppFileArchive existingRecord = vppFileArchiveMapper.selectOne(queryWrapper);
 
         if (existingRecord == null) {
@@ -168,20 +168,20 @@ public class VppArchiveServiceImpl implements VppArchiveService {
         existingRecord.setUpdatedBy(SecurityUtils.getUsername());
 
         int update = vppFileArchiveMapper.updateById(existingRecord);
-        return update > 0 ? "更新成功！" : "更新失败！";
+        return update > 0;
     }
 
     @Override
-    public String delete(Long id) {
+    public Boolean 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.setDeleteFlag(1);
         vppFileArchive.setDeletedTime(LocalDateTime.now());
         vppFileArchive.setUpdatedBy(SecurityUtils.getUsername());
         int i = vppFileArchiveMapper.updateById(vppFileArchive);
-        return i > 0 ? "删除成功！" : "删除失败！";
+        return i > 0;
     }
 
     /**