cq_anquan
/
safety-eval-service
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

archive file

dev-tmp1
luotaiqian 2026-08-25 17:57:20 +08:00
parent c71b875c4d
commit d188d191ad
10 changed files with 24 additions and 90 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/institution/EvalProcessControlExecutor.java
View File

@ -545,27 +545,24 @@ public class EvalProcessControlExecutor implements EvalProcessControlApi {
return;
}
for (EvalProjectFileCO file : files) {
ProjectStageEnum stage = resolveStageByMsg(file.getProcessName());
for (JSONObject obj : parseFileUrlObjects(file.getProjectDocUrl())) {
if (!StringUtils.hasText(obj.getStr("url"))) {
if (!StringUtils.hasText(file.getProjectDocUrl())) {
continue;
}
evalProjectArchiveFileMapper.insert(buildArchiveFileDO(projectId, project, file, stage, obj));
}
ProjectStageEnum stage = resolveStageByMsg(file.getProcessName());
evalProjectArchiveFileMapper.insert(buildArchiveFileDO(projectId, project, file, stage));
}
}
/**
* 构建单条档案文件记录：archiveType 按业务节点映射 ArchiveTypeEnum，businessNode 存 ProjectStageEnum 英文标识。
* 构建单条档案文件记录：files 存文件 JSON 数组原文，archiveType 按业务节点映射 ArchiveTypeEnum，
* businessNode 存 ProjectStageEnum 英文标识。
*/
private EvalProjectArchiveFileDO buildArchiveFileDO(Long projectId, EvalProjectEntity project,
EvalProjectFileCO file, ProjectStageEnum stage, JSONObject obj) {
String urlName = obj.getStr("name");
EvalProjectFileCO file, ProjectStageEnum stage) {
EvalProjectArchiveFileDO archiveFileDO = new EvalProjectArchiveFileDO();
archiveFileDO.setOrgId(project.getOrgId());
archiveFileDO.setProjectId(String.valueOf(projectId));
archiveFileDO.setFileUrl(obj.getStr("url"));
archiveFileDO.setFileName(StringUtils.hasText(urlName) ? urlName : file.getItemName());
archiveFileDO.setFiles(file.getProjectDocUrl());
archiveFileDO.setArchiveType(resolveArchiveType(stage).getCode());
archiveFileDO.setBusinessNode(stage != null ? stage.getVal() : file.getProcessName());
archiveFileDO.setRecordSource(ProjectArchiveFileSourceEnum.AUTO_PROCESS_RECORD.getCode());
@ -642,28 +639,6 @@ public class EvalProcessControlExecutor implements EvalProcessControlApi {
return files;
}
/**
* 将文件 projectDocUrl（JSON 数组字符串，如 [{"url":"...","name":"..."}]）解析为对象列表。
* 非数组、解析失败或为空时返回空列表。
*/
private List<JSONObject> parseFileUrlObjects(String projectDocUrl) {
List<JSONObject> result = new ArrayList<>();
if (!StringUtils.hasText(projectDocUrl)) {
return result;
}
try {
JSONArray array = JSONUtil.parseArray(projectDocUrl);
for (Object obj : array) {
if (obj instanceof JSONObject) {
result.add((JSONObject) obj);
}
}
} catch (Exception e) {
log.error(e.getMessage(), e);
}
return result;
}
/**
* 验证项目所有签字任务是否已完成（taskStatusCode=2 已签）。
* 无签字任务或存在未完成/未作废的任务均视为未完成。

10
safety-eval-client/src/main/java/org/qinan/safetyeval/client/file/request/EvalProjectArchiveFileAddCmd.java
View File

@ -22,13 +22,9 @@ public class EvalProjectArchiveFileAddCmd implements Serializable {
@NotBlank(message = "项目ID不能为空")
private String projectId;
@ApiModelProperty(value = "文件地址", required = true)
@NotBlank(message = "文件地址不能为空")
private String fileUrl;
@ApiModelProperty(value = "文件名称", required = true)
@Size(max = 100, message = "文件名称长度不能超过100")
private String fileName;
@ApiModelProperty(value = "文件列表（JSON 数组，如 [{\"url\":\"...\",\"name\":\"...\"}]）", required = true)
@NotBlank(message = "文件列表不能为空")
private String files;
@ApiModelProperty(value = ArchiveTypeEnum.REMARKS, required = true)
@NotBlank(message = ArchiveTypeEnum.REMARKS + "不能为空")

5
safety-eval-client/src/main/java/org/qinan/safetyeval/client/file/request/EvalProjectArchiveFileMonitorPageQry.java
View File

@ -21,11 +21,6 @@ public class EvalProjectArchiveFileMonitorPageQry extends PageQuery {
@ApiModelProperty(value = "项目ID")
private String projectId;
/**
* 文件名称
*/
@ApiModelProperty(value = "文件名称")
private String fileName;
/**
* ArchiveTypeEnum.REMARKS
*/

5
safety-eval-client/src/main/java/org/qinan/safetyeval/client/file/request/EvalProjectArchiveFilePageQry.java
View File

@ -21,11 +21,6 @@ public class EvalProjectArchiveFilePageQry extends PageQuery {
@ApiModelProperty(value = "项目ID")
private String projectId;
/**
* 文件名称
*/
@ApiModelProperty(value = "文件名称")
private String fileName;
/**
* ArchiveTypeEnum.REMARKS
*/

14
safety-eval-client/src/main/java/org/qinan/safetyeval/client/file/request/EvalProjectArchiveFileUpdateCmd.java
View File

@ -28,17 +28,11 @@ public class EvalProjectArchiveFileUpdateCmd implements Serializable {
@NotBlank(message = "项目ID不能为空")
private String projectId;
/**
* 文件地址
* 文件列表（JSON 数组，如 [{"url":"...","name":"..."}]）
*/
@ApiModelProperty(value = "文件地址", required = true)
@NotBlank(message = "文件地址不能为空")
private String fileUrl;
/**
* 文件名称
*/
@ApiModelProperty(value = "文件名称", required = true)
@NotBlank(message = "文件名称不能为空")
private String fileName;
@ApiModelProperty(value = "文件列表（JSON 数组，如 [{\"url\":\"...\",\"name\":\"...\"}]）", required = true)
@NotBlank(message = "文件列表不能为空")
private String files;
/**
* ArchiveTypeEnum.REMARKS
*/

11
safety-eval-client/src/main/java/org/qinan/safetyeval/client/file/response/EvalProjectArchiveFileCo.java
View File

@ -23,15 +23,10 @@ public class EvalProjectArchiveFileCo extends ClientObject {
@ApiModelProperty(value = "项目ID")
private String projectId;
/**
* 文件地址
* 文件列表（JSON 数组，如 [{"url":"...","name":"..."}]）
*/
@ApiModelProperty(value = "文件地址")
private String fileUrl;
/**
* 文件名称
*/
@ApiModelProperty(value = "文件名称")
private String fileName;
@ApiModelProperty(value = "文件列表")
private String files;
/**
* ArchiveTypeEnum.REMARKS
*/

8
safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/file/model/EvalProjectArchiveFileE.java
View File

@ -25,13 +25,9 @@ public class EvalProjectArchiveFileE extends BaseE {
*/
private String projectId;
/**
* 文件地址
* 文件列表（JSON 数组，如 [{"url":"...","name":"..."}]）
*/
private String fileUrl;
/**
* 文件名称
*/
private String fileName;
private String files;
/**
* ArchiveTypeEnum.REMARKS
*/

8
safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/persistence/domainobject/EvalProjectArchiveFileDO.java
View File

@ -22,13 +22,9 @@ public class EvalProjectArchiveFileDO extends BaseDO {
*/
private String projectId;
/**
* 文件地址
* 文件列表（JSON 数组，如 [{"url":"...","name":"..."}]）
*/
private String fileUrl;
/**
* 文件名称
*/
private String fileName;
private String files;
/**
* ArchiveTypeEnum.REMARKS
*/

6
safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/persistence/repository/impl/EvalProjectArchiveFileRepositoryImpl.java
View File

@ -40,9 +40,6 @@ public class EvalProjectArchiveFileRepositoryImpl extends BaseRepositoryImpl<Eva
evalProjectArchiveFileDoQueryWrapper.eq("project_id", evalProjectArchiveFilePageQry.getProjectId());
}
if (ObjectUtil.isNotEmpty(evalProjectArchiveFilePageQry.getFileName())) {
evalProjectArchiveFileDoQueryWrapper.like("file_name", evalProjectArchiveFilePageQry.getFileName());
}
if (ObjectUtil.isNotEmpty(evalProjectArchiveFilePageQry.getArchiveType())) {
evalProjectArchiveFileDoQueryWrapper.eq("archive_type", evalProjectArchiveFilePageQry.getArchiveType());
}
@ -63,9 +60,6 @@ public class EvalProjectArchiveFileRepositoryImpl extends BaseRepositoryImpl<Eva
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());
}

6
safety-eval-infrastructure/src/main/resources/mapper/EvalProjectArchiveFileMapper.xml
View File

@ -7,8 +7,7 @@
id="EvalProjectArchiveFileResult">
<id property="id" column="id"/>
<result property="projectId" column="project_id"/>
<result property="fileUrl" column="file_url"/>
<result property="fileName" column="file_name"/>
<result property="files" column="files"/>
<result property="archiveType" column="archive_type"/>
<result property="businessNode" column="business_node"/>
<result property="recordSource" column="record_source"/>
@ -29,8 +28,7 @@
<sql id="selectEvalProjectArchiveFile">
select id,
project_id,
file_url,
file_name,
files,
archive_type,
business_node,
record_source,