Переглянути джерело

百分比数值数值类型标记为百分比

lixing 3 роки тому
батько
коміт
8bfe16e7e4

+ 6 - 6
src/main/java/com/persagy/apm/report/dependencies/centermiddleware/service/impl/ICenterMiddlewareWebServiceImp.java

@@ -29,13 +29,13 @@ public class ICenterMiddlewareWebServiceImp implements ICenterMiddlewareWebServi
         if (null == queryEnergyDataDTO) {
             return new HashMap<>();
         }
-        PoemsFeignResponse<EnergyDataInfoVO> response = centerMiddlewareWebClient.getItemEnergyData(queryEnergyDataDTO);
-        List<EnergyDataInfoVO> energyDataInfoVOList = response.getContent();
-        if (CollectionUtils.isEmpty(energyDataInfoVOList)) {
-            return new HashMap<>();
-        }
         Map<String, TreeMap<Date, Double>> resultMap = new HashMap<>();
         try {
+            PoemsFeignResponse<EnergyDataInfoVO> response = centerMiddlewareWebClient.getItemEnergyData(queryEnergyDataDTO);
+            List<EnergyDataInfoVO> energyDataInfoVOList = response.getContent();
+            if (CollectionUtils.isEmpty(energyDataInfoVOList)) {
+                return new HashMap<>();
+            }
             for (EnergyDataInfoVO energyDataInfoVO : energyDataInfoVOList) {
                 TreeMap<Date, Double> dateDataMap = resultMap.get(energyDataInfoVO.getItemId());
                 if (null == dateDataMap) {
@@ -45,7 +45,7 @@ public class ICenterMiddlewareWebServiceImp implements ICenterMiddlewareWebServi
                 resultMap.put(energyDataInfoVO.getItemId(), dateDataMap);
             }
         } catch (Exception e) {
-            e.printStackTrace();
+            log.error("数据平台获取能耗数据失败:" + e);
         }
         return resultMap;
     }

+ 2 - 2
src/main/java/com/persagy/apm/report/indicator/factory/EnergyBudgetFactory.java

