|
@@ -1,31 +1,35 @@
|
|
|
package com.persagy.apm.energy.report.monthly.config.function.service.impl;
|
|
|
|
|
|
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
|
+import com.baomidou.mybatisplus.core.metadata.IPage;
|
|
|
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
|
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
|
|
+import com.google.common.base.CaseFormat;
|
|
|
+import com.persagy.apm.common.constant.enums.ValidEnum;
|
|
|
import com.persagy.apm.common.context.AppContext;
|
|
|
+import com.persagy.apm.common.model.dto.Sort;
|
|
|
import com.persagy.apm.energy.report.centermiddleware.model.dto.QueryItemInfoDTO;
|
|
|
import com.persagy.apm.energy.report.centermiddleware.service.ICenterMiddlewareWebService;
|
|
|
+import com.persagy.apm.energy.report.monthly.config.function.constant.enums.EnergyTypeEnum;
|
|
|
import com.persagy.apm.energy.report.monthly.config.function.dao.FunctionMapper;
|
|
|
+import com.persagy.apm.energy.report.monthly.config.function.model.ConvertFunctionTool;
|
|
|
+import com.persagy.apm.energy.report.monthly.config.function.model.Function;
|
|
|
+import com.persagy.apm.energy.report.monthly.config.function.model.dto.AddFunctionDTO;
|
|
|
+import com.persagy.apm.energy.report.monthly.config.function.model.dto.PageQueryFunctionDTO;
|
|
|
+import com.persagy.apm.energy.report.monthly.config.function.model.dto.QueryFunctionDTO;
|
|
|
+import com.persagy.apm.energy.report.monthly.config.function.model.dto.UpdateFunctionDTO;
|
|
|
import com.persagy.apm.energy.report.monthly.config.function.service.IFunctionService;
|
|
|
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
|
|
import com.persagy.apm.energy.report.saasweb.model.vo.SimpleProjectVO;
|
|
|
import com.persagy.apm.energy.report.saasweb.service.ISaasWebService;
|
|
|
+import org.apache.commons.lang.StringUtils;
|
|
|
import org.assertj.core.util.Lists;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
-import org.apache.commons.lang.StringUtils;
|
|
|
-import com.persagy.apm.common.constant.enums.ValidEnum;
|
|
|
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
|
-import com.persagy.apm.energy.report.monthly.config.function.model.*;
|
|
|
-import com.persagy.apm.energy.report.monthly.config.function.model.dto.*;
|
|
|
+import org.springframework.util.CollectionUtils;
|
|
|
|
|
|
import java.util.List;
|
|
|
import java.util.Map;
|
|
|
|
|
|
-import com.baomidou.mybatisplus.core.metadata.IPage;
|
|
|
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
|
-import com.google.common.base.CaseFormat;
|
|
|
-import com.persagy.apm.common.model.dto.Sort;
|
|
|
-import org.springframework.util.CollectionUtils;
|
|
|
-
|
|
|
/**
|
|
|
* 能耗报告信息点(Function) service层
|
|
|
*
|
|
@@ -260,12 +264,22 @@ public class FunctionServiceImpl extends ServiceImpl<FunctionMapper, Function>
|
|
|
// 注意这里应该传入项目本地编码
|
|
|
queryItemInfoDTO.setProjectId(simpleProjectInfo.getProjectLocalID());
|
|
|
queryItemInfoDTO.setBuildingId(simpleProjectInfo.getProjectLocalID());
|
|
|
- queryItemInfoDTO.setModelCode(function.getModelCode());
|
|
|
- queryItemInfoDTO.setItemIdList(Lists.newArrayList(function.getItemId()));
|
|
|
- Map<String, String> itemNameMap = centerMiddlewareWebService. getItemNameMap(queryItemInfoDTO);
|
|
|
- if (itemNameMap != null) {
|
|
|
- return itemNameMap.get(function.getItemId());
|
|
|
+ String defaultNoItemId = "sumItem";
|
|
|
+ if (defaultNoItemId.equals(function.getItemId())) {
|
|
|
+ if (StringUtils.isBlank(function.getEnergyType())) {
|
|
|
+ return "";
|
|
|
+ }
|
|
|
+ EnergyTypeEnum energyTypeEnum = EnergyTypeEnum.getByType(Integer.parseInt(function.getEnergyType()));
|
|
|
+ return energyTypeEnum.getDesc();
|
|
|
+ } else {
|
|
|
+ queryItemInfoDTO.setModelCode(function.getModelCode());
|
|
|
+ queryItemInfoDTO.setItemIdList(Lists.newArrayList(function.getItemId()));
|
|
|
+ Map<String, String> itemNameMap = centerMiddlewareWebService.getItemNameMap(queryItemInfoDTO);
|
|
|
+ if (itemNameMap != null) {
|
|
|
+ return itemNameMap.get(function.getItemId());
|
|
|
+ }
|
|
|
}
|
|
|
+
|
|
|
return "";
|
|
|
}
|
|
|
}
|