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

tcpbug

This commit is contained in:
zhangyue 2026-08-15 15:11:16 +08:00
parent 18ca00c706
commit e0f619edc0
2 changed files with 107 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5,6 +5,7 @@ import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.IdUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.lanhai.entity.*; import com.lanhai.entity.*;
import com.lanhai.enums.PollutionEnum;
import com.lanhai.mapper.SurvTransdataLivestockwaterMapper; import com.lanhai.mapper.SurvTransdataLivestockwaterMapper;
import com.lanhai.o.iot.pbs.WaterCommonTransVo; import com.lanhai.o.iot.pbs.WaterCommonTransVo;
import com.lanhai.service.ISurvAlertRecordService; import com.lanhai.service.ISurvAlertRecordService;
@ -23,6 +24,7 @@ import org.springframework.transaction.annotation.Transactional;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.util.Date; import java.util.Date;
import java.util.HashMap; import java.util.HashMap;
import java.util.List;
import java.util.Map; import java.util.Map;
/** /**
@ -44,6 +46,8 @@ public class SurvTransdataLivestockwaterServiceImpl extends ServiceImpl<SurvTran
private SurvHisdataLivestockwaterErrorServiceImpl hisdataLivestockwaterErrorService; private SurvHisdataLivestockwaterErrorServiceImpl hisdataLivestockwaterErrorService;
@Autowired @Autowired
private SurvStationInfoServiceImpl survStationInfoService; private SurvStationInfoServiceImpl survStationInfoService;
@Autowired
private ScEquZhibiaoServiceImpl zhibiaoService;
@Override @Override
public SurvTransdataLivestockwater getOneByDeviceCode(String deviceCode) { public SurvTransdataLivestockwater getOneByDeviceCode(String deviceCode) {
@ -90,44 +94,66 @@ public class SurvTransdataLivestockwaterServiceImpl extends ServiceImpl<SurvTran
} }
} }
List<ScEquZhibiao> zhibiaoList = zhibiaoService.getListByEquid(deploy.getId());
//根据指标情况，判断无效数据
Map<String,ScEquZhibiao> zhibiaoMap = new HashMap<>();
for(ScEquZhibiao zhibiao : zhibiaoList){
zhibiaoMap.put(zhibiao.getEntityField(),zhibiao);
}
//舍弃为空、负数、无意义的长串类数据 //舍弃为空、负数、无意义的长串类数据
boolean isok = true; boolean isok = true;
if(StringUtils.isNotBlank(transdataLivestockwater.getDataWaterTpSy())){ if(zhibiaoMap.containsKey(PollutionEnum.dataWaterTpSy.getCode())){
if(transdataLivestockwater.getDataWaterTpSy().contains("-") || transdataLivestockwater.getDataWaterTpSy().length()>10 || "0.0000".equals(transdataLivestockwater.getDataWaterTpSy())){ if(StringUtils.isNotBlank(transdataLivestockwater.getDataWaterTpSy())){
if(transdataLivestockwater.getDataWaterTpSy().contains("-") || transdataLivestockwater.getDataWaterTpSy().length()>10 || "0.0000".equals(transdataLivestockwater.getDataWaterTpSy()) ){
isok =false;
}
}else{
isok =false; isok =false;
} }
}else{
isok =false;
} }
if(StringUtils.isNotBlank(transdataLivestockwater.getDataWaterTnSy())){
if(transdataLivestockwater.getDataWaterTnSy().contains("-") || transdataLivestockwater.getDataWaterTnSy().length()>10 || "0.0000".equals(transdataLivestockwater.getDataWaterTnSy())){ if(zhibiaoMap.containsKey(PollutionEnum.dataWaterTnSy.getCode())) {
isok =false; if (StringUtils.isNotBlank(transdataLivestockwater.getDataWaterTnSy())) {
if (transdataLivestockwater.getDataWaterTnSy().contains("-") || transdataLivestockwater.getDataWaterTnSy().length() > 10 || "0.0000".equals(transdataLivestockwater.getDataWaterTnSy())) {
isok = false;
}
} else {
isok = false;
} }
}else{
isok =false;
} }
// if(StringUtils.isNotBlank(transdataLivestockwater.getDataWaterNoSy())){
// if(transdataLivestockwater.getDataWaterNoSy().contains("-") || transdataLivestockwater.getDataWaterNoSy().length()>10 || "0.0000".equals(transdataLivestockwater.getDataWaterNoSy())){ if(zhibiaoMap.containsKey(PollutionEnum.dataWaterNoSy.getCode())) {
// isok =false; if (StringUtils.isNotBlank(transdataLivestockwater.getDataWaterNoSy())) {
// } if (transdataLivestockwater.getDataWaterNoSy().contains("-") || transdataLivestockwater.getDataWaterNoSy().length() > 10 || "0.0000".equals(transdataLivestockwater.getDataWaterNoSy())) {
// }else{ isok = false;
// isok =false; }
// } } else {
if(StringUtils.isNotBlank(transdataLivestockwater.getDataWaterNhSy())){ isok = false;
if(transdataLivestockwater.getDataWaterNhSy().contains("-") || transdataLivestockwater.getDataWaterNhSy().length()>10 || "0.0000".equals(transdataLivestockwater.getDataWaterNhSy()) ){
isok =false;
} }
}else{
isok =false;
} }
if(StringUtils.isNotBlank(transdataLivestockwater.getDataWaterCodSy())){ if(zhibiaoMap.containsKey(PollutionEnum.dataWaterNhSy.getCode())) {
if(transdataLivestockwater.getDataWaterCodSy().contains("-") || transdataLivestockwater.getDataWaterCodSy().length()>10 || "0.0000".equals(transdataLivestockwater.getDataWaterCodSy()) ){ if (StringUtils.isNotBlank(transdataLivestockwater.getDataWaterNhSy())) {
isok =false; if (transdataLivestockwater.getDataWaterNhSy().contains("-") || transdataLivestockwater.getDataWaterNhSy().length() > 10 || "0.0000".equals(transdataLivestockwater.getDataWaterNhSy())) {
isok = false;
}
} else {
isok = false;
} }
}else{
isok =false;
} }
if(zhibiaoMap.containsKey(PollutionEnum.dataWaterCodSy.getCode())) {
if (StringUtils.isNotBlank(transdataLivestockwater.getDataWaterCodSy())) {
if (transdataLivestockwater.getDataWaterCodSy().contains("-") || transdataLivestockwater.getDataWaterCodSy().length() > 10 || "0.0000".equals(transdataLivestockwater.getDataWaterCodSy())) {
isok = false;
}
} else {
isok = false;
}
}
if(isok) { if(isok) {
saveOrUpdate(transdataLivestockwater); saveOrUpdate(transdataLivestockwater);

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

@ -6,6 +6,7 @@ import cn.hutool.core.util.IdUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.lanhai.entity.*; import com.lanhai.entity.*;
import com.lanhai.enums.PollutionEnum;
import com.lanhai.mapper.SurvTransdataOrientwaterMapper; import com.lanhai.mapper.SurvTransdataOrientwaterMapper;
import com.lanhai.o.iot.pbs.WaterCommonTransVo; import com.lanhai.o.iot.pbs.WaterCommonTransVo;
import com.lanhai.service.ISurvAlertRecordService; import com.lanhai.service.ISurvAlertRecordService;
@ -23,6 +24,7 @@ import org.springframework.transaction.annotation.Transactional;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.util.Date; import java.util.Date;
import java.util.HashMap; import java.util.HashMap;
import java.util.List;
import java.util.Map; import java.util.Map;
/** /**
@ -44,6 +46,8 @@ public class SurvTransdataOrientwaterServiceImpl extends ServiceImpl<SurvTransda
private SurvHisdataOrientwaterErrorServiceImpl hisdataOrientwaterErrorService; private SurvHisdataOrientwaterErrorServiceImpl hisdataOrientwaterErrorService;
@Autowired @Autowired
private SurvStationInfoServiceImpl survStationInfoService; private SurvStationInfoServiceImpl survStationInfoService;
@Autowired
private ScEquZhibiaoServiceImpl zhibiaoService;
@Override @Override
public SurvTransdataOrientwater getOneByDeviceCode(String deviceCode) { public SurvTransdataOrientwater getOneByDeviceCode(String deviceCode) {
@ -88,45 +92,64 @@ public class SurvTransdataOrientwaterServiceImpl extends ServiceImpl<SurvTransda
} }
} }
List<ScEquZhibiao> zhibiaoList = zhibiaoService.getListByEquid(deploy.getId());
//根据指标情况，判断无效数据
Map<String,ScEquZhibiao> zhibiaoMap = new HashMap<>();
for(ScEquZhibiao zhibiao : zhibiaoList){
zhibiaoMap.put(zhibiao.getEntityField(),zhibiao);
}
//舍弃为空、负数、无意义的长串类数据 //舍弃为空、负数、无意义的长串类数据
boolean isok = true; boolean isok = true;
if(StringUtils.isNotBlank(transdataOrientwater.getDataWaterTpSy())){ if(zhibiaoMap.containsKey(PollutionEnum.dataWaterTpSy.getCode())){
if(transdataOrientwater.getDataWaterTpSy().contains("-") || transdataOrientwater.getDataWaterTpSy().length()>10 || "0.0000".equals(transdataOrientwater.getDataWaterTpSy()) ){ if(StringUtils.isNotBlank(transdataOrientwater.getDataWaterTpSy())){
if(transdataOrientwater.getDataWaterTpSy().contains("-") || transdataOrientwater.getDataWaterTpSy().length()>10 || "0.0000".equals(transdataOrientwater.getDataWaterTpSy()) ){
isok =false;
}
}else{
isok =false; isok =false;
} }
}else{
isok =false;
}
if(StringUtils.isNotBlank(transdataOrientwater.getDataWaterTnSy())){
if(transdataOrientwater.getDataWaterTnSy().contains("-") || transdataOrientwater.getDataWaterTnSy().length()>10 || "0.0000".equals(transdataOrientwater.getDataWaterTnSy())){
isok =false;
}
}else{
isok =false;
}
if(StringUtils.isNotBlank(transdataOrientwater.getDataWaterNoSy())){
if(transdataOrientwater.getDataWaterNoSy().contains("-") || transdataOrientwater.getDataWaterNoSy().length()>10 || "0.0000".equals(transdataOrientwater.getDataWaterNoSy())){
isok =false;
}
}else{
isok =false;
} }
// if(StringUtils.isNotBlank(transdataOrientwater.getDataWaterNhSy())){ if(zhibiaoMap.containsKey(PollutionEnum.dataWaterTnSy.getCode())) {
// if(transdataOrientwater.getDataWaterNhSy().contains("-") || transdataOrientwater.getDataWaterNhSy().length()>10 || "0.0000".equals(transdataOrientwater.getDataWaterNhSy()) ){ if (StringUtils.isNotBlank(transdataOrientwater.getDataWaterTnSy())) {
// isok =false; if (transdataOrientwater.getDataWaterTnSy().contains("-") || transdataOrientwater.getDataWaterTnSy().length() > 10 || "0.0000".equals(transdataOrientwater.getDataWaterTnSy())) {
// } isok = false;
// }else{ }
// isok =false; } else {
// } isok = false;
}
}
// if(StringUtils.isNotBlank(transdataOrientwater.getDataWaterCodSy())){ if(zhibiaoMap.containsKey(PollutionEnum.dataWaterNoSy.getCode())) {
// if(transdataOrientwater.getDataWaterCodSy().contains("-") || transdataOrientwater.getDataWaterCodSy().length()>10 || "0.0000".equals(transdataOrientwater.getDataWaterCodSy()) ){ if (StringUtils.isNotBlank(transdataOrientwater.getDataWaterNoSy())) {
// isok =false; if (transdataOrientwater.getDataWaterNoSy().contains("-") || transdataOrientwater.getDataWaterNoSy().length() > 10 || "0.0000".equals(transdataOrientwater.getDataWaterNoSy())) {
// } isok = false;
// }else{ }
// isok =false; } else {
// } isok = false;
}
}
if(zhibiaoMap.containsKey(PollutionEnum.dataWaterNhSy.getCode())) {
if (StringUtils.isNotBlank(transdataOrientwater.getDataWaterNhSy())) {
if (transdataOrientwater.getDataWaterNhSy().contains("-") || transdataOrientwater.getDataWaterNhSy().length() > 10 || "0.0000".equals(transdataOrientwater.getDataWaterNhSy())) {
isok = false;
}
} else {
isok = false;
}
}
if(zhibiaoMap.containsKey(PollutionEnum.dataWaterCodSy.getCode())) {
if (StringUtils.isNotBlank(transdataOrientwater.getDataWaterCodSy())) {
if (transdataOrientwater.getDataWaterCodSy().contains("-") || transdataOrientwater.getDataWaterCodSy().length() > 10 || "0.0000".equals(transdataOrientwater.getDataWaterCodSy())) {
isok = false;
}
} else {
isok = false;
}
}
if(isok) { if(isok) {
saveOrUpdate(transdataOrientwater); saveOrUpdate(transdataOrientwater);
//保存历史表 //保存历史表