|
@@ -132,14 +132,11 @@ public class FpgStatiscsModelData{
|
|
|
|
|
|
// 峰平谷精益模型数据统计
|
|
|
public FpgStatiscsModelData(FpgGatherData fpgGather, FpgLeanModel fpgLeanModel, String datestr, String dates, String classs, Date createTime, Date updateTime) {
|
|
|
- // 基础信息配置
|
|
|
- if(fpgGather.getDeviceRegionId() != null && !fpgGather.getDeviceRegionId().isEmpty()) { // 区域特殊处理
|
|
|
- this.deviceRegionId = fpgGather.getDeviceRegionId(); // 区域id
|
|
|
- }
|
|
|
- if(fpgGather.getDeviceInformationId() != null && !fpgGather.getDeviceInformationId().isEmpty()) { // 区域特殊处理
|
|
|
+ this.deviceRegionId = fpgGather.getDeviceRegionId(); // 区域id
|
|
|
+ if(fpgLeanModel.getDeviceRegionStatus() != null && fpgLeanModel.getDeviceRegionStatus() == 2){ // 非区域统计放开一下字段
|
|
|
this.deviceInformationId = fpgGather.getDeviceInformationId(); // 设备id
|
|
|
+ this.devicePointId = fpgGather.getDevicePointId(); // 采集点id
|
|
|
}
|
|
|
- this.devicePointId = fpgGather.getDevicePointId(); // 采集点id
|
|
|
this.ingTime = new BigDecimal("0.00"); // 运行时长
|
|
|
this.power = new BigDecimal("0.00"); // 运行功率
|
|
|
this.selectricCurrent = new BigDecimal("0.00"); // 运行电流
|