diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/sms/SmsAdapter.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/sms/SmsAdapter.java index 9da060b..f47cc34 100644 --- a/xymanager_common/src/main/java/com/shxy/xymanager_common/sms/SmsAdapter.java +++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/sms/SmsAdapter.java @@ -64,7 +64,7 @@ public class SmsAdapter { result.setData(obj); } else if (Constants.NetType_Rabchaser.equals(type)) { net = "rabchaser"; - Object obj = rabchaserWeb.listSms(iccid, today); + Object obj = rabchaserApi.listSms(iccid, today); result.setData(obj); } else if (Constants.NetType_M2M10086.equals(type)) { net = "m2m10086"; diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/sms/rabchaser/RabchaserApi.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/sms/rabchaser/RabchaserApi.java index 930d25f..f7d113b 100644 --- a/xymanager_common/src/main/java/com/shxy/xymanager_common/sms/rabchaser/RabchaserApi.java +++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/sms/rabchaser/RabchaserApi.java @@ -3,6 +3,7 @@ package com.shxy.xymanager_common.sms.rabchaser; import com.shxy.xymanager_common.exception.ApiException; import com.shxy.xymanager_common.util.DigestUtils; import com.shxy.xymanager_common.util.HttpClient; +import com.shxy.xymanager_common.util.JSONUtil; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; @@ -50,4 +51,38 @@ public class RabchaserApi { throw new ApiException("发送短信异常," + e.getMessage()); } } + + public Object listSms(String iccid, String date) { + String url = "/simCards/getSmsReceiveRecord"; + + Map dataMap = new HashMap<>(); + dataMap.put("iccid", iccid); +// dataMap.put("receiveTime", date); + dataMap.put("pageNum", 1); + dataMap.put("pageSize", 10); + try { + Map headMap = this.signHead(url); + + HashMap result = null; + String json = HttpClient.post(baseUrl + url, dataMap, headMap); + log.info("查询短信记录完成: " + json); + try { + result = JSONUtil.json2Object(json, HashMap.class); + } catch (Exception e) { + throw new ApiException(json); + } + + if (result.get("code") != null && "200".equalsIgnoreCase(result.get("code").toString())) { + return result.get("result"); + } else { + String error = String.valueOf(result.get("message")); + throw new ApiException(error); + } + } catch (ApiException e) { + throw e; + } catch (Exception e) { + log.error("查询短信记录异常.", e); + throw new ApiException("查询短信记录异常," + e.getMessage()); + } + } } diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/sms/rabchaser/RabchaserWeb.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/sms/rabchaser/RabchaserWeb.java index 071cc2b..ec3217b 100644 --- a/xymanager_common/src/main/java/com/shxy/xymanager_common/sms/rabchaser/RabchaserWeb.java +++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/sms/rabchaser/RabchaserWeb.java @@ -52,7 +52,7 @@ public class RabchaserWeb { } } - @PostConstruct +// @PostConstruct private void login() { String url = "/user/login"; Map dataMap = new HashMap<>();