提交生成酒店报告代码

src/main/java/com/persagy/apm/energy/report/monthly/detail/hotel/project/model/dto/AddReportHotelProjectDetailDTO.java

@@ -24,7 +24,7 @@ public class AddReportHotelProjectDetailDTO {
     private HotelProjectPowerConsumptionOutline powerUsageOutline;
 
     @ApiModelProperty(value = "公区用电量")
-    private HotelProjectPublicPowerConsumption publicAreaPowerUsage;
+    private HotelProjectPublicPowerConsumption publicPowerUsage;
 
     @ApiModelProperty(value = "冷站效率")
     private HotelProjectChillerPlantEfficiency airConditionerEfficiency;

src/main/java/com/persagy/apm/energy/report/monthly/outline/constants/HotelProjectReportParagraphs.java

@@ -0,0 +1,42 @@
+package com.persagy.apm.energy.report.monthly.outline.constants;
+
+/**
+ * 酒店项目报告段落
+ *
+ * @author lixing
+ * @version V1.0 2021/5/24 4:17 下午
+ **/
+public class HotelProjectReportParagraphs {
+    /**
+     * 费用
+     */
+    public static final String COST = "cost";
+    /**
+     * 用电量概述
+     */
+    public static final String POWER_CONSUMPTION_OUTLINE = "powerConsumptionOutline";
+    /**
+     * 公区能耗
+     */
+    public static final String PUBLIC_POWER_CONSUMPTION = "publicPowerConsumption";
+    /**
+     * 冷站效率
+     */
+    public static final String EER = "eer";
+    /**
+     * 环境指标
+     */
+    public static final String ENV_KPI = "envKpi";
+    /**
+     * 节能工单
+     */
+    public static final String ENERGY_WORKER_ORDER = "energyWorkerOrder";
+    /**
+     * 平台维护
+     */
+    public static final String MAINTENANCE = "maintenance";
+    /**
+     * 报警处理
+     */
+    public static final String ALARM_DEAL = "alarmDeal";
+}

src/main/java/com/persagy/apm/energy/report/monthly/outline/service/builder/IHotelProjectReportGenerator.java

@@ -1,20 +0,0 @@
-package com.persagy.apm.energy.report.monthly.outline.service.builder;
-
-import com.persagy.apm.energy.report.monthly.outline.model.ReportOutline;
-
-/**
- * 生成酒店项目报告建造者接口
- *
- * @author lixing
- * @version V1.0 2021/5/30 10:26 下午
- **/
-public interface IHotelProjectReportGenerator {
-    /**
-     * 生成报告。如果生成失败，数据回滚并且报告状态修改为生成失败
-     *
-     * @param reportOutline 报告outline对象
-     * @author lixing
-     * @version V1.0 2021/5/24 4:09 下午
-     */
-    void generateReport(ReportOutline reportOutline);
-}

src/main/java/com/persagy/apm/energy/report/monthly/outline/service/builder/IBusinessReportBuilder.java

@@ -1,8 +1,9 @@
-package com.persagy.apm.energy.report.monthly.outline.service.builder;
+package com.persagy.apm.energy.report.monthly.outline.service.builder.business;
 
 import com.persagy.apm.energy.report.monthly.detail.business.model.Platform;
 import com.persagy.apm.energy.report.monthly.detail.common.model.vo.CostVO;
 import com.persagy.apm.energy.report.monthly.detail.common.model.vo.PowerVO;
+import com.persagy.apm.energy.report.monthly.detail.hotel.project.model.vo.*;
 import com.persagy.apm.energy.report.monthly.outline.model.ReportOutline;
 
 import java.util.List;
@@ -25,15 +26,6 @@ public interface IBusinessReportBuilder {
     boolean generateNewReportDetail(ReportOutline reportOutline);
 
     /**
-     * 删除之前的报告详情信息
-     *
-     * @param detailId 报告详情id
-     * @author lixing
-     * @version V1.0 2021/5/31 4:19
-     */
-    void deletePreviousReportDetail(String detailId);
-
-    /**
      * 在营项目用电量信息
      *
      * @param reportOutline 报告outline对象
@@ -82,22 +74,4 @@ public interface IBusinessReportBuilder {
      * @version V1.0 2021/5/31 4:21 下午
      */
     List<Platform> getPlatforms(ReportOutline reportOutline);
-
-    /**
-     * 成功时更新报告概要
-     *
-     * @param reportOutline 需要更新的报告概要
-     * @author lixing
-     * @version V1.0 2021/5/31 4:26 下午
-     */
-    void updateReportOutlineInfoWhenSuccess(ReportOutline reportOutline);
-
-    /**
-     * 失败时更新报告概要
-     *
-     * @param reportOutline 需要更新的报告概要
-     * @author lixing
-     * @version V1.0 2021/5/31 4:26 下午
-     */
-    void updateReportOutlineInfoWhenFailure(ReportOutline reportOutline);
 }

src/main/java/com/persagy/apm/energy/report/monthly/outline/service/impl/BusinessAreaReportBuilder.java

@@ -1,6 +1,6 @@
-package com.persagy.apm.energy.report.monthly.outline.service.impl;
+package com.persagy.apm.energy.report.monthly.outline.service.builder.business.impl;
 
-import com.persagy.apm.energy.report.monthly.outline.service.builder.impl.BusinessReportBuilder;
+import com.persagy.apm.energy.report.monthly.outline.service.builder.business.impl.BusinessReportBuilder;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
 

src/main/java/com/persagy/apm/energy/report/monthly/outline/service/impl/BusinessProjectReportBuilder.java

@@ -1,9 +1,9 @@
-package com.persagy.apm.energy.report.monthly.outline.service.impl;
+package com.persagy.apm.energy.report.monthly.outline.service.builder.business.impl;
 
 import com.persagy.apm.energy.report.monthly.detail.common.model.vo.CostVO;
 import com.persagy.apm.energy.report.monthly.detail.common.model.vo.PowerVO;
 import com.persagy.apm.energy.report.monthly.outline.model.ReportOutline;
-import com.persagy.apm.energy.report.monthly.outline.service.builder.impl.BusinessReportBuilder;
+import com.persagy.apm.energy.report.monthly.outline.service.builder.business.impl.BusinessReportBuilder;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
 

src/main/java/com/persagy/apm/energy/report/monthly/outline/service/builder/impl/BusinessReportBuilder.java

@@ -1,4 +1,4 @@
-package com.persagy.apm.energy.report.monthly.outline.service.builder.impl;
+package com.persagy.apm.energy.report.monthly.outline.service.builder.business.impl;
 
 import com.persagy.apm.energy.report.monthly.detail.business.model.Platform;
 import com.persagy.apm.energy.report.monthly.detail.business.model.dto.AddReportBusinessDetailDTO;
@@ -7,13 +7,11 @@ import com.persagy.apm.energy.report.monthly.detail.common.model.vo.PowerVO;
 import com.persagy.apm.energy.report.monthly.detail.business.service.IReportBusinessDetailService;
 import com.persagy.apm.energy.report.monthly.detail.common.service.IReportDetailService;
 import com.persagy.apm.energy.report.monthly.outline.constants.BusinessReportParagraphs;
-import com.persagy.apm.energy.report.monthly.outline.constants.enums.ReportStateEnum;
 import com.persagy.apm.energy.report.monthly.outline.model.ReportOutline;
 import com.persagy.apm.energy.report.monthly.outline.service.IBusinessReportCostInfoService;
 import com.persagy.apm.energy.report.monthly.outline.service.IBusinessReportPlatformInfoService;
 import com.persagy.apm.energy.report.monthly.outline.service.IBusinessReportPowerInfoService;
-import com.persagy.apm.energy.report.monthly.outline.service.IReportOutlineService;
+import com.persagy.apm.energy.report.monthly.outline.service.builder.business.IBusinessReportBuilder;
-import com.persagy.apm.energy.report.monthly.outline.service.builder.IBusinessReportBuilder;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
@@ -41,16 +39,11 @@ public class BusinessReportBuilder implements IBusinessReportBuilder {
     private IBusinessReportCostInfoService businessReportCostInfoService;
     @Autowired
     private IBusinessReportPlatformInfoService businessReportPlatformInfoService;
-    @Autowired
-    private IReportOutlineService reportOutlineService;
 
     @Override
     @Transactional(rollbackFor = Exception.class)
     public boolean generateNewReportDetail(ReportOutline reportOutline) {
         try {
-            // 删除之前关联的报告信息
-            deletePreviousReportDetail(reportOutline.getDetailId());
-
             AddReportBusinessDetailDTO addReportBusinessDetailDTO = new AddReportBusinessDetailDTO();
             // 获取项目用电量信息
             addReportBusinessDetailDTO.setOpenPower(getOpenPowerInfo(reportOutline));
@@ -64,7 +57,6 @@ public class BusinessReportBuilder implements IBusinessReportBuilder {
 
             String detailId = businessDetailService.createReportBusinessDetail(addReportBusinessDetailDTO);
             reportOutline.setDetailId(detailId);
-            updateReportOutlineInfoWhenSuccess(reportOutline);
             return true;
         } catch (Exception e) {
             log.error("生成报告失败", e);
@@ -73,11 +65,6 @@ public class BusinessReportBuilder implements IBusinessReportBuilder {
         }
     }
 
-    @Override
-    public void deletePreviousReportDetail(String detailId) {
-        businessDetailService.deleteReportBusinessDetail(detailId);
-    }
-
     /**
      * 获取段落包含的分组列表
      *
@@ -144,16 +131,4 @@ public class BusinessReportBuilder implements IBusinessReportBuilder {
     public List<Platform> getPlatforms(ReportOutline reportOutline) {
         return businessReportPlatformInfoService.getPlatforms(reportOutline);
     }
-
-    @Override
-    public void updateReportOutlineInfoWhenSuccess(ReportOutline reportOutline) {
-        reportOutline.setStatus(ReportStateEnum.GENERATED.getType());
-        reportOutlineService.updateReportOutline(reportOutline);
-    }
-
-    @Override
-    public void updateReportOutlineInfoWhenFailure(ReportOutline reportOutline) {
-        reportOutline.setStatus(ReportStateEnum.BUILD_FAILED.getType());
-        reportOutlineService.updateReportOutline(reportOutline);
-    }
 }

src/main/java/com/persagy/apm/energy/report/monthly/outline/service/builder/common/IReportGenerator.java

@@ -0,0 +1,57 @@
+package com.persagy.apm.energy.report.monthly.outline.service.builder.common;
+
+import com.persagy.apm.energy.report.monthly.outline.model.ReportOutline;
+
+/**
+ * 生成商业报告建造者接口
+ *
+ * @author lixing
+ * @version V1.0 2021/5/30 10:26 下午
+ **/
+public interface IReportGenerator {
+    /**
+     * 生成报告。建造方法
+     *
+     * @param reportOutline 报告outline对象
+     * @author lixing
+     * @version V1.0 2021/5/24 4:09 下午
+     */
+    void generateReport(ReportOutline reportOutline);
+
+    /**
+     * 删除之前的报告详情信息
+     *
+     * @param detailId 报告详情id
+     * @author lixing
+     * @version V1.0 2021/5/31 4:19
+     */
+    void deletePreviousReportDetail(String detailId);
+
+    /**
+     * 生成报告详情
+     *
+     * @param reportOutline 需要更新的报告概要
+     * @return 是否生成成功
+     * @author lixing
+     * @version V1.0 2021/5/31 4:26 下午
+     */
+    boolean generateReportDetail(ReportOutline reportOutline);
+
+    /**
+     * 成功时更新报告概要
+     *
+     * @param reportOutline 需要更新的报告概要
+     * @author lixing
+     * @version V1.0 2021/5/31 4:26 下午
+     */
+    void updateReportOutlineInfoWhenSuccess(ReportOutline reportOutline);
+
+    /**
+     * 失败时更新报告概要
+     *
+     * @param reportOutline 需要更新的报告概要
+     * @author lixing
+     * @version V1.0 2021/5/31 4:26 下午
+     */
+    void updateReportOutlineInfoWhenFailure(ReportOutline reportOutline);
+}

src/main/java/com/persagy/apm/energy/report/monthly/outline/service/builder/common/impl/ReportGenerator.java

@@ -0,0 +1,129 @@
+package com.persagy.apm.energy.report.monthly.outline.service.builder.common.impl;
+
+import com.persagy.apm.energy.report.monthly.config.type.constant.enums.BelongTypeEnum;
+import com.persagy.apm.energy.report.monthly.config.type.constant.enums.BuildingTypeEnum;
+import com.persagy.apm.energy.report.monthly.config.type.model.ReportType;
+import com.persagy.apm.energy.report.monthly.config.type.service.IReportTypeService;
+import com.persagy.apm.energy.report.monthly.detail.business.service.IReportBusinessDetailService;
+import com.persagy.apm.energy.report.monthly.outline.constants.enums.ReportStateEnum;
+import com.persagy.apm.energy.report.monthly.outline.model.ReportOutline;
+import com.persagy.apm.energy.report.monthly.outline.service.IReportOutlineService;
+import com.persagy.apm.energy.report.monthly.outline.service.builder.business.IBusinessReportBuilder;
+import com.persagy.apm.energy.report.monthly.outline.service.builder.hotel.IHotelAreaReportBuilder;
+import com.persagy.apm.energy.report.monthly.outline.service.builder.hotel.IHotelProjectReportBuilder;
+import com.persagy.apm.energy.report.monthly.outline.service.builder.common.IReportGenerator;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+
+/**
+ * 商业项目报告建造者
+ *
+ * @author lixing
+ * @version V1.0 2021/5/12 2:53 下午
+ **/
+@Component
+@Slf4j
+public class ReportGenerator implements IReportGenerator {
+    @Autowired
+    private IReportTypeService reportTypeService;
+    @Autowired
+    private IReportOutlineService reportOutlineService;
+    @Autowired
+    private IHotelAreaReportBuilder hotelAreaReportBuilder;
+    @Autowired
+    private IHotelProjectReportBuilder hotelProjectReportBuilder;
+    @Resource(name = "businessProjectReportBuilder")
+    private IBusinessReportBuilder businessProjectReportBuilder;
+    @Resource(name = "businessAreaReportBuilder")
+    private IBusinessReportBuilder businessAreaReportBuilder;
+    @Autowired
+    private IReportBusinessDetailService businessDetailService;
+
+    @Override
+    public void generateReport(ReportOutline reportOutline) {
+        // 删除之前关联的报告详情
+        deletePreviousReportDetail(reportOutline.getDetailId());
+        // 生成新的报告详情
+        boolean generateSuccess = generateReportDetail(reportOutline);
+
+        // 更新报告概要的状态
+        if (generateSuccess) {
+            // 更新报告生成状态为已生成
+            updateReportOutlineInfoWhenSuccess(reportOutline);
+        } else {
+            // 生成失败，回滚上述生成报告操作，更新报告状态为生成失败
+            updateReportOutlineInfoWhenFailure(reportOutline);
+        }
+    }
+
+    @Override
+    public boolean generateReportDetail(ReportOutline reportOutline) {
+        String reportTypeId = reportOutline.getReportTypeId();
+        ReportType reportType = reportTypeService.queryReportTypeDetail(reportTypeId);
+        // 根据业态判断生成那种报告
+        if (BuildingTypeEnum.BUSINESS.getType().equals(reportType.getBuildingType())) {
+            return generateBusinessReportDetail(reportOutline, reportType);
+        } else if (BuildingTypeEnum.HOTEL.getType().equals(reportType.getBuildingType())) {
+            return generateHotelReportDetail(reportOutline, reportType);
+        } else {
+            throw new IllegalArgumentException("目前不支持此类报告的生成，业态：" + reportType.getBuildingType());
+        }
+    }
+
+    /**
+     * 生成酒店报告详情
+     *
+     * @param reportOutline 报告概要
+     * @param reportType    报告类型
+     * @return 是否生成成功
+     * @author lixing
+     * @version V1.0 2021/6/8 7:28 下午
+     */
+    private boolean generateHotelReportDetail(ReportOutline reportOutline, ReportType reportType) {
+        if (BelongTypeEnum.PROJECT.getType().equals(reportType.getBelongType())) {
+            return hotelAreaReportBuilder.generateNewReportDetail(reportOutline);
+        } else {
+            return hotelProjectReportBuilder.generateNewReportDetail(reportOutline);
+        }
+    }
+
+    /**
+     * 生成商业报告详情
+     *
+     * @param reportOutline 报告概要
+     * @param reportType    报告类型
+     * @return 是否生成成功
+     * @author lixing
+     * @version V1.0 2021/6/8 7:28 下午
+     */
+    private Boolean generateBusinessReportDetail(ReportOutline reportOutline, ReportType reportType) {
+        IBusinessReportBuilder businessReportBuilder;
+        // 如果后续类型增多，可以修改为switch,case或者用map存储映射
+        if (BelongTypeEnum.PROJECT.getType().equals(reportType.getBelongType())) {
+            businessReportBuilder = businessProjectReportBuilder;
+        } else {
+            businessReportBuilder = businessAreaReportBuilder;
+        }
+        return businessReportBuilder.generateNewReportDetail(reportOutline);
+    }
+
+    @Override
+    public void updateReportOutlineInfoWhenSuccess(ReportOutline reportOutline) {
+        reportOutline.setStatus(ReportStateEnum.GENERATED.getType());
+        reportOutlineService.updateReportOutline(reportOutline);
+    }
+
+    @Override
+    public void updateReportOutlineInfoWhenFailure(ReportOutline reportOutline) {
+        reportOutline.setStatus(ReportStateEnum.BUILD_FAILED.getType());
+        reportOutlineService.updateReportOutline(reportOutline);
+    }
+
+    @Override
+    public void deletePreviousReportDetail(String detailId) {
+        businessDetailService.deleteReportBusinessDetail(detailId);
+    }
+}

src/main/java/com/persagy/apm/energy/report/monthly/outline/service/builder/IBusinessReportGenerator.java

@@ -1,20 +1,21 @@
-package com.persagy.apm.energy.report.monthly.outline.service.builder;
+package com.persagy.apm.energy.report.monthly.outline.service.builder.hotel;
 
 import com.persagy.apm.energy.report.monthly.outline.model.ReportOutline;
 
 /**
- * 生成商业报告建造者接口
+ * 生成酒店区域报告建造者接口
  *
  * @author lixing
  * @version V1.0 2021/5/30 10:26 下午
  **/
-public interface IBusinessReportGenerator {
+public interface IHotelAreaReportBuilder {
     /**
-     * 生成报告。如果生成失败，数据回滚并且报告状态修改为生成失败
+     * 生成报告详情
      *
      * @param reportOutline 报告outline对象
+     * @return 是否生成成功
      * @author lixing
      * @version V1.0 2021/5/24 4:09 下午
      */
-    void generateReport(ReportOutline reportOutline);
+    boolean generateNewReportDetail(ReportOutline reportOutline);
 }

src/main/java/com/persagy/apm/energy/report/monthly/outline/service/builder/hotel/IHotelProjectReportBuilder.java

@@ -0,0 +1,102 @@
+package com.persagy.apm.energy.report.monthly.outline.service.builder.hotel;
+
+import com.persagy.apm.energy.report.monthly.detail.hotel.project.model.vo.*;
+import com.persagy.apm.energy.report.monthly.outline.model.ReportOutline;
+
+/**
+ * 生成酒店项目报告建造者接口
+ *
+ * @author lixing
+ * @version V1.0 2021/5/30 10:26 下午
+ **/
+public interface IHotelProjectReportBuilder {
+    /**
+     * 生成报告详情
+     *
+     * @param reportOutline 报告outline对象
+     * @return 是否生成成功
+     * @author lixing
+     * @version V1.0 2021/5/24 4:09 下午
+     */
+    boolean generateNewReportDetail(ReportOutline reportOutline);
+
+    /**
+     * 获取项目报警处理信息
+     *
+     * @param reportOutline 报告outline对象
+     * @return 项目报警处理信息
+     * @author lixing
+     * @version V1.0 2021/6/9 10:04 上午
+     */
+    HotelProjectAlarmDealInfo getAlarmDealInfo(ReportOutline reportOutline);
+
+    /**
+     * 获取项目平台运行信息
+     *
+     * @param reportOutline 报告outline对象
+     * @return 项目平台运行信息
+     * @author lixing
+     * @version V1.0 2021/6/9 10:04 上午
+     */
+    HotelProjectMaintenanceInfo getMaintenanceInfo(ReportOutline reportOutline);
+
+    /**
+     * 获取项目节能工单信息
+     *
+     * @param reportOutline 报告outline对象
+     * @return 项目节能工单信息
+     * @author lixing
+     * @version V1.0 2021/6/9 10:04 上午
+     */
+    HotelProjectEnergyWorkerOrderInfo getEnergyWorkOrderInfo(ReportOutline reportOutline);
+
+    /**
+     * 获取项目环境指标信息
+     *
+     * @param reportOutline 报告outline对象
+     * @return 项目环境指标信息
+     * @author lixing
+     * @version V1.0 2021/6/9 10:04 上午
+     */
+    HotelProjectEnvKpi getEnvKpi(ReportOutline reportOutline);
+
+    /**
+     * 获取项目冷站效率信息
+     *
+     * @param reportOutline 报告outline对象
+     * @return 项目冷站效率信息
+     * @author lixing
+     * @version V1.0 2021/6/9 10:04 上午
+     */
+    HotelProjectChillerPlantEfficiency getChillerPlanEfficiency(ReportOutline reportOutline);
+
+    /**
+     * 获取项目公区用电信息
+     *
+     * @param reportOutline 报告outline对象
+     * @return 项目公区用电信息
+     * @author lixing
+     * @version V1.0 2021/6/9 10:04 上午
+     */
+    HotelProjectPublicPowerConsumption getPublicPowerConsumption(ReportOutline reportOutline);
+
+    /**
+     * 获取项目用电量信息
+     *
+     * @param reportOutline 报告outline对象
+     * @return 项目用电量信息
+     * @author lixing
+     * @version V1.0 2021/6/9 10:04 上午
+     */
+    HotelProjectPowerConsumptionOutline getPowerConsumptionOutline(ReportOutline reportOutline);
+
+    /**
+     * 获取项目费用信息
+     *
+     * @param reportOutline 报告outline对象
+     * @return 项目费用信息
+     * @author lixing
+     * @version V1.0 2021/6/9 10:04 上午
+     */
+    HotelProjectCostInfo getCostInfo(ReportOutline reportOutline);
+}

src/main/java/com/persagy/apm/energy/report/monthly/outline/service/builder/hotel/impl/HotelAreaReportBuilder.java

@@ -0,0 +1,71 @@
+package com.persagy.apm.energy.report.monthly.outline.service.builder.hotel.impl;
+
+import com.persagy.apm.energy.report.monthly.detail.common.service.IReportDetailService;
+import com.persagy.apm.energy.report.monthly.detail.hotel.area.model.dto.AddReportHotelAreaDetailDTO;
+import com.persagy.apm.energy.report.monthly.detail.hotel.area.service.IReportHotelAreaDetailService;
+import com.persagy.apm.energy.report.monthly.outline.model.ReportOutline;
+import com.persagy.apm.energy.report.monthly.outline.service.builder.hotel.IHotelAreaReportBuilder;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.interceptor.TransactionAspectSupport;
+
+import java.util.List;
+
+/**
+ * 酒店大区报告建造者
+ *
+ * @author lixing
+ * @version V1.0 2021/5/12 2:53 下午
+ **/
+@Component
+@Slf4j
+public class HotelAreaReportBuilder implements IHotelAreaReportBuilder {
+    @Autowired
+    private IReportDetailService reportDetailService;
+    @Autowired
+    private IReportHotelAreaDetailService reportHotelAreaDetailService;
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public boolean generateNewReportDetail(ReportOutline reportOutline) {
+        try {
+            AddReportHotelAreaDetailDTO addReportHotelAreaDetailDTO = new AddReportHotelAreaDetailDTO();
+            // TODO: 2021/6/8
+            String detailId = reportHotelAreaDetailService.createReportHotelAreaDetail(addReportHotelAreaDetailDTO);
+            reportOutline.setDetailId(detailId);
+            return true;
+        } catch (Exception e) {
+            log.error("生成报告失败", e);
+            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+            return false;
+        }
+    }
+
+    /**
+     * 获取段落包含的分组列表
+     *
+     * @param reportTypeId 报告类型id
+     * @param paragraph 段落
+     * @return 段落包含的分组列表
+     * @author lixing
+     * @version V1.0 2021/6/7 11:17 上午
+     */
+    private List<String> getGroupsByParagraph(String reportTypeId, String paragraph) {
+        return reportDetailService.getGroupsByParagraph(reportTypeId, paragraph);
+    }
+
+    /**
+     * 获取段落包含的功能点列表
+     *
+     * @param reportTypeId 报告类型id
+     * @param paragraph 段落
+     * @return 段落包含的功能点列表
+     * @author lixing
+     * @version V1.0 2021/6/7 11:17 上午
+     */
+    private List<String> getFunctionsByParagraph(String reportTypeId, String paragraph) {
+        return reportDetailService.getFunctionsByParagraph(reportTypeId, paragraph);
+    }
+}

src/main/java/com/persagy/apm/energy/report/monthly/outline/service/builder/hotel/impl/HotelProjectReportBuilder.java

@@ -0,0 +1,142 @@
+package com.persagy.apm.energy.report.monthly.outline.service.builder.hotel.impl;
+
+import com.persagy.apm.energy.report.monthly.detail.business.service.IReportBusinessDetailService;
+import com.persagy.apm.energy.report.monthly.detail.common.service.IReportDetailService;
+import com.persagy.apm.energy.report.monthly.detail.hotel.project.model.dto.AddReportHotelProjectDetailDTO;
+import com.persagy.apm.energy.report.monthly.detail.hotel.project.model.vo.*;
+import com.persagy.apm.energy.report.monthly.detail.hotel.project.service.IReportHotelProjectDetailService;
+import com.persagy.apm.energy.report.monthly.outline.constants.BusinessReportParagraphs;
+import com.persagy.apm.energy.report.monthly.outline.model.ReportOutline;
+import com.persagy.apm.energy.report.monthly.outline.service.builder.hotel.IHotelProjectReportBuilder;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.interceptor.TransactionAspectSupport;
+
+import java.util.List;
+
+/**
+ * 酒店项目报告建造者
+ *
+ * @author lixing
+ * @version V1.0 2021/5/12 2:53 下午
+ **/
+@Component
+@Slf4j
+public class HotelProjectReportBuilder implements IHotelProjectReportBuilder {
+    @Autowired
+    private IReportBusinessDetailService businessDetailService;
+    @Autowired
+    private IReportDetailService reportDetailService;
+    @Autowired
+    private IReportHotelProjectDetailService reportHotelProjectDetailService;
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public boolean generateNewReportDetail(ReportOutline reportOutline) {
+        try {
+            AddReportHotelProjectDetailDTO addReportHotelProjectDetailDTO = new AddReportHotelProjectDetailDTO();
+            // 获取项目费用信息
+            addReportHotelProjectDetailDTO.setCostInfo(getCostInfo(reportOutline));
+            // 获取项目用电量信息
+            addReportHotelProjectDetailDTO.setPowerUsageOutline(getPowerConsumptionOutline(reportOutline));
+            // 获取项目公区用电信息
+            addReportHotelProjectDetailDTO.setPublicPowerUsage(getPublicPowerConsumption(reportOutline));
+            // 获取项目冷站效率信息
+            addReportHotelProjectDetailDTO.setAirConditionerEfficiency(getChillerPlanEfficiency(reportOutline));
+            // 获取项目环境指标信息
+            addReportHotelProjectDetailDTO.setEnvInfo(getEnvKpi(reportOutline));
+            // 获取项目节能工单信息
+            addReportHotelProjectDetailDTO.setEnergyWorkOrderInfo(getEnergyWorkOrderInfo(reportOutline));
+            // 获取项目平台运行信息
+            addReportHotelProjectDetailDTO.setPlatformRuntimeInfo(getMaintenanceInfo(reportOutline));
+            // 获取项目报警处理信息
+            addReportHotelProjectDetailDTO.setAlarmDealInfo(getAlarmDealInfo(reportOutline));
+
+            String detailId = reportHotelProjectDetailService.createReportHotelProjectDetail(addReportHotelProjectDetailDTO);
+            reportOutline.setDetailId(detailId);
+            return true;
+        } catch (Exception e) {
+            log.error("生成报告失败", e);
+            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+            return false;
+        }
+    }
+
+    @Override
+    public HotelProjectAlarmDealInfo getAlarmDealInfo(ReportOutline reportOutline) {
+        // TODO: 2021/6/9
+        return null;
+    }
+
+    @Override
+    public HotelProjectMaintenanceInfo getMaintenanceInfo(ReportOutline reportOutline) {
+        // TODO: 2021/6/9
+        return null;
+    }
+
+    @Override
+    public HotelProjectEnergyWorkerOrderInfo getEnergyWorkOrderInfo(ReportOutline reportOutline) {
+        // TODO: 2021/6/9
+        return null;
+    }
+
+    @Override
+    public HotelProjectEnvKpi getEnvKpi(ReportOutline reportOutline) {
+        // TODO: 2021/6/9
+        return null;
+    }
+
+    @Override
+    public HotelProjectChillerPlantEfficiency getChillerPlanEfficiency(ReportOutline reportOutline) {
+        // TODO: 2021/6/9
+        return null;
+    }
+
+    @Override
+    public HotelProjectPublicPowerConsumption getPublicPowerConsumption(ReportOutline reportOutline) {
+        // TODO: 2021/6/9
+        return null;
+    }
+
+    @Override
+    public HotelProjectPowerConsumptionOutline getPowerConsumptionOutline(ReportOutline reportOutline) {
+        // TODO: 2021/6/9
+        return null;
+    }
+
+    @Override
+    public HotelProjectCostInfo getCostInfo(ReportOutline reportOutline) {
+        List<String> costFunctionIdList = getFunctionsByParagraph(
+                reportOutline.getReportTypeId(), BusinessReportParagraphs.OPEN_COST);
+        // TODO: 2021/6/9
+        return null;
+    }
+
+    /**
+     * 获取段落包含的分组列表
+     *
+     * @param reportTypeId 报告类型id
+     * @param paragraph    段落
+     * @return 段落包含的分组列表
+     * @author lixing
+     * @version V1.0 2021/6/7 11:17 上午
+     */
+    private List<String> getGroupsByParagraph(String reportTypeId, String paragraph) {
+        return reportDetailService.getGroupsByParagraph(reportTypeId, paragraph);
+    }
+
+    /**
+     * 获取段落包含的功能点列表
+     *
+     * @param reportTypeId 报告类型id
+     * @param paragraph    段落
+     * @return 段落包含的功能点列表
+     * @author lixing
+     * @version V1.0 2021/6/7 11:17 上午
+     */
+    private List<String> getFunctionsByParagraph(String reportTypeId, String paragraph) {
+        return reportDetailService.getFunctionsByParagraph(reportTypeId, paragraph);
+    }
+}

src/main/java/com/persagy/apm/energy/report/monthly/outline/service/builder/impl/BusinessReportGenerator.java

@@ -1,48 +0,0 @@
-package com.persagy.apm.energy.report.monthly.outline.service.builder.impl;
-
-import cn.hutool.extra.spring.SpringUtil;
-import com.persagy.apm.energy.report.monthly.config.type.constant.enums.BelongTypeEnum;
-import com.persagy.apm.energy.report.monthly.config.type.constant.enums.BuildingTypeEnum;
-import com.persagy.apm.energy.report.monthly.config.type.model.ReportType;
-import com.persagy.apm.energy.report.monthly.config.type.service.IReportTypeService;
-import com.persagy.apm.energy.report.monthly.outline.model.ReportOutline;
-import com.persagy.apm.energy.report.monthly.outline.service.builder.IBusinessReportBuilder;
-import com.persagy.apm.energy.report.monthly.outline.service.builder.IBusinessReportGenerator;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-/**
- * 商业项目报告建造者
- *
- * @author lixing
- * @version V1.0 2021/5/12 2:53 下午
- **/
-@Component
-@Slf4j
-public class BusinessReportGenerator implements IBusinessReportGenerator {
-    @Autowired
-    private IReportTypeService reportTypeService;
-
-    @Override
-    public void generateReport(ReportOutline reportOutline) {
-        String reportTypeId = reportOutline.getReportTypeId();
-        ReportType reportType = reportTypeService.queryReportTypeDetail(reportTypeId);
-
-        if (BuildingTypeEnum.BUSINESS.getType().equals(reportType.getBuildingType())) {
-            IBusinessReportBuilder businessReportBuilder;
-            // 如果后续类型增多，可以修改为switch,case或者用map存储映射
-            if (BelongTypeEnum.PROJECT.getType().equals(reportType.getBelongType())) {
-                businessReportBuilder = SpringUtil.getBean("businessProjectReportBuilder");
-            } else {
-                businessReportBuilder = SpringUtil.getBean("businessAreaReportBuilder");
-            }
-            // 生成报告，有事务控制。如果生成成功，更新报告状态为已生成
-            boolean generateSuccess = businessReportBuilder.generateNewReportDetail(reportOutline);
-            if (!generateSuccess) {
-                // 生成失败，回滚上述生成报告操作，更新报告状态为生成失败
-                businessReportBuilder.updateReportOutlineInfoWhenFailure(reportOutline);
-            }
-        }
-    }
-}

src/main/java/com/persagy/apm/energy/report/monthly/outline/service/impl/GenerateReportThreadPool.java

@@ -2,10 +2,8 @@ package com.persagy.apm.energy.report.monthly.outline.service.impl;
 
 import cn.hutool.core.thread.ExecutorBuilder;
 import com.persagy.apm.common.context.poems.PoemsContext;
-import com.persagy.apm.energy.report.monthly.config.type.constant.enums.BuildingTypeEnum;
 import com.persagy.apm.energy.report.monthly.outline.model.ReportOutline;
-import com.persagy.apm.energy.report.monthly.outline.service.IReportOutlineService;
+import com.persagy.apm.energy.report.monthly.outline.service.builder.common.IReportGenerator;
-import com.persagy.apm.energy.report.monthly.outline.service.builder.IBusinessReportGenerator;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
@@ -24,9 +22,7 @@ import java.util.concurrent.ThreadPoolExecutor;
 @Slf4j
 public class GenerateReportThreadPool {
     @Autowired
-    IBusinessReportGenerator businessReportGenerator;
+    IReportGenerator reportGenerator;
-    @Autowired
-    IReportOutlineService reportOutlineService;
 
     private final ExecutorService es;
 
@@ -54,14 +50,7 @@ public class GenerateReportThreadPool {
         es.execute(() -> {
             PoemsContext.setContext(userId, loginDevice, pd);
             synchronized (reportOutline.getId().intern()) {
-                String buildingType = reportOutlineService.getBuildingType(reportOutline);
+                reportGenerator.generateReport(reportOutline);
-                if (BuildingTypeEnum.BUSINESS.getType().equals(buildingType)) {
-                    businessReportGenerator.generateReport(reportOutline);
-                } else if (BuildingTypeEnum.HOTEL.getType().equals(buildingType)) {
-
-                } else {
-                    throw new IllegalArgumentException("不支持此类报告的生成，业态：" + buildingType);
-                }
             }
         });
     }