|
@@ -109,15 +109,11 @@ public class ProjectDataRecordServiceImpl implements IProjectDataRecordService {
|
|
|
// 获取不到锁,略过
|
|
|
return new AsyncResult<>("【监测维保数据计算线程】项目:" + projectDTO.getProjectId() + "被占用");
|
|
|
}
|
|
|
-
|
|
|
- Date startDate = DateUtils.addDays(todayDate,-5);
|
|
|
- computerWetBallTempMap(projectDTO,startDate,todayDate);
|
|
|
-
|
|
|
long start = System.currentTimeMillis();
|
|
|
-// AsyncResult<String> projectDTOBack = computeProjectMaintenanceData(todayDate, projectDTO);
|
|
|
-// if (projectDTOBack != null) {
|
|
|
-// return projectDTOBack;
|
|
|
-// }
|
|
|
+ AsyncResult<String> projectDTOBack = computeProjectMaintenanceData(todayDate, projectDTO);
|
|
|
+ if (projectDTOBack != null) {
|
|
|
+ return projectDTOBack;
|
|
|
+ }
|
|
|
long end = System.currentTimeMillis();
|
|
|
return new AsyncResult<>("【监测维保数据计算线程】计算项目指标数据用时:" + projectDTO.getProjectId() + ";" + (end - start));
|
|
|
} finally {
|
|
@@ -1161,7 +1157,7 @@ public class ProjectDataRecordServiceImpl implements IProjectDataRecordService {
|
|
|
Double hVal = TwdTempUtil.getHVal(dto.getTemperature(),dto.getHumidity());
|
|
|
//根据允许范围推出Tw值
|
|
|
Double Tw = TwdTempUtil.getTw(dto.getTemperature(),hVal,TwdTemp_Limit);
|
|
|
- log.info("温度:"+dto.getTemperature()+"湿度:"+dto.getHumidity()+"湿球温度:"+Tw);
|
|
|
+// log.info("温度:"+dto.getTemperature()+"湿度:"+dto.getHumidity()+"湿球温度:"+Tw);
|
|
|
//小时时间
|
|
|
Date hour = dto.getHourTime();
|
|
|
Date nextHour = com.persagy.apm.diagnose.utils.DateUtils.addHours(hour,1);
|