From d01d6289ed0717777bc86c1ead0da2495a6c4c52 Mon Sep 17 00:00:00 2001 From: huangfeng Date: Wed, 24 Jul 2024 15:07:31 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E8=B0=83=E6=95=B4=E7=9F=AD=E4=BF=A1?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E8=BF=94=E5=9B=9E=E7=BB=93=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/SmsController.java | 5 +++-- .../xymanager_common/model/SmsReturn.java | 9 +++++++++ .../shxy/xymanager_common/sms/SmsAdapter.java | 19 +++++++++++++------ .../impl/SmsServiceImpl.java | 3 ++- .../xymanager_service/service/SmsService.java | 3 ++- 5 files changed, 29 insertions(+), 10 deletions(-) create mode 100644 xymanager_common/src/main/java/com/shxy/xymanager_common/model/SmsReturn.java diff --git a/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/SmsController.java b/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/SmsController.java index 706a626..58830a8 100644 --- a/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/SmsController.java +++ b/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/SmsController.java @@ -4,6 +4,7 @@ import com.shxy.xymanager_common.annotation.Log; import com.shxy.xymanager_common.base.BaseController; import com.shxy.xymanager_common.base.ResponseReult; import com.shxy.xymanager_common.model.SmsModel; +import com.shxy.xymanager_common.model.SmsReturn; import com.shxy.xymanager_common.sms.dahan.DahanWeb; import com.shxy.xymanager_common.sms.lwwlkj.LwwlkjWeb; import com.shxy.xymanager_common.sms.m2m.M2m10086Web; @@ -38,8 +39,8 @@ public class SmsController extends BaseController { @GetMapping("list") @ApiOperation("查询短信") @Log(title = "查询短信", type = "查询") - public ResponseReult list(Integer termId) { - Object obj = service.listSms(termId); + public ResponseReult list(Integer termId) { + SmsReturn obj = service.listSms(termId); return ResponseReult.success(obj); } diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/model/SmsReturn.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/model/SmsReturn.java new file mode 100644 index 0000000..b5930f2 --- /dev/null +++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/model/SmsReturn.java @@ -0,0 +1,9 @@ +package com.shxy.xymanager_common.model; + +import lombok.Data; + +@Data +public class SmsReturn { + Integer type; + Object data; +} 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 bac817c..42bbd6e 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 @@ -1,6 +1,7 @@ package com.shxy.xymanager_common.sms; import com.shxy.xymanager_common.constant.Constants; +import com.shxy.xymanager_common.model.SmsReturn; import com.shxy.xymanager_common.sms.dahan.DahanWeb; import com.shxy.xymanager_common.sms.lwwlkj.LwwlkjWeb; import com.shxy.xymanager_common.sms.m2m.M2m10086Web; @@ -41,17 +42,23 @@ public class SmsAdapter { } } - public Object listSms(Integer type, String iccid) { + public SmsReturn listSms(Integer type, String iccid) { + SmsReturn result = new SmsReturn(); + result.setType(type); String today = DateUtil.format(new Date(), "yyyy-MM-dd"); if (Constants.NetType_Dahan.equals(type)) { - return dahanWeb.listSms(iccid, today); + Object obj = dahanWeb.listSms(iccid, today); + result.setData(obj); } else if (Constants.NetType_Rabchaser.equals(type)) { - rabchaserWeb.listSms(iccid, today); + Object obj = rabchaserWeb.listSms(iccid, today); + result.setData(obj); } else if (Constants.NetType_M2M10086.equals(type)) { - m2m10086Web.listSms(iccid, today); + Object obj = m2m10086Web.listSms(iccid, today); + result.setData(obj); } else if (Constants.NetType_LWWLKJ.equals(type)) { - lwwlkjWeb.listSms(iccid, today); + Object obj = lwwlkjWeb.listSms(iccid, today); + result.setData(obj); } - return null; + return result; } } diff --git a/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/SmsServiceImpl.java b/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/SmsServiceImpl.java index 3a93750..576d059 100644 --- a/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/SmsServiceImpl.java +++ b/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/SmsServiceImpl.java @@ -5,6 +5,7 @@ import com.shxy.xymanager_common.entity.TerminalSimcard; import com.shxy.xymanager_common.entity.Terminals; import com.shxy.xymanager_common.exception.ApiException; import com.shxy.xymanager_common.model.SmsModel; +import com.shxy.xymanager_common.model.SmsReturn; import com.shxy.xymanager_common.sms.SmsAdapter; import com.shxy.xymanager_dao.dao.TerminalSimcardMapper; import com.shxy.xymanager_service.service.*; @@ -87,7 +88,7 @@ public class SmsServiceImpl implements SmsService { } @Override - public Object listSms(Integer termId) { + public SmsReturn listSms(Integer termId) { Terminals term = newCacheService.getTerminal(termId); if (term == null) { throw new ApiException(termId + "该装置不存在"); diff --git a/xymanager_service/src/main/java/com/shxy/xymanager_service/service/SmsService.java b/xymanager_service/src/main/java/com/shxy/xymanager_service/service/SmsService.java index 922c11c..737e299 100644 --- a/xymanager_service/src/main/java/com/shxy/xymanager_service/service/SmsService.java +++ b/xymanager_service/src/main/java/com/shxy/xymanager_service/service/SmsService.java @@ -1,11 +1,12 @@ package com.shxy.xymanager_service.service; import com.shxy.xymanager_common.model.SmsModel; +import com.shxy.xymanager_common.model.SmsReturn; public interface SmsService { void sendSms(SmsModel model); - Object listSms(Integer termId); + SmsReturn listSms(Integer termId); }