Browse Source

修复生成段落的bug

lixing 3 năm trước cách đây
mục cha
commit
5f8fe4d8dc

+ 1 - 0
src/main/java/com/persagy/apm/report/dependencies/saasweb/service/impl/SaasWebClientWrapper.java

@@ -73,6 +73,7 @@ public class SaasWebClientWrapper {
      */
     public PoemsFeignResponse<PoemsPartitionVO> queryPartitionsByIds(QueryPartitionDTO queryPartitionDTO) {
         PoemsFeignBaseDTO poemsFeignBaseDTO = new PoemsFeignBaseDTO();
+        poemsFeignBaseDTO.setDefaultValue();
         poemsFeignBaseDTO.setPuser(queryPartitionDTO.getPuser());
 
         PoemsFeignResponse<PoemsPartitionVO> partitionsResponse = saasWebClient.queryAllPartitions(

+ 5 - 4
src/main/java/com/persagy/apm/report/paragraphs/service/impl/energybudget/AreaEnergyBudgetBuilder.java

@@ -50,15 +50,16 @@ public class AreaEnergyBudgetBuilder extends AreaDepsParagraphBuilder {
         // 总预算
         AttrValueVO monthlyBudget = data.get(BudgetHeaderCodes.monthlyBudget.name());
         if (monthlyBudget != null) {
-            monthlyBudget.setCode(BudgetHeaderCodes.monthlyBudget.name());
-            result.add(monthlyBudget);
+            result.add(new AttrValueVO(
+                    BudgetHeaderCodes.monthlyBudget.name(), monthlyBudget.getValue(), monthlyBudget.getType()));
         }
 
         // 实际能耗
         AttrValueVO currentMonth = data.get(BudgetHeaderCodes.currentMonth.name());
         if (currentMonth != null) {
-            currentMonth.setCode(BudgetHeaderCodes.currentMonth.name());
-            result.add(currentMonth);
+            result.add(new AttrValueVO(
+                    BudgetHeaderCodes.currentMonth.name(), currentMonth.getValue(), currentMonth.getType()
+            ));
         }
 
         // 获取能耗超过预算的子分区数目,如果没有子分区,按项目数统计

+ 11 - 9
src/main/java/com/persagy/apm/report/paragraphs/service/impl/energyusage/ProjectEnergyUsageBuilder.java

@@ -58,26 +58,28 @@ public class ProjectEnergyUsageBuilder extends ProjectParagraphBuilder {
 
         List<AttrValueVO> result = new ArrayList<>();
         // 总耗电量
-        AttrValueVO totalUsage = data.get(EnergyUsageContentCodes.currentMonth.name());
-        if (totalUsage != null) {
-            totalUsage.setCode(EnergyUsageHeaderCodes.totalUsage.name());
+        AttrValueVO currentMonth = data.get(EnergyUsageContentCodes.currentMonth.name());
+
+        if (currentMonth != null) {
+            AttrValueVO totalUsage = new AttrValueVO(
+                    EnergyUsageHeaderCodes.totalUsage.name(), currentMonth.getValue(), currentMonth.getType());
             result.add(totalUsage);
         }
         // 同比增幅
         AttrValueVO sametimeRange = data.get(EnergyUsageContentCodes.sametimeRange.name());
         if (sametimeRange != null) {
-            sametimeRange.setCode(EnergyUsageHeaderCodes.sameTimeRange.name());
-            result.add(sametimeRange);
+            result.add(new AttrValueVO(
+                    EnergyUsageHeaderCodes.sameTimeRange.name(), sametimeRange.getValue(), sametimeRange.getType()));
         }
         // 环比增幅
         AttrValueVO chainRange = data.get(EnergyUsageContentCodes.chainRange.name());
         if (chainRange != null) {
-            chainRange.setCode(EnergyUsageHeaderCodes.chainRange.name());
-            result.add(chainRange);
+            result.add(new AttrValueVO(
+                    EnergyUsageHeaderCodes.chainRange.name(), chainRange.getValue(), chainRange.getType()));
         }
         // 同等碳排放量
-        if (totalUsage != null) {
-            AttrValueVO tce = energyUsageFactory.getTce(DataUtils.parseDouble(totalUsage.getValue()));
+        if (currentMonth != null) {
+            AttrValueVO tce = energyUsageFactory.getTce(DataUtils.parseDouble(currentMonth.getValue()));
             result.add(tce);
         }
         // 总建筑面积

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

@@ -53,8 +53,8 @@ public class ProjectEnvBuilder extends ProjectParagraphBuilder {
         // 总报警数
         AttrValueVO alarmCount = dataMap.get(ProjectEnvHeaderCodes.alarmCount.name());
         if (alarmCount != null) {
-            alarmCount.setCode(ProjectEnvHeaderCodes.alarmCount.name());
-            results.add(alarmCount);
+            results.add(new AttrValueVO(
+                    ProjectEnvHeaderCodes.alarmCount.name(), alarmCount.getValue(), alarmCount.getType()));
         }
 
         // 报警次数最多的指标