From f8b96e5d47beb8d4e0eb3fba6b60a5eb212ec535 Mon Sep 17 00:00:00 2001
From: huangfeng <huangfeng@xinyingpower.com>
Date: Fri, 16 Aug 2024 10:50:18 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BB=8E=E8=BF=90=E7=BB=B4=E5=BF=83?=
 =?UTF-8?q?=E8=B7=B3=E6=8F=90=E5=8F=96=E5=8D=A11=E5=8D=A12=E7=9A=84?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=9B=B4=E6=96=B0=E5=88=B0=E8=A1=A8=E9=87=8C?=
 =?UTF-8?q?=E7=9A=84iccid?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/CmdServiceImpl.java                  | 37 +++++++++++++++++++
 1 file changed, 37 insertions(+)

diff --git a/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/CmdServiceImpl.java b/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/CmdServiceImpl.java
index 8b7f318..c2c8a1e 100644
--- a/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/CmdServiceImpl.java
+++ b/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/CmdServiceImpl.java
@@ -10,6 +10,7 @@ import com.shxy.xymanager_common.model.CmdModel;
 import com.shxy.xymanager_common.page.TableDataInfo;
 import com.shxy.xymanager_common.util.DigestUtils;
 import com.shxy.xymanager_common.util.JSONUtil;
+import com.shxy.xymanager_common.util.RawReportUtil;
 import com.shxy.xymanager_common.vo.TerminalSelectVo;
 import com.shxy.xymanager_dao.dao.*;
 import com.shxy.xymanager_service.service.CmdService;
@@ -52,6 +53,8 @@ public class CmdServiceImpl implements CmdService {
     TerminalsDao terminalsDao;
     @Resource
     MntnRawReportsMapper rawReportsMapper;
+    @Resource
+    TerminalSimcardMapper simcardMapper;
 
     private List<Integer> getTerminalLit(String cmdid) {
         TerminalSelectVo vo = new TerminalSelectVo();
@@ -858,6 +861,40 @@ public class CmdServiceImpl implements CmdService {
         item.setIp(ip);
         item.setCreateTime(System.currentTimeMillis() / 1000);
         rawReportsMapper.insert(item);
+
+        // 更新simcard1和2信息
+        HashMap<String, Object> map = RawReportUtil.buildRawReportMap(content);
+        String simcard1 = null;
+        String simcard2 = null;
+        if (map.containsKey("simcard1")) {
+            simcard1 = (String) map.get("simcard1");
+        }
+        if (map.containsKey("simcard2")) {
+            simcard2 = (String) map.get("simcard2");
+        }
+        if (StringUtils.isNotBlank(simcard1) || StringUtils.isNotBlank(simcard2)) {
+            TerminalSimcard card = simcardMapper.selectByPrimaryKey(termId);
+            if (card == null) {
+                card = new TerminalSimcard();
+                card.setTermId(termId);
+                if (StringUtils.isNotBlank(simcard1)) {
+                    card.setIccid1(simcard1);
+                }
+                if (StringUtils.isNotBlank(simcard2)) {
+                    card.setIccid2(simcard2);
+                }
+                simcardMapper.insert(card);
+            } else {
+                if (StringUtils.isNotBlank(simcard1)) {
+                    card.setIccid1(simcard1);
+                }
+                if (StringUtils.isNotBlank(simcard2)) {
+                    card.setIccid2(simcard2);
+                }
+                simcardMapper.updateByPrimaryKey(card);
+            }
+        }
+
     }
 
 }