From 59633fed0b46d258ea82b0a535a6d4bf4ca40669 Mon Sep 17 00:00:00 2001 From: zhangyue <82248909@qq.com> Date: Sat, 15 Aug 2026 14:30:01 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96tcp=E7=A8=8B=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...urvTransdataLivestockwaterServiceImpl.java | 8 +++---- .../SurvTransdataOrientwaterServiceImpl.java | 4 ++-- .../java/com/lanhai/thread/ClentThread.java | 22 ++++++++++--------- src/main/java/com/lanhai/util/DataUtil.java | 7 +++++- 4 files changed, 24 insertions(+), 17 deletions(-) diff --git a/src/main/java/com/lanhai/service/Impl/SurvTransdataLivestockwaterServiceImpl.java b/src/main/java/com/lanhai/service/Impl/SurvTransdataLivestockwaterServiceImpl.java index c79619c..5d517f5 100644 --- a/src/main/java/com/lanhai/service/Impl/SurvTransdataLivestockwaterServiceImpl.java +++ b/src/main/java/com/lanhai/service/Impl/SurvTransdataLivestockwaterServiceImpl.java @@ -114,15 +114,15 @@ public class SurvTransdataLivestockwaterServiceImpl extends ServiceImpl10 || "0.0000".equals(transdataLivestockwater.getDataWaterNh()) ){ + if(StringUtils.isNotBlank(transdataLivestockwater.getDataWaterNhSy())){ + if(transdataLivestockwater.getDataWaterNhSy().contains("-") || transdataLivestockwater.getDataWaterNhSy().length()>10 || "0.0000".equals(transdataLivestockwater.getDataWaterNhSy()) ){ isok =false; } }else{ isok =false; } - if(StringUtils.isNotBlank(transdataLivestockwater.getDataWaterCod())){ - if(transdataLivestockwater.getDataWaterCod().contains("-") || transdataLivestockwater.getDataWaterCod().length()>10 || "0.0000".equals(transdataLivestockwater.getDataWaterCod()) ){ + if(StringUtils.isNotBlank(transdataLivestockwater.getDataWaterCodSy())){ + if(transdataLivestockwater.getDataWaterCodSy().contains("-") || transdataLivestockwater.getDataWaterCodSy().length()>10 || "0.0000".equals(transdataLivestockwater.getDataWaterCodSy()) ){ isok =false; } }else{ diff --git a/src/main/java/com/lanhai/service/Impl/SurvTransdataOrientwaterServiceImpl.java b/src/main/java/com/lanhai/service/Impl/SurvTransdataOrientwaterServiceImpl.java index f4924ed..61e3b84 100644 --- a/src/main/java/com/lanhai/service/Impl/SurvTransdataOrientwaterServiceImpl.java +++ b/src/main/java/com/lanhai/service/Impl/SurvTransdataOrientwaterServiceImpl.java @@ -113,7 +113,7 @@ public class SurvTransdataOrientwaterServiceImpl extends ServiceImpl10 || "0.0000".equals(transdataOrientwater.getDataWaterNh()) ){ + if(transdataOrientwater.getDataWaterNhSy().contains("-") || transdataOrientwater.getDataWaterNhSy().length()>10 || "0.0000".equals(transdataOrientwater.getDataWaterNhSy()) ){ isok =false; } }else{ @@ -121,7 +121,7 @@ public class SurvTransdataOrientwaterServiceImpl extends ServiceImpl10 || "0.0000".equals(transdataOrientwater.getDataWaterCod()) ){ + if(transdataOrientwater.getDataWaterCodSy().contains("-") || transdataOrientwater.getDataWaterCodSy().length()>10 || "0.0000".equals(transdataOrientwater.getDataWaterCodSy()) ){ isok =false; } }else{ diff --git a/src/main/java/com/lanhai/thread/ClentThread.java b/src/main/java/com/lanhai/thread/ClentThread.java index f58b8d8..3f71698 100644 --- a/src/main/java/com/lanhai/thread/ClentThread.java +++ b/src/main/java/com/lanhai/thread/ClentThread.java @@ -55,25 +55,27 @@ public class ClentThread implements Runnable { String substring = s.substring(2, 4); String code = CommonConstant.XZP_WATER+substring; - log.error("===================收到tcp设备消息:{}===============",code); + log.error("#######################收到tcp设备消息:{}#########################",code); log.error("xxxxxxxxxxx{}原始报文:{}xxxxxxxxxxxxxxxxxx",code,s); SurvDeviceDeploy deviceDeploy = deviceDeployService.getOneByCode(code); - - if(deviceDeploy != null && (!hostAddress.equals(deviceDeploy.getIpAddr()) || !port.equals(deviceDeploy.getPort()))){ + if(deviceDeploy!=null){ if(PollutionConstants.WATER_ORIENT.equals(deviceDeploy.getDeployType())){ transdataOrientwaterService.saveBaowen(s,deviceDeploy); } else if (PollutionConstants.WATER_LIVE.equals(deviceDeploy.getDeployType())) { transdataLivestockwaterService.saveBaowen(s,deviceDeploy); } - - //更新设备信息 - deviceDeploy.setIpAddr(hostAddress); - deviceDeploy.setPort(port); - deviceDeployService.updateById(deviceDeploy); - log.error("============更新了设备信息："+deviceDeploy.getId()+","+deviceDeploy.getIpAddr()+",prot:"+deviceDeploy.getPort()); + if(!hostAddress.equals(deviceDeploy.getIpAddr()) || !port.equals(deviceDeploy.getPort())){ + //更新设备信息 + deviceDeploy.setIpAddr(hostAddress); + deviceDeploy.setPort(port); + deviceDeployService.updateById(deviceDeploy); + log.error("============更新了设备信息："+deviceDeploy.getId()+","+deviceDeploy.getIpAddr()+",prot:"+deviceDeploy.getPort()); + } + }else{ + log.error("===============普倍思设备未识别======={}",code) ; } - + log.error("^^^^^^^^^^^^^^^^^^^^^^结束tcp设备消息:{}^^^^^^^^^^^^^^^^^^^^^^",code) ; } } catch (Exception e) { diff --git a/src/main/java/com/lanhai/util/DataUtil.java b/src/main/java/com/lanhai/util/DataUtil.java index 11cdb5f..47b48f1 100644 --- a/src/main/java/com/lanhai/util/DataUtil.java +++ b/src/main/java/com/lanhai/util/DataUtil.java @@ -292,7 +292,12 @@ public class DataUtil{ String[] configs = resolveConfigDetail.getRange().split("-"); int leftside = Integer.parseInt(configs[0]); int rightSide = Integer.parseInt(configs[1]); - String vals = getVal(str.substring(leftside,rightSide)); + String vals = ""; + if("fluidLevel".equals(resolveConfigDetail.getField())){//液位特殊处理 + vals = getYewei(str.substring(leftside,rightSide)); + }else{ + vals = getVal(str.substring(leftside,rightSide)); + } TUtil.setFieldValue(waterCommonTransVo,resolveConfigDetail.getField(),vals); }catch (Exception e){ log.error("=========普备思设备解析错误跳过=={}=======",JSONUtil.toJsonStr(resolveConfigDetail));