Administrator
/
FenXiNspJavaGather
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

优化tcp程序

This commit is contained in:
zhangyue 2026-08-15 14:30:01 +08:00
parent ef4d89d09f
commit 59633fed0b
4 changed files with 24 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/com/lanhai/service/Impl/SurvTransdataLivestockwaterServiceImpl.java
View File

@ -114,15 +114,15 @@ public class SurvTransdataLivestockwaterServiceImpl extends ServiceImpl<SurvTran
}else{ }else{
isok =false; isok =false;
} }
if(StringUtils.isNotBlank(transdataLivestockwater.getDataWaterNh())){ if(StringUtils.isNotBlank(transdataLivestockwater.getDataWaterNhSy())){
if(transdataLivestockwater.getDataWaterNh().contains("-") || transdataLivestockwater.getDataWaterNh().length()>10 || "0.0000".equals(transdataLivestockwater.getDataWaterNh()) ){ if(transdataLivestockwater.getDataWaterNhSy().contains("-") || transdataLivestockwater.getDataWaterNhSy().length()>10 || "0.0000".equals(transdataLivestockwater.getDataWaterNhSy()) ){
isok =false; isok =false;
} }
}else{ }else{
isok =false; isok =false;
} }
if(StringUtils.isNotBlank(transdataLivestockwater.getDataWaterCod())){ if(StringUtils.isNotBlank(transdataLivestockwater.getDataWaterCodSy())){
if(transdataLivestockwater.getDataWaterCod().contains("-") || transdataLivestockwater.getDataWaterCod().length()>10 || "0.0000".equals(transdataLivestockwater.getDataWaterCod()) ){ if(transdataLivestockwater.getDataWaterCodSy().contains("-") || transdataLivestockwater.getDataWaterCodSy().length()>10 || "0.0000".equals(transdataLivestockwater.getDataWaterCodSy()) ){
isok =false; isok =false;
} }
}else{ }else{

4
src/main/java/com/lanhai/service/Impl/SurvTransdataOrientwaterServiceImpl.java
View File

@ -113,7 +113,7 @@ public class SurvTransdataOrientwaterServiceImpl extends ServiceImpl<SurvTransda
} }
if(StringUtils.isNotBlank(transdataOrientwater.getDataWaterNhSy())){ if(StringUtils.isNotBlank(transdataOrientwater.getDataWaterNhSy())){
if(transdataOrientwater.getDataWaterNh().contains("-") || transdataOrientwater.getDataWaterNh().length()>10 || "0.0000".equals(transdataOrientwater.getDataWaterNh()) ){ if(transdataOrientwater.getDataWaterNhSy().contains("-") || transdataOrientwater.getDataWaterNhSy().length()>10 || "0.0000".equals(transdataOrientwater.getDataWaterNhSy()) ){
isok =false; isok =false;
} }
}else{ }else{
@ -121,7 +121,7 @@ public class SurvTransdataOrientwaterServiceImpl extends ServiceImpl<SurvTransda
} }
if(StringUtils.isNotBlank(transdataOrientwater.getDataWaterCodSy())){ if(StringUtils.isNotBlank(transdataOrientwater.getDataWaterCodSy())){
if(transdataOrientwater.getDataWaterCod().contains("-") || transdataOrientwater.getDataWaterCod().length()>10 || "0.0000".equals(transdataOrientwater.getDataWaterCod()) ){ if(transdataOrientwater.getDataWaterCodSy().contains("-") || transdataOrientwater.getDataWaterCodSy().length()>10 || "0.0000".equals(transdataOrientwater.getDataWaterCodSy()) ){
isok =false; isok =false;
} }
}else{ }else{

12
src/main/java/com/lanhai/thread/ClentThread.java
View File

@ -55,25 +55,27 @@ public class ClentThread implements Runnable {
String substring = s.substring(2, 4); String substring = s.substring(2, 4);
String code = CommonConstant.XZP_WATER+substring; String code = CommonConstant.XZP_WATER+substring;
log.error("===================收到tcp设备消息:{}===============",code); log.error("#######################收到tcp设备消息:{}#########################",code);
log.error("xxxxxxxxxxx{}原始报文:{}xxxxxxxxxxxxxxxxxx",code,s); log.error("xxxxxxxxxxx{}原始报文:{}xxxxxxxxxxxxxxxxxx",code,s);
SurvDeviceDeploy deviceDeploy = deviceDeployService.getOneByCode(code); SurvDeviceDeploy deviceDeploy = deviceDeployService.getOneByCode(code);
if(deviceDeploy!=null){
if(deviceDeploy != null && (!hostAddress.equals(deviceDeploy.getIpAddr()) || !port.equals(deviceDeploy.getPort()))){
if(PollutionConstants.WATER_ORIENT.equals(deviceDeploy.getDeployType())){ if(PollutionConstants.WATER_ORIENT.equals(deviceDeploy.getDeployType())){
transdataOrientwaterService.saveBaowen(s,deviceDeploy); transdataOrientwaterService.saveBaowen(s,deviceDeploy);
} else if (PollutionConstants.WATER_LIVE.equals(deviceDeploy.getDeployType())) { } else if (PollutionConstants.WATER_LIVE.equals(deviceDeploy.getDeployType())) {
transdataLivestockwaterService.saveBaowen(s,deviceDeploy); transdataLivestockwaterService.saveBaowen(s,deviceDeploy);
} }
if(!hostAddress.equals(deviceDeploy.getIpAddr()) || !port.equals(deviceDeploy.getPort())){
//更新设备信息 //更新设备信息
deviceDeploy.setIpAddr(hostAddress); deviceDeploy.setIpAddr(hostAddress);
deviceDeploy.setPort(port); deviceDeploy.setPort(port);
deviceDeployService.updateById(deviceDeploy); deviceDeployService.updateById(deviceDeploy);
log.error("============更新了设备信息："+deviceDeploy.getId()+","+deviceDeploy.getIpAddr()+",prot:"+deviceDeploy.getPort()); log.error("============更新了设备信息："+deviceDeploy.getId()+","+deviceDeploy.getIpAddr()+",prot:"+deviceDeploy.getPort());
} }
}else{
log.error("===============普倍思设备未识别======={}",code) ;
}
log.error("^^^^^^^^^^^^^^^^^^^^^^结束tcp设备消息:{}^^^^^^^^^^^^^^^^^^^^^^",code) ;
} }
} catch (Exception e) { } catch (Exception e) {

7
src/main/java/com/lanhai/util/DataUtil.java
View File

@ -292,7 +292,12 @@ public class DataUtil{
String[] configs = resolveConfigDetail.getRange().split("-"); String[] configs = resolveConfigDetail.getRange().split("-");
int leftside = Integer.parseInt(configs[0]); int leftside = Integer.parseInt(configs[0]);
int rightSide = Integer.parseInt(configs[1]); 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); TUtil.setFieldValue(waterCommonTransVo,resolveConfigDetail.getField(),vals);
}catch (Exception e){ }catch (Exception e){
log.error("=========普备思设备解析错误跳过=={}=======",JSONUtil.toJsonStr(resolveConfigDetail)); log.error("=========普备思设备解析错误跳过=={}=======",JSONUtil.toJsonStr(resolveConfigDetail));