feat: 增加查询短信接口

xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/SmsController.java

@@ -30,5 +30,13 @@ public class SmsController extends BaseController {
         return ResponseReult.success("OK");
     }
 
+    @PostMapping("list")
+    @ApiOperation("查询短信")
+    @Log(title = "查询短信", type = "查询")
+    public ResponseReult<Object> list(Integer termId) {
+        Object obj = service.listSms(termId);
+        return ResponseReult.success(obj);
+    }
+
 
 }

xymanager_common/src/main/java/com/shxy/xymanager_common/sms/SmsAdapter.java

@@ -3,10 +3,12 @@ package com.shxy.xymanager_common.sms;
 import com.shxy.xymanager_common.constant.Constants;
 import com.shxy.xymanager_common.sms.dahan.DahanApi;
 import com.shxy.xymanager_common.sms.rabchaser.RabchaserApi;
+import com.shxy.xymanager_common.util.DateUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.util.Date;
 import java.util.List;
 
 @Service
@@ -25,4 +27,12 @@ public class SmsAdapter {
             rabchaserApi.sendSms(iccidList, content);
         }
     }
+
+    public Object listSms(Integer type, String iccid) {
+        String today = DateUtil.format(new Date(), "yyyy-MM-dd");
+        if (Constants.NetType_Dahan.equals(type)) {
+            return dahanApi.smsRecord(iccid, today);
+        }
+        return null;
+    }
 }

xymanager_common/src/main/java/com/shxy/xymanager_common/sms/dahan/DahanApi.java

@@ -55,7 +55,7 @@ public class DahanApi {
         }
     }
 
-    public HashMap<String, Object> smsRecord(String iccid, String date) {
+    public Object smsRecord(String iccid, String date) {
         String url = "/api/v1/card/base/sms/record/" + date + "/" + iccid;
         try {
             Map<String, String> headMap = this.signHead(url);
@@ -67,7 +67,7 @@ public class DahanApi {
                 String error = String.valueOf(result.get("message"));
                 throw new ApiException(error);
             } else {
-                return (HashMap<String, Object>) result.get("data");
+                return result.get("data");
             }
         } catch (ApiException e) {
             throw e;

xymanager_service/src/main/java/com/shxy/xymanager_service/impl/SmsServiceImpl.java

@@ -48,9 +48,9 @@ public class SmsServiceImpl implements SmsService {
                 throw new ApiException(termId + "该装置缺少iccid2");
             }
             if (Constants.NetType_Dahan.equals(simcard.getType2())) {
-                dahanList.add(term.getIccid());
+                dahanList.add(simcard.getIccid2());
             } else if (Constants.NetType_Rabchaser.equals(simcard.getType2())) {
-                rabchaserList.add(term.getIccid());
+                rabchaserList.add(simcard.getIccid2());
             } else {
                 throw new ApiException(termId + "该装置的运营商类型type2暂不支持发短信");
             }
@@ -63,4 +63,24 @@ public class SmsServiceImpl implements SmsService {
             smsAdapter.sendSms(Constants.NetType_Rabchaser, rabchaserList, model.getContent());
         }
     }
+
+    @Override
+    public Object listSms(Integer termId) {
+        Terminals term = newCacheService.getTerminal(termId);
+        if (term == null) {
+            throw new ApiException(termId + "该装置不存在");
+        }
+        TerminalSimcard simcard = simcardMapper.selectByPrimaryKey(termId);
+        if (simcard == null) {
+            throw new ApiException(termId + "该装置缺少simcard信息");
+        }
+        if (StringUtils.isBlank(simcard.getIccid2())) {
+            throw new ApiException(termId + "该装置缺少iccid2");
+        }
+        if (Constants.NetType_Dahan.equals(simcard.getType2())) {
+            return smsAdapter.listSms(Constants.NetType_Dahan, simcard.getIccid2());
+        } else {
+            throw new ApiException(termId + "该装置的运营商类型type2暂不支持查询短信");
+        }
+    }
 }

xymanager_service/src/main/java/com/shxy/xymanager_service/service/SmsService.java

@@ -6,4 +6,6 @@ import com.shxy.xymanager_common.model.SmsModel;
 public interface SmsService {
 
     void sendSms(SmsModel model);
+
+    Object listSms(Integer termId);
 }