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 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 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); + } + } + } }