@@ -194,7 +194,7 @@ public class EnergyBudgetFactory {
         Double proportion = getProportion(currentMonth, monthlyBudget);
         String proportionStr = proportion == null? null:String.valueOf(proportion);
         return new AttrValueVO(BudgetContentCodes.monthlyProportion.name(),
-                proportionStr, AttrValueTypeEnum.number_1, DataConstants.PERCENT);
+                proportionStr, AttrValueTypeEnum.percent_1, DataConstants.PERCENT);
     }
 
     /**
@@ -210,7 +210,7 @@ public class EnergyBudgetFactory {
         Double proportion = getProportion(aggregate, annualBudget);
         String proportionStr = proportion == null? null:String.valueOf(proportion);
         return new AttrValueVO(BudgetContentCodes.annualProportion.name(),
-                proportionStr, AttrValueTypeEnum.number_1, DataConstants.PERCENT);
+                proportionStr, AttrValueTypeEnum.percent_1, DataConstants.PERCENT);
     }
 
     /**

+ 1 - 1
src/main/java/com/persagy/apm/report/indicator/factory/EnergyEfficiencyFactory.java

@@ -168,7 +168,7 @@ public class EnergyEfficiencyFactory {
     public AttrValueVO getChainRange(
             Double chainGrowth, Double lastMonth) {
         return IndicatorUtils.getRange(ProjectEnergyEfficiencyContentCodes.chainRange.name(),
-                chainGrowth, lastMonth, AttrValueTypeEnum.number_2);
+                chainGrowth, lastMonth, AttrValueTypeEnum.percent_2);
     }
 
     /**

+ 3 - 3
src/main/java/com/persagy/apm/report/indicator/factory/EnergyUsageFactory.java

@@ -271,7 +271,7 @@ public class EnergyUsageFactory {
      */
     public AttrValueVO getChainRange(Double chainGrowth, Double lastMonth) {
         return IndicatorUtils.getRange(EnergyUsageContentCodes.chainRange.name(),
-                chainGrowth, lastMonth, AttrValueTypeEnum.number_1);
+                chainGrowth, lastMonth, AttrValueTypeEnum.percent_1);
     }
 
     /**
@@ -320,7 +320,7 @@ public class EnergyUsageFactory {
      */
     public AttrValueVO getSameTimeRange(Double sametimeGrowth, Double sametimeLastYear) {
         return IndicatorUtils.getRange(EnergyUsageContentCodes.sametimeRange.name(),
-                sametimeGrowth, sametimeLastYear, AttrValueTypeEnum.number_1);
+                sametimeGrowth, sametimeLastYear, AttrValueTypeEnum.percent_1);
     }
 
     /**
@@ -387,7 +387,7 @@ public class EnergyUsageFactory {
      */
     public AttrValueVO getAggregateRange(Double aggregateGrowth, Double aggregateLastYear) {
         return IndicatorUtils.getRange(EnergyUsageContentCodes.aggregateRange.name(),
-                aggregateGrowth, aggregateLastYear, AttrValueTypeEnum.number_1);
+                aggregateGrowth, aggregateLastYear, AttrValueTypeEnum.percent_1);
     }
 
     /**

+ 4 - 4
src/main/java/com/persagy/apm/report/indicator/factory/EnvFactory.java

@@ -122,7 +122,7 @@ public class EnvFactory {
         Double envComplianceRate = environmentWebService.getEnvComplianceRate(projectId, date, envDefine);
         String envComplianceRateStr = envComplianceRate == null ? null : String.valueOf(envComplianceRate);
         return new AttrValueVO(ProjectEnvContentCodes.complianceRate.name(),
-                envComplianceRateStr, AttrValueTypeEnum.number_2, DataConstants.PERCENT);
+                envComplianceRateStr, AttrValueTypeEnum.percent_2, DataConstants.PERCENT);
     }
 
     /**
@@ -189,11 +189,11 @@ public class EnvFactory {
     public AttrValueVO getHandleProportion(Double handledCount, Double totalCount) {
         if (handledCount == null || totalCount == null) {
             return new AttrValueVO(ProjectEnvContentCodes.handleProportion.name(),
-                    null, AttrValueTypeEnum.number_2, DataConstants.PERCENT);
+                    null, AttrValueTypeEnum.percent_2, DataConstants.PERCENT);
         }
         Double proportion = DataUtils.doubleDivide(handledCount, totalCount);
         return new AttrValueVO(ProjectEnvContentCodes.handleProportion.name(),
-                String.valueOf(proportion), AttrValueTypeEnum.number_2, DataConstants.PERCENT);
+                String.valueOf(proportion), AttrValueTypeEnum.percent_2, DataConstants.PERCENT);
     }
 
     /**
@@ -235,7 +235,7 @@ public class EnvFactory {
      */
     public AttrValueVO getQualifiedStandard(Function function) {
         return new AttrValueVO(ProjectEnvContentCodes.complianceRateQualifiedStandard.name(),
-                getQualifiedStandardValue(function), AttrValueTypeEnum.str);
+                getQualifiedStandardValue(function), AttrValueTypeEnum.percent, DataConstants.PERCENT);
     }
 
     /**

+ 3 - 3
src/main/java/com/persagy/apm/report/indicator/factory/IotFactory.java

@@ -72,7 +72,7 @@ public class IotFactory {
         String currentMonthStr = currentMonthValue == null ? null : String.valueOf(currentMonthValue);
         return new AttrValueVO(ProjectIotContentCodes.currentMonth.name(),
                 currentMonthStr,
-                AttrValueTypeEnum.number_2, DataConstants.PERCENT);
+                AttrValueTypeEnum.percent_2, DataConstants.PERCENT);
     }
 
     /**
@@ -100,7 +100,7 @@ public class IotFactory {
             Double currentMonthValue = getCurrentMonthValue(iotDefine, projectId, tmpDate);
             GraphItemVO graphItemVO = new GraphItemVO(
                     DateUtils.date2Str(tmpDate, DateUtils.SDF_SPACE_SECOND),
-                    currentMonthValue, AttrValueTypeEnum.number_2);
+                    currentMonthValue, AttrValueTypeEnum.number_2, DataConstants.PERCENT);
             data.add(graphItemVO);
         }
 
@@ -164,7 +164,7 @@ public class IotFactory {
      */
     public AttrValueVO getQualifiedStandard(Function function) {
         return new AttrValueVO(ProjectIotContentCodes.qualifiedRange.name(),
-                getQualifiedStandardValue(function), AttrValueTypeEnum.str);
+                getQualifiedStandardValue(function), AttrValueTypeEnum.percent, DataConstants.PERCENT);
     }
 
     /**

+ 2 - 0
src/main/java/com/persagy/apm/report/indicator/model/vo/GraphItemVO.java

@@ -22,4 +22,6 @@ public class GraphItemVO {
     private Double value;
     @ApiModelProperty(value = "值类型")
     private AttrValueTypeEnum type;
+    @ApiModelProperty(value = "单位")
+    private String unit;
 }

+ 1 - 1
src/main/java/com/persagy/apm/report/paragraphs/service/impl/energyefficiency/AreaEnergyEfficiencyBuilder.java

@@ -91,7 +91,7 @@ public class AreaEnergyEfficiencyBuilder extends AreaIndicatorsParagraphBuilder
             // 统计各项目能效值
             GraphItemVO graphItemVO = new GraphItemVO(simpleProjectInfo.getProjectName(),
                     DataUtils.parseDouble(attrValueMap.get(ProjectEnergyEfficiencyContentCodes.currentMonth.name()).getValue()),
-                    AttrValueTypeEnum.number_2);
+                    AttrValueTypeEnum.number_2, "");
             projectsEfficiency.add(graphItemVO);
             // 统计不合格项目数
             String isQualifiedDesc = attrValueMap.get(ProjectEnergyEfficiencyContentCodes.isQualified.name()).getValue();

+ 2 - 1
src/main/java/com/persagy/apm/report/paragraphs/service/impl/env/AreaEnvBuilder.java

@@ -2,6 +2,7 @@ package com.persagy.apm.report.paragraphs.service.impl.env;
 
 import com.alibaba.excel.util.CollectionUtils;
 import com.google.gson.Gson;
+import com.persagy.apm.report.common.constants.DataConstants;
 import com.persagy.apm.report.common.utils.DataUtils;
 import com.persagy.apm.report.dependencies.saasweb.model.vo.SimpleProjectVO;
 import com.persagy.apm.report.dependencies.saasweb.service.ISaasWebService;
@@ -162,7 +163,7 @@ public class AreaEnvBuilder extends AreaIndicatorsParagraphBuilder {
             // 统计各项目达标率
             GraphItemVO graphItemVO = new GraphItemVO(simpleProjectInfo.getProjectName(),
                     DataUtils.parseDouble(attrValueMap.get(ProjectEnvContentCodes.complianceRate.name()).getValue()),
-                    AttrValueTypeEnum.number_2);
+                    AttrValueTypeEnum.number_2, DataConstants.PERCENT);
             projectsComplianceRate.add(graphItemVO);
             // 统计不合格项目数与合格项目数
             String isQualifiedDesc = attrValueMap.get(ProjectEnvContentCodes.complianceRateIsQualified.name()).getValue();

+ 2 - 1
src/main/java/com/persagy/apm/report/paragraphs/service/impl/iot/AreaIotBuilder.java

@@ -2,6 +2,7 @@ package com.persagy.apm.report.paragraphs.service.impl.iot;
 
 import com.alibaba.excel.util.CollectionUtils;
 import com.google.gson.Gson;
+import com.persagy.apm.report.common.constants.DataConstants;
 import com.persagy.apm.report.common.utils.DataUtils;
 import com.persagy.apm.report.dependencies.saasweb.model.vo.SimpleProjectVO;
 import com.persagy.apm.report.dependencies.saasweb.service.ISaasWebService;
@@ -80,7 +81,7 @@ public class AreaIotBuilder extends AreaIndicatorsParagraphBuilder {
             // 统计各项目报告月取值
             GraphItemVO graphItemVO = new GraphItemVO(simpleProjectInfo.getProjectName(),
                     DataUtils.parseDouble(attrValueMap.get(ProjectIotContentCodes.currentMonth.name()).getValue()),
-                    AttrValueTypeEnum.number_2);
+                    AttrValueTypeEnum.number_2, DataConstants.PERCENT);
             currentMonthValueList.add(graphItemVO);
             // 统计不合格项目数
             String isQualifiedDesc = attrValueMap.get(ProjectIotContentCodes.isQualified.name()).getValue();