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

Merge remote-tracking branch 'origin/dev' into dev

dev
luotaiqian 2026-07-24 09:56:19 +08:00
parent a1a2757654 b3448f97fe
commit 1b2f50e102
3 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/WpsExecutor.java
View File

@ -10,6 +10,7 @@ import org.qinan.safetyeval.client.co.WpsDocOpenCO;
import org.qinan.safetyeval.client.co.WpsFileCO;
import org.qinan.safetyeval.client.co.WpsPermissionCO;
import org.qinan.safetyeval.client.co.WpsUserCO;
import org.qinan.safetyeval.domain.constant.ProjectStageEnum;
import org.qinan.safetyeval.domain.entity.AccountEntity;
import org.qinan.safetyeval.domain.entity.FileStorage;
import org.qinan.safetyeval.domain.entity.WpsDocEntity;
@ -18,9 +19,11 @@ import org.qinan.safetyeval.domain.exception.BizException;
import org.qinan.safetyeval.domain.exception.ErrorCode;
import org.qinan.safetyeval.domain.gateway.AccountGateway;
import org.qinan.safetyeval.domain.service.FileStorageDomainService;
import org.qinan.safetyeval.domain.service.ProjectStageSyncService;
import org.qinan.safetyeval.domain.service.WpsDocDomainService;
import org.qinan.safetyeval.infrastructure.adapter.ThreadLocalUserInfoAdapter;
import org.qinan.safetyeval.infrastructure.adapter.auth.AuthUserContextAdapter;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@ -59,6 +62,8 @@ public class WpsExecutor implements WpsApi {
@Value("${wps.def-docx-url:}")
private String defDocxUrl;
@Autowired
private ProjectStageSyncService projectStageSyncService;
@Override
public Map<String, Object> getFileInfo(String fileId) {
@ -245,6 +250,8 @@ public class WpsExecutor implements WpsApi {
WpsDocEntity updated = wpsDocDomainService.completeSave(doc, versionEntity);
log.info("wps upload complete, body={}", JSON.toJSONString(body));
// 修改节点状态
projectStageSyncService.onNodeCompleted(doc.getProjectId(), ProjectStageEnum.REPORT_PREPARATION.getNode());
return ok(wpsCmdConvertor.toFileCO(updated));
} catch (BizException e) {
return fail(e);

5
safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/dataobject/WpsDocDO.java
View File

@ -44,4 +44,9 @@ public class WpsDocDO {
private Integer pendingResourceId;
private String pendingDownloadUrl;
private Long pendingSize;
/**
* 项目id
*/
private Long projectId;
}

4
safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/dataobject/WpsDocVersionDO.java
View File

@ -33,4 +33,8 @@ public class WpsDocVersionDO {
private Long tenantId;
private LocalDateTime createTime;
private LocalDateTime updateTime;
/**
* 项目id
*/
private Long projectId;
}