diff --git a/jianshui-admin/src/main/java/com/jianshui/api/controller/http/invoiceall/v1/InvoiceAllController.java b/jianshui-admin/src/main/java/com/jianshui/api/controller/http/invoiceall/v1/InvoiceAllController.java index 73d7b6a..ae337ca 100644 --- a/jianshui-admin/src/main/java/com/jianshui/api/controller/http/invoiceall/v1/InvoiceAllController.java +++ b/jianshui-admin/src/main/java/com/jianshui/api/controller/http/invoiceall/v1/InvoiceAllController.java @@ -91,6 +91,15 @@ public class InvoiceAllController { return autonomousSqService.submitNote(invoiceAllSubmitNoteDTO); } + @ApiOperation("获取提交短信验证码结果") + @ApiImplicitParams({ + @ApiImplicitParam(name = "identity", value = "身份认证", dataType = "java.lang.Void", example = "1130", required = true), + @ApiImplicitParam(name = "inoviceAllQdLoginDTO", value = "请求体",dataType = "java.lang.Void", required = true)}) + @PostMapping("/api/invoice_all/v1/submitNoteResult") + public Object submitNoteResult(@RequestBody InvoiceAllSubmitNoteDTO invoiceAllSubmitNoteDTO) throws Exception{ + return autonomousSqService.submitNoteResult(invoiceAllSubmitNoteDTO); + } + @ApiOperation("用户登记接口") diff --git a/jianshui-invoice-all/src/main/java/com/jianshui/invoiceall/service/AutonomousSqService.java b/jianshui-invoice-all/src/main/java/com/jianshui/invoiceall/service/AutonomousSqService.java index 1ce6179..c7ea91d 100644 --- a/jianshui-invoice-all/src/main/java/com/jianshui/invoiceall/service/AutonomousSqService.java +++ b/jianshui-invoice-all/src/main/java/com/jianshui/invoiceall/service/AutonomousSqService.java @@ -33,4 +33,11 @@ public interface AutonomousSqService { * @return : java.lang.Object */ Object autonomousAuthorization(AutonomousAuthorizationDTO autonomousAuthorization); + + /** + * 功能描述: 获取短信验证结果 + * @param invoiceAllSubmitNoteDTO + * @return : java.lang.Object + */ + Object submitNoteResult(InvoiceAllSubmitNoteDTO invoiceAllSubmitNoteDTO); } diff --git a/jianshui-invoice-all/src/main/java/com/jianshui/invoiceall/service/impl/AutonomousSqServiceImpl.java b/jianshui-invoice-all/src/main/java/com/jianshui/invoiceall/service/impl/AutonomousSqServiceImpl.java index 90595ff..8ccd6e2 100644 --- a/jianshui-invoice-all/src/main/java/com/jianshui/invoiceall/service/impl/AutonomousSqServiceImpl.java +++ b/jianshui-invoice-all/src/main/java/com/jianshui/invoiceall/service/impl/AutonomousSqServiceImpl.java @@ -2,7 +2,6 @@ package com.jianshui.invoiceall.service.impl; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.copier.CopyOptions; -import cn.hutool.json.JSONObject; import cn.hutool.json.JSONUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.jianshui.common.core.domain.AjaxResult; @@ -26,6 +25,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.Date; +import java.util.List; /** * @author xingze @@ -67,6 +67,29 @@ public class AutonomousSqServiceImpl implements AutonomousSqService { return AjaxResult.success(); } + /** + * 功能描述: 获取短信验证结果 + * @param invoiceAllSubmitNoteDTO + * @return : java.lang.Object + */ + @Override + public Object submitNoteResult(InvoiceAllSubmitNoteDTO invoiceAllSubmitNoteDTO) { + log.info("获取短信验证结果入口，入参：{}", JSONUtil.toJsonStr(invoiceAllSubmitNoteDTO)); + // 短信提交 + ValidateUtils.validate(invoiceAllSubmitNoteDTO); + List invoiceAllLoginResultList = invoiceAllLoginResultMapper.findByQqlsh(invoiceAllSubmitNoteDTO.getTraceno()); + if (invoiceAllLoginResultList == null || invoiceAllLoginResultList.size() <= 0) { + log.info("自主授权短信提交接口，未查询到该流水号相关信息，请确认后输入"); + return AjaxResult.error("未查询到该流水号相关信息，请确认后输入"); + } + for (InvoiceAllLoginResult invoiceAllLoginResult : invoiceAllLoginResultList) { + if ("S000".equals(invoiceAllLoginResult.getCode())){ + return AjaxResult.success(); + } + } + return AjaxResult.error(); + } + /** * 功能描述: 全电登录 * @@ -145,29 +168,30 @@ public class AutonomousSqServiceImpl implements AutonomousSqService { // 短信提交 ValidateUtils.validate(invoiceAllSubmitNoteDTO); // 根据流水号获取登录结果 - InvoiceAllLoginResult invoiceAllLogin = invoiceAllLoginResultMapper.findByQqlsh(invoiceAllSubmitNoteDTO.getTraceno()); - if (invoiceAllLogin == null) { + List invoiceAllLoginResultList = invoiceAllLoginResultMapper.findByQqlsh(invoiceAllSubmitNoteDTO.getTraceno()); + if (invoiceAllLoginResultList == null || invoiceAllLoginResultList.size() <= 0) { log.info("自主授权短信提交接口，未查询到该流水号相关信息，请确认后输入"); return AjaxResult.error("未查询到该流水号相关信息，请确认后输入"); } - JSONObject result = null; - if ("SMS".equals(invoiceAllLogin.getCode())) { - try { - // 请求封装 - log.info("自主授权短信提交接口，请求上游地址：{}，入参：{}", "http://221.222.184.98:8880/login/submitSms", JSONUtil.toJsonStr(invoiceAllSubmitNoteDTO)); - String sendResult = HttpUtils.sendJsonPost("http://221.222.184.98:8880/login/submitSms", invoiceAllSubmitNoteDTO); - result = JSONUtil.parseObj(sendResult); - log.info("自主授权短信提交接口，请求上游结果：{}",result); - } catch (Exception e) { - e.printStackTrace(); - log.error("【金四服务类】【金财数科】【自主授权提交短信验证码】API请求异常，外部报文返回code非S000。错误信息:{}", e.getMessage()); - return AjaxResult.error(ErrorCode.INCOME_ERROR); + for (InvoiceAllLoginResult invoiceAllLoginResult : invoiceAllLoginResultList) { + if ("SMS".equals(invoiceAllLoginResult.getCode())) { + try { + // 请求封装 + log.info("自主授权短信提交接口，请求上游地址：{}，入参：{}", "http://221.222.184.98:8880/login/submitSms", JSONUtil.toJsonStr(invoiceAllSubmitNoteDTO)); + Thread requestThread = new Thread(() -> { + HttpUtils.sendJsonPost("http://221.222.184.98:8880/login/submitSms", invoiceAllSubmitNoteDTO); + }); + requestThread.start(); + } catch (Exception e) { + e.printStackTrace(); + log.error("【金四服务类】【金财数科】【自主授权提交短信验证码】API请求异常，外部报文返回code非S000。错误信息:{}", e.getMessage()); + return AjaxResult.error(ErrorCode.INCOME_ERROR); + } + } else { + log.error("自主授权短信提交接口，提交短信失败，失败原因：{}", "登录失败，请重新授权登录"); + return AjaxResult.error("登录失败，请重新授权登录"); } - return AjaxResult.success(result); - } else { - log.error("自主授权短信提交接口，提交短信失败，失败原因：{}", "登录失败，请重新登录"); - return AjaxResult.error("登录失败，请重新登录"); } + return AjaxResult.success(); } - } diff --git a/jianshui-system/src/main/java/com/jianshui/system/mapper/InvoiceAllLoginResultMapper.java b/jianshui-system/src/main/java/com/jianshui/system/mapper/InvoiceAllLoginResultMapper.java index 312cda6..f385429 100644 --- a/jianshui-system/src/main/java/com/jianshui/system/mapper/InvoiceAllLoginResultMapper.java +++ b/jianshui-system/src/main/java/com/jianshui/system/mapper/InvoiceAllLoginResultMapper.java @@ -65,5 +65,5 @@ public interface InvoiceAllLoginResultMapper * @param qqlsh * @return : com.jianshui.system.domain.InvoiceAllLoginResult */ - InvoiceAllLoginResult findByQqlsh(@Param("qqlsh") String qqlsh); + List findByQqlsh(@Param("qqlsh") String qqlsh); } diff --git a/jianshui-ui/src/views/freedom/login.vue b/jianshui-ui/src/views/freedom/login.vue index 1fd66a7..dc8f7f8 100644 --- a/jianshui-ui/src/views/freedom/login.vue +++ b/jianshui-ui/src/views/freedom/login.vue @@ -107,94 +107,94 @@