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

增加水样生成逻辑

This commit is contained in:
zy 2025-12-06 16:20:14 +08:00
parent eea1e7fcad
commit 8a9985dd8b
10 changed files with 239 additions and 143 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/com/lanhai/entity/SurvHisdataLivestockwater.java
View File

@ -6,6 +6,8 @@ import java.util.Date;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;
import java.io.Serializable; import java.io.Serializable;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors; import lombok.experimental.Accessors;
@ -62,6 +64,14 @@ public class SurvHisdataLivestockwater extends Model<SurvHisdataLivestockwater>
*/ */
@TableField("DATA_WATER_NO") @TableField("DATA_WATER_NO")
private String dataWaterNo; private String dataWaterNo;
/**硝态氮*/
@ApiModelProperty(value = "硝态氮")
@TableField("DATA_WATER_NO_SY")
private String dataWaterNoSy;
/**硝态氮*/
@ApiModelProperty(value = "硝态氮")
@TableField("DATA_WATER_NO_LD")
private String dataWaterNoLd;
/** /**
* 氨氮 * 氨氮

94
src/main/java/com/lanhai/entity/SurvHisdataLivestockwaterError.java
View File

@ -6,6 +6,8 @@ import java.util.Date;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;
import java.io.Serializable; import java.io.Serializable;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors; import lombok.experimental.Accessors;
@ -42,30 +44,77 @@ public class SurvHisdataLivestockwaterError extends Model<SurvHisdataLivestockwa
*/ */
@TableField("DATA_WATER_TP") @TableField("DATA_WATER_TP")
private String dataWaterTp; private String dataWaterTp;
@TableField("DATA_WATER_TP_SY")
private String dataWaterTpSy;
@TableField("DATA_WATER_TP_LD")
private String dataWaterTpLd;
/** /**
* 总氮 * 总氮
*/ */
@TableField("DATA_WATER_TN") @TableField("DATA_WATER_TN")
private String dataWaterTn; private String dataWaterTn;
@TableField("DATA_WATER_TN_SY")
private String dataWaterTnSy;
@TableField("DATA_WATER_TN_LD")
private String dataWaterTnLd;
/** /**
* 硝态氮 * 硝态氮
*/ */
@TableField("DATA_WATER_NO") @TableField("DATA_WATER_NO")
private String dataWaterNo; private String dataWaterNo;
/**硝态氮*/
@ApiModelProperty(value = "硝态氮")
@TableField("DATA_WATER_NO_SY")
private String dataWaterNoSy;
/**硝态氮*/
@ApiModelProperty(value = "硝态氮")
@TableField("DATA_WATER_NO_LD")
private String dataWaterNoLd;
/** /**
* 氨氮 * 氨氮
*/ */
@TableField("DATA_WATER_NH") @TableField("DATA_WATER_NH")
private String dataWaterNh; private String dataWaterNh;
@TableField("DATA_WATER_NH_SY")
private String dataWaterNhSy;
@TableField("DATA_WATER_NH_LD")
private String dataWaterNhLd;
/** /**
* 化学需氧量 * 化学需氧量
*/ */
@TableField("DATA_WATER_COD") @TableField("DATA_WATER_COD")
private String dataWaterCod; private String dataWaterCod;
@TableField("DATA_WATER_COD_SY")
private String dataWaterCodSy;
@TableField("DATA_WATER_COD_LD")
private String dataWaterCodLd;
@TableField("FLUID_LEVEL")
private String fluidLevel;//液位
@TableField("FIRST_VALVE_STATUS")
private String firstValveStatus;//1#球阀状态
@TableField("SECOND_VALVE_STATUS")
private String secondValveStatus;//2#球阀状态
/**
* 3#球阀状态
*/
@TableField("THIRD_VALVE_STATUS")
private String thirdValveStatus;
@TableField("CRASH_STOP_STATUS")
private String crashStopStatus;//急停状态
@TableField("WATER_PUMP_STATUS")
private String waterPumpStatus;//水泵状态
@TableField("MAIN_SIDE_STATUS")
private String mainSideStatus;//主副泵状态
/** /**
* 数据更新时间 * 数据更新时间
@ -175,53 +224,8 @@ public class SurvHisdataLivestockwaterError extends Model<SurvHisdataLivestockwa
@TableField("UPDATED_TIME") @TableField("UPDATED_TIME")
private Date updatedTime; private Date updatedTime;
@TableField("DATA_WATER_TP_SY")
private String dataWaterTpSy;
@TableField("DATA_WATER_TP_LD")
private String dataWaterTpLd;
@TableField("DATA_WATER_TN_SY")
private String dataWaterTnSy;
@TableField("DATA_WATER_TN_LD")
private String dataWaterTnLd;
@TableField("DATA_WATER_NH_SY")
private String dataWaterNhSy;
@TableField("DATA_WATER_NH_LD")
private String dataWaterNhLd;
@TableField("DATA_WATER_COD_SY")
private String dataWaterCodSy;
@TableField("DATA_WATER_COD_LD")
private String dataWaterCodLd;
@TableField("FLUID_LEVEL")
private String fluidLevel;
@TableField("FIRST_VALVE_STATUS")
private String firstValveStatus;
@TableField("SECOND_VALVE_STATUS")
private String secondValveStatus;
/**
* 3#球阀状态
*/
@TableField("THIRD_VALVE_STATUS")
private String thirdValveStatus;
@TableField("CRASH_STOP_STATUS")
private String crashStopStatus;
@TableField("WATER_PUMP_STATUS")
private String waterPumpStatus;
@TableField("MAIN_SIDE_STATUS")
private String mainSideStatus;

