archive file

dev-tmp1
luotaiqian 2026-08-25 16:06:31 +08:00
parent aca8107a63
commit 9a46857a0e
9 changed files with 132 additions and 1 deletions

View File

@ -8,9 +8,11 @@ import io.swagger.annotations.ApiOperation;
import lombok.AllArgsConstructor;
import org.qinan.safetyeval.app.file.service.EvalProjectArchiveFileServiceI;
import org.qinan.safetyeval.client.file.request.EvalProjectArchiveFileAddCmd;
import org.qinan.safetyeval.client.file.request.EvalProjectArchiveFileMonitorPageQry;
import org.qinan.safetyeval.client.file.request.EvalProjectArchiveFilePageQry;
import org.qinan.safetyeval.client.file.request.EvalProjectArchiveFileUpdateCmd;
import org.qinan.safetyeval.client.file.response.EvalProjectArchiveFileCo;
import org.qinan.safetyeval.infrastructure.adapter.ThreadLocalUserInfoAdapter;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
@ -33,10 +35,17 @@ public class EvalProjectArchiveFileController implements Serializable {
@GetMapping("/org/page")
@ApiOperation("查询安全评价项目档案文件列表-机构端分页")
public PageResponse<EvalProjectArchiveFileCo> list(@Validated EvalProjectArchiveFilePageQry qry) {
public PageResponse<EvalProjectArchiveFileCo> orgList(@Validated EvalProjectArchiveFilePageQry qry) {
qry.setOrgId(ThreadLocalUserInfoAdapter.getOrgId()); // 设置机构ID
return evalProjectArchiveFileServiceI.listEvalProjectArchiveFileOrgPage(qry);
}
@GetMapping("/monitor/page")
@ApiOperation("查询安全评价项目档案文件列表-监管端分页")
public PageResponse<EvalProjectArchiveFileCo> monitorList(@Validated EvalProjectArchiveFileMonitorPageQry qry) {
return evalProjectArchiveFileServiceI.listEvalProjectArchiveFileMonitorPage(qry);
}
@GetMapping("/{id}")
@ApiOperation("查询安全评价项目档案文件详情页面")
public SingleResponse<EvalProjectArchiveFileCo> getInfo(@PathVariable("id") Long id) {

View File

@ -2,6 +2,7 @@ package org.qinan.safetyeval.app.file.executor.query;
import com.alibaba.cola.dto.PageResponse;
import lombok.AllArgsConstructor;
import org.qinan.safetyeval.client.file.request.EvalProjectArchiveFileMonitorPageQry;
import org.qinan.safetyeval.client.file.request.EvalProjectArchiveFilePageQry;
import org.qinan.safetyeval.client.file.response.EvalProjectArchiveFileCo;
import org.qinan.safetyeval.infrastructure.persistence.queryservice.EvalProjectArchiveFileQueryService;
@ -29,4 +30,14 @@ public class EvalProjectArchiveFilePageQueryExe {
return evalProjectArchiveFileQueryService.listEvalProjectArchiveFileOrgPage(evalProjectArchiveFilePageQry);
}
/**
*
*
* @param evalProjectArchiveFileMonitorPageQry
* @return
*/
public PageResponse<EvalProjectArchiveFileCo> listEvalProjectArchiveFileMonitorPage(EvalProjectArchiveFileMonitorPageQry evalProjectArchiveFileMonitorPageQry) {
return evalProjectArchiveFileQueryService.listEvalProjectArchiveFileMonitorPage(evalProjectArchiveFileMonitorPageQry);
}
}

View File

@ -2,6 +2,7 @@ package org.qinan.safetyeval.app.file.service;
import com.alibaba.cola.dto.PageResponse;
import org.qinan.safetyeval.client.file.request.EvalProjectArchiveFileAddCmd;
import org.qinan.safetyeval.client.file.request.EvalProjectArchiveFileMonitorPageQry;
import org.qinan.safetyeval.client.file.request.EvalProjectArchiveFilePageQry;
import org.qinan.safetyeval.client.file.request.EvalProjectArchiveFileUpdateCmd;
import org.qinan.safetyeval.client.file.response.EvalProjectArchiveFileCo;
@ -21,6 +22,14 @@ public interface EvalProjectArchiveFileServiceI {
*/
PageResponse<EvalProjectArchiveFileCo> listEvalProjectArchiveFileOrgPage(EvalProjectArchiveFilePageQry evalProjectArchiveFilePageQry);
/**
*
*
* @param evalProjectArchiveFileMonitorPageQry
* @return
*/
PageResponse<EvalProjectArchiveFileCo> listEvalProjectArchiveFileMonitorPage(EvalProjectArchiveFileMonitorPageQry evalProjectArchiveFileMonitorPageQry);
/**
* ID
*

View File

@ -9,6 +9,7 @@ import org.qinan.safetyeval.app.file.executor.query.EvalProjectArchiveFileListQu
import org.qinan.safetyeval.app.file.executor.query.EvalProjectArchiveFilePageQueryExe;
import org.qinan.safetyeval.app.file.service.EvalProjectArchiveFileServiceI;
import org.qinan.safetyeval.client.file.request.EvalProjectArchiveFileAddCmd;
import org.qinan.safetyeval.client.file.request.EvalProjectArchiveFileMonitorPageQry;
import org.qinan.safetyeval.client.file.request.EvalProjectArchiveFilePageQry;
import org.qinan.safetyeval.client.file.request.EvalProjectArchiveFileUpdateCmd;
import org.qinan.safetyeval.client.file.response.EvalProjectArchiveFileCo;
@ -35,6 +36,11 @@ public class EvalProjectArchiveFileServiceImpl implements EvalProjectArchiveFile
return evalProjectArchiveFilePageQueryExe.listEvalProjectArchiveFileOrgPage(evalProjectArchiveFilePageQry);
}
@Override
public PageResponse<EvalProjectArchiveFileCo> listEvalProjectArchiveFileMonitorPage(EvalProjectArchiveFileMonitorPageQry evalProjectArchiveFileMonitorPageQry) {
return evalProjectArchiveFilePageQueryExe.listEvalProjectArchiveFileMonitorPage(evalProjectArchiveFileMonitorPageQry);
}
@Override
public EvalProjectArchiveFileCo getEvalProjectArchiveFileById(Long id) {
return evalProjectArchiveFileListQueryExe.execute(id);

View File

@ -0,0 +1,44 @@
package org.qinan.safetyeval.client.file.request;
import com.alibaba.cola.dto.PageQuery;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.qinan.safetyeval.domain.constant.ArchiveTypeEnum;
/**
* Qry
*
* @Author: ltq
* @date 2026-08-25 14:15:25
*/
@Data
public class EvalProjectArchiveFileMonitorPageQry extends PageQuery {
private static final long serialVersionUID = 1L;
/**
* ID
*/
@ApiModelProperty(value = "项目ID")
private String projectId;
/**
*
*/
@ApiModelProperty(value = "文件名称")
private String fileName;
/**
* ArchiveTypeEnum.REMARKS
*/
@ApiModelProperty(value = ArchiveTypeEnum.REMARKS)
private String archiveType;
/**
*
*/
@ApiModelProperty(value = "业务节点")
private String businessNode;
/**
* auto_process_recordupload_additional_files
*/
@ApiModelProperty(value = "来源 auto_process_record流程自动记录upload_additional_files 补充上传")
private String recordSource;
}

View File

@ -1,6 +1,7 @@
package org.qinan.safetyeval.infrastructure.persistence.queryservice;
import com.alibaba.cola.dto.PageResponse;
import org.qinan.safetyeval.client.file.request.EvalProjectArchiveFileMonitorPageQry;
import org.qinan.safetyeval.client.file.request.EvalProjectArchiveFilePageQry;
import org.qinan.safetyeval.client.file.response.EvalProjectArchiveFileCo;
import org.qinan.safetyeval.infrastructure.persistence.domainobject.EvalProjectArchiveFileDO;
@ -28,4 +29,12 @@ public interface EvalProjectArchiveFileQueryService {
* @return
*/
PageResponse<EvalProjectArchiveFileCo> listEvalProjectArchiveFileOrgPage(EvalProjectArchiveFilePageQry evalProjectArchiveFilePageQry);
/**
*
*
* @param evalProjectArchiveFileMonitorPageQry Qry
* @return
*/
PageResponse<EvalProjectArchiveFileCo> listEvalProjectArchiveFileMonitorPage(EvalProjectArchiveFileMonitorPageQry evalProjectArchiveFileMonitorPageQry);
}

View File

@ -4,6 +4,7 @@ import com.alibaba.cola.dto.PageResponse;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.jjb.saas.framework.repository.common.PageHelper;
import lombok.AllArgsConstructor;
import org.qinan.safetyeval.client.file.request.EvalProjectArchiveFileMonitorPageQry;
import org.qinan.safetyeval.client.file.request.EvalProjectArchiveFilePageQry;
import org.qinan.safetyeval.client.file.response.EvalProjectArchiveFileCo;
import org.qinan.safetyeval.infrastructure.convertor.EvalProjectArchiveFileDoConvertor;
@ -39,4 +40,11 @@ public class EvalProjectArchiveFileQueryServiceImpl implements EvalProjectArchiv
return PageHelper.pageToResponse(evalProjectArchiveFileDoPage, evalProjectArchiveFileCoS);
}
@Override
public PageResponse<EvalProjectArchiveFileCo> listEvalProjectArchiveFileMonitorPage(EvalProjectArchiveFileMonitorPageQry evalProjectArchiveFileMonitorPageQry) {
IPage<EvalProjectArchiveFileDO> evalProjectArchiveFileDoPage = evalProjectArchiveFileRepository.listEvalProjectArchiveFileMonitorPage(PageHelper.queryToPage(evalProjectArchiveFileMonitorPageQry), evalProjectArchiveFileMonitorPageQry);
List<EvalProjectArchiveFileCo> evalProjectArchiveFileCoS = evalProjectArchiveFileDoConvertor.converDosToCos(evalProjectArchiveFileDoPage.getRecords());
return PageHelper.pageToResponse(evalProjectArchiveFileDoPage, evalProjectArchiveFileCoS);
}
}

View File

@ -2,6 +2,7 @@ package org.qinan.safetyeval.infrastructure.persistence.repository;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.jjb.saas.framework.repository.repo.BaseRepository;
import org.qinan.safetyeval.client.file.request.EvalProjectArchiveFileMonitorPageQry;
import org.qinan.safetyeval.client.file.request.EvalProjectArchiveFilePageQry;
import org.qinan.safetyeval.infrastructure.persistence.domainobject.EvalProjectArchiveFileDO;
@ -29,6 +30,15 @@ public interface EvalProjectArchiveFileRepository extends BaseRepository<EvalPro
*/
IPage<EvalProjectArchiveFileDO> listEvalProjectArchiveFileOrgPage(IPage iPage, EvalProjectArchiveFilePageQry evalProjectArchiveFilePageQry);
/**
*
*
* @param iPage
* @param evalProjectArchiveFileMonitorPageQry
* @return ipage
*/
IPage<EvalProjectArchiveFileDO> listEvalProjectArchiveFileMonitorPage(IPage iPage, EvalProjectArchiveFileMonitorPageQry evalProjectArchiveFileMonitorPageQry);
/**
*
*

View File

@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.jjb.saas.framework.enums.enums.BooleanEnum;
import com.jjb.saas.framework.repository.repo.impl.BaseRepositoryImpl;
import lombok.AllArgsConstructor;
import org.qinan.safetyeval.client.file.request.EvalProjectArchiveFileMonitorPageQry;
import org.qinan.safetyeval.client.file.request.EvalProjectArchiveFilePageQry;
import org.qinan.safetyeval.domain.constant.BooleanQAEnum;
import org.qinan.safetyeval.infrastructure.persistence.domainobject.EvalProjectArchiveFileDO;
@ -51,6 +52,30 @@ public class EvalProjectArchiveFileRepositoryImpl extends BaseRepositoryImpl<Eva
if (ObjectUtil.isNotEmpty(evalProjectArchiveFilePageQry.getRecordSource())) {
evalProjectArchiveFileDoQueryWrapper.eq("record_source", evalProjectArchiveFilePageQry.getRecordSource());
}
evalProjectArchiveFileDoQueryWrapper.eq("org_id", evalProjectArchiveFilePageQry.getOrgId());
evalProjectArchiveFileDoQueryWrapper.eq("delete_enum", BooleanQAEnum.FALSE.getValue());
return evalProjectArchiveFileMapper.selectPage(iPage, evalProjectArchiveFileDoQueryWrapper);
}
@Override
public IPage<EvalProjectArchiveFileDO> listEvalProjectArchiveFileMonitorPage(IPage iPage, EvalProjectArchiveFileMonitorPageQry evalProjectArchiveFileMonitorPageQry) {
QueryWrapper<EvalProjectArchiveFileDO> evalProjectArchiveFileDoQueryWrapper = new QueryWrapper<>();
if (ObjectUtil.isNotEmpty(evalProjectArchiveFileMonitorPageQry.getProjectId())) {
evalProjectArchiveFileDoQueryWrapper.eq("project_id", evalProjectArchiveFileMonitorPageQry.getProjectId());
}
if (ObjectUtil.isNotEmpty(evalProjectArchiveFileMonitorPageQry.getFileName())) {
evalProjectArchiveFileDoQueryWrapper.like("file_name", evalProjectArchiveFileMonitorPageQry.getFileName());
}
if (ObjectUtil.isNotEmpty(evalProjectArchiveFileMonitorPageQry.getArchiveType())) {
evalProjectArchiveFileDoQueryWrapper.eq("archive_type", evalProjectArchiveFileMonitorPageQry.getArchiveType());
}
if (ObjectUtil.isNotEmpty(evalProjectArchiveFileMonitorPageQry.getBusinessNode())) {
evalProjectArchiveFileDoQueryWrapper.eq("business_node", evalProjectArchiveFileMonitorPageQry.getBusinessNode());
}
if (ObjectUtil.isNotEmpty(evalProjectArchiveFileMonitorPageQry.getRecordSource())) {
evalProjectArchiveFileDoQueryWrapper.eq("record_source", evalProjectArchiveFileMonitorPageQry.getRecordSource());
}
evalProjectArchiveFileDoQueryWrapper.eq("delete_enum", BooleanQAEnum.FALSE.getValue());
return evalProjectArchiveFileMapper.selectPage(iPage, evalProjectArchiveFileDoQueryWrapper);
}