lixing пре 4 година
родитељ
комит
b02868c4b2
30 измењених фајлова са 125 додато и 124 уклоњено
  1. 6 6
      src/main/java/com/persagy/apm/energy/report/monthly/controller/ReportBusinessDetailController.java
  2. 3 3
      src/main/java/com/persagy/apm/energy/report/monthly/dao/ReportBusinessDetailMapper.java
  3. 9 9
      src/main/java/com/persagy/apm/energy/report/monthly/model/ConvertReportBusinessDetailTool.java
  4. 3 3
      src/main/java/com/persagy/apm/energy/report/monthly/model/ReportBusinessDetail.java
  5. 2 2
      src/main/java/com/persagy/apm/energy/report/monthly/model/dto/AddReportBusinessDetailDTO.java
  6. 2 2
      src/main/java/com/persagy/apm/energy/report/monthly/model/dto/DeleteReportBusinessDetailDTO.java
  7. 2 2
      src/main/java/com/persagy/apm/energy/report/monthly/model/dto/PageQueryReportBusinessDetailDTO.java
  8. 2 2
      src/main/java/com/persagy/apm/energy/report/monthly/model/dto/QueryReportBusinessDetailDTO.java
  9. 2 2
      src/main/java/com/persagy/apm/energy/report/monthly/model/dto/QueryReportBusinessDetailDetailDTO.java
  10. 2 2
      src/main/java/com/persagy/apm/energy/report/monthly/model/dto/UpdateReportBusinessDetailDTO.java
  11. 2 2
      src/main/java/com/persagy/apm/energy/report/monthly/model/vo/ResponseReportBusinessDetailItemVO.java
  12. 2 2
      src/main/java/com/persagy/apm/energy/report/monthly/model/vo/ResponseReportBusinessDetailListItemVO.java
  13. 10 10
      src/main/java/com/persagy/apm/energy/report/monthly/service/IReportBusinessDetailService.java
  14. 13 13
      src/main/java/com/persagy/apm/energy/report/monthly/service/impl/ReportBusinessDetailServiceImpl.java
  15. 6 6
      src/main/java/com/persagy/apm/energy/report/monthly/controller/ReportOutlineController.java
  16. 3 3
      src/main/java/com/persagy/apm/energy/report/monthly/dao/ReportOutlineMapper.java
  17. 9 9
      src/main/java/com/persagy/apm/energy/report/monthly/model/ConvertReportOutlineTool.java
  18. 3 3
      src/main/java/com/persagy/apm/energy/report/monthly/model/ReportOutline.java
  19. 2 2
      src/main/java/com/persagy/apm/energy/report/monthly/model/dto/AddReportOutlineDTO.java
  20. 2 2
      src/main/java/com/persagy/apm/energy/report/monthly/model/dto/DeleteReportOutlineDTO.java
  21. 2 2
      src/main/java/com/persagy/apm/energy/report/monthly/model/dto/PageQueryReportOutlineDTO.java
  22. 2 2
      src/main/java/com/persagy/apm/energy/report/monthly/model/dto/QueryReportOutlineDTO.java
  23. 2 2
      src/main/java/com/persagy/apm/energy/report/monthly/model/dto/QueryReportOutlineDetailDTO.java
  24. 2 2
      src/main/java/com/persagy/apm/energy/report/monthly/model/dto/UpdateReportOutlineDTO.java
  25. 2 2
      src/main/java/com/persagy/apm/energy/report/monthly/model/vo/ResponseReportOutlineItemVO.java
  26. 2 2
      src/main/java/com/persagy/apm/energy/report/monthly/model/vo/ResponseReportOutlineListItemVO.java
  27. 10 10
      src/main/java/com/persagy/apm/energy/report/monthly/service/IReportOutlineService.java
  28. 13 13
      src/main/java/com/persagy/apm/energy/report/monthly/service/impl/ReportOutlineServiceImpl.java
  29. 3 2
      src/main/resources/mapper/ReportBusinessDetailMapper.xml
  30. 2 2
      src/main/resources/mapper/ReportOutlineMapper.xml

+ 6 - 6
src/main/java/com/persagy/apm/energy/report/monthly/controller/ReportBusinessDetailController.java

@@ -1,14 +1,14 @@
-package com.persagy.apm.energy.report.monthly.controller;
+package com.persagy.apm.energy.report.monthly.detail.business.controller;
 
-import com.persagy.apm.energy.report.monthly.service.IReportBusinessDetailService;
+import com.persagy.apm.energy.report.monthly.detail.business.service.IReportBusinessDetailService;
 
 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.model.*;
-import com.persagy.apm.energy.report.monthly.model.vo.*;
-import com.persagy.apm.energy.report.monthly.model.dto.*;
+import com.persagy.apm.energy.report.monthly.detail.business.model.*;
+import com.persagy.apm.energy.report.monthly.detail.business.model.vo.*;
+import com.persagy.apm.energy.report.monthly.detail.business.model.dto.*;
 import com.persagy.apm.common.response.*;
 import com.persagy.apm.common.utils.ResultHelper;
 import org.springframework.validation.annotation.Validated;
