From 0c27030989fa9cece7c5b2daeb81271351b97fcc Mon Sep 17 00:00:00 2001 From: luotaiqian <1147642922@qq.com> Date: Fri, 3 Jul 2026 14:38:35 +0800 Subject: [PATCH] message --- .../adapter/web/AccountController.java | 24 +++++++------------ .../web/QualFilingChangeController.java | 5 ++-- .../executor/QualFilingChangeExecutor.java | 3 +++ ...regationSaveOrEditQualFilingChangeCmd.java | 2 ++ .../utils/RequestHandlerUtil.java | 20 ++++++++++++++++ 5 files changed, 35 insertions(+), 19 deletions(-) create mode 100644 safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/utils/RequestHandlerUtil.java diff --git a/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/AccountController.java b/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/AccountController.java index d9c5af4..740c1ab 100644 --- a/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/AccountController.java +++ b/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/AccountController.java @@ -7,26 +7,18 @@ import com.jjb.saas.message.client.message.request.MessageTargetCmd; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; -import java.util.UUID; import lombok.extern.slf4j.Slf4j; import org.apache.dubbo.config.annotation.DubboReference; import org.qinan.safetyeval.client.api.AccountApi; import org.qinan.safetyeval.client.co.AccountCO; -import org.qinan.safetyeval.client.dto.AccountAddCmd; -import org.qinan.safetyeval.client.dto.AccountModifyCmd; -import org.qinan.safetyeval.client.dto.AccountPageQuery; -import org.qinan.safetyeval.client.dto.PageResponse; -import org.qinan.safetyeval.client.dto.SendMessageCmd; -import org.qinan.safetyeval.client.dto.SingleResponse; +import org.qinan.safetyeval.client.dto.*; import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; +import java.util.HashMap; +import java.util.Map; +import java.util.UUID; /** * 用户适配层（Controller） @@ -83,13 +75,13 @@ public class AccountController { messageSendCmd.setBusinessId(UUID.randomUUID().toString().replace("-", "")); MessageTargetCmd messageTargetCmd = new MessageTargetCmd(); - messageTargetCmd.setUserId(cmd.getUserId()); messageTargetCmd.setMobile(cmd.getMobile()); messageSendCmd.setTargetCmd(messageTargetCmd); messageSendCmd.setSourceCode("MS000146"); - messageSendCmd.setNeedTokenEnum(false); - messageSendCmd.setParams(cmd.getParams()); + Map codeMap = new HashMap<>(); + codeMap.put("code", "512454"); + messageSendCmd.setParams(codeMap); log.info("发送短信参数: messageSendCmd: {}", JSONUtil.toJsonStr(messageSendCmd)); com.alibaba.cola.dto.SingleResponse result = messageFacade.send(messageSendCmd); diff --git a/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/QualFilingChangeController.java b/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/QualFilingChangeController.java index 3899b2a..e2b2c87 100644 --- a/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/QualFilingChangeController.java +++ b/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/QualFilingChangeController.java @@ -1,6 +1,5 @@ package org.qinan.safetyeval.adapter.web; -import com.jjb.saas.secure.context.AuthContext; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; @@ -9,7 +8,7 @@ import org.qinan.safetyeval.client.co.QualFilingChangeAggregationCO; import org.qinan.safetyeval.client.co.QualFilingChangeCO; import org.qinan.safetyeval.client.co.QualFilingChangeComplianceCheckResultCO; import org.qinan.safetyeval.client.dto.*; -import org.qinan.safetyeval.infrastructure.adapter.ThreadLocalUserInfoAdapter; +import org.qinan.safetyeval.infrastructure.utils.RequestHandlerUtil; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -45,7 +44,7 @@ public class QualFilingChangeController { @ApiOperation("分页查询备案变更-机构端") @GetMapping("/org/page") public PageResponse orgPage(@Validated QualFilingChangePageQuery query) { - Long orgId = ThreadLocalUserInfoAdapter.get(); + Long orgId = RequestHandlerUtil.getOrgId(); query.setOrgId(orgId); return qualFilingChangeApi.page(query); } diff --git a/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/QualFilingChangeExecutor.java b/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/QualFilingChangeExecutor.java index a571ef5..1e13039 100644 --- a/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/QualFilingChangeExecutor.java +++ b/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/QualFilingChangeExecutor.java @@ -23,12 +23,14 @@ import org.qinan.safetyeval.domain.service.QualFilingChangeDomainService; import org.qinan.safetyeval.domain.service.QualFilingDomainService; import org.qinan.safetyeval.domain.service.QualFilingReviewDomainService; import org.qinan.safetyeval.infrastructure.adapter.auth.AuthUserContextAdapter; +import org.qinan.safetyeval.infrastructure.utils.RequestHandlerUtil; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.util.CollectionUtils; +import org.springframework.web.context.request.RequestContextHolder; import javax.annotation.Resource; import java.util.ArrayList; @@ -214,6 +216,7 @@ public class QualFilingChangeExecutor implements QualFilingChangeApi { // 变更基本信息 QualFilingChangeEntity entity = qualFilingChangeCmdConvertor.convertCmdToE(cmd.getQualFilingChangeAddCmd()); + entity.setOrgId(RequestHandlerUtil.getOrgId()); // 变更承诺书 QualFilingCommitmentChangeE commitmentEntity = qualFilingCommitmentChangeCmdConvertor.convertCmdToE(cmd.getQualFilingCommitmentChangeAddCmd()); diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/AggregationSaveOrEditQualFilingChangeCmd.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/AggregationSaveOrEditQualFilingChangeCmd.java index 1548a02..abf61ee 100644 --- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/AggregationSaveOrEditQualFilingChangeCmd.java +++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/AggregationSaveOrEditQualFilingChangeCmd.java @@ -4,6 +4,7 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; import org.qinan.safetyeval.client.change.request.*; +import javax.validation.constraints.NotNull; import java.util.List; @Data @@ -13,6 +14,7 @@ public class AggregationSaveOrEditQualFilingChangeCmd { private boolean add; @ApiModelProperty(value = "基本信息") + @NotNull private QualFilingChangeAddCmd qualFilingChangeAddCmd; @ApiModelProperty(value = "备案承诺书") diff --git a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/utils/RequestHandlerUtil.java b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/utils/RequestHandlerUtil.java new file mode 100644 index 0000000..3e8aa0e --- /dev/null +++ b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/utils/RequestHandlerUtil.java @@ -0,0 +1,20 @@ +package org.qinan.safetyeval.infrastructure.utils; + +import lombok.experimental.UtilityClass; +import org.springframework.web.context.request.RequestContextHolder; +import org.springframework.web.context.request.ServletRequestAttributes; + +@UtilityClass +public class RequestHandlerUtil { + + + /** + * holder + * + * @return String + */ + public static Long getOrgId() { + return Long.parseLong(((ServletRequestAttributes) RequestContextHolder + .getRequestAttributes()).getRequest().getHeader("orgInfoId")); + } +}