|
@@ -28,6 +28,8 @@ import com.persagy.apm.energy.report.monthly.detail.hotel.project.model.vo.Hotel
|
|
|
import com.persagy.apm.energy.report.monthly.detail.hotel.project.model.vo.HotelProjectMaintenanceInfo;
|
|
|
import com.persagy.apm.energy.report.saasweb.model.dto.QueryProjectDTO;
|
|
|
import com.persagy.apm.energy.report.saasweb.model.vo.PoemsProjectVO;
|
|
|
+import com.persagy.apm.energy.report.saasweb.model.vo.ReportProjectVO;
|
|
|
+import com.persagy.apm.energy.report.saasweb.service.ISaasWebService;
|
|
|
import com.persagy.apm.energy.report.saasweb.service.impl.SaasWebClientWrapper;
|
|
|
import com.persagy.apm.energy.report.workorder.service.IWorkOrderWebService;
|
|
|
import io.swagger.annotations.Api;
|
|
@@ -66,6 +68,9 @@ public class CommonServiceImpl implements CommonService {
|
|
|
@Autowired
|
|
|
IStatisticItemsService iStatisticItemsService;
|
|
|
|
|
|
+ @Autowired
|
|
|
+ ISaasWebService saasWebService;
|
|
|
+
|
|
|
@Override
|
|
|
public List<String> getPjNameByPjId(List<String> pjIdList) {
|
|
|
if (CollectionUtils.isEmpty(pjIdList)) {
|
|
@@ -130,6 +135,9 @@ public class CommonServiceImpl implements CommonService {
|
|
|
hotelProjectAlarmDealInfo.setHandledCount(dealCount);
|
|
|
hotelProjectAlarmDealInfo.setHandledPercent(completeRate);
|
|
|
hotelProjectAlarmDealInfo.setTotalCount(workCount);
|
|
|
+ // 获取项目信息
|
|
|
+ ReportProjectVO reportProjectInfo = saasWebService.getReportProjectInfo(projectId);
|
|
|
+ hotelProjectAlarmDealInfo.setProjectName(null == reportProjectInfo ? "" : reportProjectInfo.getProjectName());
|
|
|
return hotelProjectAlarmDealInfo;
|
|
|
}
|
|
|
|
|
@@ -161,6 +169,7 @@ public class CommonServiceImpl implements CommonService {
|
|
|
continue;
|
|
|
}
|
|
|
hotelProjectKpiItem.setRankWithinClimateZone(i + 1);
|
|
|
+ hotelProjectKpiItem.setName(function.getName());
|
|
|
return hotelProjectKpiItem;
|
|
|
}
|
|
|
} catch (Exception e) {
|