@@ -21,7 +21,7 @@ import java.util.List;
  * 报告详情表控制层
  *
  * @author lixing
- * @version V1.0 2021-05-17 09:55:24
+ * @version V1.0 2021-05-17 10:48:45
  */
 @Api(tags = "报告详情表")
 @Validated

+ 3 - 3
src/main/java/com/persagy/apm/energy/report/monthly/dao/ReportBusinessDetailMapper.java

@@ -1,6 +1,6 @@
-package com.persagy.apm.energy.report.monthly.dao;
+package com.persagy.apm.energy.report.monthly.detail.business.dao;
 
-import com.persagy.apm.energy.report.monthly.model.ReportBusinessDetail;
+import com.persagy.apm.energy.report.monthly.detail.business.model.ReportBusinessDetail;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
 
@@ -8,7 +8,7 @@ import org.apache.ibatis.annotations.Mapper;
  * 报告详情表(ReportBusinessDetail)dao层
  *
  * @author lixing
- * @version V1.0 2021-05-17 09:55:25
+ * @version V1.0 2021-05-17 10:48:45
  */
 @Mapper
 public interface ReportBusinessDetailMapper extends BaseMapper<ReportBusinessDetail> {

+ 9 - 9
src/main/java/com/persagy/apm/energy/report/monthly/model/ConvertReportBusinessDetailTool.java

@@ -1,10 +1,10 @@
-package com.persagy.apm.energy.report.monthly.model;
+package com.persagy.apm.energy.report.monthly.detail.business.model;
 
 import org.mapstruct.*;
 import org.mapstruct.MappingTarget;
 import org.mapstruct.factory.Mappers;
-import com.persagy.apm.energy.report.monthly.model.vo.*;
-import com.persagy.apm.energy.report.monthly.model.dto.*;
+import com.persagy.apm.energy.report.monthly.detail.business.model.vo.*;
+import com.persagy.apm.energy.report.monthly.detail.business.model.dto.*;
 
 import java.util.List;
 
@@ -12,7 +12,7 @@ import java.util.List;
  * 报告详情表(ReportBusinessDetail) dto、vo、do转换工具类
  *
  * @author lixing
- * @version V1.0 2021-05-17 09:55:26 2021-05-17 09:55:26
+ * @version V1.0 2021-05-17 10:48:46 2021-05-17 10:48:46
  */
 @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 09:55:26
+     * @version V1.0 2021-05-17 10:48:46
      */
     ResponseReportBusinessDetailItemVO convert2ResponseItemDTO(ReportBusinessDetail reportBusinessDetail);
 
@@ -36,7 +36,7 @@ public interface ConvertReportBusinessDetailTool {
      * @param reportBusinessDetail do对象
      * @return ResponseListItemVO
      * @author lixing
-     * @version V1.0 2021-05-17 09:55:26
+     * @version V1.0 2021-05-17 10:48:46
      */
     ResponseReportBusinessDetailListItemVO convert2ResponseListItemDTO(ReportBusinessDetail reportBusinessDetail);
 
@@ -46,7 +46,7 @@ public interface ConvertReportBusinessDetailTool {
      * @param reportBusinessDetailList do列表
      * @return ResponseListItemVO列表
      * @author lixing
-     * @version V1.0 2021-05-17 09:55:26
+     * @version V1.0 2021-05-17 10:48:46
      */
     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 09:55:26
+     * @version V1.0 2021-05-17 10:48:46
      */
     ReportBusinessDetail convertAddDto2Entity(AddReportBusinessDetailDTO addReportBusinessDetailDTO);
 
@@ -67,7 +67,7 @@ public interface ConvertReportBusinessDetailTool {
      * @param updateReportBusinessDetailDTO updateDTO
      * @return 更新后的do对象
      * @author lixing
-     * @version V1.0 2021-05-17 09:55:26
+     * @version V1.0 2021-05-17 10:48:46
      */
     ReportBusinessDetail convertUpdateDto2Entity(@MappingTarget ReportBusinessDetail reportBusinessDetail, UpdateReportBusinessDetailDTO updateReportBusinessDetailDTO);
 }

+ 3 - 3
src/main/java/com/persagy/apm/energy/report/monthly/model/ReportBusinessDetail.java

@@ -1,4 +1,4 @@
-package com.persagy.apm.energy.report.monthly.model;
+package com.persagy.apm.energy.report.monthly.detail.business.model;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -13,13 +13,13 @@ import java.util.Date;
  * 报告详情表(ReportBusinessDetail)实体类
  *
  * @author lixing
- * @version V1.0 2021-05-17 09:55:25
+ * @version V1.0 2021-05-17 10:48:46
  */
 @EqualsAndHashCode(callSuper = true)
 @Data
 @ApiModel(description = "报告详情表")
 public class ReportBusinessDetail extends AuditableEntity<ReportBusinessDetail> implements Serializable {
-    private static final long serialVersionUID = -77817945215986879L;
+    private static final long serialVersionUID = 911808574629588997L;
 
     @ApiModelProperty("在营项目用电量数据对象信息,项目月报使用此字段")
     private Object openPower;

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

@@ -1,4 +1,4 @@
-package com.persagy.apm.energy.report.monthly.model.dto;
+package com.persagy.apm.energy.report.monthly.detail.business.model.dto;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -11,7 +11,7 @@ import java.util.Date;
 
 /**
  * @author lixing
- * @version V1.0 2021-05-17 09:55:25
+ * @version V1.0 2021-05-17 10:48:46
  */
 @Data
 @ApiModel(value = "创建报告详情表入参")

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

@@ -1,4 +1,4 @@
-package com.persagy.apm.energy.report.monthly.model.dto;
+package com.persagy.apm.energy.report.monthly.detail.business.model.dto;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -8,7 +8,7 @@ import javax.validation.constraints.NotNull;
 
 /**
  * @author lixing
- * @version V1.0 2021-05-17 09:55:26
+ * @version V1.0 2021-05-17 10:48:46
  */
 @Data
 @ApiModel(value = "删除报告详情表入参")

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

@@ -1,4 +1,4 @@
-package com.persagy.apm.energy.report.monthly.model.dto;
+package com.persagy.apm.energy.report.monthly.detail.business.model.dto;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -11,7 +11,7 @@ import lombok.EqualsAndHashCode;
 
 /**
  * @author lixing
- * @version V1.0 2021-05-17 09:55:26
+ * @version V1.0 2021-05-17 10:48:46
  */
 @EqualsAndHashCode(callSuper = true)
 @Data

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

@@ -1,4 +1,4 @@
-package com.persagy.apm.energy.report.monthly.model.dto;
+package com.persagy.apm.energy.report.monthly.detail.business.model.dto;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -8,7 +8,7 @@ import java.util.Date;
 
 /**
  * @author lixing
- * @version V1.0 2021-05-17 09:55:26
+ * @version V1.0 2021-05-17 10:48:46
  */
 @Data
 @ApiModel(value = "查询报告详情表入参")

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

@@ -1,4 +1,4 @@
-package com.persagy.apm.energy.report.monthly.model.dto;
+package com.persagy.apm.energy.report.monthly.detail.business.model.dto;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -8,7 +8,7 @@ import javax.validation.constraints.NotNull;
 
 /**
  * @author lixing
- * @version V1.0 2021-05-17 09:55:26
+ * @version V1.0 2021-05-17 10:48:46
  */
 @Data
 @ApiModel(value = "获取报告详情表详情入参")

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

@@ -1,4 +1,4 @@
-package com.persagy.apm.energy.report.monthly.model.dto;
+package com.persagy.apm.energy.report.monthly.detail.business.model.dto;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -11,7 +11,7 @@ import java.util.Date;
 
 /**
  * @author lixing
- * @version V1.0 2021-05-17 09:55:26
+ * @version V1.0 2021-05-17 10:48:46
  */
 @Data
 @ApiModel(value = "更新报告详情表入参")

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

@@ -1,4 +1,4 @@
-package com.persagy.apm.energy.report.monthly.model.vo;
+package com.persagy.apm.energy.report.monthly.detail.business.model.vo;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -10,7 +10,7 @@ import com.fasterxml.jackson.annotation.JsonInclude;
 
 /**
  * @author lixing
- * @version V1.0 2021-05-17 09:55:26
+ * @version V1.0 2021-05-17 10:48:46
  */
 @Data
 @ApiModel(value = "报告详情表返回结果参数")

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

@@ -1,4 +1,4 @@
-package com.persagy.apm.energy.report.monthly.model.vo;
+package com.persagy.apm.energy.report.monthly.detail.business.model.vo;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -10,7 +10,7 @@ import com.fasterxml.jackson.annotation.JsonInclude;
 
 /**
  * @author lixing
- * @version V1.0 2021-05-17 09:55:26
+ * @version V1.0 2021-05-17 10:48:46
  */
 @Data
 @ApiModel(value = "报告详情表列表返回结果参数")

+ 10 - 10
src/main/java/com/persagy/apm/energy/report/monthly/service/IReportBusinessDetailService.java

@@ -1,7 +1,7 @@
-package com.persagy.apm.energy.report.monthly.service;
+package com.persagy.apm.energy.report.monthly.detail.business.service;
 
-import com.persagy.apm.energy.report.monthly.model.*;
-import com.persagy.apm.energy.report.monthly.model.dto.*;
+import com.persagy.apm.energy.report.monthly.detail.business.model.*;
+import com.persagy.apm.energy.report.monthly.detail.business.model.dto.*;
 
 import java.util.List;
 
@@ -13,7 +13,7 @@ import io.swagger.annotations.ApiOperation;
  * 报告详情表(ReportBusinessDetail) service接口
  *
  * @author lixing
- * @version V1.0 2021-05-17 09:55:24
+ * @version V1.0 2021-05-17 10:48:45
  */
 public interface IReportBusinessDetailService {
 
@@ -23,7 +23,7 @@ public interface IReportBusinessDetailService {
      * @param addReportBusinessDetailDTO addDTO
      * @return 报告详情表主键
      * @author lixing
-     * @version V1.0 2021-05-17 09:55:24
+     * @version V1.0 2021-05-17 10:48:45
      */
     String createReportBusinessDetail(AddReportBusinessDetailDTO addReportBusinessDetailDTO);
 
@@ -33,7 +33,7 @@ public interface IReportBusinessDetailService {
      * @param id 主键
      * @return 报告详情表do对象
      * @author lixing
-     * @version V1.0 2021-05-17 09:55:24
+     * @version V1.0 2021-05-17 10:48:45
      */
     ReportBusinessDetail queryReportBusinessDetailDetail(String id);
 
@@ -42,7 +42,7 @@ public interface IReportBusinessDetailService {
      *
      * @param updateReportBusinessDetailDTO updateDTO
      * @author lixing
-     * @version V1.0 2021-05-17 09:55:24
+     * @version V1.0 2021-05-17 10:48:45
      */
     void updateReportBusinessDetail(UpdateReportBusinessDetailDTO updateReportBusinessDetailDTO);
 
@@ -51,7 +51,7 @@ public interface IReportBusinessDetailService {
      *
      * @param id 主键
      * @author lixing
-     * @version V1.0 2021-05-17 09:55:24
+     * @version V1.0 2021-05-17 10:48:45
      */
     void deleteReportBusinessDetail(String id);
 
@@ -61,7 +61,7 @@ public interface IReportBusinessDetailService {
      * @param queryReportBusinessDetailDTO queryDTO
      * @return List<ReportBusinessDetail>
      * @author lixing
-     * @version V1.0 2021-05-17 09:55:24
+     * @version V1.0 2021-05-17 10:48:45
      */
     List<ReportBusinessDetail> queryReportBusinessDetailList(QueryReportBusinessDetailDTO queryReportBusinessDetailDTO);
 
@@ -71,7 +71,7 @@ public interface IReportBusinessDetailService {
      * @param pageQueryReportBusinessDetailDTO pageQueryDTO
      * @return IPage<ReportBusinessDetail>
      * @author lixing
-     * @version V1.0 2021-05-17 09:55:24
+     * @version V1.0 2021-05-17 10:48:45
      */
     IPage<ReportBusinessDetail> pageQueryReportBusinessDetail(PageQueryReportBusinessDetailDTO pageQueryReportBusinessDetailDTO);
 }

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

@@ -1,15 +1,15 @@
-package com.persagy.apm.energy.report.monthly.service.impl;
+package com.persagy.apm.energy.report.monthly.detail.business.service.impl;
 
 import com.persagy.apm.common.context.AppContext;
-import com.persagy.apm.energy.report.monthly.dao.ReportBusinessDetailMapper;
-import com.persagy.apm.energy.report.monthly.service.IReportBusinessDetailService;
+import com.persagy.apm.energy.report.monthly.detail.business.dao.ReportBusinessDetailMapper;
+import com.persagy.apm.energy.report.monthly.detail.business.service.IReportBusinessDetailService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 import org.apache.commons.lang.StringUtils;
 import com.persagy.apm.common.constant.enums.ValidEnum;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.persagy.apm.energy.report.monthly.model.*;
-import com.persagy.apm.energy.report.monthly.model.dto.*;
+import com.persagy.apm.energy.report.monthly.detail.business.model.*;
+import com.persagy.apm.energy.report.monthly.detail.business.model.dto.*;
 
 import java.util.List;
 
@@ -23,7 +23,7 @@ import org.springframework.util.CollectionUtils;
  * 报告详情表(ReportBusinessDetail) service层
  *
  * @author lixing
- * @version V1.0 2021-05-17 09:55:24
+ * @version V1.0 2021-05-17 10:48:45
  */
 @Service
 public class ReportBusinessDetailServiceImpl extends ServiceImpl<ReportBusinessDetailMapper, ReportBusinessDetail>
@@ -34,7 +34,7 @@ public class ReportBusinessDetailServiceImpl extends ServiceImpl<ReportBusinessD
      *
      * @return 报告详情表主键
      * @author lixing
-     * @version V1.0 2021-05-17 09:55:24
+     * @version V1.0 2021-05-17 10:48:45
      */
     @Override
     public String createReportBusinessDetail(AddReportBusinessDetailDTO addReportBusinessDetailDTO) {
@@ -64,7 +64,7 @@ public class ReportBusinessDetailServiceImpl extends ServiceImpl<ReportBusinessD
      * @param id 主键
      * @return 部门do类
      * @author lixing
-     * @version V1.0 2021-05-17 09:55:24
+     * @version V1.0 2021-05-17 10:48:45
      */
     @Override
     public ReportBusinessDetail queryReportBusinessDetailDetail(String id) {
@@ -79,7 +79,7 @@ public class ReportBusinessDetailServiceImpl extends ServiceImpl<ReportBusinessD
      * 更新报告详情表
      *
      * @author lixing
-     * @version V1.0 2021-05-17 09:55:24
+     * @version V1.0 2021-05-17 10:48:45
      */
     @Override
     public void updateReportBusinessDetail(UpdateReportBusinessDetailDTO updateReportBusinessDetailDTO) {
@@ -95,7 +95,7 @@ public class ReportBusinessDetailServiceImpl extends ServiceImpl<ReportBusinessD
      * @param id 报告详情表主键
      * @return 报告详情表do类
      * @author lixing
-     * @version V1.0 2021-05-17 09:55:24
+     * @version V1.0 2021-05-17 10:48:45
      */
     public ReportBusinessDetail checkDeletable(String id) {
         if (id == null) {
@@ -116,7 +116,7 @@ public class ReportBusinessDetailServiceImpl extends ServiceImpl<ReportBusinessD
      *
      * @param id 主键
      * @author lixing
-     * @version V1.0 2021-05-17 09:55:24
+     * @version V1.0 2021-05-17 10:48:45
      */
     @Override
     public void deleteReportBusinessDetail(String id) {
@@ -132,7 +132,7 @@ public class ReportBusinessDetailServiceImpl extends ServiceImpl<ReportBusinessD
      *
      * @return List<ReportBusinessDetail>
      * @author lixing
-     * @version V1.0 2021-05-17 09:55:24
+     * @version V1.0 2021-05-17 10:48:45
      */
     @Override
     public List<ReportBusinessDetail> queryReportBusinessDetailList(QueryReportBusinessDetailDTO queryReportBusinessDetailDTO) {
@@ -211,7 +211,7 @@ public class ReportBusinessDetailServiceImpl extends ServiceImpl<ReportBusinessD
      *
      * @return IPage<ReportBusinessDetail>
      * @author lixing
-     * @version V1.0 2021-05-17 09:55:24
+     * @version V1.0 2021-05-17 10:48:45
      */
     @Override
     public IPage<ReportBusinessDetail> pageQueryReportBusinessDetail(PageQueryReportBusinessDetailDTO pageQueryReportBusinessDetailDTO) {

+ 6 - 6
src/main/java/com/persagy/apm/energy/report/monthly/controller/ReportOutlineController.java

@@ -1,14 +1,14 @@
-package com.persagy.apm.energy.report.monthly.controller;
+package com.persagy.apm.energy.report.monthly.outline.controller;
 
-import com.persagy.apm.energy.report.monthly.service.IReportOutlineService;
+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.model.*;
-import com.persagy.apm.energy.report.monthly.model.vo.*;
-import com.persagy.apm.energy.report.monthly.model.dto.*;
+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.springframework.validation.annotation.Validated;
@@ -21,7 +21,7 @@ import java.util.List;
  * 报告表控制层
  *
  * @author lixing
- * @version V1.0 2021-05-17 09:55:26
+ * @version V1.0 2021-05-17 10:47:26
  */
 @Api(tags = "报告表")
 @Validated

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

@@ -1,6 +1,6 @@
-package com.persagy.apm.energy.report.monthly.dao;
+package com.persagy.apm.energy.report.monthly.outline.dao;
 
-import com.persagy.apm.energy.report.monthly.model.ReportOutline;
+import com.persagy.apm.energy.report.monthly.outline.model.ReportOutline;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
 
@@ -8,7 +8,7 @@ import org.apache.ibatis.annotations.Mapper;
  * 报告表(ReportOutline)dao层
  *
  * @author lixing
- * @version V1.0 2021-05-17 09:55:27
+ * @version V1.0 2021-05-17 10:47:27
  */
 @Mapper
 public interface ReportOutlineMapper extends BaseMapper<ReportOutline> {

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

@@ -1,10 +1,10 @@
-package com.persagy.apm.energy.report.monthly.model;
+package com.persagy.apm.energy.report.monthly.outline.model;
 
 import org.mapstruct.*;
 import org.mapstruct.MappingTarget;
 import org.mapstruct.factory.Mappers;
-import com.persagy.apm.energy.report.monthly.model.vo.*;
-import com.persagy.apm.energy.report.monthly.model.dto.*;
+import com.persagy.apm.energy.report.monthly.outline.model.vo.*;
+import com.persagy.apm.energy.report.monthly.outline.model.dto.*;
 
 import java.util.List;
 
@@ -12,7 +12,7 @@ import java.util.List;
  * 报告表(ReportOutline) dto、vo、do转换工具类
  *
  * @author lixing
- * @version V1.0 2021-05-17 09:55:28 2021-05-17 09:55:28
+ * @version V1.0 2021-05-17 10:47:30 2021-05-17 10:47:30
  */
 @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 09:55:28
+     * @version V1.0 2021-05-17 10:47:30
      */
     ResponseReportOutlineItemVO convert2ResponseItemDTO(ReportOutline reportOutline);
 
@@ -36,7 +36,7 @@ public interface ConvertReportOutlineTool {
      * @param reportOutline do对象
      * @return ResponseListItemVO
      * @author lixing
-     * @version V1.0 2021-05-17 09:55:28
+     * @version V1.0 2021-05-17 10:47:30
      */
     ResponseReportOutlineListItemVO convert2ResponseListItemDTO(ReportOutline reportOutline);
 
@@ -46,7 +46,7 @@ public interface ConvertReportOutlineTool {
      * @param reportOutlineList do列表
      * @return ResponseListItemVO列表
      * @author lixing
-     * @version V1.0 2021-05-17 09:55:28
+     * @version V1.0 2021-05-17 10:47:30
      */
     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 09:55:28
+     * @version V1.0 2021-05-17 10:47:30
      */
     ReportOutline convertAddDto2Entity(AddReportOutlineDTO addReportOutlineDTO);
 
@@ -67,7 +67,7 @@ public interface ConvertReportOutlineTool {
      * @param updateReportOutlineDTO updateDTO
      * @return 更新后的do对象
      * @author lixing
-     * @version V1.0 2021-05-17 09:55:28
+     * @version V1.0 2021-05-17 10:47:30
      */
     ReportOutline convertUpdateDto2Entity(@MappingTarget ReportOutline reportOutline, UpdateReportOutlineDTO updateReportOutlineDTO);
 }

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

@@ -1,4 +1,4 @@
-package com.persagy.apm.energy.report.monthly.model;
+package com.persagy.apm.energy.report.monthly.outline.model;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -13,13 +13,13 @@ import java.util.Date;
  * 报告表(ReportOutline)实体类
  *
  * @author lixing
- * @version V1.0 2021-05-17 09:55:27
+ * @version V1.0 2021-05-17 10:47:28
  */
 @EqualsAndHashCode(callSuper = true)
 @Data
 @ApiModel(description = "报告表")
 public class ReportOutline extends AuditableEntity<ReportOutline> implements Serializable {
-    private static final long serialVersionUID = -70295079401649569L;
+    private static final long serialVersionUID = -71031967304672818L;
 
     @ApiModelProperty("报告名称")
     private String name;

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

@@ -1,4 +1,4 @@
-package com.persagy.apm.energy.report.monthly.model.dto;
+package com.persagy.apm.energy.report.monthly.outline.model.dto;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -11,7 +11,7 @@ import java.util.Date;
 
 /**
  * @author lixing
- * @version V1.0 2021-05-17 09:55:27
+ * @version V1.0 2021-05-17 10:47:28
  */
 @Data
 @ApiModel(value = "创建报告表入参")

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

@@ -1,4 +1,4 @@
-package com.persagy.apm.energy.report.monthly.model.dto;
+package com.persagy.apm.energy.report.monthly.outline.model.dto;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -8,7 +8,7 @@ import javax.validation.constraints.NotNull;
 
 /**
  * @author lixing
- * @version V1.0 2021-05-17 09:55:28
+ * @version V1.0 2021-05-17 10:47:29
  */
 @Data
 @ApiModel(value = "删除报告表入参")

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

@@ -1,4 +1,4 @@
-package com.persagy.apm.energy.report.monthly.model.dto;
+package com.persagy.apm.energy.report.monthly.outline.model.dto;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -11,7 +11,7 @@ import lombok.EqualsAndHashCode;
 
 /**
  * @author lixing
- * @version V1.0 2021-05-17 09:55:28
+ * @version V1.0 2021-05-17 10:47:29
  */
 @EqualsAndHashCode(callSuper = true)
 @Data

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

@@ -1,4 +1,4 @@
-package com.persagy.apm.energy.report.monthly.model.dto;
+package com.persagy.apm.energy.report.monthly.outline.model.dto;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -8,7 +8,7 @@ import java.util.Date;
 
 /**
  * @author lixing
- * @version V1.0 2021-05-17 09:55:28
+ * @version V1.0 2021-05-17 10:47:29
  */
 @Data
 @ApiModel(value = "查询报告表入参")

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

@@ -1,4 +1,4 @@
-package com.persagy.apm.energy.report.monthly.model.dto;
+package com.persagy.apm.energy.report.monthly.outline.model.dto;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -8,7 +8,7 @@ import javax.validation.constraints.NotNull;
 
 /**
  * @author lixing
- * @version V1.0 2021-05-17 09:55:27
+ * @version V1.0 2021-05-17 10:47:28
  */
 @Data
 @ApiModel(value = "获取报告表详情入参")

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

@@ -1,4 +1,4 @@
-package com.persagy.apm.energy.report.monthly.model.dto;
+package com.persagy.apm.energy.report.monthly.outline.model.dto;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -11,7 +11,7 @@ import java.util.Date;
 
 /**
  * @author lixing
- * @version V1.0 2021-05-17 09:55:27
+ * @version V1.0 2021-05-17 10:47:29
  */
 @Data
 @ApiModel(value = "更新报告表入参")

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

@@ -1,4 +1,4 @@
-package com.persagy.apm.energy.report.monthly.model.vo;
+package com.persagy.apm.energy.report.monthly.outline.model.vo;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -10,7 +10,7 @@ import com.fasterxml.jackson.annotation.JsonInclude;
 
 /**
  * @author lixing
- * @version V1.0 2021-05-17 09:55:28
+ * @version V1.0 2021-05-17 10:47:30
  */
 @Data
 @ApiModel(value = "报告表返回结果参数")

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

@@ -1,4 +1,4 @@
-package com.persagy.apm.energy.report.monthly.model.vo;
+package com.persagy.apm.energy.report.monthly.outline.model.vo;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -10,7 +10,7 @@ import com.fasterxml.jackson.annotation.JsonInclude;
 
 /**
  * @author lixing
- * @version V1.0 2021-05-17 09:55:28
+ * @version V1.0 2021-05-17 10:47:30
  */
 @Data
 @ApiModel(value = "报告表列表返回结果参数")

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

@@ -1,7 +1,7 @@
-package com.persagy.apm.energy.report.monthly.service;
+package com.persagy.apm.energy.report.monthly.outline.service;
 
-import com.persagy.apm.energy.report.monthly.model.*;
-import com.persagy.apm.energy.report.monthly.model.dto.*;
+import com.persagy.apm.energy.report.monthly.outline.model.*;
+import com.persagy.apm.energy.report.monthly.outline.model.dto.*;
 
 import java.util.List;
 
@@ -13,7 +13,7 @@ import io.swagger.annotations.ApiOperation;
  * 报告表(ReportOutline) service接口
  *
  * @author lixing
- * @version V1.0 2021-05-17 09:55:27
+ * @version V1.0 2021-05-17 10:47:27
  */
 public interface IReportOutlineService {
 
@@ -23,7 +23,7 @@ public interface IReportOutlineService {
      * @param addReportOutlineDTO addDTO
      * @return 报告表主键
      * @author lixing
-     * @version V1.0 2021-05-17 09:55:27
+     * @version V1.0 2021-05-17 10:47:27
      */
     String createReportOutline(AddReportOutlineDTO addReportOutlineDTO);
 
@@ -33,7 +33,7 @@ public interface IReportOutlineService {
      * @param id 主键
      * @return 报告表do对象
      * @author lixing
-     * @version V1.0 2021-05-17 09:55:27
+     * @version V1.0 2021-05-17 10:47:27
      */
     ReportOutline queryReportOutlineDetail(String id);
 
@@ -42,7 +42,7 @@ public interface IReportOutlineService {
      *
      * @param updateReportOutlineDTO updateDTO
      * @author lixing
-     * @version V1.0 2021-05-17 09:55:27
+     * @version V1.0 2021-05-17 10:47:27
      */
     void updateReportOutline(UpdateReportOutlineDTO updateReportOutlineDTO);
 
@@ -51,7 +51,7 @@ public interface IReportOutlineService {
      *
      * @param id 主键
      * @author lixing
-     * @version V1.0 2021-05-17 09:55:27
+     * @version V1.0 2021-05-17 10:47:27
      */
     void deleteReportOutline(String id);
 
@@ -61,7 +61,7 @@ public interface IReportOutlineService {
      * @param queryReportOutlineDTO queryDTO
      * @return List<ReportOutline>
      * @author lixing
-     * @version V1.0 2021-05-17 09:55:27
+     * @version V1.0 2021-05-17 10:47:27
      */
     List<ReportOutline> queryReportOutlineList(QueryReportOutlineDTO queryReportOutlineDTO);
 
@@ -71,7 +71,7 @@ public interface IReportOutlineService {
      * @param pageQueryReportOutlineDTO pageQueryDTO
      * @return IPage<ReportOutline>
      * @author lixing
-     * @version V1.0 2021-05-17 09:55:27
+     * @version V1.0 2021-05-17 10:47:27
      */
     IPage<ReportOutline> pageQueryReportOutline(PageQueryReportOutlineDTO pageQueryReportOutlineDTO);
 }

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

@@ -1,15 +1,15 @@
-package com.persagy.apm.energy.report.monthly.service.impl;
+package com.persagy.apm.energy.report.monthly.outline.service.impl;
 
 import com.persagy.apm.common.context.AppContext;
-import com.persagy.apm.energy.report.monthly.dao.ReportOutlineMapper;
-import com.persagy.apm.energy.report.monthly.service.IReportOutlineService;
+import com.persagy.apm.energy.report.monthly.outline.dao.ReportOutlineMapper;
+import com.persagy.apm.energy.report.monthly.outline.service.IReportOutlineService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 import org.apache.commons.lang.StringUtils;
 import com.persagy.apm.common.constant.enums.ValidEnum;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.persagy.apm.energy.report.monthly.model.*;
-import com.persagy.apm.energy.report.monthly.model.dto.*;
+import com.persagy.apm.energy.report.monthly.outline.model.*;
+import com.persagy.apm.energy.report.monthly.outline.model.dto.*;
 
 import java.util.List;
 
@@ -23,7 +23,7 @@ import org.springframework.util.CollectionUtils;
  * 报告表(ReportOutline) service层
  *
  * @author lixing
- * @version V1.0 2021-05-17 09:55:27
+ * @version V1.0 2021-05-17 10:47:27
  */
 @Service
 public class ReportOutlineServiceImpl extends ServiceImpl<ReportOutlineMapper, ReportOutline>
@@ -34,7 +34,7 @@ public class ReportOutlineServiceImpl extends ServiceImpl<ReportOutlineMapper, R
      *
      * @return 报告表主键
      * @author lixing
-     * @version V1.0 2021-05-17 09:55:27
+     * @version V1.0 2021-05-17 10:47:27
      */
     @Override
     public String createReportOutline(AddReportOutlineDTO addReportOutlineDTO) {
@@ -64,7 +64,7 @@ public class ReportOutlineServiceImpl extends ServiceImpl<ReportOutlineMapper, R
      * @param id 主键
      * @return 部门do类
      * @author lixing
-     * @version V1.0 2021-05-17 09:55:27
+     * @version V1.0 2021-05-17 10:47:27
      */
     @Override
     public ReportOutline queryReportOutlineDetail(String id) {
@@ -79,7 +79,7 @@ public class ReportOutlineServiceImpl extends ServiceImpl<ReportOutlineMapper, R
      * 更新报告表
      *
      * @author lixing
-     * @version V1.0 2021-05-17 09:55:27
+     * @version V1.0 2021-05-17 10:47:27
      */
     @Override
     public void updateReportOutline(UpdateReportOutlineDTO updateReportOutlineDTO) {
@@ -95,7 +95,7 @@ public class ReportOutlineServiceImpl extends ServiceImpl<ReportOutlineMapper, R
      * @param id 报告表主键
      * @return 报告表do类
      * @author lixing
-     * @version V1.0 2021-05-17 09:55:27
+     * @version V1.0 2021-05-17 10:47:27
      */
     public ReportOutline checkDeletable(String id) {
         if (id == null) {
@@ -116,7 +116,7 @@ public class ReportOutlineServiceImpl extends ServiceImpl<ReportOutlineMapper, R
      *
      * @param id 主键
      * @author lixing
-     * @version V1.0 2021-05-17 09:55:27
+     * @version V1.0 2021-05-17 10:47:27
      */
     @Override
     public void deleteReportOutline(String id) {
@@ -132,7 +132,7 @@ public class ReportOutlineServiceImpl extends ServiceImpl<ReportOutlineMapper, R
      *
      * @return List<ReportOutline>
      * @author lixing
-     * @version V1.0 2021-05-17 09:55:27
+     * @version V1.0 2021-05-17 10:47:27
      */
     @Override
     public List<ReportOutline> queryReportOutlineList(QueryReportOutlineDTO queryReportOutlineDTO) {
@@ -185,7 +185,7 @@ public class ReportOutlineServiceImpl extends ServiceImpl<ReportOutlineMapper, R
      *
      * @return IPage<ReportOutline>
      * @author lixing
-     * @version V1.0 2021-05-17 09:55:27
+     * @version V1.0 2021-05-17 10:47:27
      */
     @Override
     public IPage<ReportOutline> pageQueryReportOutline(PageQueryReportOutlineDTO pageQueryReportOutlineDTO) {

+ 3 - 2
src/main/resources/mapper/ReportBusinessDetailMapper.xml

@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.persagy.apm.energy.report.monthly.dao.ReportBusinessDetailMapper">
-    <resultMap id="ReportBusinessDetailMap" type="com.persagy.apm.energy.report.monthly.model.ReportBusinessDetail">
+<mapper namespace="com.persagy.apm.energy.report.monthly.detail.business.dao.ReportBusinessDetailMapper">
+    <resultMap id="ReportBusinessDetailMap"
+               type="com.persagy.apm.energy.report.monthly.detail.business.model.ReportBusinessDetail">
         <result column="id" property="id"/>
         <result column="open_power" property="openPower"/>
         <result column="open_power_explain" property="openPowerExplain"/>

+ 2 - 2
src/main/resources/mapper/ReportOutlineMapper.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.persagy.apm.energy.report.monthly.dao.ReportOutlineMapper">
-    <resultMap id="ReportOutlineMap" type="com.persagy.apm.energy.report.monthly.model.ReportOutline">
+<mapper namespace="com.persagy.apm.energy.report.monthly.outline.dao.ReportOutlineMapper">
+    <resultMap id="ReportOutlineMap" type="com.persagy.apm.energy.report.monthly.outline.model.ReportOutline">
         <result column="id" property="id"/>
         <result column="name" property="name"/>
         <result column="date" property="date"/>