Bladeren bron

修复第三轮测试bug

lixing 3 jaren geleden
bovenliggende
commit
d0190097b5

+ 1 - 1
src/main/java/com/persagy/apm/energy/report/monthly/detail/common/service/impl/ReportCostInfoServiceImpl.java

@@ -265,7 +265,7 @@ public abstract class ReportCostInfoServiceImpl implements IReportCostInfoServic
         Double sameTimeGrowth = result.getSameTimeGrowth();
         Double sameTime = result.getSameTime();
         if (DataUtils.isNotNull(sameTimeGrowth, sameTime)) {
-            result.setSameRange(DataUtils.doubleDivide(sameTimeGrowth, sameTime));
+            result.setSameTimeRange(DataUtils.doubleDivide(sameTimeGrowth, sameTime));
         }
 
         return result;

+ 1 - 1
src/main/java/com/persagy/apm/energy/report/monthly/detail/common/service/impl/ReportPowerInfoServiceImpl.java

@@ -281,7 +281,7 @@ public abstract class ReportPowerInfoServiceImpl implements IReportPowerInfoServ
         Double sameTimeGrowth = result.getSameTimeGrowth();
         Double sameTime = result.getLastYearSameTime();
         if (DataUtils.isNotNull(sameTimeGrowth, sameTime)) {
-            result.setSameRange(DataUtils.doubleDivide(sameTimeGrowth, sameTime));
+            result.setSameTimeRange(DataUtils.doubleDivide(sameTimeGrowth, sameTime));
         }
 
         return result;

+ 2 - 2
src/main/java/com/persagy/apm/energy/report/saasweb/service/impl/SaasWebServiceImpl.java

@@ -663,13 +663,13 @@ public class SaasWebServiceImpl implements ISaasWebService {
             }
             Set<String> projectIds = projects.stream().
                     map(SimpleProjectVO::getProjectId).collect(Collectors.toSet());
-            // 取用户可选项目和分区下项目的交集,projectIds会被更新为两个集合的交集
+            // 取用户可选项目和分区下项目的交集,projectIds会被更新为两个集合的交集 projectIds是用户在分区下可选的项目
             projectIds.retainAll(availableProjectIds);
             // 根据业态和分区过滤项目
             List<PoemsProjectVO> projectsByAreaAndBuildingType = getProjectsByAreaAndBuildingType(partition.getAreaId(), buildingType);
             Set<String> projectIdsByAreaAndBuildingType = projectsByAreaAndBuildingType.stream().
                     map(PoemsProjectVO::getProjectId).collect(Collectors.toSet());
-            projectIdsByAreaAndBuildingType.retainAll(availableProjectIds);
+//            projectIdsByAreaAndBuildingType.retainAll(availableProjectIds);
             // 如果用户拥有的项目数和分区下的项目数不一致,则用户没有该分区的权限
             if (CollectionUtils.isEmpty(projectIds) || projectIdsByAreaAndBuildingType.size() != projectIds.size()) {
                 continue;