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 5f98b79..a2b4682 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 @@ -42,7 +42,7 @@ public class AccountController { @Resource private AccountApi accountApi; - @DubboReference + @DubboReference(protocol = "dubbo", url = "${safety-eval.gbs-user-sync.user-facade-url:}") private MessageFacade messageFacade; @ApiOperation("新增用户") @@ -78,11 +78,13 @@ public class AccountController { @ApiOperation("发送短信") @PostMapping("/sendMessage") public com.alibaba.cola.dto.SingleResponse sendMessage(@Validated @RequestBody SendMessageCmd cmd) { + MessageSendCmd messageSendCmd = new MessageSendCmd(); messageSendCmd.setBusinessId(UUID.randomUUID().toString().replace("-", "")); MessageTargetCmd messageTargetCmd = new MessageTargetCmd(); messageTargetCmd.setUserId(cmd.getUserId()); + messageTargetCmd.setMobile(cmd.getMobile()); messageSendCmd.setTargetCmd(messageTargetCmd); messageSendCmd.setSourceCode("MS000146"); 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 5d2e4ef..42a8022 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 @@ -27,23 +27,6 @@ public class QualFilingChangeController { @Resource private QualFilingChangeApi qualFilingChangeApi; - @ApiOperation("新增备案变更") - @PostMapping("/save") - public SingleResponse add(@Validated @RequestBody QualFilingChangeAddCmd cmd) { - return qualFilingChangeApi.add(cmd); - } - - @ApiOperation("查询备案变更详情") - @GetMapping("/get") - public SingleResponse get(@ApiParam("主键ID") @RequestParam Long id) { - return qualFilingChangeApi.get(id); - } - - @ApiOperation("修改备案变更") - @PostMapping("/modify") - public SingleResponse modify(@Validated @RequestBody QualFilingChangeModifyCmd cmd) { - return qualFilingChangeApi.modify(cmd); - } @ApiOperation("删除备案变更") @PostMapping("/delete") @@ -57,17 +40,6 @@ public class QualFilingChangeController { return qualFilingChangeApi.page(query); } - @ApiOperation("发起备案变更(克隆草稿)") - @PostMapping("/start") - public SingleResponse start(@ApiParam("备案申请id") @RequestParam Long filingId) { - return qualFilingChangeApi.start(filingId); - } - - @ApiOperation("提交备案变更") - @PostMapping("/submit") - public SingleResponse submit(@Validated @RequestBody org.qinan.safetyeval.client.dto.QualFilingChangeSubmitCmd cmd) { - return qualFilingChangeApi.submit(cmd); - } @ApiOperation("备案变更历史") @GetMapping("/history") @@ -76,17 +48,6 @@ public class QualFilingChangeController { return qualFilingChangeApi.history(filingId); } - @ApiOperation("变更审核通过") - @PostMapping("/approve") - public SingleResponse approve(@ApiParam("备案变更id") @RequestParam Long changeId) { - return qualFilingChangeApi.approve(changeId); - } - - @ApiOperation("变更审核打回") - @PostMapping("/reject") - public SingleResponse reject(@Validated @RequestBody QualFilingRejectCmd cmd) { - return qualFilingChangeApi.reject(cmd); - } @ApiOperation("聚合新增or编辑资质备案变更申请") @PostMapping("/aggregationSaveOrEdit") diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/SendMessageCmd.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/SendMessageCmd.java index 6517b99..e0186df 100644 --- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/SendMessageCmd.java +++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/SendMessageCmd.java @@ -18,9 +18,9 @@ public class SendMessageCmd { @NotNull(message = "消息接受人ID不能为空") private Long userId; - @ApiModelProperty(value = "消息模板编码", required = true) - @NotBlank(message = "消息模板编码不能为空") - private String sourceCode; + @ApiModelProperty(value = "手机号", required = true) + @NotBlank(message = "手机号不能为空") + private String mobile; @ApiModelProperty(value = "消息模板参数") private Map params;