|
@@ -106,8 +106,6 @@ public class ProjectDataRecordServiceImpl implements IProjectDataRecordService {
|
|
|
// 获取不到锁,略过
|
|
|
return new AsyncResult<>("【监测维保数据计算线程】项目:" + projectDTO.getProjectId() + "被占用");
|
|
|
}
|
|
|
- Date startDate = com.persagy.apm.diagnose.utils.DateUtils.addDays(todayDate,-1);
|
|
|
- computerWetBallTempMap(projectDTO,startDate,todayDate);
|
|
|
long start = System.currentTimeMillis();
|
|
|
AsyncResult<String> projectDTOBack = computeProjectMaintenanceData(todayDate, projectDTO);
|
|
|
if (projectDTOBack != null) {
|
|
@@ -660,7 +658,7 @@ public class ProjectDataRecordServiceImpl implements IProjectDataRecordService {
|
|
|
}
|
|
|
//循环计算日均
|
|
|
for (Date dayDate = startDate; dayDate.before(endDate); dayDate = DateUtils.addDays(dayDate, 1)) {
|
|
|
- //计算冷却泵 日均值 并构造实体对象
|
|
|
+ //计算 日均值 并构造实体对象
|
|
|
Double dayAvg = computeDayAvg(dayDate, dateRunDataMap, dayCoolWaterMainReturnTempMap, dayTwdTempMap);
|
|
|
//构造实体对象
|
|
|
MonitorIndicatorRecord monitorIndicatorRecord = new MonitorIndicatorRecord();
|
|
@@ -1103,7 +1101,6 @@ public class ProjectDataRecordServiceImpl implements IProjectDataRecordService {
|
|
|
for (WeatherDTO dto:dtoList) {
|
|
|
//根据温度和湿度 计算出湿空气焓值
|
|
|
Double hVal = getHVal(dto.getTemperature(),dto.getHumidity());
|
|
|
- log.info("项目编号为:"+projectDTO.getProjectId()+"日期为:"+dto.getHourTime()+"温度:"+dto.getTemperature()+"湿度:"+dto.getHumidity());
|
|
|
//根据允许范围推出Tw值
|
|
|
Double Tw = getTw(dto.getTemperature(),hVal,TwdTemp_Limit);
|
|
|
log.info("项目编号为:"+projectDTO.getProjectId()+"日期为:"+dto.getHourTime()+"温度:"+dto.getTemperature()+"湿度:"+dto.getHumidity()+"湿球温度:"+Tw);
|