57
src/main/java/com/lanhai/entity/SurvHisdataOrientwater.java
View File

@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.extension.activerecord.Model; import com.baomidou.mybatisplus.extension.activerecord.Model;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors; import lombok.experimental.Accessors;
@ -43,7 +44,6 @@ public class SurvHisdataOrientwater extends Model<SurvHisdataOrientwater> {
*/ */
@TableField("DATA_WATER_TP") @TableField("DATA_WATER_TP")
private String dataWaterTp; private String dataWaterTp;
@TableField("DATA_WATER_TP_SY") @TableField("DATA_WATER_TP_SY")
private String dataWaterTpSy; private String dataWaterTpSy;
@TableField("DATA_WATER_TP_LD") @TableField("DATA_WATER_TP_LD")
@ -54,12 +54,48 @@ public class SurvHisdataOrientwater extends Model<SurvHisdataOrientwater> {
*/ */
@TableField("DATA_WATER_TN") @TableField("DATA_WATER_TN")
private String dataWaterTn; private String dataWaterTn;
@TableField("DATA_WATER_TN_SY") @TableField("DATA_WATER_TN_SY")
private String dataWaterTnSy; private String dataWaterTnSy;
@TableField("DATA_WATER_TN_LD") @TableField("DATA_WATER_TN_LD")
private String dataWaterTnLd; private String dataWaterTnLd;
/**
* 硝态氮
*/
@TableField("DATA_WATER_NO")
private String dataWaterNo;
/**硝态氮*/
@ApiModelProperty(value = "硝态氮")
@TableField("DATA_WATER_NO_SY")
private String dataWaterNoSy;
/**硝态氮*/
@ApiModelProperty(value = "硝态氮")
@TableField("DATA_WATER_NO_LD")
private String dataWaterNoLd;
/**
* 氨氮
*/
@TableField("DATA_WATER_NH")
private String dataWaterNh;
@TableField("DATA_WATER_NH_SY")
private String dataWaterNhSy;
@TableField("DATA_WATER_NH_LD")
private String dataWaterNhLd;
/**
* 化学需氧量
*/
@TableField("DATA_WATER_COD")
private String dataWaterCod;
@TableField("DATA_WATER_COD_SY")
private String dataWaterCodSy;
@TableField("DATA_WATER_COD_LD")
private String dataWaterCodLd;
@TableField("FLUID_LEVEL") @TableField("FLUID_LEVEL")
private String fluidLevel;//液位 private String fluidLevel;//液位
@ -85,23 +121,6 @@ public class SurvHisdataOrientwater extends Model<SurvHisdataOrientwater> {
private String mainSideStatus;//主副泵状态 private String mainSideStatus;//主副泵状态
/**
* 氨氮
*/
@TableField("DATA_WATER_NH")
private String dataWaterNh;
/**
* 化学需氧量
*/
@TableField("DATA_WATER_COD")
private String dataWaterCod;
/**
* 硝态氮
*/
@TableField("DATA_WATER_NO")
private String dataWaterNo;
/** /**
* 数据更新时间 * 数据更新时间

50
src/main/java/com/lanhai/entity/SurvHisdataOrientwaterError.java
View File

@ -6,6 +6,8 @@ import java.util.Date;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;
import java.io.Serializable; import java.io.Serializable;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors; import lombok.experimental.Accessors;
@ -42,54 +44,74 @@ public class SurvHisdataOrientwaterError extends Model<SurvHisdataOrientwaterErr
*/ */
@TableField("DATA_WATER_TP") @TableField("DATA_WATER_TP")
private String dataWaterTp; private String dataWaterTp;
/** /**
* 总磷水样 * 总磷水样
*/ */
@TableField("DATA_WATER_TP_SY") @TableField("DATA_WATER_TP_SY")
private String dataWaterTpSy; private String dataWaterTpSy;
/** /**
* 总磷零点 * 总磷零点
*/ */
@TableField("DATA_WATER_TP_LD") @TableField("DATA_WATER_TP_LD")
private String dataWaterTpLd; private String dataWaterTpLd;
/** /**
* 总氮 * 总氮
*/ */
@TableField("DATA_WATER_TN") @TableField("DATA_WATER_TN")
private String dataWaterTn; private String dataWaterTn;
/** /**
* 总氮水样 * 总氮水样
*/ */
@TableField("DATA_WATER_TN_SY") @TableField("DATA_WATER_TN_SY")
private String dataWaterTnSy; private String dataWaterTnSy;
/** /**
* 总氮零点 * 总氮零点
*/ */
@TableField("DATA_WATER_TN_LD") @TableField("DATA_WATER_TN_LD")
private String dataWaterTnLd; private String dataWaterTnLd;
/**
* 氨氮
*/
@TableField("DATA_WATER_NH")
private String dataWaterNh;
/**
* 化学需氧量
*/
@TableField("DATA_WATER_COD")
private String dataWaterCod;
/** /**
* 硝态氮 * 硝态氮
*/ */
@TableField("DATA_WATER_NO") @TableField("DATA_WATER_NO")
private String dataWaterNo; private String dataWaterNo;
/**硝态氮*/
@ApiModelProperty(value = "硝态氮")
@TableField("DATA_WATER_NO_SY")
private String dataWaterNoSy;
/**硝态氮*/
@ApiModelProperty(value = "硝态氮")
@TableField("DATA_WATER_NO_LD")
private String dataWaterNoLd;
/**
* 氨氮
*/
@TableField("DATA_WATER_NH")
private String dataWaterNh;
@TableField("DATA_WATER_NH_SY")
private String dataWaterNhSy;
@TableField("DATA_WATER_NH_LD")
private String dataWaterNhLd;
/**
* 化学需氧量
*/
@TableField("DATA_WATER_COD")
private String dataWaterCod;
@TableField("DATA_WATER_COD_SY")
private String dataWaterCodSy;
@TableField("DATA_WATER_COD_LD")
private String dataWaterCodLd;
/** /**
* 液位 * 液位

10
src/main/java/com/lanhai/entity/SurvTransdataLivestockwater.java
View File

@ -6,6 +6,8 @@ import java.util.Date;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;
import java.io.Serializable; import java.io.Serializable;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors; import lombok.experimental.Accessors;
@ -63,6 +65,14 @@ public class SurvTransdataLivestockwater extends Model<SurvTransdataLivestockwat
*/ */
@TableField("DATA_WATER_NO") @TableField("DATA_WATER_NO")
private String dataWaterNo; private String dataWaterNo;
/**硝态氮*/
@ApiModelProperty(value = "硝态氮")
@TableField("DATA_WATER_NO_SY")
private String dataWaterNoSy;
/**硝态氮*/
@ApiModelProperty(value = "硝态氮")
@TableField("DATA_WATER_NO_LD")
private String dataWaterNoLd;
/** /**
* 氨氮 * 氨氮

61
src/main/java/com/lanhai/entity/SurvTransdataOrientwater.java
View File

@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.extension.activerecord.Model; import com.baomidou.mybatisplus.extension.activerecord.Model;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors; import lombok.experimental.Accessors;
@ -43,13 +44,13 @@ public class SurvTransdataOrientwater extends Model<SurvTransdataOrientwater> {
*/ */
@TableField("DATA_WATER_TP") @TableField("DATA_WATER_TP")
private String dataWaterTp; private String dataWaterTp;
@TableField("DATA_WATER_TP_SY") @TableField("DATA_WATER_TP_SY")
private String dataWaterTpSy; private String dataWaterTpSy;
@TableField("DATA_WATER_TP_LD") @TableField("DATA_WATER_TP_LD")
private String dataWaterTpLd; private String dataWaterTpLd;
/** /**
* 总氮 * 总氮
*/ */
@ -61,6 +62,46 @@ public class SurvTransdataOrientwater extends Model<SurvTransdataOrientwater> {
@TableField("DATA_WATER_TN_LD") @TableField("DATA_WATER_TN_LD")
private String dataWaterTnLd; private String dataWaterTnLd;
/**
* 硝态氮
*/
@TableField("DATA_WATER_NO")
private String dataWaterNo;
/**硝态氮*/
@ApiModelProperty(value = "硝态氮")
@TableField("DATA_WATER_NO_SY")
private String dataWaterNoSy;
/**硝态氮*/
@ApiModelProperty(value = "硝态氮")
@TableField("DATA_WATER_NO_LD")
private String dataWaterNoLd;
/**
* 氨氮
*/
@TableField("DATA_WATER_NH")
private String dataWaterNh;
@TableField("DATA_WATER_NH_SY")
private String dataWaterNhSy;
@TableField("DATA_WATER_NH_LD")
private String dataWaterNhLd;
/**
* 化学需氧量
*/
@TableField("DATA_WATER_COD")
private String dataWaterCod;
@TableField("DATA_WATER_COD_SY")
private String dataWaterCodSy;
@TableField("DATA_WATER_COD_LD")
private String dataWaterCodLd;
@TableField("FLUID_LEVEL") @TableField("FLUID_LEVEL")
private String fluidLevel;//液位 private String fluidLevel;//液位
@ -86,23 +127,7 @@ public class SurvTransdataOrientwater extends Model<SurvTransdataOrientwater> {
private String mainSideStatus;//主副泵状态 private String mainSideStatus;//主副泵状态
/**
* 氨氮
*/
@TableField("DATA_WATER_NH")
private String dataWaterNh;
/**
* 化学需氧量
*/
@TableField("DATA_WATER_COD")
private String dataWaterCod;
/**
* 硝态氮 硝碳氮
*/
@TableField("DATA_WATER_NO")
private String dataWaterNo;
/** /**
* 数据更新时间 * 数据更新时间

35
src/main/java/com/lanhai/service/Impl/SurvHisdataLivestockwaterServiceImpl.java
View File

@ -70,18 +70,18 @@ public class SurvHisdataLivestockwaterServiceImpl extends ServiceImpl<SurvHisdat
orgId = newestData.getId(); orgId = newestData.getId();
boolean isNegative = false; boolean isNegative = false;
//检查有没有负数 //检查有没有负数
if(StringUtils.isNotBlank(newestData.getDataWaterTp())){//跳过负数 if(StringUtils.isNotBlank(newestData.getDataWaterTpSy())){//跳过负数
if(newestData.getDataWaterTp().contains("-") || newestData.getDataWaterTp().length()>10){ if(newestData.getDataWaterTpSy().contains("-") || newestData.getDataWaterTpSy().length()>10){
isNegative = true; isNegative = true;
} }
} }
else if(StringUtils.isNotBlank(newestData.getDataWaterTn())){//跳过负数 else if(StringUtils.isNotBlank(newestData.getDataWaterTnSy())){//跳过负数
if(newestData.getDataWaterTn().contains("-") || newestData.getDataWaterTn().length()>10){ if(newestData.getDataWaterTnSy().contains("-") || newestData.getDataWaterTnSy().length()>10){
isNegative = true; isNegative = true;
} }
} }
else if(StringUtils.isNotBlank(newestData.getDataWaterNo())){//跳过负数 else if(StringUtils.isNotBlank(newestData.getDataWaterNoSy())){//跳过负数
if(newestData.getDataWaterNo().contains("-") || newestData.getDataWaterNo().length()>10){ if(newestData.getDataWaterNoSy().contains("-") || newestData.getDataWaterNoSy().length()>10){
isNegative = true; isNegative = true;
} }
} }
@ -135,8 +135,8 @@ public class SurvHisdataLivestockwaterServiceImpl extends ServiceImpl<SurvHisdat
hisdataLivestockwater.setDataDateTime(nowTime); hisdataLivestockwater.setDataDateTime(nowTime);
hisdataLivestockwater.setDataGatherType(IotConstants.MARK_GENDATA); hisdataLivestockwater.setDataGatherType(IotConstants.MARK_GENDATA);
// hisdataLivestockwater.setDataWaterTp(BigDecimalRandomAdjuster.randomAdjustByFixedRange(new BigDecimal(newestData.getDataWaterTp()), fixedRange, scale)); // hisdataLivestockwater.setDataWaterTp(BigDecimalRandomAdjuster.randomAdjustByFixedRange(new BigDecimal(newestData.getDataWaterTpSy()), fixedRange, scale));
// hisdataLivestockwater.setDataWaterTn(BigDecimalRandomAdjuster.randomAdjustByFixedRange(new BigDecimal(newestData.getDataWaterTn()), fixedRange, scale)); // hisdataLivestockwater.setDataWaterTn(BigDecimalRandomAdjuster.randomAdjustByFixedRange(new BigDecimal(newestData.getDataWaterTnSy()), fixedRange, scale));
// hisdataLivestockwater.setDataWaterNh(BigDecimalRandomAdjuster.randomAdjustByFixedRange(new BigDecimal(newestData.getDataWaterNh()), fixedRange, scale)); // hisdataLivestockwater.setDataWaterNh(BigDecimalRandomAdjuster.randomAdjustByFixedRange(new BigDecimal(newestData.getDataWaterNh()), fixedRange, scale));
// hisdataLivestockwater.setDataWaterCod(BigDecimalRandomAdjuster.randomAdjustByFixedRange(new BigDecimal(newestData.getDataWaterCod()), fixedRange, scale)); // hisdataLivestockwater.setDataWaterCod(BigDecimalRandomAdjuster.randomAdjustByFixedRange(new BigDecimal(newestData.getDataWaterCod()), fixedRange, scale));
@ -199,23 +199,23 @@ public class SurvHisdataLivestockwaterServiceImpl extends ServiceImpl<SurvHisdat
orgId = newestData.getId(); orgId = newestData.getId();
boolean isNegative = false; boolean isNegative = false;
//检查有没有负数 //检查有没有负数
if (StringUtils.isNotBlank(newestData.getDataWaterTp())) {//跳过负数 if (StringUtils.isNotBlank(newestData.getDataWaterTpSy())) {//跳过负数
if (newestData.getDataWaterTp().contains("-") || newestData.getDataWaterTp().length() > 10) { if (newestData.getDataWaterTpSy().contains("-") || newestData.getDataWaterTpSy().length() > 10) {
isNegative = true; isNegative = true;
} }
} else if (StringUtils.isNotBlank(newestData.getDataWaterTn())) {//跳过负数 } else if (StringUtils.isNotBlank(newestData.getDataWaterTnSy())) {//跳过负数
if (newestData.getDataWaterTn().contains("-") || newestData.getDataWaterTn().length() > 10) { if (newestData.getDataWaterTnSy().contains("-") || newestData.getDataWaterTnSy().length() > 10) {
isNegative = true; isNegative = true;
} }
} else if (StringUtils.isNotBlank(newestData.getDataWaterNo())) {//跳过负数 } else if (StringUtils.isNotBlank(newestData.getDataWaterNoSy())) {//跳过负数
if (newestData.getDataWaterNo().contains("-") || newestData.getDataWaterNo().length() > 10) { if (newestData.getDataWaterNoSy().contains("-") || newestData.getDataWaterNoSy().length() > 10) {
isNegative = true; isNegative = true;
} }
} else if (StringUtils.isNotBlank(newestData.getDataWaterNh())) {//跳过负数 } else if (StringUtils.isNotBlank(newestData.getDataWaterNhSy())) {//跳过负数
if (newestData.getDataWaterNh().contains("-") || newestData.getDataWaterNh().length() > 10) { if (newestData.getDataWaterNh().contains("-") || newestData.getDataWaterNh().length() > 10) {
isNegative = true; isNegative = true;
} }
} else if (StringUtils.isNotBlank(newestData.getDataWaterCod())) {//跳过负数 } else if (StringUtils.isNotBlank(newestData.getDataWaterCodSy())) {//跳过负数
if (newestData.getDataWaterCod().contains("-") || newestData.getDataWaterCod().length() > 10) { if (newestData.getDataWaterCod().contains("-") || newestData.getDataWaterCod().length() > 10) {
isNegative = true; isNegative = true;
} }
@ -306,6 +306,9 @@ public class SurvHisdataLivestockwaterServiceImpl extends ServiceImpl<SurvHisdat
BigDecimal fixedRange = new BigDecimal(rule.getFactor()); BigDecimal fixedRange = new BigDecimal(rule.getFactor());
int scale = rule.getScale();//小数位 int scale = rule.getScale();//小数位
String correctVal = BigDecimalRandomAdjuster.randomAdjustByFixedRange(new BigDecimal(vals), fixedRange, scale); String correctVal = BigDecimalRandomAdjuster.randomAdjustByFixedRange(new BigDecimal(vals), fixedRange, scale);
if(correctVal.contains("-") || "0".equals(correctVal)){//如果是负数或0用原来的值
correctVal = vals;
}
TUtil.setFieldValue(hisdataLivestockwater, rule.getFields(), correctVal); TUtil.setFieldValue(hisdataLivestockwater, rule.getFields(), correctVal);
} else { } else {
log.error("==========设备:{}，编号:{}指标：{}配置错误==============，跳过", deploy.getDeployDes(), deploy.getDeployCode(), rule.getFields()); log.error("==========设备:{}，编号:{}指标：{}配置错误==============，跳过", deploy.getDeployDes(), deploy.getDeployCode(), rule.getFields());

37
src/main/java/com/lanhai/service/Impl/SurvHisdataOrientwaterServiceImpl.java
View File

@ -75,18 +75,18 @@ public class SurvHisdataOrientwaterServiceImpl extends ServiceImpl<SurvHisdataOr
orgId = newestData.getId(); orgId = newestData.getId();
boolean isNegative = false; boolean isNegative = false;
//检查有没有负数 //检查有没有负数
if(StringUtils.isNotBlank(newestData.getDataWaterTp())){//跳过负数 if(StringUtils.isNotBlank(newestData.getDataWaterTpSy())){//跳过负数
if(newestData.getDataWaterTp().contains("-") || newestData.getDataWaterTp().length()>10){ if(newestData.getDataWaterTpSy().contains("-") || newestData.getDataWaterTpSy().length()>10){
isNegative = true; isNegative = true;
} }
} }
else if(StringUtils.isNotBlank(newestData.getDataWaterTn())){//跳过负数 else if(StringUtils.isNotBlank(newestData.getDataWaterTnSy())){//跳过负数
if(newestData.getDataWaterTn().contains("-") || newestData.getDataWaterTn().length()>10){ if(newestData.getDataWaterTnSy().contains("-") || newestData.getDataWaterTnSy().length()>10){
isNegative = true; isNegative = true;
} }
} }
else if(StringUtils.isNotBlank(newestData.getDataWaterNo())){//跳过负数 else if(StringUtils.isNotBlank(newestData.getDataWaterNoSy())){//跳过负数
if(newestData.getDataWaterNo().contains("-") || newestData.getDataWaterNo().length()>10){ if(newestData.getDataWaterNoSy().contains("-") || newestData.getDataWaterNoSy().length()>10){
isNegative = true; isNegative = true;
} }
} }
@ -150,9 +150,9 @@ public class SurvHisdataOrientwaterServiceImpl extends ServiceImpl<SurvHisdataOr
hisdataOrientwater.setDataDateTime(nowTime); hisdataOrientwater.setDataDateTime(nowTime);
hisdataOrientwater.setDataGatherType(IotConstants.MARK_GENDATA); hisdataOrientwater.setDataGatherType(IotConstants.MARK_GENDATA);
// hisdataOrientwater.setDataWaterTp(BigDecimalRandomAdjuster.randomAdjustByFixedRange(new BigDecimal(newestData.getDataWaterTp()), fixedRange, scale)); // hisdataOrientwater.setDataWaterTp(BigDecimalRandomAdjuster.randomAdjustByFixedRange(new BigDecimal(newestData.getDataWaterTpSy()), fixedRange, scale));
// hisdataOrientwater.setDataWaterTn(BigDecimalRandomAdjuster.randomAdjustByFixedRange(new BigDecimal(newestData.getDataWaterTn()), fixedRange, scale)); // hisdataOrientwater.setDataWaterTn(BigDecimalRandomAdjuster.randomAdjustByFixedRange(new BigDecimal(newestData.getDataWaterTnSy()), fixedRange, scale));
// hisdataOrientwater.setDataWaterNo(BigDecimalRandomAdjuster.randomAdjustByFixedRange(new BigDecimal(newestData.getDataWaterNo()), fixedRange, scale)); // hisdataOrientwater.setDataWaterNo(BigDecimalRandomAdjuster.randomAdjustByFixedRange(new BigDecimal(newestData.getDataWaterNoSy()), fixedRange, scale));
// hisdataOrientwater.setDataWaterCod(BigDecimalRandomAdjuster.randomAdjustByFixedRange(new BigDecimal(newestData.getDataWaterCod()), fixedRange, scale)); // hisdataOrientwater.setDataWaterCod(BigDecimalRandomAdjuster.randomAdjustByFixedRange(new BigDecimal(newestData.getDataWaterCod()), fixedRange, scale));
for (ScEquZhibiao zhibiao : zhibiaos) { for (ScEquZhibiao zhibiao : zhibiaos) {
@ -218,23 +218,23 @@ public class SurvHisdataOrientwaterServiceImpl extends ServiceImpl<SurvHisdataOr
orgId = newestData.getId(); orgId = newestData.getId();
boolean isNegative = false; boolean isNegative = false;
//检查有没有负数 //检查有没有负数
if (StringUtils.isNotBlank(newestData.getDataWaterTp())) {//跳过负数 if (StringUtils.isNotBlank(newestData.getDataWaterTpSy())) {//跳过负数
if (newestData.getDataWaterTp().contains("-") || newestData.getDataWaterTp().length() > 10) { if (newestData.getDataWaterTpSy().contains("-") || newestData.getDataWaterTpSy().length() > 10) {
isNegative = true; isNegative = true;
} }
} else if (StringUtils.isNotBlank(newestData.getDataWaterTn())) {//跳过负数 } else if (StringUtils.isNotBlank(newestData.getDataWaterTnSy())) {//跳过负数
if (newestData.getDataWaterTn().contains("-") || newestData.getDataWaterTn().length() > 10) { if (newestData.getDataWaterTnSy().contains("-") || newestData.getDataWaterTnSy().length() > 10) {
isNegative = true; isNegative = true;
} }
} else if (StringUtils.isNotBlank(newestData.getDataWaterNo())) {//跳过负数 } else if (StringUtils.isNotBlank(newestData.getDataWaterNoSy())) {//跳过负数
if (newestData.getDataWaterNo().contains("-") || newestData.getDataWaterNo().length() > 10) { if (newestData.getDataWaterNoSy().contains("-") || newestData.getDataWaterNoSy().length() > 10) {
isNegative = true; isNegative = true;
} }
} else if (StringUtils.isNotBlank(newestData.getDataWaterNh())) {//跳过负数 } else if (StringUtils.isNotBlank(newestData.getDataWaterNhSy())) {//跳过负数
if (newestData.getDataWaterNh().contains("-") || newestData.getDataWaterNh().length() > 10) { if (newestData.getDataWaterNh().contains("-") || newestData.getDataWaterNh().length() > 10) {
isNegative = true; isNegative = true;
} }
} else if (StringUtils.isNotBlank(newestData.getDataWaterCod())) {//跳过负数 } else if (StringUtils.isNotBlank(newestData.getDataWaterCodSy())) {//跳过负数
if (newestData.getDataWaterCod().contains("-") || newestData.getDataWaterCod().length() > 10) { if (newestData.getDataWaterCod().contains("-") || newestData.getDataWaterCod().length() > 10) {
isNegative = true; isNegative = true;
} }
@ -327,6 +327,9 @@ public class SurvHisdataOrientwaterServiceImpl extends ServiceImpl<SurvHisdataOr
BigDecimal fixedRange = new BigDecimal(rule.getFactor()); BigDecimal fixedRange = new BigDecimal(rule.getFactor());
int scale = rule.getScale();//小数位 int scale = rule.getScale();//小数位
String correctVal = BigDecimalRandomAdjuster.randomAdjustByFixedRange(new BigDecimal(vals), fixedRange, scale); String correctVal = BigDecimalRandomAdjuster.randomAdjustByFixedRange(new BigDecimal(vals), fixedRange, scale);
if(correctVal.contains("-") || "0".equals(correctVal)){//如果是负数或0用原来的值
correctVal = vals;
}
TUtil.setFieldValue(hisdataOrientwater, rule.getFields(), correctVal); TUtil.setFieldValue(hisdataOrientwater, rule.getFields(), correctVal);
} else { } else {
log.error("==========设备:{}，编号:{}指标：{}配置错误==============，跳过", deploy.getDeployDes(), deploy.getDeployCode(), rule.getFields()); log.error("==========设备:{}，编号:{}指标：{}配置错误==============，跳过", deploy.getDeployDes(), deploy.getDeployCode(), rule.getFields());

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

@ -85,22 +85,22 @@ public class SurvTransdataLivestockwaterServiceImpl extends ServiceImpl<SurvTran
//舍弃为空、负数、无意义的长串类数据 //舍弃为空、负数、无意义的长串类数据
boolean isok = true; boolean isok = true;
if(StringUtils.isNotBlank(transdataLivestockwater.getDataWaterTp())){ if(StringUtils.isNotBlank(transdataLivestockwater.getDataWaterTpSy())){
if(transdataLivestockwater.getDataWaterTp().contains("-") || transdataLivestockwater.getDataWaterTp().length()>10 || "0.0000".equals(transdataLivestockwater.getDataWaterTp())){ if(transdataLivestockwater.getDataWaterTpSy().contains("-") || transdataLivestockwater.getDataWaterTpSy().length()>10 || "0.0000".equals(transdataLivestockwater.getDataWaterTpSy())){
isok =false; isok =false;
} }
}else{ }else{
isok =false; isok =false;
} }
if(StringUtils.isNotBlank(transdataLivestockwater.getDataWaterTn())){ if(StringUtils.isNotBlank(transdataLivestockwater.getDataWaterTnSy())){
if(transdataLivestockwater.getDataWaterTn().contains("-") || transdataLivestockwater.getDataWaterTn().length()>10 || "0.0000".equals(transdataLivestockwater.getDataWaterTn())){ if(transdataLivestockwater.getDataWaterTnSy().contains("-") || transdataLivestockwater.getDataWaterTnSy().length()>10 || "0.0000".equals(transdataLivestockwater.getDataWaterTnSy())){
isok =false; isok =false;
} }
}else{ }else{
isok =false; isok =false;
} }
if(StringUtils.isNotBlank(transdataLivestockwater.getDataWaterNo())){ if(StringUtils.isNotBlank(transdataLivestockwater.getDataWaterNoSy())){
if(transdataLivestockwater.getDataWaterNo().contains("-") || transdataLivestockwater.getDataWaterNo().length()>10 || "0.0000".equals(transdataLivestockwater.getDataWaterNo())){ if(transdataLivestockwater.getDataWaterNoSy().contains("-") || transdataLivestockwater.getDataWaterNoSy().length()>10 || "0.0000".equals(transdataLivestockwater.getDataWaterNoSy())){
isok =false; isok =false;
} }
}else{ }else{

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

@ -82,29 +82,29 @@ public class SurvTransdataOrientwaterServiceImpl extends ServiceImpl<SurvTransda
//舍弃为空、负数、无意义的长串类数据 //舍弃为空、负数、无意义的长串类数据
boolean isok = true; boolean isok = true;
if(StringUtils.isNotBlank(transdataOrientwater.getDataWaterTp())){ if(StringUtils.isNotBlank(transdataOrientwater.getDataWaterTpSy())){
if(transdataOrientwater.getDataWaterTp().contains("-") || transdataOrientwater.getDataWaterTp().length()>10 || "0.0000".equals(transdataOrientwater.getDataWaterTp()) ){ if(transdataOrientwater.getDataWaterTpSy().contains("-") || transdataOrientwater.getDataWaterTpSy().length()>10 || "0.0000".equals(transdataOrientwater.getDataWaterTpSy()) ){
isok =false; isok =false;
} }
}else{ }else{
isok =false; isok =false;
} }
if(StringUtils.isNotBlank(transdataOrientwater.getDataWaterTn())){ if(StringUtils.isNotBlank(transdataOrientwater.getDataWaterTnSy())){
if(transdataOrientwater.getDataWaterTn().contains("-") || transdataOrientwater.getDataWaterTn().length()>10 || "0.0000".equals(transdataOrientwater.getDataWaterTn())){ if(transdataOrientwater.getDataWaterTnSy().contains("-") || transdataOrientwater.getDataWaterTnSy().length()>10 || "0.0000".equals(transdataOrientwater.getDataWaterTnSy())){
isok =false; isok =false;
} }
}else{ }else{
isok =false; isok =false;
} }
if(StringUtils.isNotBlank(transdataOrientwater.getDataWaterNo())){ if(StringUtils.isNotBlank(transdataOrientwater.getDataWaterNoSy())){
if(transdataOrientwater.getDataWaterNo().contains("-") || transdataOrientwater.getDataWaterNo().length()>10 || "0.0000".equals(transdataOrientwater.getDataWaterNo())){ if(transdataOrientwater.getDataWaterNoSy().contains("-") || transdataOrientwater.getDataWaterNoSy().length()>10 || "0.0000".equals(transdataOrientwater.getDataWaterNoSy())){
isok =false; isok =false;
} }
}else{ }else{
isok =false; isok =false;
} }
if(StringUtils.isNotBlank(transdataOrientwater.getDataWaterNh())){ if(StringUtils.isNotBlank(transdataOrientwater.getDataWaterNhSy())){
if(transdataOrientwater.getDataWaterNh().contains("-") || transdataOrientwater.getDataWaterNh().length()>10 || "0.0000".equals(transdataOrientwater.getDataWaterNh()) ){ if(transdataOrientwater.getDataWaterNh().contains("-") || transdataOrientwater.getDataWaterNh().length()>10 || "0.0000".equals(transdataOrientwater.getDataWaterNh()) ){
isok =false; isok =false;
} }
@ -112,7 +112,7 @@ public class SurvTransdataOrientwaterServiceImpl extends ServiceImpl<SurvTransda
isok =false; isok =false;
} }
if(StringUtils.isNotBlank(transdataOrientwater.getDataWaterCod())){ if(StringUtils.isNotBlank(transdataOrientwater.getDataWaterCodSy())){
if(transdataOrientwater.getDataWaterCod().contains("-") || transdataOrientwater.getDataWaterCod().length()>10 || "0.0000".equals(transdataOrientwater.getDataWaterCod()) ){ if(transdataOrientwater.getDataWaterCod().contains("-") || transdataOrientwater.getDataWaterCod().length()>10 || "0.0000".equals(transdataOrientwater.getDataWaterCod()) ){
isok =false; isok =false;
} }