소스 검색

调整提供给前端的接口

lixing 4 년 전
부모
커밋
989b32653c
33개의 변경된 파일446개의 추가작업 그리고 214개의 파일을 삭제
  1. 30 30
      src/main/java/com/persagy/apm/energy/report/monthly/detail/business/controller/ReportBusinessDetailController.java
  2. 2 2
      src/main/java/com/persagy/apm/energy/report/monthly/detail/business/dao/ReportBusinessDetailMapper.java
  3. 7 7
      src/main/java/com/persagy/apm/energy/report/monthly/detail/business/model/ConvertReportBusinessDetailTool.java
  4. 4 4
      src/main/java/com/persagy/apm/energy/report/monthly/detail/business/model/ReportBusinessDetail.java
  5. 2 2
      src/main/java/com/persagy/apm/energy/report/monthly/detail/business/model/dto/AddReportBusinessDetailDTO.java
  6. 2 2
      src/main/java/com/persagy/apm/energy/report/monthly/detail/business/model/dto/DeleteReportBusinessDetailDTO.java
  7. 2 2
      src/main/java/com/persagy/apm/energy/report/monthly/detail/business/model/dto/PageQueryReportBusinessDetailDTO.java
  8. 2 2
      src/main/java/com/persagy/apm/energy/report/monthly/detail/business/model/dto/QueryReportBusinessDetailDTO.java
  9. 2 2
      src/main/java/com/persagy/apm/energy/report/monthly/detail/business/model/dto/QueryReportBusinessDetailDetailDTO.java
  10. 2 2
      src/main/java/com/persagy/apm/energy/report/monthly/detail/business/model/dto/UpdateReportBusinessDetailDTO.java
  11. 2 2
      src/main/java/com/persagy/apm/energy/report/monthly/detail/business/model/vo/ResponseReportBusinessDetailItemVO.java
  12. 2 2
      src/main/java/com/persagy/apm/energy/report/monthly/detail/business/model/vo/ResponseReportBusinessDetailListItemVO.java
  13. 16 16
      src/main/java/com/persagy/apm/energy/report/monthly/detail/business/service/IReportBusinessDetailService.java
  14. 20 20
      src/main/java/com/persagy/apm/energy/report/monthly/detail/business/service/impl/ReportBusinessDetailServiceImpl.java
  15. 43 0
      src/main/java/com/persagy/apm/energy/report/monthly/outline/constants/enums/ReportStateEnum.java
  16. 44 0
      src/main/java/com/persagy/apm/energy/report/monthly/outline/constants/enums/ReportTypeEnum.java
  17. 52 0
      src/main/java/com/persagy/apm/energy/report/monthly/outline/controller/ReportOutLineEnumController.java
  18. 76 54
      src/main/java/com/persagy/apm/energy/report/monthly/outline/controller/ReportOutlineController.java
  19. 2 2
      src/main/java/com/persagy/apm/energy/report/monthly/outline/dao/ReportOutlineMapper.java
  20. 7 7
      src/main/java/com/persagy/apm/energy/report/monthly/outline/model/ConvertReportOutlineTool.java
  21. 4 4
      src/main/java/com/persagy/apm/energy/report/monthly/outline/model/ReportOutline.java
  22. 2 2
      src/main/java/com/persagy/apm/energy/report/monthly/outline/model/dto/AddReportOutlineDTO.java
  23. 2 2
      src/main/java/com/persagy/apm/energy/report/monthly/outline/model/dto/DeleteReportOutlineDTO.java
  24. 2 2
      src/main/java/com/persagy/apm/energy/report/monthly/outline/model/dto/PageQueryReportOutlineDTO.java
  25. 2 2
      src/main/java/com/persagy/apm/energy/report/monthly/outline/model/dto/QueryReportOutlineDTO.java
  26. 2 2
      src/main/java/com/persagy/apm/energy/report/monthly/outline/model/dto/QueryReportOutlineDetailDTO.java
  27. 2 2
      src/main/java/com/persagy/apm/energy/report/monthly/outline/model/dto/UpdateReportOutlineDTO.java
  28. 2 2
      src/main/java/com/persagy/apm/energy/report/monthly/outline/model/vo/ResponseReportOutlineItemVO.java
  29. 2 2
      src/main/java/com/persagy/apm/energy/report/monthly/outline/model/vo/ResponseReportOutlineListItemVO.java
  30. 33 0
      src/main/java/com/persagy/apm/energy/report/monthly/outline/service/IReportOutlineEnumService.java
  31. 16 16
      src/main/java/com/persagy/apm/energy/report/monthly/outline/service/IReportOutlineService.java
  32. 38 0
      src/main/java/com/persagy/apm/energy/report/monthly/outline/service/impl/ReportOutlineEnumServiceImpl.java
  33. 20 20
      src/main/java/com/persagy/apm/energy/report/monthly/outline/service/impl/ReportOutlineServiceImpl.java

+ 30 - 30
src/main/java/com/persagy/apm/energy/report/monthly/detail/business/controller/ReportBusinessDetailController.java

@@ -18,12 +18,12 @@ import javax.validation.Valid;
 import java.util.List;
 
 /**
- * 报告详情控制层
+ * 报告详情控制层
  *
  * @author lixing
- * @version V1.0 2021-05-17 10:48:45
+ * @version V1.0 2021-05-17 11:08:34
  */
-@Api(tags = "报告详情")
+@Api(tags = "报告详情")
 @Validated
 @RestController
 @RequestMapping("reportBusinessDetails")
