浏览代码

Merge branch 'dev-v1.0.0' of http://39.106.8.246:3003/apm/energy-report into dev-v1.0.0

lixing 3 年之前
父节点
当前提交
a749dc043d

+ 1 - 2
src/main/java/com/persagy/apm/energy/report/common/service/impl/CommonServiceImpl.java

@@ -65,8 +65,7 @@ public class CommonServiceImpl implements CommonService {
         PlatformService platformService = holder.getPlatformService(serviceName);
         Platform platform = new Platform();
         platform.setItemCode(statisticItems.getItemCode());
-        // TODO 条目名称赋值
-        platform.setModelName("");
+        platform.setModelName(statisticItems.getItemName());
         if (queryPlatformParamDTO.getBelongType().equals(BelongTypeEnum.PROJECT.getType())) {
             platform.setMonthlySummaries(platformService.getPjPlatformRate(queryPlatformParamDTO));
         } else if (queryPlatformParamDTO.getBelongType().equals(BelongTypeEnum.AREA.getType())) {

+ 2 - 4
src/main/java/com/persagy/apm/energy/report/manualfilling/controller/ManualFillingController.java

@@ -32,8 +32,7 @@ public class ManualFillingController {
     @ApiOperation(value = "查询报告能耗分项列表")
     @PostMapping("/query")
     public CommonResult<PageList<EnergyItemInfoVo>> queryEnergyItemDataList(
-            @Valid @RequestBody QueryEnergyItemDataDTO queryEnergyItemDataDTO, @RequestParam(value = "userId", defaultValue = DataConstants.USER_ID) String userId,
-            @RequestParam(value = "loginDevice", defaultValue = DataConstants.LOGIN_DEVICE) String loginDevice, @RequestParam(value = "pd", defaultValue = DataConstants.PD) String pd) {
+            @Valid @RequestBody QueryEnergyItemDataDTO queryEnergyItemDataDTO) {
         List<EnergyItemInfoVo> energyItemInfoVoList = iEnergyItemDataService.queryEnergyItemDataList(queryEnergyItemDataDTO);
         return ResultHelper.multi(energyItemInfoVoList);
     }
@@ -41,8 +40,7 @@ public class ManualFillingController {
     @ApiOperation(value = "保存能耗分项数值")
     @PostMapping("/save")
     public CommonResult<ApmResponseUpsertVO> updateReportBusinessDetail(
-            @Valid @RequestBody SaveEnergyItemDataDTO saveEnergyItemDataDTO, @RequestParam(value = "userId", defaultValue = DataConstants.USER_ID) String userId,
-            @RequestParam(value = "loginDevice", defaultValue = DataConstants.LOGIN_DEVICE) String loginDevice, @RequestParam(value = "pd", defaultValue = DataConstants.PD) String pd) {
+            @Valid @RequestBody SaveEnergyItemDataDTO saveEnergyItemDataDTO) {
         iEnergyItemDataService.saveEnergyItemData(saveEnergyItemDataDTO);
         return ResultHelper.single(new ApmResponseUpsertVO());
     }

+ 6 - 1
src/main/java/com/persagy/apm/energy/report/manualfilling/service/impl/IEnergyItemDataServiceImpl.java

@@ -1,5 +1,7 @@
 package com.persagy.apm.energy.report.manualfilling.service.impl;
 
+import com.persagy.apm.common.context.poems.PoemsContext;
+import com.persagy.apm.energy.report.common.DataConstants;
 import com.persagy.apm.energy.report.common.utils.DateUtils;
 import com.persagy.apm.energy.report.manualfilling.model.dto.QueryEnergyItemDataDTO;
 import com.persagy.apm.energy.report.manualfilling.model.dto.SaveEnergyItemDataDTO;
@@ -17,6 +19,7 @@ import com.persagy.apm.energy.report.saasweb.model.vo.ReportProjectVO;
 import com.persagy.apm.energy.report.saasweb.service.ISaasWebService;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang.StringUtils;
+import org.assertj.core.util.Lists;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
@@ -41,6 +44,7 @@ public class IEnergyItemDataServiceImpl implements IEnergyItemDataService {
     @Override
     public List<EnergyItemInfoVo> queryEnergyItemDataList(QueryEnergyItemDataDTO queryEnergyItemDataDTO) {
         try {
+            PoemsContext.setContext(DataConstants.USER_ID, DataConstants.LOGIN_DEVICE, DataConstants.PD);
             ReportProjectVO projectVO = iSaasWebService.getReportProjectInfo(queryEnergyItemDataDTO.getProjectId());
             if (null == projectVO || StringUtils.isEmpty(projectVO.getFunctionType())) {
                 return new ArrayList<>();
@@ -99,12 +103,13 @@ public class IEnergyItemDataServiceImpl implements IEnergyItemDataService {
         } catch (Exception e) {
             e.printStackTrace();
         }
-        return null;
+        return Lists.newArrayList();
     }
 
     @Override
     public void saveEnergyItemData(SaveEnergyItemDataDTO saveEnergyItemDataDTO) {
         try {
+            PoemsContext.setContext(DataConstants.USER_ID, DataConstants.LOGIN_DEVICE, DataConstants.PD);
             ReportProjectVO projectVO = iSaasWebService.getReportProjectInfo(saveEnergyItemDataDTO.getProjectId());
             if (null == projectVO || StringUtils.isEmpty(projectVO.getFunctionType())) {
                 throw new Exception("获取不到项目信息");

+ 3 - 0
src/main/java/com/persagy/apm/energy/report/monthly/config/statisticsitems/model/StatisticItems.java

@@ -24,6 +24,9 @@ public class StatisticItems extends AuditableEntity<StatisticItems> implements S
     @ApiModelProperty("条目编码")
     private String itemCode;
 
+    @ApiModelProperty("条目名称")
+    private String itemName;
+
     @ApiModelProperty("条目来源")
     private String itemSource;