diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/MntnCmdHistory.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/MntnCmdHistory.java index 0215d72..9c54835 100644 --- a/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/MntnCmdHistory.java +++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/MntnCmdHistory.java @@ -1,6 +1,7 @@ package com.shxy.xymanager_common.entity; import java.util.Date; +import java.util.HashMap; public class MntnCmdHistory { /** @@ -276,4 +277,14 @@ public class MntnCmdHistory { public void setTerminal(Terminals terminal) { this.terminal = terminal; } + + private HashMap cmdMap; + + public HashMap getCmdMap() { + return cmdMap; + } + + public void setCmdMap(HashMap cmdMap) { + this.cmdMap = cmdMap; + } } \ No newline at end of file diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/MntnCmds.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/MntnCmds.java index 12bd21e..98a2f02 100644 --- a/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/MntnCmds.java +++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/MntnCmds.java @@ -1,6 +1,7 @@ package com.shxy.xymanager_common.entity; import java.util.Date; +import java.util.HashMap; public class MntnCmds { /** @@ -210,4 +211,14 @@ public class MntnCmds { public void setTerminal(Terminals terminal) { this.terminal = terminal; } + + private HashMap cmdMap; + + public HashMap getCmdMap() { + return cmdMap; + } + + public void setCmdMap(HashMap cmdMap) { + this.cmdMap = cmdMap; + } } \ No newline at end of file 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 666bb93..0056875 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 @@ -101,14 +101,20 @@ public class CmdServiceImpl implements CmdService { map.put(item.getTermId(), terminal); } item.setTerminal(terminal); + + try { + if (StringUtils.isNotBlank(item.getCmd())) { + HashMap cmdMap = JSONUtil.json2Object(item.getCmd(), HashMap.class); + item.setCmdMap(cmdMap); + } + } catch (Exception ignore) { + } } } @Override public PageInfo listHistory(String cmdid, String action, Integer pageNum, Integer pageSize) { - - MntnCmdHistoryExample example = new MntnCmdHistoryExample(); MntnCmdHistoryExample.Criteria criteria = example.createCriteria(); if (StringUtils.isNotBlank(cmdid)) { @@ -142,6 +148,14 @@ public class CmdServiceImpl implements CmdService { map.put(item.getTermId(), terminal); } item.setTerminal(terminal); + + try { + if (StringUtils.isNotBlank(item.getCmd())) { + HashMap cmdMap = JSONUtil.json2Object(item.getCmd(), HashMap.class); + item.setCmdMap(cmdMap); + } + } catch (Exception ignore) { + } } }