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-02 16:31:38 +08:00
parent a773232cff f983c8e0f2
commit 119945d782
5 changed files with 5 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/handler/GlobalExceptionHandler.java
View File

@ -70,7 +70,7 @@ public class GlobalExceptionHandler {
@ExceptionHandler(Exception.class) @ExceptionHandler(Exception.class)
public ResponseEntity<SingleResponse<Void>> handleUnexpectedException(Exception exception) { public ResponseEntity<SingleResponse<Void>> handleUnexpectedException(Exception exception) {
LOGGER.error("Unhandled controller exception", exception); LOGGER.error("Unhandled controller exception", exception);
return response(HttpStatus.INTERNAL_SERVER_ERROR, SYSTEM_ERROR_CODE, return response(HttpStatus.OK, SYSTEM_ERROR_CODE,
message("system.error", "Internal server error")); message("system.error", "Internal server error"));
} }

11
safety-eval-app/src/main/java/org/qinan/safetyeval/app/orchestrator/QualFilingOrchestrator.java
View File

@ -214,15 +214,7 @@ public class QualFilingOrchestrator {
domainQuery.setSupervision(query.getSupervision()); domainQuery.setSupervision(query.getSupervision());
PageResult<QualFilingEntity> pageResult = qualFilingGateway.page(domainQuery); PageResult<QualFilingEntity> pageResult = qualFilingGateway.page(domainQuery);
List<QualFilingCO> records = pageResult.getRecords().stream() List<QualFilingCO> records = pageResult.getRecords().stream()
.map(entity -> { .map(entity -> toCO(entity))
QualFilingCO co = toCO(entity);
Long originId = entity.getApplyTypeCode() != null
&& entity.getApplyTypeCode() == QualFilingApplyTypeEnum.CHANGE_DRAFT.getCode()
&& entity.getOriginFilingId() != null
? entity.getOriginFilingId() : entity.getId();
co.setChangeCount(qualFilingChangeDetailGateway.countByFilingId(originId));
return co;
})
.collect(Collectors.toList()); .collect(Collectors.toList());
return PageResult.of(records, pageResult.getTotal(), pageResult.getPageNum(), pageResult.getPageSize()); return PageResult.of(records, pageResult.getTotal(), pageResult.getPageNum(), pageResult.getPageSize());
} }
@ -685,6 +677,7 @@ public class QualFilingOrchestrator {
co.setUploadStatusName(entity.getUploadStatusName()); co.setUploadStatusName(entity.getUploadStatusName());
co.setAttachmentDesc(entity.getAttachmentDesc()); co.setAttachmentDesc(entity.getAttachmentDesc());
co.setAttachmentUrl(entity.getAttachmentUrl()); co.setAttachmentUrl(entity.getAttachmentUrl());
co.setMaterialType(entity.getMaterialType());
co.setMaterialRemark(entity.getMaterialRemark()); co.setMaterialRemark(entity.getMaterialRemark());
co.setTenantId(entity.getTenantId()); co.setTenantId(entity.getTenantId());
return co; return co;

17
safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/gatewayimpl/QualFilingGatewayImpl.java
View File

@ -119,23 +119,6 @@ public class QualFilingGatewayImpl implements QualFilingGateway {
if (query.getSupervision()) { if (query.getSupervision()) {
wrapper.ne(QualFilingDO::getFilingStatusCode, 5); wrapper.ne(QualFilingDO::getFilingStatusCode, 5);
} }
// if (SCENE_CHANGE.equals(query.getScene())) {
// applyChangeListFilter(wrapper, query);
// }
// else {
// if (query.getFilingStatusCodes() != null && !query.getFilingStatusCodes().isEmpty()) {
// wrapper.in(QualFilingDO::getFilingStatusCode, query.getFilingStatusCodes());
// }
// else if (query.getFilingStatusCode() != null) {
// wrapper.eq(QualFilingDO::getFilingStatusCode, query.getFilingStatusCode());
// }
// if (query.getApplyTypeCode() != null) {
// wrapper.eq(QualFilingDO::getApplyTypeCode, query.getApplyTypeCode());
// if (query.getApplyTypeCode() == APPLY_TYPE_FILED_MANAGE) {
// wrapper.isNull(QualFilingDO::getOriginFilingId);
// }
// }
// }
wrapper.orderByDesc(QualFilingDO::getCreateTime); wrapper.orderByDesc(QualFilingDO::getCreateTime);
Page<QualFilingDO> page = new Page<>(query.getPageNum(), query.getPageSize()); Page<QualFilingDO> page = new Page<>(query.getPageNum(), query.getPageSize());

2
safety-eval-start/src/main/java/org/qinan/safetyeval/start/SafetyEvalApplication.java
View File

@ -24,7 +24,7 @@ import java.util.List;
* *
* @author safety-eval * @author safety-eval
*/ */
@SpringBootApplication(scanBasePackages = {"org.qinan.safetyeval", "com.jjb.saas"}) @SpringBootApplication(scanBasePackages = {"org.qinan.safetyeval", "com.jjb.saas"},exclude = {com.jjb.saas.framework.datascope.DataScopeConfiguration.class})
@EnableDubbo @EnableDubbo
@EnableFeignClients(basePackages = {"org.qinan.safetyeval", "com.jjb.saas"}) @EnableFeignClients(basePackages = {"org.qinan.safetyeval", "com.jjb.saas"})
@Slf4j @Slf4j

2
safety-eval-start/src/main/resources/nacos/config-common.yml
View File

@ -146,7 +146,7 @@ mysql:
port: ${common.mysql.port} port: ${common.mysql.port}
username: ${common.mysql.username} username: ${common.mysql.username}
password: ${common.mysql.password} password: ${common.mysql.password}
db: jjb_saas_safety_eval db: ${application.name}
open: open:
sdk: sdk: