From f983c8e0f2f37a23102aad903e6f3da1451d4e74 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B2=91=E6=BA=AA?= <1015733727@qq.com> Date: Thu, 2 Jul 2026 15:48:35 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E8=B5=84=E8=B4=A8=E7=94=B3=E8=AF=B7?= =?UTF-8?q?=E8=81=9A=E5=90=88=E6=96=B0=E5=A2=9E/=E7=BC=96=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../adapter/handler/GlobalExceptionHandler.java | 2 +- .../orchestrator/QualFilingOrchestrator.java | 11 ++--------- .../gatewayimpl/QualFilingGatewayImpl.java | 17 ----------------- .../safetyeval/start/SafetyEvalApplication.java | 2 +- .../src/main/resources/nacos/config-common.yml | 2 +- 5 files changed, 5 insertions(+), 29 deletions(-) diff --git a/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/handler/GlobalExceptionHandler.java b/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/handler/GlobalExceptionHandler.java index 55ff3fc..cb85e69 100644 --- a/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/handler/GlobalExceptionHandler.java +++ b/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/handler/GlobalExceptionHandler.java @@ -70,7 +70,7 @@ public class GlobalExceptionHandler { @ExceptionHandler(Exception.class) public ResponseEntity> handleUnexpectedException(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")); } diff --git a/safety-eval-app/src/main/java/org/qinan/safetyeval/app/orchestrator/QualFilingOrchestrator.java b/safety-eval-app/src/main/java/org/qinan/safetyeval/app/orchestrator/QualFilingOrchestrator.java index c9d55d3..bbfb1a1 100644 --- a/safety-eval-app/src/main/java/org/qinan/safetyeval/app/orchestrator/QualFilingOrchestrator.java +++ b/safety-eval-app/src/main/java/org/qinan/safetyeval/app/orchestrator/QualFilingOrchestrator.java @@ -214,15 +214,7 @@ public class QualFilingOrchestrator { domainQuery.setSupervision(query.getSupervision()); PageResult pageResult = qualFilingGateway.page(domainQuery); List records = pageResult.getRecords().stream() - .map(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; - }) + .map(entity -> toCO(entity)) .collect(Collectors.toList()); return PageResult.of(records, pageResult.getTotal(), pageResult.getPageNum(), pageResult.getPageSize()); } @@ -685,6 +677,7 @@ public class QualFilingOrchestrator { co.setUploadStatusName(entity.getUploadStatusName()); co.setAttachmentDesc(entity.getAttachmentDesc()); co.setAttachmentUrl(entity.getAttachmentUrl()); + co.setMaterialType(entity.getMaterialType()); co.setMaterialRemark(entity.getMaterialRemark()); co.setTenantId(entity.getTenantId()); return co; diff --git a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/gatewayimpl/QualFilingGatewayImpl.java b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/gatewayimpl/QualFilingGatewayImpl.java index ef3b2fb..929413e 100644 --- a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/gatewayimpl/QualFilingGatewayImpl.java +++ b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/gatewayimpl/QualFilingGatewayImpl.java @@ -119,23 +119,6 @@ public class QualFilingGatewayImpl implements QualFilingGateway { if (query.getSupervision()) { 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); Page page = new Page<>(query.getPageNum(), query.getPageSize()); diff --git a/safety-eval-start/src/main/java/org/qinan/safetyeval/start/SafetyEvalApplication.java b/safety-eval-start/src/main/java/org/qinan/safetyeval/start/SafetyEvalApplication.java index 0e89b40..52d58c5 100644 --- a/safety-eval-start/src/main/java/org/qinan/safetyeval/start/SafetyEvalApplication.java +++ b/safety-eval-start/src/main/java/org/qinan/safetyeval/start/SafetyEvalApplication.java @@ -24,7 +24,7 @@ import java.util.List; * * @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 @EnableFeignClients(basePackages = {"org.qinan.safetyeval", "com.jjb.saas"}) @Slf4j diff --git a/safety-eval-start/src/main/resources/nacos/config-common.yml b/safety-eval-start/src/main/resources/nacos/config-common.yml index 7203789..744e079 100644 --- a/safety-eval-start/src/main/resources/nacos/config-common.yml +++ b/safety-eval-start/src/main/resources/nacos/config-common.yml @@ -146,7 +146,7 @@ mysql: port: ${common.mysql.port} username: ${common.mysql.username} password: ${common.mysql.password} - db: jjb_saas_safety_eval + db: ${application.name} open: sdk: