diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/constant/Constants.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/constant/Constants.java index 9e17028..d4ebb81 100644 --- a/xymanager_common/src/main/java/com/shxy/xymanager_common/constant/Constants.java +++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/constant/Constants.java @@ -27,19 +27,15 @@ public class Constants { public static String CMD = ""; public static String newCMD = ""; - public static String shpath = "/usr/local/bin/xympadmn"; - public static String serverpath = ""; - public static String portpath = ""; @PostConstruct private void init() { server = cmServer; port = cmaPort; - CMD = "/usr/local/bin/xympadmn --server=" + server + " --port=" + port + " --udp=1"+ " --act="; +// CMD = "/usr/local/bin/xympadmn --server=" + server + " --port=" + port + " --udp=1"+ " --act="; + CMD = "C:\\Users\\shxy\\Desktop\\xymp\\xympadmn --server=" + server + " --port=" + port + " --udp=1"+ " --act="; newCMD = "/usr/local/bin/xympadmn --server=" + server + " --port=" + port; - serverpath = "--server=" + server; - portpath = "--port=" + port; } diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/Protocols.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/Protocols.java new file mode 100644 index 0000000..6d2cc16 --- /dev/null +++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/Protocols.java @@ -0,0 +1,17 @@ +package com.shxy.xymanager_common.entity; + +import lombok.Data; + +import java.io.Serializable; + +@Data +public class Protocols implements Serializable { + private Integer id; + + private String name; + + private String version; + + private static final long serialVersionUID = 1L; + +} \ No newline at end of file diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/TerminalFavs.java.1 b/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/TerminalFavs.java.1 deleted file mode 100644 index f3a3327..0000000 --- a/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/TerminalFavs.java.1 +++ /dev/null @@ -1,38 +0,0 @@ -package com.shxy.xymanager_common.entity; - -import java.io.Serializable; -import java.util.Date; - -public class TerminalFavs implements Serializable { - private Integer userId; - - private Integer termId; - - private Date createTime; - - private static final long serialVersionUID = 1L; - - public Integer getUserId() { - return userId; - } - - public void setUserId(Integer userId) { - this.userId = userId; - } - - public Integer getTermId() { - return termId; - } - - public void setTermId(Integer termId) { - this.termId = termId; - } - - public Date getCreateTime() { - return createTime; - } - - public void setCreateTime(Date createTime) { - this.createTime = createTime; - } -} \ No newline at end of file diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/model/DyLineTreeListModel.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/model/DyLineTreeListModel.java index d1d037b..24b9e76 100644 --- a/xymanager_common/src/main/java/com/shxy/xymanager_common/model/DyLineTreeListModel.java +++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/model/DyLineTreeListModel.java @@ -79,6 +79,9 @@ public class DyLineTreeListModel implements Serializable { @ApiModelProperty(value = "杆塔地址", example = "名称名称") private String address; + @ApiModelProperty(value = "规约", example = "规约") + private Integer protocol; + @ApiModelProperty(value = "装置显示名", example = "名称名称") private String displayname; @@ -91,5 +94,6 @@ public class DyLineTreeListModel implements Serializable { @ApiModelProperty(value = "是否收藏", example = "0--未收藏 1--已收藏") private Integer isfavor; + } } diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/model/TerminalListModel.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/model/TerminalListModel.java index 5988718..5ad42f5 100644 --- a/xymanager_common/src/main/java/com/shxy/xymanager_common/model/TerminalListModel.java +++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/model/TerminalListModel.java @@ -116,6 +116,12 @@ public class TerminalListModel implements Serializable { @ApiModelProperty(value = "是否删除", example = "0--删除1--未删除") private Integer status; + @ApiModelProperty(value = "规约编号", example = "21223") + private Integer protocol; + + @ApiModelProperty(value = "规约名称", example = "21223") + private String protocolName; + @ApiModelProperty(value = "通道编号和名称", example = "213") private List list; diff --git a/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/ProtocolsDao.java b/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/ProtocolsDao.java new file mode 100644 index 0000000..554eb68 --- /dev/null +++ b/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/ProtocolsDao.java @@ -0,0 +1,9 @@ +package com.shxy.xymanager_dao.dao; + +import com.shxy.xymanager_common.entity.Protocols; + +import java.util.List; + +public interface ProtocolsDao { + List selectAll(); +} \ No newline at end of file diff --git a/xymanager_dao/src/main/resources/mappers/ProtocolsDao.xml b/xymanager_dao/src/main/resources/mappers/ProtocolsDao.xml new file mode 100644 index 0000000..85ce981 --- /dev/null +++ b/xymanager_dao/src/main/resources/mappers/ProtocolsDao.xml @@ -0,0 +1,17 @@ + + + + + + + + + + id, name, version + + + \ No newline at end of file diff --git a/xymanager_service/src/main/java/com/shxy/xymanager_service/cache/XyCache.java b/xymanager_service/src/main/java/com/shxy/xymanager_service/cache/XyCache.java index c5753e9..6485bf1 100644 --- a/xymanager_service/src/main/java/com/shxy/xymanager_service/cache/XyCache.java +++ b/xymanager_service/src/main/java/com/shxy/xymanager_service/cache/XyCache.java @@ -32,6 +32,7 @@ public class XyCache { cacheService.updateGolobalMap(); + cacheService.updateProtocolMap(); } diff --git a/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/CacheServiceImpl.java b/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/CacheServiceImpl.java index 75f8a79..f74265c 100644 --- a/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/CacheServiceImpl.java +++ b/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/CacheServiceImpl.java @@ -46,6 +46,8 @@ public class CacheServiceImpl implements CacheService { @Autowired TerminalImgAlarmParamsDao terminalImgAlarmParamsDao; + @Autowired + ProtocolsDao protocolsDao; // @Override // @Cacheable(value = "globalParams", key = "#param") @@ -287,6 +289,28 @@ public class CacheServiceImpl implements CacheService { return lineMap; } + @Override + @Cacheable(value = "protocolMap") + public Map getProtocolMap() { + Map Map = new HashMap(); + List protocols = protocolsDao.selectAll(); + for (Protocols lineitem : protocols) { + Map.put(lineitem.getId(), lineitem); + } + return Map; + } + + + @Override + @Cacheable(value = "protocolMap") + public Map updateProtocolMap() { + Map Map = new HashMap(); + List protocols = protocolsDao.selectAll(); + for (Protocols lineitem : protocols) { + Map.put(lineitem.getId(), lineitem); + } + return Map; + } @Override @CachePut(value = "globalMap") diff --git a/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/DyLevelServiceImpl.java b/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/DyLevelServiceImpl.java index 72780b3..754799d 100644 --- a/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/DyLevelServiceImpl.java +++ b/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/DyLevelServiceImpl.java @@ -103,6 +103,7 @@ public class DyLevelServiceImpl implements DyLevelService { bean.setEquipname(terminalsWithHeart.getEquipname()); bean.setModel(terminalsWithHeart.getModel()); bean.setName(terminalsWithHeart.getName()); + bean.setProtocol(terminalsWithHeart.getProtocol()); bean.setTowerid(terminalsWithHeart.getTowerid()); Integer isfavor = terminalsWithHeart.getIsfavor(); bean.setIsfavor(isfavor); diff --git a/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalServiceImpl.java b/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalServiceImpl.java index db7c342..61f06e9 100644 --- a/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalServiceImpl.java +++ b/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalServiceImpl.java @@ -85,7 +85,7 @@ public class TerminalServiceImpl implements TerminalService { Map towerMap = cacheService.getTowerMap(); Map lineMap = cacheService.getLineMap(); Map termAndChannelMap = cacheService.getTermAndChannelMap(); -// Map protocolMap = cacheService.getProtocolMap(); + Map protocolMap = cacheService.getProtocolMap(); Integer dyid = vo.getDyId(); Integer lineid = vo.getLineId(); Integer tower = vo.getTowerId(); @@ -132,19 +132,21 @@ public class TerminalServiceImpl implements TerminalService { } } -// if (protocolMap != null) { -// Integer protocol = item.getProtocol(); -// if (protocol != null) { -// terminalsBean.setProtocol(protocol); -// Protocols protocols = protocolMap.get(protocol); -// if (protocols != null) { -// terminalsBean.setProtocolName(protocols.getName()); -// } -// } -// } + if (protocolMap != null) { + Integer protocol = item.getProtocol(); + if (protocol != null) { + terminalsBean.setProtocol(protocol); + Protocols protocols = protocolMap.get(protocol); + if (protocols != null) { + terminalsBean.setProtocolName(protocols.getName()); + } + } + } // terminalsBean.setSim(item.getSim()); // terminalsBean.setWorkingDate(item.getWorkingDate()); // terminalsBean.setNetType(item.getNetType()); +// terminalsBean.setPhase(item.getPhase()); +// terminalsBean.setEquipmentType(item.getEquipmentType()); terminalsBean.setCmdId(item.getCmdid()); terminalsBean.setOrgId(item.getOrgId()); diff --git a/xymanager_service/src/main/java/com/shxy/xymanager_service/service/CacheService.java b/xymanager_service/src/main/java/com/shxy/xymanager_service/service/CacheService.java index 3cf48c4..3f9263d 100644 --- a/xymanager_service/src/main/java/com/shxy/xymanager_service/service/CacheService.java +++ b/xymanager_service/src/main/java/com/shxy/xymanager_service/service/CacheService.java @@ -83,6 +83,10 @@ public interface CacheService { Map getGolobalMap(); + Map getProtocolMap(); + + Map updateProtocolMap(); + Map updateGolobalMap(); Map getAlarmParamMap();