diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/rs/H2SRequest.java b/casic-device/src/main/java/com/casic/missiles/modular/system/rs/H2SRequest.java index 298f039..7f81f36 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/rs/H2SRequest.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/rs/H2SRequest.java @@ -13,13 +13,17 @@ public void send(String devCode, String content, String attemptsMax) { RedisCommon redisCommon = SpringContextHolder.getBean("redisCommon"); CommConfigDTO commConfigDTO = new CommConfigDTO(); - commConfigDTO.setRepeat(Long.valueOf(content.split(",")[0])); - commConfigDTO.setInterval(Long.valueOf(content.split(",")[1])); - commConfigDTO.setPeriod(Long.valueOf(content.split(",")[2])); - if(StringUtils.isNotBlank(content.split(",",6)[3])){ - commConfigDTO.setIp(content.split(",", 6)[3]); - commConfigDTO.setPort(Long.valueOf(content.split(",", 6)[4])); - commConfigDTO.setThresh(Float.valueOf(content.split(",", 6)[5])); + String[] contentList = content.split(","); + commConfigDTO.setRepeat(Long.valueOf(contentList[0])); + commConfigDTO.setInterval(Long.valueOf(contentList[1])); + commConfigDTO.setPeriod(Long.valueOf(contentList[2])); + if(contentList.length >= 4 && StringUtils.isNotBlank(contentList[3])){ + commConfigDTO.setIp(contentList[3]); + commConfigDTO.setPort(Long.valueOf(contentList[4])); + + } + if (contentList.length >= 6 && StringUtils.isNotBlank(contentList[5])) { + commConfigDTO.setThresh(Float.valueOf(contentList[5])); } redisCommon.setRedisConfig(devCode, commConfigDTO); if (/*"1".equals(this.getNetType()) &&*/ StringUtils.isNotBlank(getConcentratorCode()))