diff --git a/src/main/java/com/casic/resolver/RainFallDataResolver.java b/src/main/java/com/casic/resolver/RainFallDataResolver.java index e38474e..e9427ca 100644 --- a/src/main/java/com/casic/resolver/RainFallDataResolver.java +++ b/src/main/java/com/casic/resolver/RainFallDataResolver.java @@ -32,7 +32,7 @@ long defaultValue = Long.parseLong(defaultStrValue, 16); log.info("设备编号为" + devcode + ",设备数据为" + defaultValue); RainFallData rainFallData = initRainFallData(devcode, defaultValue); -// rainFallDataMapper.insert(rainFallData); + rainFallDataMapper.insert(rainFallData); Integer isAlarm = isAlarm(String.valueOf(defaultValue), alarmLevelConfig.getRainfall()); String channelName = RelayDevcodeMapEnums.RELAY_DEVCODE.getRelayDevcodeMap().get(devcode); if (StringUtils.isEmpty(channelName)) { diff --git a/src/main/java/com/casic/resolver/RainFallDataResolver.java b/src/main/java/com/casic/resolver/RainFallDataResolver.java index e38474e..e9427ca 100644 --- a/src/main/java/com/casic/resolver/RainFallDataResolver.java +++ b/src/main/java/com/casic/resolver/RainFallDataResolver.java @@ -32,7 +32,7 @@ long defaultValue = Long.parseLong(defaultStrValue, 16); log.info("设备编号为" + devcode + ",设备数据为" + defaultValue); RainFallData rainFallData = initRainFallData(devcode, defaultValue); -// rainFallDataMapper.insert(rainFallData); + rainFallDataMapper.insert(rainFallData); Integer isAlarm = isAlarm(String.valueOf(defaultValue), alarmLevelConfig.getRainfall()); String channelName = RelayDevcodeMapEnums.RELAY_DEVCODE.getRelayDevcodeMap().get(devcode); if (StringUtils.isEmpty(channelName)) { diff --git a/src/main/java/com/casic/server/ReceiverServerHandler.java b/src/main/java/com/casic/server/ReceiverServerHandler.java index f99778f..507fa09 100644 --- a/src/main/java/com/casic/server/ReceiverServerHandler.java +++ b/src/main/java/com/casic/server/ReceiverServerHandler.java @@ -67,7 +67,6 @@ */ @Override public void channelRead(ChannelHandlerContext ctx, Object msg) throws Exception { - ThreadPoolTaskExecutor executor = new ThreadPoolTaskExecutor(); if (msg instanceof String) { if (!String.valueOf(msg).contains("iccid")) { datagramResolverList.forEach( @@ -87,11 +86,11 @@ private void sendMsg(ChannelHandlerContext ctx, RelayStatusDTO relayStatusDTO) { if (!ObjectUtils.isEmpty(relayStatusDTO)) { ByteBuf out = ByteBufAllocator.DEFAULT.heapBuffer(); - String switchConent = preFix + relayStatusDTO.getChannelName() + "," + relayStatusDTO.getLampSwitch() + postFix; + String switchContent = preFix + relayStatusDTO.getChannelName() + "," + relayStatusDTO.getLampSwitch() + postFix; // for (int i = 1; i < 6; i++) { // switchConent = preFix + relayStatusDTO.getChannelName() + "," + 1 + postFix; - System.out.println(switchConent); - out.writeBytes(switchConent.getBytes()); + System.out.println(switchContent); + out.writeBytes(switchContent.getBytes()); channels.forEach(channel -> { if (channel.isActive()) { if (channel != ctx.channel()) {