@@ -31,15 +31,15 @@ public class ReportBusinessDetailController {
     @Autowired
     private IReportBusinessDetailService reportBusinessDetailService;
 
-    @ApiOperation(value = "创建报告详情")
-    @PostMapping("/create")
-    public CommonResult<ApmResponseUpsertVO> createReportBusinessDetail(
-            @Valid @RequestBody AddReportBusinessDetailDTO addReportBusinessDetailDTO) {
-        String id = reportBusinessDetailService.createReportBusinessDetail(addReportBusinessDetailDTO);
-        return ResultHelper.single(new ApmResponseUpsertVO(id));
-    }
+//    @ApiOperation(value = "创建报告详情")
+//    @PostMapping("/create")
+//    public CommonResult<ApmResponseUpsertVO> createReportBusinessDetail(
+//            @Valid @RequestBody AddReportBusinessDetailDTO addReportBusinessDetailDTO) {
+//        String id = reportBusinessDetailService.createReportBusinessDetail(addReportBusinessDetailDTO);
+//        return ResultHelper.single(new ApmResponseUpsertVO(id));
+//    }
 
-    @ApiOperation(value = "报告详情表详情")
+    @ApiOperation(value = "查看报告详情")
     @PostMapping("/get")
     public CommonResult<ResponseReportBusinessDetailItemVO> queryReportBusinessDetailDetail(
             @Valid @RequestBody QueryReportBusinessDetailDetailDTO queryReportBusinessDetailDetailDTO) {
@@ -49,7 +49,7 @@ public class ReportBusinessDetailController {
     }
 
 
-    @ApiOperation(value = "更新报告详情")
+    @ApiOperation(value = "更新报告详情")
     @PostMapping("/update")
     public CommonResult<ApmResponseUpsertVO> updateReportBusinessDetail(
             @Valid @RequestBody UpdateReportBusinessDetailDTO updateReportBusinessDetailDTO) {
@@ -58,25 +58,25 @@ public class ReportBusinessDetailController {
     }
 
 
-    @ApiOperation(value = "删除报告详情")
-    @PostMapping("/delete")
-    public CommonResult deleteReportBusinessDetail(
-            @RequestBody @Valid DeleteReportBusinessDetailDTO deleteReportBusinessDetailDTO) {
-        reportBusinessDetailService.deleteReportBusinessDetail(deleteReportBusinessDetailDTO.getId());
-        return ResultHelper.success();
-    }
-
-
-    @ApiOperation(value = "报告详情列表")
-    @PostMapping("/query")
-    public CommonResult<PageList<ResponseReportBusinessDetailListItemVO>> queryReportBusinessDetail(
-            @Valid @RequestBody QueryReportBusinessDetailDTO queryReportBusinessDetailDTO) {
-        List<ReportBusinessDetail> reportBusinessDetailList = reportBusinessDetailService.queryReportBusinessDetailList(queryReportBusinessDetailDTO);
-        List<ResponseReportBusinessDetailListItemVO> resultList = ConvertReportBusinessDetailTool.INSTANCE.convert2List(reportBusinessDetailList);
-        return ResultHelper.multi(resultList);
-    }
+//    @ApiOperation(value = "删除报告详情")
+//    @PostMapping("/delete")
+//    public CommonResult deleteReportBusinessDetail(
+//            @RequestBody @Valid DeleteReportBusinessDetailDTO deleteReportBusinessDetailDTO) {
+//        reportBusinessDetailService.deleteReportBusinessDetail(deleteReportBusinessDetailDTO.getId());
+//        return ResultHelper.success();
+//    }
+//
+//
+//    @ApiOperation(value = "报告详情列表")
+//    @PostMapping("/query")
+//    public CommonResult<PageList<ResponseReportBusinessDetailListItemVO>> queryReportBusinessDetail(
+//            @Valid @RequestBody QueryReportBusinessDetailDTO queryReportBusinessDetailDTO) {
+//        List<ReportBusinessDetail> reportBusinessDetailList = reportBusinessDetailService.queryReportBusinessDetailList(queryReportBusinessDetailDTO);
+//        List<ResponseReportBusinessDetailListItemVO> resultList = ConvertReportBusinessDetailTool.INSTANCE.convert2List(reportBusinessDetailList);
+//        return ResultHelper.multi(resultList);
+//    }
 
-    //@ApiOperation(value = "报告详情列表, 分页查询")
+    //@ApiOperation(value = "报告详情列表, 分页查询")
     //@PostMapping("/query")
     //public CommonResult<PageList<ResponseReportBusinessDetailListItemVO>> queryReportBusinessDetail(
     //        @Valid @RequestBody PageQueryReportBusinessDetailDTO pageQueryReportBusinessDetailDTO) {

+ 2 - 2
src/main/java/com/persagy/apm/energy/report/monthly/detail/business/dao/ReportBusinessDetailMapper.java

@@ -5,10 +5,10 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
 
 /**
- * 报告详情(ReportBusinessDetail)dao层
+ * 报告详情(ReportBusinessDetail)dao层
  *
  * @author lixing
- * @version V1.0 2021-05-17 10:48:45
+ * @version V1.0 2021-05-17 11:08:34
  */
 @Mapper
 public interface ReportBusinessDetailMapper extends BaseMapper<ReportBusinessDetail> {

+ 7 - 7
src/main/java/com/persagy/apm/energy/report/monthly/detail/business/model/ConvertReportBusinessDetailTool.java

@@ -9,10 +9,10 @@ import com.persagy.apm.energy.report.monthly.detail.business.model.dto.*;
 import java.util.List;
 
 /**
- * 报告详情(ReportBusinessDetail) dto、vo、do转换工具类
+ * 报告详情(ReportBusinessDetail) dto、vo、do转换工具类
  *
  * @author lixing
- * @version V1.0 2021-05-17 10:48:46 2021-05-17 10:48:46
+ * @version V1.0 2021-05-17 11:08:35 2021-05-17 11:08:35
  */
 @Mapper(nullValueMappingStrategy = NullValueMappingStrategy.RETURN_DEFAULT,
         nullValueCheckStrategy = NullValueCheckStrategy.ALWAYS)
@@ -26,7 +26,7 @@ public interface ConvertReportBusinessDetailTool {
      * @param reportBusinessDetail do对象
      * @return ResponseItemVO
      * @author lixing
-     * @version V1.0 2021-05-17 10:48:46
+     * @version V1.0 2021-05-17 11:08:35
      */
     ResponseReportBusinessDetailItemVO convert2ResponseItemDTO(ReportBusinessDetail reportBusinessDetail);
 
@@ -36,7 +36,7 @@ public interface ConvertReportBusinessDetailTool {
      * @param reportBusinessDetail do对象
      * @return ResponseListItemVO
      * @author lixing
-     * @version V1.0 2021-05-17 10:48:46
+     * @version V1.0 2021-05-17 11:08:35
      */
     ResponseReportBusinessDetailListItemVO convert2ResponseListItemDTO(ReportBusinessDetail reportBusinessDetail);
 
@@ -46,7 +46,7 @@ public interface ConvertReportBusinessDetailTool {
      * @param reportBusinessDetailList do列表
      * @return ResponseListItemVO列表
      * @author lixing
-     * @version V1.0 2021-05-17 10:48:46
+     * @version V1.0 2021-05-17 11:08:35
      */
     List<ResponseReportBusinessDetailListItemVO> convert2List(List<ReportBusinessDetail> reportBusinessDetailList);
 
@@ -56,7 +56,7 @@ public interface ConvertReportBusinessDetailTool {
      * @param addReportBusinessDetailDTO addDTO
      * @return 要创建的do对象
      * @author lixing
-     * @version V1.0 2021-05-17 10:48:46
+     * @version V1.0 2021-05-17 11:08:35
      */
     ReportBusinessDetail convertAddDto2Entity(AddReportBusinessDetailDTO addReportBusinessDetailDTO);
 
@@ -67,7 +67,7 @@ public interface ConvertReportBusinessDetailTool {
      * @param updateReportBusinessDetailDTO updateDTO
      * @return 更新后的do对象
      * @author lixing
-     * @version V1.0 2021-05-17 10:48:46
+     * @version V1.0 2021-05-17 11:08:35
      */
     ReportBusinessDetail convertUpdateDto2Entity(@MappingTarget ReportBusinessDetail reportBusinessDetail, UpdateReportBusinessDetailDTO updateReportBusinessDetailDTO);
 }

+ 4 - 4
src/main/java/com/persagy/apm/energy/report/monthly/detail/business/model/ReportBusinessDetail.java

@@ -10,16 +10,16 @@ import java.io.Serializable;
 import java.util.Date;
 
 /**
- * 报告详情(ReportBusinessDetail)实体类
+ * 报告详情(ReportBusinessDetail)实体类
  *
  * @author lixing
- * @version V1.0 2021-05-17 10:48:46
+ * @version V1.0 2021-05-17 11:08:35
  */
 @EqualsAndHashCode(callSuper = true)
 @Data
-@ApiModel(description = "报告详情")
+@ApiModel(description = "报告详情")
 public class ReportBusinessDetail extends AuditableEntity<ReportBusinessDetail> implements Serializable {
-    private static final long serialVersionUID = 911808574629588997L;
+    private static final long serialVersionUID = -53430011796515423L;
 
     @ApiModelProperty("在营项目用电量数据对象信息,项目月报使用此字段")
     private Object openPower;

+ 2 - 2
src/main/java/com/persagy/apm/energy/report/monthly/detail/business/model/dto/AddReportBusinessDetailDTO.java

@@ -11,10 +11,10 @@ import java.util.Date;
 
 /**
  * @author lixing
- * @version V1.0 2021-05-17 10:48:46
+ * @version V1.0 2021-05-17 11:08:35
  */
 @Data
-@ApiModel(value = "创建报告详情入参")
+@ApiModel(value = "创建报告详情入参")
 public class AddReportBusinessDetailDTO {
     @ApiModelProperty(value = "在营项目用电量数据对象信息,项目月报使用此字段", required = true)
     @NotNull(message = "在营项目用电量数据对象信息,项目月报使用此字段不能为空") // todo 更新校验规则

+ 2 - 2
src/main/java/com/persagy/apm/energy/report/monthly/detail/business/model/dto/DeleteReportBusinessDetailDTO.java

@@ -8,10 +8,10 @@ import javax.validation.constraints.NotNull;
 
 /**
  * @author lixing
- * @version V1.0 2021-05-17 10:48:46
+ * @version V1.0 2021-05-17 11:08:35
  */
 @Data
-@ApiModel(value = "删除报告详情入参")
+@ApiModel(value = "删除报告详情入参")
 public class DeleteReportBusinessDetailDTO {
     @NotNull(message = "id不能为空")
     @ApiModelProperty(value = "主键", required = true)

+ 2 - 2
src/main/java/com/persagy/apm/energy/report/monthly/detail/business/model/dto/PageQueryReportBusinessDetailDTO.java

@@ -11,11 +11,11 @@ import lombok.EqualsAndHashCode;
 
 /**
  * @author lixing
- * @version V1.0 2021-05-17 10:48:46
+ * @version V1.0 2021-05-17 11:08:35
  */
 @EqualsAndHashCode(callSuper = true)
 @Data
-@ApiModel(value = "分页查询报告详情入参")
+@ApiModel(value = "分页查询报告详情入参")
 public class PageQueryReportBusinessDetailDTO extends PageDTO {
     @ApiModelProperty(value = "主键", required = true)
     private String id;

+ 2 - 2
src/main/java/com/persagy/apm/energy/report/monthly/detail/business/model/dto/QueryReportBusinessDetailDTO.java

@@ -8,10 +8,10 @@ import java.util.Date;
 
 /**
  * @author lixing
- * @version V1.0 2021-05-17 10:48:46
+ * @version V1.0 2021-05-17 11:08:35
  */
 @Data
-@ApiModel(value = "查询报告详情入参")
+@ApiModel(value = "查询报告详情入参")
 public class QueryReportBusinessDetailDTO {
     @ApiModelProperty(value = "在营项目用电量数据对象信息,项目月报使用此字段", required = true)
     private Object openPower;

+ 2 - 2
src/main/java/com/persagy/apm/energy/report/monthly/detail/business/model/dto/QueryReportBusinessDetailDetailDTO.java

@@ -8,10 +8,10 @@ import javax.validation.constraints.NotNull;
 
 /**
  * @author lixing
- * @version V1.0 2021-05-17 10:48:46
+ * @version V1.0 2021-05-17 11:08:35
  */
 @Data
-@ApiModel(value = "获取报告详情详情入参")
+@ApiModel(value = "获取报告详情详情入参")
 public class QueryReportBusinessDetailDetailDTO {
     @NotNull(message = "主键不能为空")
     @ApiModelProperty(value = "主键", required = true)

+ 2 - 2
src/main/java/com/persagy/apm/energy/report/monthly/detail/business/model/dto/UpdateReportBusinessDetailDTO.java

@@ -11,10 +11,10 @@ import java.util.Date;
 
 /**
  * @author lixing
- * @version V1.0 2021-05-17 10:48:46
+ * @version V1.0 2021-05-17 11:08:35
  */
 @Data
-@ApiModel(value = "更新报告详情入参")
+@ApiModel(value = "更新报告详情入参")
 public class UpdateReportBusinessDetailDTO {
     @ApiModelProperty(value = "主键", required = true)
     @NotNull(message = "主键不能为空") // todo 更新校验规则

+ 2 - 2
src/main/java/com/persagy/apm/energy/report/monthly/detail/business/model/vo/ResponseReportBusinessDetailItemVO.java

@@ -10,10 +10,10 @@ import com.fasterxml.jackson.annotation.JsonInclude;
 
 /**
  * @author lixing
- * @version V1.0 2021-05-17 10:48:46
+ * @version V1.0 2021-05-17 11:08:35
  */
 @Data
-@ApiModel(value = "报告详情返回结果参数")
+@ApiModel(value = "报告详情返回结果参数")
 @JsonInclude(JsonInclude.Include.NON_NULL)
 public class ResponseReportBusinessDetailItemVO {
     @ApiModelProperty("主键")

+ 2 - 2
src/main/java/com/persagy/apm/energy/report/monthly/detail/business/model/vo/ResponseReportBusinessDetailListItemVO.java

@@ -10,10 +10,10 @@ import com.fasterxml.jackson.annotation.JsonInclude;
 
 /**
  * @author lixing
- * @version V1.0 2021-05-17 10:48:46
+ * @version V1.0 2021-05-17 11:08:35
  */
 @Data
-@ApiModel(value = "报告详情列表返回结果参数")
+@ApiModel(value = "报告详情列表返回结果参数")
 @JsonInclude(JsonInclude.Include.NON_NULL)
 public class ResponseReportBusinessDetailListItemVO {
     @ApiModelProperty("主键")

+ 16 - 16
src/main/java/com/persagy/apm/energy/report/monthly/detail/business/service/IReportBusinessDetailService.java

@@ -10,68 +10,68 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 
 /**
- * 报告详情(ReportBusinessDetail) service接口
+ * 报告详情(ReportBusinessDetail) service接口
  *
  * @author lixing
- * @version V1.0 2021-05-17 10:48:45
+ * @version V1.0 2021-05-17 11:08:34
  */
 public interface IReportBusinessDetailService {
 
     /**
-     * 创建报告详情
+     * 创建报告详情
      *
      * @param addReportBusinessDetailDTO addDTO
-     * @return 报告详情主键
+     * @return 报告详情主键
      * @author lixing
-     * @version V1.0 2021-05-17 10:48:45
+     * @version V1.0 2021-05-17 11:08:34
      */
     String createReportBusinessDetail(AddReportBusinessDetailDTO addReportBusinessDetailDTO);
 
     /**
-     * 报告详情详情
+     * 报告详情详情
      *
      * @param id 主键
-     * @return 报告详情do对象
+     * @return 报告详情do对象
      * @author lixing
-     * @version V1.0 2021-05-17 10:48:45
+     * @version V1.0 2021-05-17 11:08:34
      */
     ReportBusinessDetail queryReportBusinessDetailDetail(String id);
 
     /**
-     * 更新报告详情
+     * 更新报告详情
      *
      * @param updateReportBusinessDetailDTO updateDTO
      * @author lixing
-     * @version V1.0 2021-05-17 10:48:45
+     * @version V1.0 2021-05-17 11:08:34
      */
     void updateReportBusinessDetail(UpdateReportBusinessDetailDTO updateReportBusinessDetailDTO);
 
     /**
-     * 删除报告详情
+     * 删除报告详情
      *
      * @param id 主键
      * @author lixing
-     * @version V1.0 2021-05-17 10:48:45
+     * @version V1.0 2021-05-17 11:08:34
      */
     void deleteReportBusinessDetail(String id);
 
     /**
-     * 查询报告详情
+     * 查询报告详情
      *
      * @param queryReportBusinessDetailDTO queryDTO
      * @return List<ReportBusinessDetail>
      * @author lixing
-     * @version V1.0 2021-05-17 10:48:45
+     * @version V1.0 2021-05-17 11:08:34
      */
     List<ReportBusinessDetail> queryReportBusinessDetailList(QueryReportBusinessDetailDTO queryReportBusinessDetailDTO);
 
     /**
-     * 分页查询报告详情
+     * 分页查询报告详情
      *
      * @param pageQueryReportBusinessDetailDTO pageQueryDTO
      * @return IPage<ReportBusinessDetail>
      * @author lixing
-     * @version V1.0 2021-05-17 10:48:45
+     * @version V1.0 2021-05-17 11:08:34
      */
     IPage<ReportBusinessDetail> pageQueryReportBusinessDetail(PageQueryReportBusinessDetailDTO pageQueryReportBusinessDetailDTO);
 }

+ 20 - 20
src/main/java/com/persagy/apm/energy/report/monthly/detail/business/service/impl/ReportBusinessDetailServiceImpl.java

@@ -20,21 +20,21 @@ import com.persagy.apm.common.model.dto.Sort;
 import org.springframework.util.CollectionUtils;
 
 /**
- * 报告详情(ReportBusinessDetail) service层
+ * 报告详情(ReportBusinessDetail) service层
  *
  * @author lixing
- * @version V1.0 2021-05-17 10:48:45
+ * @version V1.0 2021-05-17 11:08:34
  */
 @Service
 public class ReportBusinessDetailServiceImpl extends ServiceImpl<ReportBusinessDetailMapper, ReportBusinessDetail>
         implements IReportBusinessDetailService {
 
     /**
-     * 创建报告详情
+     * 创建报告详情
      *
-     * @return 报告详情主键
+     * @return 报告详情主键
      * @author lixing
-     * @version V1.0 2021-05-17 10:48:45
+     * @version V1.0 2021-05-17 11:08:34
      */
     @Override
     public String createReportBusinessDetail(AddReportBusinessDetailDTO addReportBusinessDetailDTO) {
@@ -48,7 +48,7 @@ public class ReportBusinessDetailServiceImpl extends ServiceImpl<ReportBusinessD
     /**
      * 如果某些字段没有赋值,使用默认的值
      *
-     * @param reportBusinessDetail 报告详情实体
+     * @param reportBusinessDetail 报告详情实体
      * @author lixing
      * @version V1.0 2021/3/12 12:29 下午
      */
@@ -59,12 +59,12 @@ public class ReportBusinessDetailServiceImpl extends ServiceImpl<ReportBusinessD
     }
 
     /**
-     * 报告详情详情
+     * 报告详情详情
      *
      * @param id 主键
      * @return 部门do类
      * @author lixing
-     * @version V1.0 2021-05-17 10:48:45
+     * @version V1.0 2021-05-17 11:08:34
      */
     @Override
     public ReportBusinessDetail queryReportBusinessDetailDetail(String id) {
@@ -76,10 +76,10 @@ public class ReportBusinessDetailServiceImpl extends ServiceImpl<ReportBusinessD
     }
 
     /**
-     * 更新报告详情
+     * 更新报告详情
      *
      * @author lixing
-     * @version V1.0 2021-05-17 10:48:45
+     * @version V1.0 2021-05-17 11:08:34
      */
     @Override
     public void updateReportBusinessDetail(UpdateReportBusinessDetailDTO updateReportBusinessDetailDTO) {
@@ -90,12 +90,12 @@ public class ReportBusinessDetailServiceImpl extends ServiceImpl<ReportBusinessD
     }
 
     /**
-     * 校验报告详情是否可删除
+     * 校验报告详情是否可删除
      *
-     * @param id 报告详情主键
-     * @return 报告详情do类
+     * @param id 报告详情主键
+     * @return 报告详情do类
      * @author lixing
-     * @version V1.0 2021-05-17 10:48:45
+     * @version V1.0 2021-05-17 11:08:34
      */
     public ReportBusinessDetail checkDeletable(String id) {
         if (id == null) {
@@ -112,11 +112,11 @@ public class ReportBusinessDetailServiceImpl extends ServiceImpl<ReportBusinessD
     }
 
     /**
-     * 删除报告详情
+     * 删除报告详情
      *
      * @param id 主键
      * @author lixing
-     * @version V1.0 2021-05-17 10:48:45
+     * @version V1.0 2021-05-17 11:08:34
      */
     @Override
     public void deleteReportBusinessDetail(String id) {
@@ -128,11 +128,11 @@ public class ReportBusinessDetailServiceImpl extends ServiceImpl<ReportBusinessD
     }
 
     /**
-     * 查询报告详情
+     * 查询报告详情
      *
      * @return List<ReportBusinessDetail>
      * @author lixing
-     * @version V1.0 2021-05-17 10:48:45
+     * @version V1.0 2021-05-17 11:08:34
      */
     @Override
     public List<ReportBusinessDetail> queryReportBusinessDetailList(QueryReportBusinessDetailDTO queryReportBusinessDetailDTO) {
@@ -207,11 +207,11 @@ public class ReportBusinessDetailServiceImpl extends ServiceImpl<ReportBusinessD
     }
 
     /**
-     * 分页查询报告详情
+     * 分页查询报告详情
      *
      * @return IPage<ReportBusinessDetail>
      * @author lixing
-     * @version V1.0 2021-05-17 10:48:45
+     * @version V1.0 2021-05-17 11:08:34
      */
     @Override
     public IPage<ReportBusinessDetail> pageQueryReportBusinessDetail(PageQueryReportBusinessDetailDTO pageQueryReportBusinessDetailDTO) {

+ 43 - 0
src/main/java/com/persagy/apm/energy/report/monthly/outline/constants/enums/ReportStateEnum.java

@@ -0,0 +1,43 @@
+package com.persagy.apm.energy.report.monthly.outline.constants.enums;
+
+import com.persagy.apm.common.model.annotation.SwaggerDisplayEnum;
+
+/**
+ * 报告状态
+ *
+ * @author lixing
+ * @version V1.0 2021/5/17 10:51 上午
+ */
+@SwaggerDisplayEnum
+public enum ReportStateEnum {
+    /**
+     * 报告状态
+     */
+    BUILDING("0", "生成中"),
+    GENERATED("1", "已生成"),
+    BUILD_FAILED("2", "生成失败");
+
+    private String type;
+    private String desc;
+
+    ReportStateEnum(String type, String desc) {
+        this.type = type;
+        this.desc = desc;
+    }
+
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+
+    public String getDesc() {
+        return desc;
+    }
+
+    public void setDesc(String desc) {
+        this.desc = desc;
+    }
+}

+ 44 - 0
src/main/java/com/persagy/apm/energy/report/monthly/outline/constants/enums/ReportTypeEnum.java

@@ -0,0 +1,44 @@
+package com.persagy.apm.energy.report.monthly.outline.constants.enums;
+
+import com.persagy.apm.common.model.annotation.SwaggerDisplayEnum;
+
+/**
+ * 报告类型
+ *
+ * @author lixing
+ * @version V1.0 2021/5/17 10:51 上午
+ */
+@SwaggerDisplayEnum
+public enum ReportTypeEnum {
+    /**
+     * 报告类型
+     */
+    BUSINESS_PROJECT("1", "商业项目能耗月报"),
+    HOTEL_PROJECT("2", "酒店项目能耗月报"),
+    BUSINESS_AREA("3", "商业大区能耗月报"),
+    HOTEL_AREA("4", "酒店集团能耗月报");
+
+    private String type;
+    private String desc;
+
+    ReportTypeEnum(String type, String desc) {
+        this.type = type;
+        this.desc = desc;
+    }
+
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+
+    public String getDesc() {
+        return desc;
+    }
+
+    public void setDesc(String desc) {
+        this.desc = desc;
+    }
+}

+ 52 - 0
src/main/java/com/persagy/apm/energy/report/monthly/outline/controller/ReportOutLineEnumController.java

@@ -0,0 +1,52 @@
+package com.persagy.apm.energy.report.monthly.outline.controller;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.persagy.apm.common.model.dto.EnumQueryDTO;
+import com.persagy.apm.common.model.vo.EnumVO;
+import com.persagy.apm.common.response.CommonResult;
+import com.persagy.apm.common.response.PageList;
+import com.persagy.apm.common.utils.ResultHelper;
+import com.persagy.apm.energy.report.monthly.outline.model.ConvertReportOutlineTool;
+import com.persagy.apm.energy.report.monthly.outline.model.ReportOutline;
+import com.persagy.apm.energy.report.monthly.outline.model.dto.PageQueryReportOutlineDTO;
+import com.persagy.apm.energy.report.monthly.outline.model.vo.ResponseReportOutlineListItemVO;
+import com.persagy.apm.energy.report.monthly.outline.service.IReportOutlineEnumService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.assertj.core.util.Lists;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
+import java.util.List;
+
+/**
+ * @author lixing
+ * @version V1.0 2021/5/17 10:57 上午
+ **/
+@RestController
+@Validated
+@RequestMapping("/reportOutlines/enums")
+@Api(tags = "报告枚举")
+public class ReportOutLineEnumController {
+    @Autowired
+    IReportOutlineEnumService reportOutLineEnumService;
+
+    @PostMapping("/reportState")
+    @ApiOperation(value="报告状态")
+    public CommonResult<PageList<EnumVO>> queryReportStateEnum() {
+        List<EnumVO> resultList = reportOutLineEnumService.queryReportStateEnum();
+        return ResultHelper.multi(resultList);
+    }
+
+    @ApiOperation(value = "当前用户可用的报告类型")
+    @PostMapping("/reportType")
+    public CommonResult<PageList<EnumVO>> queryReportTypeEnum() {
+        IPage<EnumVO> resultList = reportOutLineEnumService.queryReportTypeEnum();
+        return ResultHelper.multi(resultList);
+    }
+}

+ 76 - 54
src/main/java/com/persagy/apm/energy/report/monthly/outline/controller/ReportOutlineController.java

@@ -1,29 +1,37 @@
 package com.persagy.apm.energy.report.monthly.outline.controller;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.persagy.apm.common.response.ApmResponseUpsertVO;
+import com.persagy.apm.common.response.CommonResult;
+import com.persagy.apm.common.response.PageList;
+import com.persagy.apm.common.utils.ResultHelper;
+import com.persagy.apm.energy.report.monthly.outline.model.ConvertReportOutlineTool;
+import com.persagy.apm.energy.report.monthly.outline.model.ReportOutline;
+import com.persagy.apm.energy.report.monthly.outline.model.dto.AddReportOutlineDTO;
+import com.persagy.apm.energy.report.monthly.outline.model.dto.PageQueryReportOutlineDTO;
+import com.persagy.apm.energy.report.monthly.outline.model.dto.QueryReportOutlineDTO;
+import com.persagy.apm.energy.report.monthly.outline.model.vo.ResponseReportOutlineListItemVO;
 import com.persagy.apm.energy.report.monthly.outline.service.IReportOutlineService;
-
-import org.springframework.beans.factory.annotation.Autowired;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
-import com.persagy.apm.energy.report.monthly.outline.model.*;
-import com.persagy.apm.energy.report.monthly.outline.model.vo.*;
-import com.persagy.apm.energy.report.monthly.outline.model.dto.*;
-import com.persagy.apm.common.response.*;
-import com.persagy.apm.common.utils.ResultHelper;
+import org.assertj.core.util.Lists;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
 import java.util.List;
 
 /**
- * 报告控制层
+ * 报告概要控制层
  *
  * @author lixing
- * @version V1.0 2021-05-17 10:47:26
+ * @version V1.0 2021-05-17 11:09:37
  */
-@Api(tags = "报告")
+@Api(tags = "报告概要")
 @Validated
 @RestController
 @RequestMapping("reportOutlines")
@@ -31,7 +39,7 @@ public class ReportOutlineController {
     @Autowired
     private IReportOutlineService reportOutlineService;
 
-    @ApiOperation(value = "创建报告")
+    @ApiOperation(value = "创建报告概要")
     @PostMapping("/create")
     public CommonResult<ApmResponseUpsertVO> createReportOutline(
             @Valid @RequestBody AddReportOutlineDTO addReportOutlineDTO) {
@@ -39,56 +47,70 @@ public class ReportOutlineController {
         return ResultHelper.single(new ApmResponseUpsertVO(id));
     }
 
-    @ApiOperation(value = "报告表详情")
-    @PostMapping("/get")
-    public CommonResult<ResponseReportOutlineItemVO> queryReportOutlineDetail(
-            @Valid @RequestBody QueryReportOutlineDetailDTO queryReportOutlineDetailDTO) {
-        ReportOutline reportOutline = reportOutlineService.queryReportOutlineDetail(queryReportOutlineDetailDTO.getId());
-        ResponseReportOutlineItemVO responseReportOutlineItemVO = ConvertReportOutlineTool.INSTANCE.convert2ResponseItemDTO(reportOutline);
-        return ResultHelper.single(responseReportOutlineItemVO);
-    }
+//    @ApiOperation(value = "报告概要详情")
+//    @PostMapping("/get")
+//    public CommonResult<ResponseReportOutlineItemVO> queryReportOutlineDetail(
+//            @Valid @RequestBody QueryReportOutlineDetailDTO queryReportOutlineDetailDTO) {
+//        ReportOutline reportOutline = reportOutlineService.queryReportOutlineDetail(queryReportOutlineDetailDTO.getId());
+//        ResponseReportOutlineItemVO responseReportOutlineItemVO = ConvertReportOutlineTool.INSTANCE.convert2ResponseItemDTO(reportOutline);
+//        return ResultHelper.single(responseReportOutlineItemVO);
+//    }
 
 
-    @ApiOperation(value = "更新报告表")
-    @PostMapping("/update")
-    public CommonResult<ApmResponseUpsertVO> updateReportOutline(
-            @Valid @RequestBody UpdateReportOutlineDTO updateReportOutlineDTO) {
-        reportOutlineService.updateReportOutline(updateReportOutlineDTO);
-        return ResultHelper.single(new ApmResponseUpsertVO(updateReportOutlineDTO.getId()));
-    }
+//    @ApiOperation(value = "更新报告概要")
+//    @PostMapping("/update")
+//    public CommonResult<ApmResponseUpsertVO> updateReportOutline(
+//            @Valid @RequestBody UpdateReportOutlineDTO updateReportOutlineDTO) {
+//        reportOutlineService.updateReportOutline(updateReportOutlineDTO);
+//        return ResultHelper.single(new ApmResponseUpsertVO(updateReportOutlineDTO.getId()));
+//    }
 
 
-    @ApiOperation(value = "删除报告表")
-    @PostMapping("/delete")
-    public CommonResult deleteReportOutline(
-            @RequestBody @Valid DeleteReportOutlineDTO deleteReportOutlineDTO) {
-        reportOutlineService.deleteReportOutline(deleteReportOutlineDTO.getId());
-        return ResultHelper.success();
-    }
+//    @ApiOperation(value = "删除报告概要")
+//    @PostMapping("/delete")
+//    public CommonResult deleteReportOutline(
+//            @RequestBody @Valid DeleteReportOutlineDTO deleteReportOutlineDTO) {
+//        reportOutlineService.deleteReportOutline(deleteReportOutlineDTO.getId());
+//        return ResultHelper.success();
+//    }
+
 
+//    @ApiOperation(value = "报告概要列表")
+//    @PostMapping("/query")
+//    public CommonResult<PageList<ResponseReportOutlineListItemVO>> queryReportOutline(
+//            @Valid @RequestBody QueryReportOutlineDTO queryReportOutlineDTO) {
+//        List<ReportOutline> reportOutlineList = reportOutlineService.queryReportOutlineList(queryReportOutlineDTO);
+//        List<ResponseReportOutlineListItemVO> resultList = ConvertReportOutlineTool.INSTANCE.convert2List(reportOutlineList);
+//        return ResultHelper.multi(resultList);
+//    }
 
-    @ApiOperation(value = "报告表列表")
+    @ApiOperation(value = "报告概要列表, 分页查询")
     @PostMapping("/query")
     public CommonResult<PageList<ResponseReportOutlineListItemVO>> queryReportOutline(
-            @Valid @RequestBody QueryReportOutlineDTO queryReportOutlineDTO) {
-        List<ReportOutline> reportOutlineList = reportOutlineService.queryReportOutlineList(queryReportOutlineDTO);
-        List<ResponseReportOutlineListItemVO> resultList = ConvertReportOutlineTool.INSTANCE.convert2List(reportOutlineList);
-        return ResultHelper.multi(resultList);
+            @Valid @RequestBody PageQueryReportOutlineDTO pageQueryReportOutlineDTO) {
+        IPage<ReportOutline> pagedList = reportOutlineService.pageQueryReportOutline(pageQueryReportOutlineDTO);
+        IPage<ResponseReportOutlineListItemVO> pagedResultList = pagedList.convert(item -> {
+            try {
+               return ConvertReportOutlineTool.INSTANCE.convert2ResponseListItemDTO(item);
+            } catch (Exception e) {
+                throw new IllegalArgumentException("分页查询,ReportOutline实体类转换为列表对象发生异常", e);
+            }
+        });
+        return ResultHelper.multi(pagedResultList);
     }
 
-    //@ApiOperation(value = "报告表列表, 分页查询")
-    //@PostMapping("/query")
-    //public CommonResult<PageList<ResponseReportOutlineListItemVO>> queryReportOutline(
-    //        @Valid @RequestBody PageQueryReportOutlineDTO pageQueryReportOutlineDTO) {
-    //    IPage<ReportOutline> pagedList = reportOutlineService.pageQueryReportOutline(pageQueryReportOutlineDTO);
-    //    IPage<ResponseReportOutlineListItemVO> pagedResultList = pagedList.convert(item -> {
-    //        try {
-    //           return ConvertReportOutlineTool.INSTANCE.convert2ResponseListItemDTO(item);
-    //        } catch (Exception e) {
-    //            throw new IllegalArgumentException("分页查询,ReportOutline实体类转换为列表对象发生异常", e);
-    //        }
-    //    });
-    //    return ResultHelper.multi(pagedResultList);
-    //}
+    @ApiOperation(value = "查询用户可选项目范围")
+    @PostMapping("/queryAvailableProjects")
+    public CommonResult<PageList<ResponseReportOutlineListItemVO>> queryAvailableProjects() {
+        // TODO: 2021/5/17 查询用户可选项目范围
+        return ResultHelper.multi(Lists.newArrayList());
+    }
+
+    @ApiOperation(value = "查询用户可选分区范围")
+    @PostMapping("/queryAvailableAreas")
+    public CommonResult<PageList<ResponseReportOutlineListItemVO>> queryAvailableAreas() {
+        // TODO: 2021/5/17 查询用户可选分区范围
+        return ResultHelper.multi(Lists.newArrayList());
+    }
 }
 

+ 2 - 2
src/main/java/com/persagy/apm/energy/report/monthly/outline/dao/ReportOutlineMapper.java

@@ -5,10 +5,10 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
 
 /**
- * 报告(ReportOutline)dao层
+ * 报告概要(ReportOutline)dao层
  *
  * @author lixing
- * @version V1.0 2021-05-17 10:47:27
+ * @version V1.0 2021-05-17 11:09:38
  */
 @Mapper
 public interface ReportOutlineMapper extends BaseMapper<ReportOutline> {

+ 7 - 7
src/main/java/com/persagy/apm/energy/report/monthly/outline/model/ConvertReportOutlineTool.java

@@ -9,10 +9,10 @@ import com.persagy.apm.energy.report.monthly.outline.model.dto.*;
 import java.util.List;
 
 /**
- * 报告(ReportOutline) dto、vo、do转换工具类
+ * 报告概要(ReportOutline) dto、vo、do转换工具类
  *
  * @author lixing
- * @version V1.0 2021-05-17 10:47:30 2021-05-17 10:47:30
+ * @version V1.0 2021-05-17 11:09:38 2021-05-17 11:09:38
  */
 @Mapper(nullValueMappingStrategy = NullValueMappingStrategy.RETURN_DEFAULT,
         nullValueCheckStrategy = NullValueCheckStrategy.ALWAYS)
@@ -26,7 +26,7 @@ public interface ConvertReportOutlineTool {
      * @param reportOutline do对象
      * @return ResponseItemVO
      * @author lixing
-     * @version V1.0 2021-05-17 10:47:30
+     * @version V1.0 2021-05-17 11:09:38
      */
     ResponseReportOutlineItemVO convert2ResponseItemDTO(ReportOutline reportOutline);
 
@@ -36,7 +36,7 @@ public interface ConvertReportOutlineTool {
      * @param reportOutline do对象
      * @return ResponseListItemVO
      * @author lixing
-     * @version V1.0 2021-05-17 10:47:30
+     * @version V1.0 2021-05-17 11:09:38
      */
     ResponseReportOutlineListItemVO convert2ResponseListItemDTO(ReportOutline reportOutline);
 
@@ -46,7 +46,7 @@ public interface ConvertReportOutlineTool {
      * @param reportOutlineList do列表
      * @return ResponseListItemVO列表
      * @author lixing
-     * @version V1.0 2021-05-17 10:47:30
+     * @version V1.0 2021-05-17 11:09:38
      */
     List<ResponseReportOutlineListItemVO> convert2List(List<ReportOutline> reportOutlineList);
 
@@ -56,7 +56,7 @@ public interface ConvertReportOutlineTool {
      * @param addReportOutlineDTO addDTO
      * @return 要创建的do对象
      * @author lixing
-     * @version V1.0 2021-05-17 10:47:30
+     * @version V1.0 2021-05-17 11:09:38
      */
     ReportOutline convertAddDto2Entity(AddReportOutlineDTO addReportOutlineDTO);
 
@@ -67,7 +67,7 @@ public interface ConvertReportOutlineTool {
      * @param updateReportOutlineDTO updateDTO
      * @return 更新后的do对象
      * @author lixing
-     * @version V1.0 2021-05-17 10:47:30
+     * @version V1.0 2021-05-17 11:09:38
      */
     ReportOutline convertUpdateDto2Entity(@MappingTarget ReportOutline reportOutline, UpdateReportOutlineDTO updateReportOutlineDTO);
 }

+ 4 - 4
src/main/java/com/persagy/apm/energy/report/monthly/outline/model/ReportOutline.java

@@ -10,16 +10,16 @@ import java.io.Serializable;
 import java.util.Date;
 
 /**
- * 报告(ReportOutline)实体类
+ * 报告概要(ReportOutline)实体类
  *
  * @author lixing
- * @version V1.0 2021-05-17 10:47:28
+ * @version V1.0 2021-05-17 11:09:38
  */
 @EqualsAndHashCode(callSuper = true)
 @Data
-@ApiModel(description = "报告")
+@ApiModel(description = "报告概要")
 public class ReportOutline extends AuditableEntity<ReportOutline> implements Serializable {
-    private static final long serialVersionUID = -71031967304672818L;
+    private static final long serialVersionUID = -86078914254018057L;
 
     @ApiModelProperty("报告名称")
     private String name;

+ 2 - 2
src/main/java/com/persagy/apm/energy/report/monthly/outline/model/dto/AddReportOutlineDTO.java

@@ -11,10 +11,10 @@ import java.util.Date;
 
 /**
  * @author lixing
- * @version V1.0 2021-05-17 10:47:28
+ * @version V1.0 2021-05-17 11:09:38
  */
 @Data
-@ApiModel(value = "创建报告入参")
+@ApiModel(value = "创建报告概要入参")
 public class AddReportOutlineDTO {
     @ApiModelProperty(value = "报告名称", required = true)
     @NotNull(message = "报告名称不能为空") // todo 更新校验规则

+ 2 - 2
src/main/java/com/persagy/apm/energy/report/monthly/outline/model/dto/DeleteReportOutlineDTO.java

@@ -8,10 +8,10 @@ import javax.validation.constraints.NotNull;
 
 /**
  * @author lixing
- * @version V1.0 2021-05-17 10:47:29
+ * @version V1.0 2021-05-17 11:09:38
  */
 @Data
-@ApiModel(value = "删除报告入参")
+@ApiModel(value = "删除报告概要入参")
 public class DeleteReportOutlineDTO {
     @NotNull(message = "id不能为空")
     @ApiModelProperty(value = "报告id", required = true)

+ 2 - 2
src/main/java/com/persagy/apm/energy/report/monthly/outline/model/dto/PageQueryReportOutlineDTO.java

@@ -11,11 +11,11 @@ import lombok.EqualsAndHashCode;
 
 /**
  * @author lixing
- * @version V1.0 2021-05-17 10:47:29
+ * @version V1.0 2021-05-17 11:09:38
  */
 @EqualsAndHashCode(callSuper = true)
 @Data
-@ApiModel(value = "分页查询报告入参")
+@ApiModel(value = "分页查询报告概要入参")
 public class PageQueryReportOutlineDTO extends PageDTO {
     @ApiModelProperty(value = "报告id", required = true)
     private String id;

+ 2 - 2
src/main/java/com/persagy/apm/energy/report/monthly/outline/model/dto/QueryReportOutlineDTO.java

@@ -8,10 +8,10 @@ import java.util.Date;
 
 /**
  * @author lixing
- * @version V1.0 2021-05-17 10:47:29
+ * @version V1.0 2021-05-17 11:09:38
  */
 @Data
-@ApiModel(value = "查询报告入参")
+@ApiModel(value = "查询报告概要入参")
 public class QueryReportOutlineDTO {
     @ApiModelProperty(value = "报告名称", required = true)
     private String name;

+ 2 - 2
src/main/java/com/persagy/apm/energy/report/monthly/outline/model/dto/QueryReportOutlineDetailDTO.java

@@ -8,10 +8,10 @@ import javax.validation.constraints.NotNull;
 
 /**
  * @author lixing
- * @version V1.0 2021-05-17 10:47:28
+ * @version V1.0 2021-05-17 11:09:38
  */
 @Data
-@ApiModel(value = "获取报告详情入参")
+@ApiModel(value = "获取报告概要详情入参")
 public class QueryReportOutlineDetailDTO {
     @NotNull(message = "报告id不能为空")
     @ApiModelProperty(value = "报告id", required = true)

+ 2 - 2
src/main/java/com/persagy/apm/energy/report/monthly/outline/model/dto/UpdateReportOutlineDTO.java

@@ -11,10 +11,10 @@ import java.util.Date;
 
 /**
  * @author lixing
- * @version V1.0 2021-05-17 10:47:29
+ * @version V1.0 2021-05-17 11:09:38
  */
 @Data
-@ApiModel(value = "更新报告入参")
+@ApiModel(value = "更新报告概要入参")
 public class UpdateReportOutlineDTO {
     @ApiModelProperty(value = "报告id", required = true)
     @NotNull(message = "报告id不能为空") // todo 更新校验规则

+ 2 - 2
src/main/java/com/persagy/apm/energy/report/monthly/outline/model/vo/ResponseReportOutlineItemVO.java

@@ -10,10 +10,10 @@ import com.fasterxml.jackson.annotation.JsonInclude;
 
 /**
  * @author lixing
- * @version V1.0 2021-05-17 10:47:30
+ * @version V1.0 2021-05-17 11:09:38
  */
 @Data
-@ApiModel(value = "报告返回结果参数")
+@ApiModel(value = "报告概要返回结果参数")
 @JsonInclude(JsonInclude.Include.NON_NULL)
 public class ResponseReportOutlineItemVO {
     @ApiModelProperty("报告id")

+ 2 - 2
src/main/java/com/persagy/apm/energy/report/monthly/outline/model/vo/ResponseReportOutlineListItemVO.java

@@ -10,10 +10,10 @@ import com.fasterxml.jackson.annotation.JsonInclude;
 
 /**
  * @author lixing
- * @version V1.0 2021-05-17 10:47:30
+ * @version V1.0 2021-05-17 11:09:38
  */
 @Data
-@ApiModel(value = "报告列表返回结果参数")
+@ApiModel(value = "报告概要列表返回结果参数")
 @JsonInclude(JsonInclude.Include.NON_NULL)
 public class ResponseReportOutlineListItemVO {
     @ApiModelProperty("报告id")

+ 33 - 0
src/main/java/com/persagy/apm/energy/report/monthly/outline/service/IReportOutlineEnumService.java

@@ -0,0 +1,33 @@
+package com.persagy.apm.energy.report.monthly.outline.service;
+
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.persagy.apm.common.model.vo.EnumVO;
+
+import java.util.List;
+
+/**
+ * 报告枚举类接口
+ *
+ * @author lixing
+ * @version V1.0 2021/5/17 10:57 上午
+ */
+public interface IReportOutlineEnumService {
+    /**
+     * 报告状态枚举
+     *
+     * @return 报告状态枚举列表
+     * @author lixing
+     * @version V1.0 2021/5/17 11:32 上午
+     */
+    List<EnumVO> queryReportStateEnum();
+
+    /**
+     * 当前用户可用的报告类型
+     *
+     * @return 报告类型枚举列表
+     * @author lixing
+     * @version V1.0 2021/5/17 11:32 上午
+     */
+    IPage<EnumVO> queryReportTypeEnum();
+}

+ 16 - 16
src/main/java/com/persagy/apm/energy/report/monthly/outline/service/IReportOutlineService.java

@@ -10,68 +10,68 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 
 /**
- * 报告(ReportOutline) service接口
+ * 报告概要(ReportOutline) service接口
  *
  * @author lixing
- * @version V1.0 2021-05-17 10:47:27
+ * @version V1.0 2021-05-17 11:09:37
  */
 public interface IReportOutlineService {
 
     /**
-     * 创建报告
+     * 创建报告概要
      *
      * @param addReportOutlineDTO addDTO
-     * @return 报告主键
+     * @return 报告概要主键
      * @author lixing
-     * @version V1.0 2021-05-17 10:47:27
+     * @version V1.0 2021-05-17 11:09:37
      */
     String createReportOutline(AddReportOutlineDTO addReportOutlineDTO);
 
     /**
-     * 报告详情
+     * 报告概要详情
      *
      * @param id 主键
-     * @return 报告do对象
+     * @return 报告概要do对象
      * @author lixing
-     * @version V1.0 2021-05-17 10:47:27
+     * @version V1.0 2021-05-17 11:09:37
      */
     ReportOutline queryReportOutlineDetail(String id);
 
     /**
-     * 更新报告
+     * 更新报告概要
      *
      * @param updateReportOutlineDTO updateDTO
      * @author lixing
-     * @version V1.0 2021-05-17 10:47:27
+     * @version V1.0 2021-05-17 11:09:37
      */
     void updateReportOutline(UpdateReportOutlineDTO updateReportOutlineDTO);
 
     /**
-     * 删除报告
+     * 删除报告概要
      *
      * @param id 主键
      * @author lixing
-     * @version V1.0 2021-05-17 10:47:27
+     * @version V1.0 2021-05-17 11:09:37
      */
     void deleteReportOutline(String id);
 
     /**
-     * 查询报告
+     * 查询报告概要
      *
      * @param queryReportOutlineDTO queryDTO
      * @return List<ReportOutline>
      * @author lixing
-     * @version V1.0 2021-05-17 10:47:27
+     * @version V1.0 2021-05-17 11:09:37
      */
     List<ReportOutline> queryReportOutlineList(QueryReportOutlineDTO queryReportOutlineDTO);
 
     /**
-     * 分页查询报告
+     * 分页查询报告概要
      *
      * @param pageQueryReportOutlineDTO pageQueryDTO
      * @return IPage<ReportOutline>
      * @author lixing
-     * @version V1.0 2021-05-17 10:47:27
+     * @version V1.0 2021-05-17 11:09:37
      */
     IPage<ReportOutline> pageQueryReportOutline(PageQueryReportOutlineDTO pageQueryReportOutlineDTO);
 }

+ 38 - 0
src/main/java/com/persagy/apm/energy/report/monthly/outline/service/impl/ReportOutlineEnumServiceImpl.java

@@ -0,0 +1,38 @@
+package com.persagy.apm.energy.report.monthly.outline.service.impl;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.persagy.apm.common.model.vo.EnumVO;
+import com.persagy.apm.energy.report.monthly.outline.constants.enums.ReportStateEnum;
+import com.persagy.apm.energy.report.monthly.outline.service.IReportOutlineEnumService;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * 报告枚举实现类
+ *
+ * @author lixing
+ * @version V1.0 2021/5/17 11:00 上午
+ **/
+@Service
+public class ReportOutlineEnumServiceImpl implements IReportOutlineEnumService {
+    @Override
+    public List<EnumVO> queryReportStateEnum() {
+        List<EnumVO> resultList = new ArrayList<>(ReportStateEnum.values().length);
+        Arrays.asList(ReportStateEnum.values()).forEach(reportStateEnum -> {
+            EnumVO enumVO = new EnumVO();
+            enumVO.setKey(reportStateEnum.getType());
+            enumVO.setValue(reportStateEnum.getDesc());
+            resultList.add(enumVO);
+        });
+        return resultList;
+    }
+
+    @Override
+    public IPage<EnumVO> queryReportTypeEnum() {
+        // TODO: 2021/5/17  根据用户查询可用的报告类型
+        return null;
+    }
+}

+ 20 - 20
src/main/java/com/persagy/apm/energy/report/monthly/outline/service/impl/ReportOutlineServiceImpl.java

@@ -20,21 +20,21 @@ import com.persagy.apm.common.model.dto.Sort;
 import org.springframework.util.CollectionUtils;
 
 /**
- * 报告(ReportOutline) service层
+ * 报告概要(ReportOutline) service层
  *
  * @author lixing
- * @version V1.0 2021-05-17 10:47:27
+ * @version V1.0 2021-05-17 11:09:37
  */
 @Service
 public class ReportOutlineServiceImpl extends ServiceImpl<ReportOutlineMapper, ReportOutline>
         implements IReportOutlineService {
 
     /**
-     * 创建报告
+     * 创建报告概要
      *
-     * @return 报告主键
+     * @return 报告概要主键
      * @author lixing
-     * @version V1.0 2021-05-17 10:47:27
+     * @version V1.0 2021-05-17 11:09:37
      */
     @Override
     public String createReportOutline(AddReportOutlineDTO addReportOutlineDTO) {
@@ -48,7 +48,7 @@ public class ReportOutlineServiceImpl extends ServiceImpl<ReportOutlineMapper, R
     /**
      * 如果某些字段没有赋值,使用默认的值
      *
-     * @param reportOutline 报告实体
+     * @param reportOutline 报告概要实体
      * @author lixing
      * @version V1.0 2021/3/12 12:29 下午
      */
@@ -59,12 +59,12 @@ public class ReportOutlineServiceImpl extends ServiceImpl<ReportOutlineMapper, R
     }
 
     /**
-     * 报告详情
+     * 报告概要详情
      *
      * @param id 主键
      * @return 部门do类
      * @author lixing
-     * @version V1.0 2021-05-17 10:47:27
+     * @version V1.0 2021-05-17 11:09:37
      */
     @Override
     public ReportOutline queryReportOutlineDetail(String id) {
@@ -76,10 +76,10 @@ public class ReportOutlineServiceImpl extends ServiceImpl<ReportOutlineMapper, R
     }
 
     /**
-     * 更新报告
+     * 更新报告概要
      *
      * @author lixing
-     * @version V1.0 2021-05-17 10:47:27
+     * @version V1.0 2021-05-17 11:09:37
      */
     @Override
     public void updateReportOutline(UpdateReportOutlineDTO updateReportOutlineDTO) {
@@ -90,12 +90,12 @@ public class ReportOutlineServiceImpl extends ServiceImpl<ReportOutlineMapper, R
     }
 
     /**
-     * 校验报告是否可删除
+     * 校验报告概要是否可删除
      *
-     * @param id 报告主键
-     * @return 报告do类
+     * @param id 报告概要主键
+     * @return 报告概要do类
      * @author lixing
-     * @version V1.0 2021-05-17 10:47:27
+     * @version V1.0 2021-05-17 11:09:37
      */
     public ReportOutline checkDeletable(String id) {
         if (id == null) {
@@ -112,11 +112,11 @@ public class ReportOutlineServiceImpl extends ServiceImpl<ReportOutlineMapper, R
     }
 
     /**
-     * 删除报告
+     * 删除报告概要
      *
      * @param id 主键
      * @author lixing
-     * @version V1.0 2021-05-17 10:47:27
+     * @version V1.0 2021-05-17 11:09:37
      */
     @Override
     public void deleteReportOutline(String id) {
@@ -128,11 +128,11 @@ public class ReportOutlineServiceImpl extends ServiceImpl<ReportOutlineMapper, R
     }
 
     /**
-     * 查询报告
+     * 查询报告概要
      *
      * @return List<ReportOutline>
      * @author lixing
-     * @version V1.0 2021-05-17 10:47:27
+     * @version V1.0 2021-05-17 11:09:37
      */
     @Override
     public List<ReportOutline> queryReportOutlineList(QueryReportOutlineDTO queryReportOutlineDTO) {
@@ -181,11 +181,11 @@ public class ReportOutlineServiceImpl extends ServiceImpl<ReportOutlineMapper, R
     }
 
     /**
-     * 分页查询报告
+     * 分页查询报告概要
      *
      * @return IPage<ReportOutline>
      * @author lixing
-     * @version V1.0 2021-05-17 10:47:27
+     * @version V1.0 2021-05-17 11:09:37
      */
     @Override
     public IPage<ReportOutline> pageQueryReportOutline(PageQueryReportOutlineDTO pageQueryReportOutlineDTO) {