diff --git a/data_receiver.iml b/data_receiver.iml index 8d50c52..91d1dc0 100644 --- a/data_receiver.iml +++ b/data_receiver.iml @@ -55,6 +55,7 @@ + diff --git a/data_receiver.iml b/data_receiver.iml index 8d50c52..91d1dc0 100644 --- a/data_receiver.iml +++ b/data_receiver.iml @@ -55,6 +55,7 @@ + diff --git a/pom.xml b/pom.xml index 6a05fdc..0eaadd9 100644 --- a/pom.xml +++ b/pom.xml @@ -45,6 +45,13 @@ + org.bouncycastle + bcprov-jdk15to18 + 1.71 + + + + org.projectlombok lombok 1.18.20 diff --git a/data_receiver.iml b/data_receiver.iml index 8d50c52..91d1dc0 100644 --- a/data_receiver.iml +++ b/data_receiver.iml @@ -55,6 +55,7 @@ + diff --git a/pom.xml b/pom.xml index 6a05fdc..0eaadd9 100644 --- a/pom.xml +++ b/pom.xml @@ -45,6 +45,13 @@ + org.bouncycastle + bcprov-jdk15to18 + 1.71 + + + + org.projectlombok lombok 1.18.20 diff --git a/src/main/java/com/casic/resolver/RainFallDataResolver.java b/src/main/java/com/casic/resolver/RainFallDataResolver.java index 9b643de..e38474e 100644 --- a/src/main/java/com/casic/resolver/RainFallDataResolver.java +++ b/src/main/java/com/casic/resolver/RainFallDataResolver.java @@ -28,10 +28,11 @@ if (msg.toLowerCase().contains(rainFallMark)) { //去掉补位 String devcode = msg.substring(0, 15); - String defaultValue = String.valueOf(Integer.valueOf(msg.substring(26, 30))); + String defaultStrValue = msg.substring(26, 30); + 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)) { @@ -50,7 +51,7 @@ * 比较是否报警 报警/正常 1/0 */ protected Integer isAlarm(String realData, String thresholdValue) { - if (!StringUtils.isEmpty(realData) && StringUtils.isEmpty(thresholdValue)) { + if (!StringUtils.isEmpty(realData) && !StringUtils.isEmpty(thresholdValue)) { if (Float.valueOf(realData) >= Float.valueOf(thresholdValue)) { return 1; } @@ -58,10 +59,10 @@ return 0; } - private RainFallData initRainFallData(String devcode, String valueStr) { + private RainFallData initRainFallData(String devcode, Long valueStr) { RainFallData rainFallData = new RainFallData(); rainFallData.setDstid(devcode); - rainFallData.setTotalyuliang(valueStr); + rainFallData.setTotalyuliang(String.valueOf(valueStr)); rainFallData.setUptime(new Date()); rainFallData.setLogtime(new Date()); return rainFallData; diff --git a/data_receiver.iml b/data_receiver.iml index 8d50c52..91d1dc0 100644 --- a/data_receiver.iml +++ b/data_receiver.iml @@ -55,6 +55,7 @@ + diff --git a/pom.xml b/pom.xml index 6a05fdc..0eaadd9 100644 --- a/pom.xml +++ b/pom.xml @@ -45,6 +45,13 @@ + org.bouncycastle + bcprov-jdk15to18 + 1.71 + + + + org.projectlombok lombok 1.18.20 diff --git a/src/main/java/com/casic/resolver/RainFallDataResolver.java b/src/main/java/com/casic/resolver/RainFallDataResolver.java index 9b643de..e38474e 100644 --- a/src/main/java/com/casic/resolver/RainFallDataResolver.java +++ b/src/main/java/com/casic/resolver/RainFallDataResolver.java @@ -28,10 +28,11 @@ if (msg.toLowerCase().contains(rainFallMark)) { //去掉补位 String devcode = msg.substring(0, 15); - String defaultValue = String.valueOf(Integer.valueOf(msg.substring(26, 30))); + String defaultStrValue = msg.substring(26, 30); + 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)) { @@ -50,7 +51,7 @@ * 比较是否报警 报警/正常 1/0 */ protected Integer isAlarm(String realData, String thresholdValue) { - if (!StringUtils.isEmpty(realData) && StringUtils.isEmpty(thresholdValue)) { + if (!StringUtils.isEmpty(realData) && !StringUtils.isEmpty(thresholdValue)) { if (Float.valueOf(realData) >= Float.valueOf(thresholdValue)) { return 1; } @@ -58,10 +59,10 @@ return 0; } - private RainFallData initRainFallData(String devcode, String valueStr) { + private RainFallData initRainFallData(String devcode, Long valueStr) { RainFallData rainFallData = new RainFallData(); rainFallData.setDstid(devcode); - rainFallData.setTotalyuliang(valueStr); + rainFallData.setTotalyuliang(String.valueOf(valueStr)); rainFallData.setUptime(new Date()); rainFallData.setLogtime(new Date()); return rainFallData; diff --git a/src/main/java/com/casic/server/ReceiverServerHandler.java b/src/main/java/com/casic/server/ReceiverServerHandler.java index 627c518..f99778f 100644 --- a/src/main/java/com/casic/server/ReceiverServerHandler.java +++ b/src/main/java/com/casic/server/ReceiverServerHandler.java @@ -4,9 +4,9 @@ import com.casic.enums.RelaySwitchEnums; import com.casic.model.RelayStatusDTO; import com.casic.resolver.DatagramResolver; -import com.casic.resolver.RainFallDataResolver; import io.netty.buffer.ByteBuf; import io.netty.buffer.ByteBufAllocator; +import io.netty.buffer.ByteBufUtil; import io.netty.channel.ChannelHandler; import io.netty.channel.ChannelHandlerContext; import io.netty.channel.ChannelInboundHandlerAdapter; @@ -19,9 +19,7 @@ import org.springframework.stereotype.Component; import org.springframework.util.ObjectUtils; -import java.nio.charset.Charset; import java.util.List; -import java.util.concurrent.TimeUnit; /** * @description: 消息处理handler @@ -80,6 +78,9 @@ ); } } + if (msg instanceof ByteBuf) { + log.info(ByteBufUtil.hexDump((ByteBuf) msg)); + } super.channelRead(ctx, msg); } diff --git a/data_receiver.iml b/data_receiver.iml index 8d50c52..91d1dc0 100644 --- a/data_receiver.iml +++ b/data_receiver.iml @@ -55,6 +55,7 @@ + diff --git a/pom.xml b/pom.xml index 6a05fdc..0eaadd9 100644 --- a/pom.xml +++ b/pom.xml @@ -45,6 +45,13 @@ + org.bouncycastle + bcprov-jdk15to18 + 1.71 + + + + org.projectlombok lombok 1.18.20 diff --git a/src/main/java/com/casic/resolver/RainFallDataResolver.java b/src/main/java/com/casic/resolver/RainFallDataResolver.java index 9b643de..e38474e 100644 --- a/src/main/java/com/casic/resolver/RainFallDataResolver.java +++ b/src/main/java/com/casic/resolver/RainFallDataResolver.java @@ -28,10 +28,11 @@ if (msg.toLowerCase().contains(rainFallMark)) { //去掉补位 String devcode = msg.substring(0, 15); - String defaultValue = String.valueOf(Integer.valueOf(msg.substring(26, 30))); + String defaultStrValue = msg.substring(26, 30); + 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)) { @@ -50,7 +51,7 @@ * 比较是否报警 报警/正常 1/0 */ protected Integer isAlarm(String realData, String thresholdValue) { - if (!StringUtils.isEmpty(realData) && StringUtils.isEmpty(thresholdValue)) { + if (!StringUtils.isEmpty(realData) && !StringUtils.isEmpty(thresholdValue)) { if (Float.valueOf(realData) >= Float.valueOf(thresholdValue)) { return 1; } @@ -58,10 +59,10 @@ return 0; } - private RainFallData initRainFallData(String devcode, String valueStr) { + private RainFallData initRainFallData(String devcode, Long valueStr) { RainFallData rainFallData = new RainFallData(); rainFallData.setDstid(devcode); - rainFallData.setTotalyuliang(valueStr); + rainFallData.setTotalyuliang(String.valueOf(valueStr)); rainFallData.setUptime(new Date()); rainFallData.setLogtime(new Date()); return rainFallData; diff --git a/src/main/java/com/casic/server/ReceiverServerHandler.java b/src/main/java/com/casic/server/ReceiverServerHandler.java index 627c518..f99778f 100644 --- a/src/main/java/com/casic/server/ReceiverServerHandler.java +++ b/src/main/java/com/casic/server/ReceiverServerHandler.java @@ -4,9 +4,9 @@ import com.casic.enums.RelaySwitchEnums; import com.casic.model.RelayStatusDTO; import com.casic.resolver.DatagramResolver; -import com.casic.resolver.RainFallDataResolver; import io.netty.buffer.ByteBuf; import io.netty.buffer.ByteBufAllocator; +import io.netty.buffer.ByteBufUtil; import io.netty.channel.ChannelHandler; import io.netty.channel.ChannelHandlerContext; import io.netty.channel.ChannelInboundHandlerAdapter; @@ -19,9 +19,7 @@ import org.springframework.stereotype.Component; import org.springframework.util.ObjectUtils; -import java.nio.charset.Charset; import java.util.List; -import java.util.concurrent.TimeUnit; /** * @description: 消息处理handler @@ -80,6 +78,9 @@ ); } } + if (msg instanceof ByteBuf) { + log.info(ByteBufUtil.hexDump((ByteBuf) msg)); + } super.channelRead(ctx, msg); } diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 104e4e0..d44a245 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -28,6 +28,6 @@ pressure: 15 flow: 5 task: - cron-time: 0 */1 * * * ? + cron-time: 0 0 */1 * * ? server: port: 13764