Browse Source

报告工厂服务初始化

lixing 3 years ago
parent
commit
f176c410ed
100 changed files with 295 additions and 5764 deletions
  1. 1 1
      src/main/java/com/persagy/apm/report/dependencies/common/FeignConfig.java
  2. 1 1
      src/main/java/com/persagy/apm/report/dependencies/common/PoemsWebConfigurer.java
  3. 4 5
      src/main/java/com/persagy/apm/report/dependencies/common/DataConstants.java
  4. 3 1
      src/main/java/com/persagy/apm/report/dependencies/common/FeignClientNameConstants.java
  5. 67 0
      src/main/java/com/persagy/apm/report/common/schedule/ReportGenerateFailScheduleTask.java
  6. 59 0
      src/main/java/com/persagy/apm/report/common/utils/ApmStrUtils.java
  7. 53 4
      src/main/java/com/persagy/apm/report/dependencies/common/utils/DataUtils.java
  8. 45 4
      src/main/java/com/persagy/apm/report/dependencies/common/utils/DateUtils.java
  9. 5 2
      src/main/java/com/persagy/apm/report/dependencies/common/utils/HttpUtils.java
  10. 0 16
      src/main/java/com/persagy/apm/report/config/function/dao/FunctionMapper.java
  11. 0 53
      src/main/java/com/persagy/apm/report/config/function/model/Function.java
  12. 0 43
      src/main/java/com/persagy/apm/report/config/function/model/dto/AddFunctionDTO.java
  13. 0 41
      src/main/java/com/persagy/apm/report/config/function/model/dto/PageQueryFunctionDTO.java
  14. 0 38
      src/main/java/com/persagy/apm/report/config/function/model/dto/QueryFunctionDTO.java
  15. 0 47
      src/main/java/com/persagy/apm/report/config/function/model/dto/UpdateFunctionDTO.java
  16. 0 53
      src/main/java/com/persagy/apm/report/config/function/model/vo/ResponseFunctionItemVO.java
  17. 0 52
      src/main/java/com/persagy/apm/report/config/function/model/vo/ResponseFunctionListItemVO.java
  18. 0 88
      src/main/java/com/persagy/apm/report/config/function/service/IFunctionService.java
  19. 0 288
      src/main/java/com/persagy/apm/report/config/function/service/impl/FunctionServiceImpl.java
  20. 0 101
      src/main/java/com/persagy/apm/report/config/rel/detailstatisticsitem/controller/ReportDetailStatisticsItemRelController.java
  21. 0 16
      src/main/java/com/persagy/apm/report/config/rel/detailstatisticsitem/dao/ReportDetailStatisticsItemRelMapper.java
  22. 0 78
      src/main/java/com/persagy/apm/report/config/rel/detailstatisticsitem/model/ConvertReportDetailStatisticsItemRelTool.java
  23. 0 45
      src/main/java/com/persagy/apm/report/config/rel/detailstatisticsitem/model/ReportDetailStatisticsItemRel.java
  24. 0 37
      src/main/java/com/persagy/apm/report/config/rel/detailstatisticsitem/model/dto/AddReportDetailStatisticsItemRelDTO.java
  25. 0 20
      src/main/java/com/persagy/apm/report/config/rel/detailstatisticsitem/model/dto/DeleteReportDetailStatisticsItemRelDTO.java
  26. 0 38
      src/main/java/com/persagy/apm/report/config/rel/detailstatisticsitem/model/dto/PageQueryReportDetailStatisticsItemRelDTO.java
  27. 0 31
      src/main/java/com/persagy/apm/report/config/rel/detailstatisticsitem/model/dto/QueryReportDetailStatisticsItemRelDTO.java
  28. 0 20
      src/main/java/com/persagy/apm/report/config/rel/detailstatisticsitem/model/dto/QueryReportDetailStatisticsItemRelDetailDTO.java
  29. 0 43
      src/main/java/com/persagy/apm/report/config/rel/detailstatisticsitem/model/dto/UpdateReportDetailStatisticsItemRelDTO.java
  30. 0 36
      src/main/java/com/persagy/apm/report/config/rel/detailstatisticsitem/model/vo/ResponseReportDetailStatisticsItemRelItemVO.java
  31. 0 49
      src/main/java/com/persagy/apm/report/config/rel/detailstatisticsitem/model/vo/ResponseReportDetailStatisticsItemRelListItemVO.java
  32. 0 77
      src/main/java/com/persagy/apm/report/config/rel/detailstatisticsitem/service/IReportDetailStatisticsItemRelService.java
  33. 0 232
      src/main/java/com/persagy/apm/report/config/rel/detailstatisticsitem/service/impl/ReportDetailStatisticsItemRelServiceImpl.java
  34. 0 16
      src/main/java/com/persagy/apm/report/config/rel/typefunction/dao/ReportTypeFunctionRelMapper.java
  35. 0 78
      src/main/java/com/persagy/apm/report/config/rel/typefunction/model/ConvertReportTypeFunctionRelTool.java
  36. 0 37
      src/main/java/com/persagy/apm/report/config/rel/typefunction/model/ReportTypeFunctionRel.java
  37. 0 31
      src/main/java/com/persagy/apm/report/config/rel/typefunction/model/dto/AddReportTypeFunctionRelDTO.java
  38. 0 32
      src/main/java/com/persagy/apm/report/config/rel/typefunction/model/dto/PageQueryReportTypeFunctionRelDTO.java
  39. 0 25
      src/main/java/com/persagy/apm/report/config/rel/typefunction/model/dto/QueryReportTypeFunctionRelDTO.java
  40. 0 35
      src/main/java/com/persagy/apm/report/config/rel/typefunction/model/dto/UpdateReportTypeFunctionRelDTO.java
  41. 0 43
      src/main/java/com/persagy/apm/report/config/rel/typefunction/model/vo/ResponseReportTypeFunctionRelListItemVO.java
  42. 0 77
      src/main/java/com/persagy/apm/report/config/rel/typefunction/service/IReportTypeFunctionRelService.java
  43. 0 212
      src/main/java/com/persagy/apm/report/config/rel/typefunction/service/impl/ReportTypeFunctionRelServiceImpl.java
  44. 0 16
      src/main/java/com/persagy/apm/report/config/rel/typefunctiongroup/dao/ReportTypeFunctionGroupRelMapper.java
  45. 0 78
      src/main/java/com/persagy/apm/report/config/rel/typefunctiongroup/model/ConvertReportTypeFunctionGroupRelTool.java
  46. 0 37
      src/main/java/com/persagy/apm/report/config/rel/typefunctiongroup/model/ReportTypeFunctionGroupRel.java
  47. 0 31
      src/main/java/com/persagy/apm/report/config/rel/typefunctiongroup/model/dto/AddReportTypeFunctionGroupRelDTO.java
  48. 0 20
      src/main/java/com/persagy/apm/report/config/rel/typefunctiongroup/model/dto/DeleteReportTypeFunctionGroupRelDTO.java
  49. 0 32
      src/main/java/com/persagy/apm/report/config/rel/typefunctiongroup/model/dto/PageQueryReportTypeFunctionGroupRelDTO.java
  50. 0 25
      src/main/java/com/persagy/apm/report/config/rel/typefunctiongroup/model/dto/QueryReportTypeFunctionGroupRelDTO.java
  51. 0 20
      src/main/java/com/persagy/apm/report/config/rel/typefunctiongroup/model/dto/QueryReportTypeFunctionGroupRelDetailDTO.java
  52. 0 35
      src/main/java/com/persagy/apm/report/config/rel/typefunctiongroup/model/dto/UpdateReportTypeFunctionGroupRelDTO.java
  53. 0 43
      src/main/java/com/persagy/apm/report/config/rel/typefunctiongroup/model/vo/ResponseReportTypeFunctionGroupRelItemVO.java
  54. 0 43
      src/main/java/com/persagy/apm/report/config/rel/typefunctiongroup/model/vo/ResponseReportTypeFunctionGroupRelListItemVO.java
  55. 0 77
      src/main/java/com/persagy/apm/report/config/rel/typefunctiongroup/service/IReportTypeFunctionGroupRelService.java
  56. 0 209
      src/main/java/com/persagy/apm/report/config/rel/typefunctiongroup/service/impl/ReportTypeFunctionGroupRelServiceImpl.java
  57. 0 101
      src/main/java/com/persagy/apm/report/config/rel/typestatisticsitem/controller/ReportTypeStatisticsItemRelController.java
  58. 0 16
      src/main/java/com/persagy/apm/report/config/rel/typestatisticsitem/dao/ReportTypeStatisticsItemRelMapper.java
  59. 0 78
      src/main/java/com/persagy/apm/report/config/rel/typestatisticsitem/model/ConvertReportTypeStatisticsItemRelTool.java
  60. 0 33
      src/main/java/com/persagy/apm/report/config/rel/typestatisticsitem/model/ReportTypeStatisticsItemRel.java
  61. 0 27
      src/main/java/com/persagy/apm/report/config/rel/typestatisticsitem/model/dto/AddReportTypeStatisticsItemRelDTO.java
  62. 0 20
      src/main/java/com/persagy/apm/report/config/rel/typestatisticsitem/model/dto/DeleteReportTypeStatisticsItemRelDTO.java
  63. 0 29
      src/main/java/com/persagy/apm/report/config/rel/typestatisticsitem/model/dto/PageQueryReportTypeStatisticsItemRelDTO.java
  64. 0 22
      src/main/java/com/persagy/apm/report/config/rel/typestatisticsitem/model/dto/QueryReportTypeStatisticsItemRelDTO.java
  65. 0 20
      src/main/java/com/persagy/apm/report/config/rel/typestatisticsitem/model/dto/QueryReportTypeStatisticsItemRelDetailDTO.java
  66. 0 31
      src/main/java/com/persagy/apm/report/config/rel/typestatisticsitem/model/dto/UpdateReportTypeStatisticsItemRelDTO.java
  67. 0 77
      src/main/java/com/persagy/apm/report/config/rel/typestatisticsitem/service/IReportTypeStatisticsItemRelService.java
  68. 0 202
      src/main/java/com/persagy/apm/report/config/rel/typestatisticsitem/service/impl/ReportTypeStatisticsItemRelServiceImpl.java
  69. 0 101
      src/main/java/com/persagy/apm/report/config/statisticsitems/controller/StatisticItemsController.java
  70. 0 16
      src/main/java/com/persagy/apm/report/config/statisticsitems/dao/StatisticItemsMapper.java
  71. 0 78
      src/main/java/com/persagy/apm/report/config/statisticsitems/model/ConvertStatisticItemsTool.java
  72. 0 47
      src/main/java/com/persagy/apm/report/config/statisticsitems/model/StatisticItems.java
  73. 0 35
      src/main/java/com/persagy/apm/report/config/statisticsitems/model/dto/AddStatisticItemsDTO.java
  74. 0 35
      src/main/java/com/persagy/apm/report/config/statisticsitems/model/dto/PageQueryStatisticItemsDTO.java
  75. 0 32
      src/main/java/com/persagy/apm/report/config/statisticsitems/model/dto/QueryStatisticItemsDTO.java
  76. 0 39
      src/main/java/com/persagy/apm/report/config/statisticsitems/model/dto/UpdateStatisticItemsDTO.java
  77. 0 77
      src/main/java/com/persagy/apm/report/config/statisticsitems/service/IStatisticItemsService.java
  78. 0 222
      src/main/java/com/persagy/apm/report/config/statisticsitems/service/impl/StatisticItemsServiceImpl.java
  79. 0 32
      src/main/java/com/persagy/apm/report/config/type/constant/enums/BuildingTypeEnum.java
  80. 0 87
      src/main/java/com/persagy/apm/report/config/type/service/IReportTypeService.java
  81. 2 2
      src/main/java/com/persagy/apm/report/dependencies/centermiddleware/client/CenterMiddlewareWebClient.java
  82. 0 28
      src/main/java/com/persagy/apm/report/dependencies/centermiddleware/model/vo/ProjectEERDataVo.java
  83. 0 24
      src/main/java/com/persagy/apm/report/dependencies/centermiddleware/service/ICenterMiddlewareWebService.java
  84. 6 198
      src/main/java/com/persagy/apm/report/dependencies/centermiddleware/service/impl/ICenterMiddlewareWebServiceImp.java
  85. 0 29
      src/main/java/com/persagy/apm/report/dependencies/common/dto/QueryAreaPlatformParamDTO.java
  86. 0 28
      src/main/java/com/persagy/apm/report/dependencies/common/dto/QueryPjPlatformParamDTO.java
  87. 0 32
      src/main/java/com/persagy/apm/report/dependencies/common/dto/QueryPlatformParamDTO.java
  88. 0 103
      src/main/java/com/persagy/apm/report/dependencies/common/service/CommonService.java
  89. 0 33
      src/main/java/com/persagy/apm/report/dependencies/common/service/PlatformService.java
  90. 0 113
      src/main/java/com/persagy/apm/report/dependencies/common/service/impl/BianSunDataAnalysisPlatformServiceImpl.java
  91. 0 476
      src/main/java/com/persagy/apm/report/dependencies/common/service/impl/CommonServiceImpl.java
  92. 0 111
      src/main/java/com/persagy/apm/report/dependencies/common/service/impl/EnvironmentPlatformServiceImpl.java
  93. 0 150
      src/main/java/com/persagy/apm/report/dependencies/common/service/impl/WorkOrderPlatformServiceImpl.java
  94. 0 114
      src/main/java/com/persagy/apm/report/dependencies/common/service/impl/ZongZhiDataAnalysisPlatformServiceImpl.java
  95. 0 14
      src/main/java/com/persagy/apm/report/dependencies/common/utils/SpringContextHolder.java
  96. 0 20
      src/main/java/com/persagy/apm/report/dependencies/common/vo/PlatformAreaInfoVO.java
  97. 0 20
      src/main/java/com/persagy/apm/report/dependencies/common/vo/WorkOrderVO.java
  98. 36 0
      src/main/java/com/persagy/apm/report/dependencies/dmpalarm/client/DmpAlarmClient.java
  99. 13 0
      src/main/java/com/persagy/apm/report/dependencies/dmpalarm/client/fallback/DmpAlarmClientFallbackFactory.java
  100. 0 0
      src/main/java/com/persagy/apm/report/dependencies/dmpalarm/enums/EnumAlarmTreatState.java

+ 1 - 1
src/main/java/com/persagy/apm/report/dependencies/common/FeignConfig.java

@@ -1,4 +1,4 @@
-package com.persagy.apm.report.dependencies.common;
+package com.persagy.apm.report.common.config;
 
 import com.persagy.apm.common.config.FeignExceptionHandler;
 import com.persagy.apm.common.config.PoemsFeignExceptionHandler;

+ 1 - 1
src/main/java/com/persagy/apm/report/dependencies/common/PoemsWebConfigurer.java

@@ -1,4 +1,4 @@
-package com.persagy.apm.report.dependencies.common;
+package com.persagy.apm.report.common.config;
 
 import com.persagy.apm.common.handler.PoemsContextFilter;
 import com.persagy.apm.common.handler.PoemsContextHandler;

+ 4 - 5
src/main/java/com/persagy/apm/report/dependencies/common/DataConstants.java

@@ -1,4 +1,4 @@
-package com.persagy.apm.report.dependencies.common;
+package com.persagy.apm.report.common.constants;
 
 /**
  * 常量类
@@ -12,10 +12,9 @@ public class DataConstants {
 
     public static final String LOGIN_DEVICE = "PC";
 
-    public static final String ENV_TYPE_ID = "Temp";
-
-    public static final String ENV_PARENT_TYPE_ID = "Humiture";
-
     public static final String SUCCESS = "success";
 
+    public static final String SPLIT_FLAG = ",";
+
+    public static final String SQM = "/㎡";
 }

+ 3 - 1
src/main/java/com/persagy/apm/report/dependencies/common/FeignClientNameConstants.java

@@ -1,4 +1,4 @@
-package com.persagy.apm.report.dependencies.common;
+package com.persagy.apm.report.common.constants;
 
 /**
  * feign client名称
@@ -19,4 +19,6 @@ public class FeignClientNameConstants {
 
     public static final String MANUAL_FILLING = "manual-filling";
 
+    public static final String ENERGY_EFFICIENCY = "energy-efficiency";
+
 }

+ 67 - 0
src/main/java/com/persagy/apm/report/common/schedule/ReportGenerateFailScheduleTask.java

@@ -0,0 +1,67 @@
+package com.persagy.apm.report.common.schedule;
+
+
+import com.persagy.apm.report.common.utils.DateUtils;
+import com.persagy.apm.report.outline.constants.enums.ReportStateEnum;
+import com.persagy.apm.report.outline.model.ReportOutline;
+import com.persagy.apm.report.outline.model.dto.QueryReportOutlineDTO;
+import com.persagy.apm.report.outline.service.IReportOutlineService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+import org.springframework.util.CollectionUtils;
+
+import java.util.Date;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * 定时更新还未生成成功的报告状态为生成失败
+ *
+ * @author lixing
+ * @version V1.0 2021/8/9 11:59 上午
+ **/
+@Component
+@Slf4j
+public class ReportGenerateFailScheduleTask {
+    @Autowired
+    IReportOutlineService reportOutlineService;
+    @Value("${maxGenerateMinutes}")
+    private int maxGenerateMinutes;
+    @Value("${failReportPeriod}")
+    private String failReportPeriod;
+
+    /**
+     * 定时更新还未生成成功的报告状态为生成失败(目的是为了处理宕机引起的报告状态一直处于生成中的问题)
+     *
+     * @author lixing
+     * @version V1.0 2021/8/9 12:01 下午
+     */
+    @Scheduled(fixedRateString = "${failReportPeriod}")
+    public void checkAndFailReportGenerateState() {
+        log.info("开始检查生成时间超过{}ms, 依然处于生成中的报告", failReportPeriod);
+        // 查询生成状态为生成中的报告
+        QueryReportOutlineDTO queryReportOutlineDTO = new QueryReportOutlineDTO();
+        queryReportOutlineDTO.setStatus(ReportStateEnum.BUILDING.getType());
+        List<ReportOutline> reportOutlines = reportOutlineService.queryReportOutlineList(queryReportOutlineDTO);
+        // 过滤当前时间 - 更新时间 > failReportPeriod的报告
+        if (CollectionUtils.isEmpty(reportOutlines)) {
+            return;
+        }
+
+        Date now = new Date();
+        List<ReportOutline> reports2Fail = reportOutlines.stream().filter(reportOutline -> {
+            Double dateDuration = DateUtils.getDateDuration(now, reportOutline.getModifiedTime());
+            return dateDuration > maxGenerateMinutes * 60 * 1000;
+        }).collect(Collectors.toList());
+        log.info("共有{}个报告生成超时", reports2Fail.size());
+        // 将这些报告的状态置为生成失败
+        reports2Fail.forEach(reportOutline -> {
+            reportOutline.setStatus(ReportStateEnum.BUILD_FAILED.getType());
+            reportOutlineService.updateReportOutline(reportOutline);
+        });
+        log.info("将这些报告的状态更新为生成失败");
+    }
+}

+ 59 - 0
src/main/java/com/persagy/apm/report/common/utils/ApmStrUtils.java

@@ -0,0 +1,59 @@
+package com.persagy.apm.report.common.utils;
+
+import cn.hutool.core.util.StrUtil;
+import com.persagy.apm.report.common.constants.DataConstants;
+
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+/**
+ * apm开发部字符串工具类
+ *
+ * @author lixing
+ * @version V1.0 2021/7/19 10:28 上午
+ **/
+public class ApmStrUtils {
+    /**
+     * 字符串转换为列表(默认分隔符为',')
+     *
+     * @param str 字符串
+     * @return 字符串列表
+     * @author lixing
+     * @version V1.0 2021/7/19 10:30 上午
+     */
+    public static List<String> str2List(String str) {
+        return str2List(str, DataConstants.SPLIT_FLAG);
+    }
+
+    /**
+     * 字符串转换为列表
+     *
+     * @param str 字符串
+     * @param splitFlag 字符串分隔符
+     * @return 字符串列表
+     * @author lixing
+     * @version V1.0 2021/7/19 10:30 上午
+     */
+    public static List<String> str2List(String str, String splitFlag) {
+        if (StrUtil.isBlank(str)) {
+            return null;
+        }
+        return Arrays.asList(StrUtil.split(str, splitFlag));
+    }
+
+    /**
+     * 字符串转换为Set(默认分隔符为',')
+     *
+     * @param str 字符串
+     * @return 字符串Set
+     * @author lixing
+     * @version V1.0 2021/7/19 10:30 上午
+     */
+    public static Set<String> str2Set(String str) {
+        List<String> strList = str2List(str);
+        return new HashSet<>(strList);
+    }
+
+}

+ 53 - 4
src/main/java/com/persagy/apm/report/dependencies/common/utils/DataUtils.java

@@ -1,4 +1,4 @@
-package com.persagy.apm.report.dependencies.common.utils;
+package com.persagy.apm.report.common.utils;
 
 import org.apache.commons.lang3.StringUtils;
 import org.nfunk.jep.JEP;
@@ -46,10 +46,10 @@ public class DataUtils {
     /**
      * 按规则进行计算
      *
-     * @param standardValue  规则
+     * @param standardValue  标准
      * @param qualifyFormula 规则
      * @param data           要进行规则校验的数据
-     * @return
+     * @return 计算结果(如果规则结果是bool值,1.0 -> true, 0.0 -> false)
      */
     public static Double getQualifyResult(Double standardValue, String qualifyFormula, Double data) {
         JEP jep = new JEP();
@@ -141,7 +141,25 @@ public class DataUtils {
     }
 
     /**
-     * 两个double做减法
+     * 两个double做加法
+     *
+     * @param d1 第一个double值
+     * @param d2 第二个double值
+     * @return 结果
+     * @author lixing
+     * @version V1.0 2021/6/2 11:02 上午
+     */
+    public static Double doubleSum(Double d1, Double d2) {
+        if (d1 == null || d2 == null) {
+            throw new IllegalArgumentException("两个double做加法,其中一个为空或两个都为空");
+        }
+        BigDecimal bigDecimal1 = new BigDecimal(d1);
+        BigDecimal bigDecimal2 = new BigDecimal(d2);
+        return bigDecimal1.add(bigDecimal2).doubleValue();
+    }
+
+    /**
+     * 两个double做加法
      *
      * @param d1 第一个double值
      * @param d2 第二个double值
@@ -158,6 +176,15 @@ public class DataUtils {
         return bigDecimal1.subtract(bigDecimal2).doubleValue();
     }
 
+    /**
+     * 根据自定义规则对列表排序
+     * 如果存在多个要排序的字段,排序方式同数据库排序方式
+     *
+     * @param list 要排序的列表
+     * @param comparatorMap 要排序的属性 -> 正序/倒序(-1:从高到低,1: 从低到高)
+     * @author lixing
+     * @version V1.0 2021/7/29 9:52 上午
+     */
     public static void sort(List<?> list, final Map<String, Integer> comparatorMap) {
         Comparator<Object> comparator = new Comparator<Object>() {
 
@@ -268,4 +295,26 @@ public class DataUtils {
         return true;
     }
 
+    /**
+     * double绝对值比较器
+     *
+     * @return double绝对值比较器
+     * @author lixing
+     * @version V1.0 2021/8/9 9:59 上午
+     */
+    public static Comparator<Double> absComparable() {
+        return new Comparator<Double>() {
+            @Override
+            public int compare(Double o1, Double o2) {
+                if (o1 == null) {
+                    return -1;
+                }
+                if (o2 == null) {
+                    return 1;
+                }
+
+                return Double.compare(Math.abs(o1), Math.abs(o2));
+            }
+        };
+    }
 }

+ 45 - 4
src/main/java/com/persagy/apm/report/dependencies/common/utils/DateUtils.java

@@ -1,4 +1,4 @@
-package com.persagy.apm.report.dependencies.common.utils;
+package com.persagy.apm.report.common.utils;
 
 import org.assertj.core.util.Lists;
 
@@ -6,7 +6,6 @@ import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.time.Instant;
 import java.time.LocalDate;
-import java.time.LocalDateTime;
 import java.time.ZoneId;
 import java.util.ArrayList;
 import java.util.Calendar;
@@ -17,7 +16,9 @@ public class DateUtils {
     public static final String SDFSECOND = "yyyyMMddHHmmss";
     public static final String SDFDAY = "yyyyMMdd";
     public static final String SDF_SECOND = "yyyy-MM-dd HH:mm:ss";
+    public static final String SDF_SPACE_SECOND = "yyyyMMdd HH:mm:ss";
     public static final String SDF_DOT_DAY = "yyyy.MM.dd";
+    public static final String SDF_CHAR_MONTH_DAY = "MM月dd日";
 
     /**
      * 将pattern格式的字符串日期转换为Date类型日期
@@ -185,7 +186,7 @@ public class DateUtils {
         c.set(Calendar.MONTH, 0);
         return c.getTime();
     }
-    
+
     /**
      * 去年的第一天
      *
@@ -268,6 +269,26 @@ public class DateUtils {
     }
 
     /**
+     * 给定年份十二月第一天
+     *
+     * @param date 参照的日期
+     * @return 十二月第一天
+     * @author lixing
+     * @version V1.0 2021/5/30 11:43 上午
+     */
+    public static Date getDecemberFirstDayOfYear(Date date) {
+        if (date == null) {
+            return null;
+        }
+        Instant instant = date.toInstant();
+        ZoneId zoneId = ZoneId.systemDefault();
+
+        LocalDate localDate = instant.atZone(zoneId).toLocalDate();
+        LocalDate decemberFirstDayOfYear = LocalDate.of(localDate.getYear(), 12, 1);
+        return Date.from(decemberFirstDayOfYear.atStartOfDay(zoneId).toInstant());
+    }
+
+    /**
      * 去年同期月份第一天
      *
      * @param date 参照的日期
@@ -293,7 +314,7 @@ public class DateUtils {
      * 获取阶段内的每个月的第一天
      *
      * @param startDate 开始日期
-     * @param endDate 结束日期
+     * @param endDate   结束日期
      * @return 阶段内的每个月的第一天
      * @author lixing
      * @version V1.0 2021/5/30 11:43 上午
@@ -340,6 +361,26 @@ public class DateUtils {
     }
 
     /**
+     * 给定月份的第一天
+     *
+     * @param date 给定的日期
+     * @return 给定月份的第一天
+     * @author lixing
+     * @version V1.0 2021/5/30 11:44 上午
+     */
+    public static Date getFirstDayOfMonth(Date date) {
+        if (date == null) {
+            return null;
+        }
+        Instant instant = date.toInstant();
+        ZoneId zoneId = ZoneId.systemDefault();
+
+        LocalDate localDate = instant.atZone(zoneId).toLocalDate();
+        LocalDate firstDayOfMonth = LocalDate.of(localDate.getYear(), localDate.getMonth(), 1);
+        return Date.from(firstDayOfMonth.atStartOfDay(zoneId).toInstant());
+    }
+
+    /**
      * 上个月的第一天
      *
      * @param date 参照的日期

+ 5 - 2
src/main/java/com/persagy/apm/report/dependencies/common/utils/HttpUtils.java

@@ -1,5 +1,8 @@
-package com.persagy.apm.report.dependencies.common.utils;
+package com.persagy.apm.report.common.utils;
 
+import com.google.common.reflect.TypeToken;
+import com.google.gson.Gson;
+import com.persagy.apm.report.detail.model.vo.AttrDefineVO;
 import org.apache.http.HttpEntity;
 import org.apache.http.HttpVersion;
 import org.apache.http.client.config.RequestConfig;
@@ -12,6 +15,7 @@ import org.apache.http.impl.conn.PoolingHttpClientConnectionManager;
 import org.apache.http.util.EntityUtils;
 
 import java.nio.charset.Charset;
+import java.util.List;
 
 public class HttpUtils {
     private final static PoolingHttpClientConnectionManager CONNECTION_MANAGER = new PoolingHttpClientConnectionManager();
@@ -56,5 +60,4 @@ public class HttpUtils {
         response.close();
         return result;
     }
-
 }

+ 0 - 16
src/main/java/com/persagy/apm/report/config/function/dao/FunctionMapper.java

@@ -1,16 +0,0 @@
-package com.persagy.apm.report.config.function.dao;
-
-import com.persagy.apm.report.config.function.model.Function;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Mapper;
-
-/**
- * 能耗报告信息点(Function)dao层
- *
- * @author lixing
- * @version V1.0 2021-05-20 19:05:35
- */
-@Mapper
-public interface FunctionMapper extends BaseMapper<Function> {
-
-}

+ 0 - 53
src/main/java/com/persagy/apm/report/config/function/model/Function.java

@@ -1,53 +0,0 @@
-package com.persagy.apm.report.config.function.model;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import com.persagy.apm.common.model.entity.AuditableEntity;
-
-import java.io.Serializable;
-
-/**
- * 能耗报告信息点(Function)实体类
- *
- * @author lixing
- * @version V1.0 2021-05-20 19:05:35
- */
-@EqualsAndHashCode(callSuper = true)
-@Data
-@ApiModel(description = "能耗报告信息点")
-public class Function extends AuditableEntity<Function> implements Serializable {
-    private static final long serialVersionUID = 108688063917803317L;
-
-    @ApiModelProperty("集团编码")
-    private String groupCode;
-
-    @ApiModelProperty("能耗类型")
-    private String energyType;
-
-    @ApiModelProperty("建筑类型(业态)")
-    private String buildingType;
-
-    @ApiModelProperty("信息点类型(0-能耗,1-费用 ,2-能耗预算,3-费用预算)")
-    private String functionType;
-
-    @ApiModelProperty("能耗模型编码")
-    private String modelCode;
-
-    @ApiModelProperty("分项id")
-    private String itemId;
-
-    @ApiModelProperty("function名称")
-    private String name;
-
-
-    public static String PROP_GROUP_CODE = "group_code";
-    public static String PROP_ENERGY_TYPE = "energy_type";
-    public static String PROP_BUILDING_TYPE = "building_type";
-    public static String PROP_FUNCTION_TYPE = "function_type";
-    public static String PROP_MODEL_CODE = "model_code";
-    public static String PROP_ITEM_ID = "item_id";
-    public static String PROP_NAME = "name";
-
-}

+ 0 - 43
src/main/java/com/persagy/apm/report/config/function/model/dto/AddFunctionDTO.java

@@ -1,43 +0,0 @@
-package com.persagy.apm.report.config.function.model.dto;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-
-import javax.validation.constraints.NotNull;
-
-import lombok.Data;
-
-import java.util.Date;
-
-/**
- * @author lixing
- * @version V1.0 2021-05-20 19:05:35
- */
-@Data
-@ApiModel(value = "创建能耗报告信息点入参")
-public class AddFunctionDTO {
-    @ApiModelProperty(value = "集团编码", required = true)
-    @NotNull(message = "集团编码不能为空")
-    private String groupCode;
-
-    @ApiModelProperty(value = "能耗类型", required = true)
-    @NotNull(message = "能耗类型不能为空")
-    private String energyType;
-
-    @ApiModelProperty(value = "建筑类型(业态)", required = true)
-    @NotNull(message = "建筑类型(业态)不能为空")
-    private String buildingType;
-
-    @ApiModelProperty(value = "信息点类型(0-能耗,1-费用 ,2-能耗预算,3-费用预算)", required = true)
-    @NotNull(message = "信息点类型(0-能耗,1-费用 ,2-能耗预算,3-费用预算)不能为空")
-    private String functionType;
-
-    @ApiModelProperty(value = "能耗模型编码", required = true)
-    @NotNull(message = "能耗模型编码不能为空")
-    private String modelCode;
-
-    @ApiModelProperty(value = "分项id", required = true)
-    @NotNull(message = "分项id不能为空")
-    private String itemId;
-
-}

+ 0 - 41
src/main/java/com/persagy/apm/report/config/function/model/dto/PageQueryFunctionDTO.java

@@ -1,41 +0,0 @@
-package com.persagy.apm.report.config.function.model.dto;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-
-import java.util.Date;
-
-import com.persagy.apm.common.model.dto.PageDTO;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * @author lixing
- * @version V1.0 2021-05-20 19:05:36
- */
-@EqualsAndHashCode(callSuper = true)
-@Data
-@ApiModel(value = "分页查询能耗报告信息点入参")
-public class PageQueryFunctionDTO extends PageDTO {
-    @ApiModelProperty(value = "主键", required = true)
-    private String id;
-
-    @ApiModelProperty(value = "集团编码", required = true)
-    private String groupCode;
-
-    @ApiModelProperty(value = "能耗类型", required = true)
-    private String energyType;
-
-    @ApiModelProperty(value = "建筑类型(业态)", required = true)
-    private String buildingType;
-
-    @ApiModelProperty(value = "信息点类型(0-能耗,1-费用 ,2-能耗预算,3-费用预算)", required = true)
-    private String functionType;
-
-    @ApiModelProperty(value = "能耗模型编码", required = true)
-    private String modelCode;
-
-    @ApiModelProperty(value = "分项id", required = true)
-    private String itemId;
-
-}

+ 0 - 38
src/main/java/com/persagy/apm/report/config/function/model/dto/QueryFunctionDTO.java

@@ -1,38 +0,0 @@
-package com.persagy.apm.report.config.function.model.dto;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.util.Date;
-import java.util.List;
-
-/**
- * @author lixing
- * @version V1.0 2021-05-20 19:05:36
- */
-@Data
-@ApiModel(value = "查询能耗报告信息点入参")
-public class QueryFunctionDTO {
-    @ApiModelProperty(value = "功能点id列表")
-    private List<String> functionIdList;
-    
-    @ApiModelProperty(value = "集团编码")
-    private String groupCode;
-
-    @ApiModelProperty(value = "能耗类型")
-    private String energyType;
-
-    @ApiModelProperty(value = "建筑类型(业态)")
-    private String buildingType;
-
-    @ApiModelProperty(value = "信息点类型(0-能耗,1-费用 ,2-能耗预算,3-费用预算)")
-    private String functionType;
-
-    @ApiModelProperty(value = "能耗模型编码")
-    private String modelCode;
-
-    @ApiModelProperty(value = "分项id")
-    private String itemId;
-
-}

+ 0 - 47
src/main/java/com/persagy/apm/report/config/function/model/dto/UpdateFunctionDTO.java

@@ -1,47 +0,0 @@
-package com.persagy.apm.report.config.function.model.dto;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-
-import javax.validation.constraints.NotNull;
-
-import lombok.Data;
-
-import java.util.Date;
-
-/**
- * @author lixing
- * @version V1.0 2021-05-20 19:05:36
- */
-@Data
-@ApiModel(value = "更新能耗报告信息点入参")
-public class UpdateFunctionDTO {
-    @ApiModelProperty(value = "主键", required = true)
-    @NotNull(message = "主键不能为空")
-    private String id;
-
-    @ApiModelProperty(value = "集团编码", required = true)
-    @NotNull(message = "集团编码不能为空")
-    private String groupCode;
-
-    @ApiModelProperty(value = "能耗类型", required = true)
-    @NotNull(message = "能耗类型不能为空")
-    private String energyType;
-
-    @ApiModelProperty(value = "建筑类型(业态)", required = true)
-    @NotNull(message = "建筑类型(业态)不能为空")
-    private String buildingType;
-
-    @ApiModelProperty(value = "信息点类型(0-能耗,1-费用 ,2-能耗预算,3-费用预算)", required = true)
-    @NotNull(message = "信息点类型(0-能耗,1-费用 ,2-能耗预算,3-费用预算)不能为空")
-    private String functionType;
-
-    @ApiModelProperty(value = "能耗模型编码", required = true)
-    @NotNull(message = "能耗模型编码不能为空")
-    private String modelCode;
-
-    @ApiModelProperty(value = "分项id", required = true)
-    @NotNull(message = "分项id不能为空")
-    private String itemId;
-
-}

+ 0 - 53
src/main/java/com/persagy/apm/report/config/function/model/vo/ResponseFunctionItemVO.java

@@ -1,53 +0,0 @@
-package com.persagy.apm.report.config.function.model.vo;
-
-import com.fasterxml.jackson.annotation.JsonInclude;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.util.Date;
-
-/**
- * @author lixing
- * @version V1.0 2021-05-20 19:05:36
- */
-@Data
-@ApiModel(value = "能耗报告信息点返回结果参数")
-@JsonInclude(JsonInclude.Include.NON_NULL)
-public class ResponseFunctionItemVO {
-    @ApiModelProperty("主键")
-    private String id;
-
-    @ApiModelProperty("集团编码")
-    private String groupCode;
-
-    @ApiModelProperty(value = "能耗类型",
-            notes = "com.persagy.apm.energy.report.monthly.config.function.constant.enums.EnergyTypeEnum")
-    private String energyType;
-
-    @ApiModelProperty("建筑类型(业态)")
-    private String buildingType;
-
-    @ApiModelProperty(value = "信息点类型",
-            notes = "com.persagy.apm.energy.report.monthly.config.function.constant.enums.FunctionTypeEnum")
-    private String functionType;
-
-    @ApiModelProperty("能耗模型编码")
-    private String modelCode;
-
-    @ApiModelProperty("分项id")
-    private String itemId;
-
-    @ApiModelProperty("创建人")
-    private String creator;
-
-    @ApiModelProperty("创建时间")
-    private Date creationTime;
-
-    @ApiModelProperty("最后修改人")
-    private String modifier;
-
-    @ApiModelProperty("最后修改时间")
-    private Date modifiedTime;
-
-}

+ 0 - 52
src/main/java/com/persagy/apm/report/config/function/model/vo/ResponseFunctionListItemVO.java

@@ -1,52 +0,0 @@
-package com.persagy.apm.report.config.function.model.vo;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.util.Date;
-
-import com.fasterxml.jackson.annotation.JsonInclude;
-
-/**
- * @author lixing
- * @version V1.0 2021-05-20 19:05:36
- */
-@Data
-@ApiModel(value = "能耗报告信息点列表返回结果参数")
-@JsonInclude(JsonInclude.Include.NON_NULL)
-public class ResponseFunctionListItemVO {
-    @ApiModelProperty("主键")
-    private String id;
-
-    @ApiModelProperty("集团编码")
-    private String groupCode;
-
-    @ApiModelProperty("能耗类型")
-    private String energyType;
-
-    @ApiModelProperty("建筑类型(业态)")
-    private String buildingType;
-
-    @ApiModelProperty("信息点类型(0-能耗,1-费用 ,2-能耗预算,3-费用预算)")
-    private String functionType;
-
-    @ApiModelProperty("能耗模型编码")
-    private String modelCode;
-
-    @ApiModelProperty("分项id")
-    private String itemId;
-
-    @ApiModelProperty("创建人")
-    private String creator;
-
-    @ApiModelProperty("创建时间")
-    private Date creationTime;
-
-    @ApiModelProperty("最后修改人")
-    private String modifier;
-
-    @ApiModelProperty("最后修改时间")
-    private Date modifiedTime;
-
-}

+ 0 - 88
src/main/java/com/persagy/apm/report/config/function/service/IFunctionService.java

@@ -1,88 +0,0 @@
-package com.persagy.apm.report.config.function.service;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.persagy.apm.report.config.function.model.Function;
-import com.persagy.apm.report.config.function.model.dto.AddFunctionDTO;
-import com.persagy.apm.report.config.function.model.dto.PageQueryFunctionDTO;
-import com.persagy.apm.report.config.function.model.dto.QueryFunctionDTO;
-import com.persagy.apm.report.config.function.model.dto.UpdateFunctionDTO;
-
-import java.util.List;
-
-/**
- * 能耗报告信息点(Function) service接口
- *
- * @author lixing
- * @version V1.0 2021-05-20 19:05:33
- */
-public interface IFunctionService {
-
-    /**
-     * 创建能耗报告信息点
-     *
-     * @param addFunctionDTO addDTO
-     * @return 能耗报告信息点主键
-     * @author lixing
-     * @version V1.0 2021-05-20 19:05:33
-     */
-    String createFunction(AddFunctionDTO addFunctionDTO);
-
-    /**
-     * 能耗报告信息点详情
-     *
-     * @param id 主键
-     * @return 能耗报告信息点do对象
-     * @author lixing
-     * @version V1.0 2021-05-20 19:05:33
-     */
-    Function queryFunctionDetail(String id);
-
-    /**
-     * 更新能耗报告信息点
-     *
-     * @param updateFunctionDTO updateDTO
-     * @author lixing
-     * @version V1.0 2021-05-20 19:05:33
-     */
-    void updateFunction(UpdateFunctionDTO updateFunctionDTO);
-
-    /**
-     * 删除能耗报告信息点
-     *
-     * @param id 主键
-     * @author lixing
-     * @version V1.0 2021-05-20 19:05:33
-     */
-    void deleteFunction(String id);
-
-    /**
-     * 查询能耗报告信息点
-     *
-     * @param queryFunctionDTO queryDTO
-     * @return List<Function>
-     * @author lixing
-     * @version V1.0 2021-05-20 19:05:33
-     */
-    List<Function> queryFunctionList(QueryFunctionDTO queryFunctionDTO);
-
-    /**
-     * 分页查询能耗报告信息点
-     *
-     * @param pageQueryFunctionDTO pageQueryDTO
-     * @return IPage<Function>
-     * @author lixing
-     * @version V1.0 2021-05-20 19:05:33
-     */
-    IPage<Function> pageQueryFunction(PageQueryFunctionDTO pageQueryFunctionDTO);
-
-    /**
-     * 获取条目名称
-     *
-     * @param function  功能点信息
-     * @param projectId 项目id
-     * @return 条目名称
-     * @author lixing
-     * @version V1.0 2021/5/28 7:22 下午
-     */
-    String getItemName(Function function, String projectId);
-}

+ 0 - 288
src/main/java/com/persagy/apm/report/config/function/service/impl/FunctionServiceImpl.java

@@ -1,288 +0,0 @@
-package com.persagy.apm.report.config.function.service.impl;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.google.common.base.CaseFormat;
-import com.persagy.apm.common.constant.enums.ValidEnum;
-import com.persagy.apm.common.context.AppContext;
-import com.persagy.apm.common.model.dto.Sort;
-import com.persagy.apm.report.config.function.constant.enums.EnergyTypeEnum;
-import com.persagy.apm.report.config.function.constant.enums.FunctionTypeEnum;
-import com.persagy.apm.report.config.function.dao.FunctionMapper;
-import com.persagy.apm.report.config.function.model.ConvertFunctionTool;
-import com.persagy.apm.report.config.function.model.Function;
-import com.persagy.apm.report.config.function.model.dto.AddFunctionDTO;
-import com.persagy.apm.report.config.function.model.dto.PageQueryFunctionDTO;
-import com.persagy.apm.report.config.function.model.dto.QueryFunctionDTO;
-import com.persagy.apm.report.config.function.model.dto.UpdateFunctionDTO;
-import com.persagy.apm.report.config.function.service.IFunctionService;
-import com.persagy.apm.report.dependencies.centermiddleware.model.dto.QueryItemInfoDTO;
-import com.persagy.apm.report.dependencies.centermiddleware.service.ICenterMiddlewareWebService;
-import com.persagy.apm.report.dependencies.saasweb.model.vo.SimpleProjectVO;
-import com.persagy.apm.report.dependencies.saasweb.service.ISaasWebService;
-import org.apache.commons.lang.StringUtils;
-import org.assertj.core.util.Lists;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.util.CollectionUtils;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * 能耗报告信息点(Function) service层
- *
- * @author lixing
- * @version V1.0 2021-05-20 19:05:34
- */
-@Service
-public class FunctionServiceImpl extends ServiceImpl<FunctionMapper, Function>
-        implements IFunctionService {
-    @Autowired
-    private ICenterMiddlewareWebService centerMiddlewareWebService;
-    @Autowired
-    private ISaasWebService saasWebService;
-
-    /**
-     * 创建能耗报告信息点
-     *
-     * @return 能耗报告信息点主键
-     * @author lixing
-     * @version V1.0 2021-05-20 19:05:34
-     */
-    @Override
-    public String createFunction(AddFunctionDTO addFunctionDTO) {
-        Function function = ConvertFunctionTool.INSTANCE.convertAddDto2Entity(addFunctionDTO);
-        // 设置默认值
-        setDefaultValue(function);
-        save(function);
-        return function.getId();
-    }
-
-    /**
-     * 如果某些字段没有赋值,使用默认的值
-     *
-     * @param function 能耗报告信息点实体
-     * @author lixing
-     * @version V1.0 2021/3/12 12:29 下午
-     */
-    private void setDefaultValue(Function function) {
-        function.setCreator(AppContext.getContext().getAccountId());
-        
-
-    }
-
-    /**
-     * 能耗报告信息点详情
-     *
-     * @param id 主键
-     * @return 部门do类
-     * @author lixing
-     * @version V1.0 2021-05-20 19:05:34
-     */
-    @Override
-    public Function queryFunctionDetail(String id) {
-        Function function = getById(id);
-        if (function == null) {
-            throw new IllegalArgumentException("查看Function详情时发生异常,找不到要查看的记录,id=" + id);
-        }
-        return function;
-    }
-
-    /**
-     * 更新能耗报告信息点
-     *
-     * @author lixing
-     * @version V1.0 2021-05-20 19:05:34
-     */
-    @Override
-    public void updateFunction(UpdateFunctionDTO updateFunctionDTO) {
-        Function function = getById(updateFunctionDTO.getId());
-        function = ConvertFunctionTool.INSTANCE.convertUpdateDto2Entity(function, updateFunctionDTO);
-        function.setModifier(AppContext.getContext().getAccountId());
-        updateById(function);
-    }
-
-    /**
-     * 校验能耗报告信息点是否可删除
-     *
-     * @param id 能耗报告信息点主键
-     * @return 能耗报告信息点do类
-     * @author lixing
-     * @version V1.0 2021-05-20 19:05:34
-     */
-    public Function checkDeletable(String id) {
-        if (id == null) {
-            throw new IllegalArgumentException("删除Function时发生异常,主键为空");
-        }
-
-        Function function = getById(id);
-
-        if (function == null) {
-            throw new IllegalArgumentException("删除Function时发生异常,找不到要删除的数据,id:" + id);
-        }
-
-        return function;
-    }
-
-    /**
-     * 删除能耗报告信息点
-     *
-     * @param id 主键
-     * @author lixing
-     * @version V1.0 2021-05-20 19:05:34
-     */
-    @Override
-    public void deleteFunction(String id) {
-        // 校验是否可删除
-        Function function = checkDeletable(id);
-
-        function.setValid(ValidEnum.FALSE.getType());
-        updateById(function);
-    }
-
-    /**
-     * 查询能耗报告信息点
-     *
-     * @return List<Function>
-     * @author lixing
-     * @version V1.0 2021-05-20 19:05:34
-     */
-    @Override
-    public List<Function> queryFunctionList(QueryFunctionDTO queryFunctionDTO) {
-        QueryWrapper<Function> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq(Function.PROP_VALID, ValidEnum.TRUE.getType());
-        // 默认按创建时间倒序排序
-        queryWrapper.orderBy(true, false, Function.PROP_CREATIONTIME);
-
-        if (queryFunctionDTO != null) {
-
-            if (!CollectionUtils.isEmpty(queryFunctionDTO.getFunctionIdList())) {
-                queryWrapper.in(Function.PROP_ID, queryFunctionDTO.getFunctionIdList());
-            }
-            if (StringUtils.isNotEmpty(queryFunctionDTO.getGroupCode())) {
-                queryWrapper.eq(Function.PROP_GROUP_CODE, queryFunctionDTO.getGroupCode());
-            }
-            if (StringUtils.isNotEmpty(queryFunctionDTO.getEnergyType())) {
-                queryWrapper.eq(Function.PROP_ENERGY_TYPE, queryFunctionDTO.getEnergyType());
-            }
-
-            if (StringUtils.isNotEmpty(queryFunctionDTO.getBuildingType())) {
-                queryWrapper.eq(Function.PROP_BUILDING_TYPE, queryFunctionDTO.getBuildingType());
-            }
-
-            if (StringUtils.isNotEmpty(queryFunctionDTO.getFunctionType())) {
-                queryWrapper.eq(Function.PROP_FUNCTION_TYPE, queryFunctionDTO.getFunctionType());
-            }
-
-            if (StringUtils.isNotEmpty(queryFunctionDTO.getModelCode())) {
-                queryWrapper.eq(Function.PROP_MODEL_CODE, queryFunctionDTO.getModelCode());
-            }
-
-            if (StringUtils.isNotEmpty(queryFunctionDTO.getItemId())) {
-                queryWrapper.eq(Function.PROP_ITEM_ID, queryFunctionDTO.getItemId());
-            }
-
-        }
-
-        return list(queryWrapper);
-    }
-
-    /**
-     * 分页查询能耗报告信息点
-     *
-     * @return IPage<Function>
-     * @author lixing
-     * @version V1.0 2021-05-20 19:05:34
-     */
-    @Override
-    public IPage<Function> pageQueryFunction(PageQueryFunctionDTO pageQueryFunctionDTO) {
-        QueryWrapper<Function> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq(Function.PROP_VALID, ValidEnum.TRUE.getType());
-        // 这里认为pageQueryDTO是经过校验的,肯定包含分页信息
-        IPage<Function> pageParam = new Page<>(pageQueryFunctionDTO.getPage(), pageQueryFunctionDTO.getSize(), true);
-        // 排序信息
-        if (CollectionUtils.isEmpty(pageQueryFunctionDTO.getOrders())) {
-            // 默认按创建时间倒序排序
-            queryWrapper.orderBy(true, false, Function.PROP_CREATIONTIME);
-        } else {
-            List<Sort> orders = pageQueryFunctionDTO.getOrders();
-            for (Sort sort : orders) {
-                // 将驼峰转换为下划线格式
-                sort.setColumn(CaseFormat.LOWER_CAMEL.to(CaseFormat.LOWER_UNDERSCORE, sort.getColumn()));
-                queryWrapper.orderBy(true, sort.isAsc(), sort.getColumn());
-            }
-        }
-
-        
-        if (StringUtils.isNotEmpty(pageQueryFunctionDTO.getGroupCode())) {
-            queryWrapper.like(Function.PROP_GROUP_CODE, pageQueryFunctionDTO.getGroupCode());
-        }
-
-        
-        if (StringUtils.isNotEmpty(pageQueryFunctionDTO.getEnergyType())) {
-            queryWrapper.like(Function.PROP_ENERGY_TYPE, pageQueryFunctionDTO.getEnergyType());
-        }
-
-        
-        if (StringUtils.isNotEmpty(pageQueryFunctionDTO.getBuildingType())) {
-            queryWrapper.like(Function.PROP_BUILDING_TYPE, pageQueryFunctionDTO.getBuildingType());
-        }
-
-        
-        if (StringUtils.isNotEmpty(pageQueryFunctionDTO.getFunctionType())) {
-            queryWrapper.like(Function.PROP_FUNCTION_TYPE, pageQueryFunctionDTO.getFunctionType());
-        }
-
-        
-        if (StringUtils.isNotEmpty(pageQueryFunctionDTO.getModelCode())) {
-            queryWrapper.like(Function.PROP_MODEL_CODE, pageQueryFunctionDTO.getModelCode());
-        }
-
-        
-        if (StringUtils.isNotEmpty(pageQueryFunctionDTO.getItemId())) {
-            queryWrapper.like(Function.PROP_ITEM_ID, pageQueryFunctionDTO.getItemId());
-        }
-
-        return getBaseMapper().selectPage(pageParam, queryWrapper);
-    }
-
-    @Override
-    public String getItemName(Function function, String projectId) {
-        // 获取项目信息
-        SimpleProjectVO simpleProjectInfo = saasWebService.getSimpleProjectInfo(projectId);
-
-        if (simpleProjectInfo == null) {
-            return "";
-        }
-        QueryItemInfoDTO queryItemInfoDTO = new QueryItemInfoDTO();
-        // 注意这里应该传入项目本地编码
-        queryItemInfoDTO.setProjectId(simpleProjectInfo.getProjectLocalID());
-        queryItemInfoDTO.setBuildingId(simpleProjectInfo.getProjectLocalID());
-        // 是否是用电条目
-        boolean isEnergyItem = EnergyTypeEnum.ELECTRICITY.getType().toString().equals(function.getEnergyType());
-        // 是否是能耗类型
-        boolean isEnergyType = FunctionTypeEnum.ENERGY.getType().equals(function.getFunctionType());
-        // 是否是费用类型
-        boolean isCostType = FunctionTypeEnum.COST.getType().equals(function.getFunctionType());
-        // 统计条目
-        String sumItem = "sumItem";
-        // 是否从调研获取条目名称
-        boolean getNameFromResearch = isEnergyItem &&
-                (isEnergyType || (isCostType && !sumItem.equals(function.getItemId())));
-        if (getNameFromResearch) {
-            queryItemInfoDTO.setModelCode(function.getModelCode());
-            queryItemInfoDTO.setItemIdList(Lists.newArrayList(function.getItemId()));
-            Map<String, String> itemNameMap = centerMiddlewareWebService.getItemNameMap(queryItemInfoDTO);
-            if (itemNameMap != null) {
-                return itemNameMap.get(function.getItemId());
-            }
-        } else {
-            return function.getName();
-        }
-
-        return "";
-    }
-}

+ 0 - 101
src/main/java/com/persagy/apm/report/config/rel/detailstatisticsitem/controller/ReportDetailStatisticsItemRelController.java

@@ -1,101 +0,0 @@
-package com.persagy.apm.report.config.rel.detailstatisticsitem.controller;
-
-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.report.config.rel.detailstatisticsitem.model.ConvertReportDetailStatisticsItemRelTool;
-import com.persagy.apm.report.config.rel.detailstatisticsitem.model.ReportDetailStatisticsItemRel;
-import com.persagy.apm.report.config.rel.detailstatisticsitem.model.dto.*;
-import com.persagy.apm.report.config.rel.detailstatisticsitem.model.vo.ResponseReportDetailStatisticsItemRelItemVO;
-import com.persagy.apm.report.config.rel.detailstatisticsitem.model.vo.ResponseReportDetailStatisticsItemRelListItemVO;
-import com.persagy.apm.report.config.rel.detailstatisticsitem.service.IReportDetailStatisticsItemRelService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-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 springfox.documentation.annotations.ApiIgnore;
-
-import javax.validation.Valid;
-import java.util.List;
-
-/**
- * 报告详情与统计条目的关联控制层
- *
- * @author lixing
- * @version V1.0 2021-05-20 19:19:38
- */
-@ApiIgnore
-@Api(tags = "报告详情与统计条目的关联", hidden = true)
-@Validated
-@RestController
-@RequestMapping("reportDetailStatisticsItemRels")
-public class ReportDetailStatisticsItemRelController {
-    @Autowired
-    private IReportDetailStatisticsItemRelService reportDetailStatisticsItemRelService;
-
-    @ApiOperation(value = "创建报告详情与统计条目的关联")
-    @PostMapping("/create")
-    public CommonResult<ApmResponseUpsertVO> createReportDetailStatisticsItemRel(
-            @Valid @RequestBody AddReportDetailStatisticsItemRelDTO addReportDetailStatisticsItemRelDTO) {
-        String id = reportDetailStatisticsItemRelService.createReportDetailStatisticsItemRel(addReportDetailStatisticsItemRelDTO);
-        return ResultHelper.single(new ApmResponseUpsertVO(id));
-    }
-
-    @ApiOperation(value = "报告详情与统计条目的关联详情")
-    @PostMapping("/get")
-    public CommonResult<ResponseReportDetailStatisticsItemRelItemVO> queryReportDetailStatisticsItemRelDetail(
-            @Valid @RequestBody QueryReportDetailStatisticsItemRelDetailDTO queryReportDetailStatisticsItemRelDetailDTO) {
-        ReportDetailStatisticsItemRel reportDetailStatisticsItemRel = reportDetailStatisticsItemRelService.queryReportDetailStatisticsItemRelDetail(queryReportDetailStatisticsItemRelDetailDTO.getId());
-        ResponseReportDetailStatisticsItemRelItemVO responseReportDetailStatisticsItemRelItemVO = ConvertReportDetailStatisticsItemRelTool.INSTANCE.convert2ResponseItemDTO(reportDetailStatisticsItemRel);
-        return ResultHelper.single(responseReportDetailStatisticsItemRelItemVO);
-    }
-
-
-    @ApiOperation(value = "更新报告详情与统计条目的关联")
-    @PostMapping("/update")
-    public CommonResult<ApmResponseUpsertVO> updateReportDetailStatisticsItemRel(
-            @Valid @RequestBody UpdateReportDetailStatisticsItemRelDTO updateReportDetailStatisticsItemRelDTO) {
-        reportDetailStatisticsItemRelService.updateReportDetailStatisticsItemRel(updateReportDetailStatisticsItemRelDTO);
-        return ResultHelper.single(new ApmResponseUpsertVO(updateReportDetailStatisticsItemRelDTO.getId()));
-    }
-
-
-    @ApiOperation(value = "删除报告详情与统计条目的关联")
-    @PostMapping("/delete")
-    public CommonResult deleteReportDetailStatisticsItemRel(
-            @RequestBody @Valid DeleteReportDetailStatisticsItemRelDTO deleteReportDetailStatisticsItemRelDTO) {
-        reportDetailStatisticsItemRelService.deleteReportDetailStatisticsItemRel(deleteReportDetailStatisticsItemRelDTO.getId());
-        return ResultHelper.success();
-    }
-
-
-    @ApiOperation(value = "报告详情与统计条目的关联列表")
-    @PostMapping("/query")
-    public CommonResult<PageList<ResponseReportDetailStatisticsItemRelListItemVO>> queryReportDetailStatisticsItemRel(
-            @Valid @RequestBody QueryReportDetailStatisticsItemRelDTO queryReportDetailStatisticsItemRelDTO) {
-        List<ReportDetailStatisticsItemRel> reportDetailStatisticsItemRelList = reportDetailStatisticsItemRelService.queryReportDetailStatisticsItemRelList(queryReportDetailStatisticsItemRelDTO);
-        List<ResponseReportDetailStatisticsItemRelListItemVO> resultList = ConvertReportDetailStatisticsItemRelTool.INSTANCE.convert2List(reportDetailStatisticsItemRelList);
-        return ResultHelper.multi(resultList);
-    }
-
-    //@ApiOperation(value = "报告详情与统计条目的关联列表, 分页查询")
-    //@PostMapping("/query")
-    //public CommonResult<PageList<ResponseReportDetailStatisticsItemRelListItemVO>> queryReportDetailStatisticsItemRel(
-    //        @Valid @RequestBody PageQueryReportDetailStatisticsItemRelDTO pageQueryReportDetailStatisticsItemRelDTO) {
-    //    IPage<ReportDetailStatisticsItemRel> pagedList = reportDetailStatisticsItemRelService.pageQueryReportDetailStatisticsItemRel(pageQueryReportDetailStatisticsItemRelDTO);
-    //    IPage<ResponseReportDetailStatisticsItemRelListItemVO> pagedResultList = pagedList.convert(item -> {
-    //        try {
-    //           return ConvertReportDetailStatisticsItemRelTool.INSTANCE.convert2ResponseListItemDTO(item);
-    //        } catch (Exception e) {
-    //            throw new IllegalArgumentException("分页查询,ReportDetailStatisticsItemRel实体类转换为列表对象发生异常", e);
-    //        }
-    //    });
-    //    return ResultHelper.multi(pagedResultList);
-    //}
-}
-

+ 0 - 16
src/main/java/com/persagy/apm/report/config/rel/detailstatisticsitem/dao/ReportDetailStatisticsItemRelMapper.java

@@ -1,16 +0,0 @@
-package com.persagy.apm.report.config.rel.detailstatisticsitem.dao;
-
-import com.persagy.apm.report.config.rel.detailstatisticsitem.model.ReportDetailStatisticsItemRel;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Mapper;
-
-/**
- * 报告详情与统计条目的关联(ReportDetailStatisticsItemRel)dao层
- *
- * @author lixing
- * @version V1.0 2021-05-20 19:19:39
- */
-@Mapper
-public interface ReportDetailStatisticsItemRelMapper extends BaseMapper<ReportDetailStatisticsItemRel> {
-
-}

+ 0 - 78
src/main/java/com/persagy/apm/report/config/rel/detailstatisticsitem/model/ConvertReportDetailStatisticsItemRelTool.java

@@ -1,78 +0,0 @@
-package com.persagy.apm.report.config.rel.detailstatisticsitem.model;
-
-import com.persagy.apm.report.config.rel.detailstatisticsitem.model.dto.AddReportDetailStatisticsItemRelDTO;
-import com.persagy.apm.report.config.rel.detailstatisticsitem.model.dto.UpdateReportDetailStatisticsItemRelDTO;
-import com.persagy.apm.report.config.rel.detailstatisticsitem.model.vo.ResponseReportDetailStatisticsItemRelItemVO;
-import com.persagy.apm.report.config.rel.detailstatisticsitem.model.vo.ResponseReportDetailStatisticsItemRelListItemVO;
-import org.mapstruct.Mapper;
-import org.mapstruct.MappingTarget;
-import org.mapstruct.NullValueCheckStrategy;
-import org.mapstruct.NullValueMappingStrategy;
-import org.mapstruct.factory.Mappers;
-
-import java.util.List;
-
-/**
- * 报告详情与统计条目的关联(ReportDetailStatisticsItemRel) dto、vo、do转换工具类
- *
- * @author lixing
- * @version V1.0 2021-05-20 19:19:41 2021-05-20 19:19:41
- */
-@Mapper(nullValueMappingStrategy = NullValueMappingStrategy.RETURN_DEFAULT,
-        nullValueCheckStrategy = NullValueCheckStrategy.ALWAYS)
-public interface ConvertReportDetailStatisticsItemRelTool {
-
-    ConvertReportDetailStatisticsItemRelTool INSTANCE = Mappers.getMapper(ConvertReportDetailStatisticsItemRelTool.class);
-
-    /**
-     * do转换为ResponseItemVO
-     *
-     * @param reportDetailStatisticsItemRel do对象
-     * @return ResponseItemVO
-     * @author lixing
-     * @version V1.0 2021-05-20 19:19:41
-     */
-    ResponseReportDetailStatisticsItemRelItemVO convert2ResponseItemDTO(ReportDetailStatisticsItemRel reportDetailStatisticsItemRel);
-
-    /**
-     * do转换为ResponseListItemVO
-     *
-     * @param reportDetailStatisticsItemRel do对象
-     * @return ResponseListItemVO
-     * @author lixing
-     * @version V1.0 2021-05-20 19:19:41
-     */
-    ResponseReportDetailStatisticsItemRelListItemVO convert2ResponseListItemDTO(ReportDetailStatisticsItemRel reportDetailStatisticsItemRel);
-
-    /**
-     * do列表转换为ResponseListItemVO列表
-     *
-     * @param reportDetailStatisticsItemRelList do列表
-     * @return ResponseListItemVO列表
-     * @author lixing
-     * @version V1.0 2021-05-20 19:19:41
-     */
-    List<ResponseReportDetailStatisticsItemRelListItemVO> convert2List(List<ReportDetailStatisticsItemRel> reportDetailStatisticsItemRelList);
-
-    /**
-     * addDTO转换为do
-     *
-     * @param addReportDetailStatisticsItemRelDTO addDTO
-     * @return 要创建的do对象
-     * @author lixing
-     * @version V1.0 2021-05-20 19:19:41
-     */
-    ReportDetailStatisticsItemRel convertAddDto2Entity(AddReportDetailStatisticsItemRelDTO addReportDetailStatisticsItemRelDTO);
-
-    /**
-     * updateDTO转换为实体
-     *
-     * @param reportDetailStatisticsItemRel          更新前的do对象
-     * @param updateReportDetailStatisticsItemRelDTO updateDTO
-     * @return 更新后的do对象
-     * @author lixing
-     * @version V1.0 2021-05-20 19:19:41
-     */
-    ReportDetailStatisticsItemRel convertUpdateDto2Entity(@MappingTarget ReportDetailStatisticsItemRel reportDetailStatisticsItemRel, UpdateReportDetailStatisticsItemRelDTO updateReportDetailStatisticsItemRelDTO);
-}
-

+ 0 - 45
src/main/java/com/persagy/apm/report/config/rel/detailstatisticsitem/model/ReportDetailStatisticsItemRel.java

@@ -1,45 +0,0 @@
-package com.persagy.apm.report.config.rel.detailstatisticsitem.model;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import com.persagy.apm.common.model.entity.AuditableEntity;
-
-import java.io.Serializable;
-
-/**
- * 报告详情与统计条目的关联(ReportDetailStatisticsItemRel)实体类
- *
- * @author lixing
- * @version V1.0 2021-05-20 19:19:40
- */
-@EqualsAndHashCode(callSuper = true)
-@Data
-@ApiModel(description = "报告详情与统计条目的关联")
-public class ReportDetailStatisticsItemRel extends AuditableEntity<ReportDetailStatisticsItemRel> implements Serializable {
-    private static final long serialVersionUID = -23777287365374831L;
-
-    @ApiModelProperty("报告详情主键")
-    private String reportDetailId;
-
-    @ApiModelProperty("报告类型id")
-    private String reportTypeId;
-
-    @ApiModelProperty("统计条目id")
-    private String statisticsItemId;
-
-    @ApiModelProperty("不合格原因")
-    private String unqualifiedReason;
-
-    @ApiModelProperty("备注")
-    private String remark;
-
-
-    public static String PROP_REPORT_DETAIL_ID = "report_detail_id";
-    public static String PROP_REPORT_TYPE_ID = "report_type_id";
-    public static String PROP_STATISTICS_ITEM_ID = "statistics_item_id";
-    public static String PROP_UNQUALIFIED_REASON = "unqualified_reason";
-    public static String PROP_REMARK = "remark";
-
-}

+ 0 - 37
src/main/java/com/persagy/apm/report/config/rel/detailstatisticsitem/model/dto/AddReportDetailStatisticsItemRelDTO.java

@@ -1,37 +0,0 @@
-package com.persagy.apm.report.config.rel.detailstatisticsitem.model.dto;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-
-import javax.validation.constraints.NotNull;
-
-import lombok.Data;
-
-import java.util.Date;
-
-/**
- * @author lixing
- * @version V1.0 2021-05-20 19:19:40
- */
-@Data
-@ApiModel(value = "创建报告详情与统计条目的关联入参")
-public class AddReportDetailStatisticsItemRelDTO {
-    @ApiModelProperty(value = "报告详情主键", required = true)
-    @NotNull(message = "报告详情主键不能为空")
-    private String reportDetailId;
-
-    @ApiModelProperty(value = "报告类型id", required = true)
-    @NotNull(message = "报告类型id不能为空")
-    private String reportTypeId;
-
-    @ApiModelProperty(value = "统计条目id", required = true)
-    @NotNull(message = "统计条目id不能为空")
-    private String statisticsItemId;
-
-    @ApiModelProperty(value = "不合格原因")
-    private String unqualifiedReason;
-
-    @ApiModelProperty(value = "备注")
-    private String remark;
-
-}

+ 0 - 20
src/main/java/com/persagy/apm/report/config/rel/detailstatisticsitem/model/dto/DeleteReportDetailStatisticsItemRelDTO.java

@@ -1,20 +0,0 @@
-package com.persagy.apm.report.config.rel.detailstatisticsitem.model.dto;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import javax.validation.constraints.NotNull;
-
-/**
- * @author lixing
- * @version V1.0 2021-05-20 19:19:40
- */
-@Data
-@ApiModel(value = "删除报告详情与统计条目的关联入参")
-public class DeleteReportDetailStatisticsItemRelDTO {
-    @NotNull(message = "id不能为空")
-    @ApiModelProperty(value = "主键", required = true)
-    private String id;
-
-}

+ 0 - 38
src/main/java/com/persagy/apm/report/config/rel/detailstatisticsitem/model/dto/PageQueryReportDetailStatisticsItemRelDTO.java

@@ -1,38 +0,0 @@
-package com.persagy.apm.report.config.rel.detailstatisticsitem.model.dto;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-
-import java.util.Date;
-
-import com.persagy.apm.common.model.dto.PageDTO;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * @author lixing
- * @version V1.0 2021-05-20 19:19:40
- */
-@EqualsAndHashCode(callSuper = true)
-@Data
-@ApiModel(value = "分页查询报告详情与统计条目的关联入参")
-public class PageQueryReportDetailStatisticsItemRelDTO extends PageDTO {
-    @ApiModelProperty(value = "主键", required = true)
-    private String id;
-
-    @ApiModelProperty(value = "报告详情主键", required = true)
-    private String reportDetailId;
-
-    @ApiModelProperty(value = "报告类型id", required = true)
-    private String reportTypeId;
-
-    @ApiModelProperty(value = "统计条目id", required = true)
-    private String statisticsItemId;
-
-    @ApiModelProperty(value = "不合格原因", required = true)
-    private String unqualifiedReason;
-
-    @ApiModelProperty(value = "备注", required = true)
-    private String remark;
-
-}

+ 0 - 31
src/main/java/com/persagy/apm/report/config/rel/detailstatisticsitem/model/dto/QueryReportDetailStatisticsItemRelDTO.java

@@ -1,31 +0,0 @@
-package com.persagy.apm.report.config.rel.detailstatisticsitem.model.dto;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.util.Date;
-
-/**
- * @author lixing
- * @version V1.0 2021-05-20 19:19:40
- */
-@Data
-@ApiModel(value = "查询报告详情与统计条目的关联入参")
-public class QueryReportDetailStatisticsItemRelDTO {
-    @ApiModelProperty(value = "报告详情主键", required = true)
-    private String reportDetailId;
-
-    @ApiModelProperty(value = "报告类型id", required = true)
-    private String reportTypeId;
-
-    @ApiModelProperty(value = "统计条目id", required = true)
-    private String statisticsItemId;
-
-    @ApiModelProperty(value = "不合格原因", required = true)
-    private String unqualifiedReason;
-
-    @ApiModelProperty(value = "备注", required = true)
-    private String remark;
-
-}

+ 0 - 20
src/main/java/com/persagy/apm/report/config/rel/detailstatisticsitem/model/dto/QueryReportDetailStatisticsItemRelDetailDTO.java

@@ -1,20 +0,0 @@
-package com.persagy.apm.report.config.rel.detailstatisticsitem.model.dto;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import javax.validation.constraints.NotNull;
-
-/**
- * @author lixing
- * @version V1.0 2021-05-20 19:19:40
- */
-@Data
-@ApiModel(value = "获取报告详情与统计条目的关联详情入参")
-public class QueryReportDetailStatisticsItemRelDetailDTO {
-    @NotNull(message = "主键不能为空")
-    @ApiModelProperty(value = "主键", required = true)
-    private String id;
-
-}

+ 0 - 43
src/main/java/com/persagy/apm/report/config/rel/detailstatisticsitem/model/dto/UpdateReportDetailStatisticsItemRelDTO.java

@@ -1,43 +0,0 @@
-package com.persagy.apm.report.config.rel.detailstatisticsitem.model.dto;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-
-import javax.validation.constraints.NotNull;
-
-import lombok.Data;
-
-import java.util.Date;
-
-/**
- * @author lixing
- * @version V1.0 2021-05-20 19:19:40
- */
-@Data
-@ApiModel(value = "更新报告详情与统计条目的关联入参")
-public class UpdateReportDetailStatisticsItemRelDTO {
-    @ApiModelProperty(value = "主键", required = true)
-    @NotNull(message = "主键不能为空") 
-    private String id;
-
-    @ApiModelProperty(value = "报告详情主键", required = true)
-    @NotNull(message = "报告详情主键不能为空") 
-    private String reportDetailId;
-
-    @ApiModelProperty(value = "报告类型id", required = true)
-    @NotNull(message = "报告类型id不能为空") 
-    private String reportTypeId;
-
-    @ApiModelProperty(value = "统计条目id", required = true)
-    @NotNull(message = "统计条目id不能为空") 
-    private String statisticsItemId;
-
-    @ApiModelProperty(value = "不合格原因", required = true)
-    @NotNull(message = "不合格原因不能为空") 
-    private String unqualifiedReason;
-
-    @ApiModelProperty(value = "备注", required = true)
-    @NotNull(message = "备注不能为空") 
-    private String remark;
-
-}

+ 0 - 36
src/main/java/com/persagy/apm/report/config/rel/detailstatisticsitem/model/vo/ResponseReportDetailStatisticsItemRelItemVO.java

@@ -1,36 +0,0 @@
-package com.persagy.apm.report.config.rel.detailstatisticsitem.model.vo;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.util.Date;
-
-import com.fasterxml.jackson.annotation.JsonInclude;
-
-/**
- * @author lixing
- * @version V1.0 2021-05-20 19:19:40
- */
-@Data
-@ApiModel(value = "报告详情与统计条目的关联返回结果参数")
-@JsonInclude(JsonInclude.Include.NON_NULL)
-public class ResponseReportDetailStatisticsItemRelItemVO {
-    @ApiModelProperty("主键")
-    private String id;
-
-    @ApiModelProperty("报告详情主键")
-    private String reportDetailId;
-
-    @ApiModelProperty("报告类型id")
-    private String reportTypeId;
-
-    @ApiModelProperty("统计条目id")
-    private String statisticsItemId;
-
-    @ApiModelProperty("不合格原因")
-    private String unqualifiedReason;
-
-    @ApiModelProperty("备注")
-    private String remark;
-}

+ 0 - 49
src/main/java/com/persagy/apm/report/config/rel/detailstatisticsitem/model/vo/ResponseReportDetailStatisticsItemRelListItemVO.java

@@ -1,49 +0,0 @@
-package com.persagy.apm.report.config.rel.detailstatisticsitem.model.vo;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.util.Date;
-
-import com.fasterxml.jackson.annotation.JsonInclude;
-
-/**
- * @author lixing
- * @version V1.0 2021-05-20 19:19:41
- */
-@Data
-@ApiModel(value = "报告详情与统计条目的关联列表返回结果参数")
-@JsonInclude(JsonInclude.Include.NON_NULL)
-public class ResponseReportDetailStatisticsItemRelListItemVO {
-    @ApiModelProperty("主键")
-    private String id;
-
-    @ApiModelProperty("报告详情主键")
-    private String reportDetailId;
-
-    @ApiModelProperty("报告类型id")
-    private String reportTypeId;
-
-    @ApiModelProperty("统计条目id")
-    private String statisticsItemId;
-
-    @ApiModelProperty("不合格原因")
-    private String unqualifiedReason;
-
-    @ApiModelProperty("备注")
-    private String remark;
-
-    @ApiModelProperty("创建人")
-    private String creator;
-
-    @ApiModelProperty("创建时间")
-    private Date creationTime;
-
-    @ApiModelProperty("最后修改人")
-    private String modifier;
-
-    @ApiModelProperty("最后修改时间")
-    private Date modifiedTime;
-
-}

+ 0 - 77
src/main/java/com/persagy/apm/report/config/rel/detailstatisticsitem/service/IReportDetailStatisticsItemRelService.java

@@ -1,77 +0,0 @@
-package com.persagy.apm.report.config.rel.detailstatisticsitem.service;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.persagy.apm.report.config.rel.detailstatisticsitem.model.ReportDetailStatisticsItemRel;
-import com.persagy.apm.report.config.rel.detailstatisticsitem.model.dto.AddReportDetailStatisticsItemRelDTO;
-import com.persagy.apm.report.config.rel.detailstatisticsitem.model.dto.PageQueryReportDetailStatisticsItemRelDTO;
-import com.persagy.apm.report.config.rel.detailstatisticsitem.model.dto.QueryReportDetailStatisticsItemRelDTO;
-import com.persagy.apm.report.config.rel.detailstatisticsitem.model.dto.UpdateReportDetailStatisticsItemRelDTO;
-
-import java.util.List;
-
-/**
- * 报告详情与统计条目的关联(ReportDetailStatisticsItemRel) service接口
- *
- * @author lixing
- * @version V1.0 2021-05-20 19:19:39
- */
-public interface IReportDetailStatisticsItemRelService {
-
-    /**
-     * 创建报告详情与统计条目的关联
-     *
-     * @param addReportDetailStatisticsItemRelDTO addDTO
-     * @return 报告详情与统计条目的关联主键
-     * @author lixing
-     * @version V1.0 2021-05-20 19:19:39
-     */
-    String createReportDetailStatisticsItemRel(AddReportDetailStatisticsItemRelDTO addReportDetailStatisticsItemRelDTO);
-
-    /**
-     * 报告详情与统计条目的关联详情
-     *
-     * @param id 主键
-     * @return 报告详情与统计条目的关联do对象
-     * @author lixing
-     * @version V1.0 2021-05-20 19:19:39
-     */
-    ReportDetailStatisticsItemRel queryReportDetailStatisticsItemRelDetail(String id);
-
-    /**
-     * 更新报告详情与统计条目的关联
-     *
-     * @param updateReportDetailStatisticsItemRelDTO updateDTO
-     * @author lixing
-     * @version V1.0 2021-05-20 19:19:39
-     */
-    void updateReportDetailStatisticsItemRel(UpdateReportDetailStatisticsItemRelDTO updateReportDetailStatisticsItemRelDTO);
-
-    /**
-     * 删除报告详情与统计条目的关联
-     *
-     * @param id 主键
-     * @author lixing
-     * @version V1.0 2021-05-20 19:19:39
-     */
-    void deleteReportDetailStatisticsItemRel(String id);
-
-    /**
-     * 查询报告详情与统计条目的关联
-     *
-     * @param queryReportDetailStatisticsItemRelDTO queryDTO
-     * @return List<ReportDetailStatisticsItemRel>
-     * @author lixing
-     * @version V1.0 2021-05-20 19:19:39
-     */
-    List<ReportDetailStatisticsItemRel> queryReportDetailStatisticsItemRelList(QueryReportDetailStatisticsItemRelDTO queryReportDetailStatisticsItemRelDTO);
-
-    /**
-     * 分页查询报告详情与统计条目的关联
-     *
-     * @param pageQueryReportDetailStatisticsItemRelDTO pageQueryDTO
-     * @return IPage<ReportDetailStatisticsItemRel>
-     * @author lixing
-     * @version V1.0 2021-05-20 19:19:39
-     */
-    IPage<ReportDetailStatisticsItemRel> pageQueryReportDetailStatisticsItemRel(PageQueryReportDetailStatisticsItemRelDTO pageQueryReportDetailStatisticsItemRelDTO);
-}

+ 0 - 232
src/main/java/com/persagy/apm/report/config/rel/detailstatisticsitem/service/impl/ReportDetailStatisticsItemRelServiceImpl.java

@@ -1,232 +0,0 @@
-package com.persagy.apm.report.config.rel.detailstatisticsitem.service.impl;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.google.common.base.CaseFormat;
-import com.persagy.apm.common.constant.enums.ValidEnum;
-import com.persagy.apm.common.context.AppContext;
-import com.persagy.apm.common.model.dto.Sort;
-import com.persagy.apm.report.config.rel.detailstatisticsitem.dao.ReportDetailStatisticsItemRelMapper;
-import com.persagy.apm.report.config.rel.detailstatisticsitem.model.ConvertReportDetailStatisticsItemRelTool;
-import com.persagy.apm.report.config.rel.detailstatisticsitem.model.ReportDetailStatisticsItemRel;
-import com.persagy.apm.report.config.rel.detailstatisticsitem.model.dto.AddReportDetailStatisticsItemRelDTO;
-import com.persagy.apm.report.config.rel.detailstatisticsitem.model.dto.PageQueryReportDetailStatisticsItemRelDTO;
-import com.persagy.apm.report.config.rel.detailstatisticsitem.model.dto.QueryReportDetailStatisticsItemRelDTO;
-import com.persagy.apm.report.config.rel.detailstatisticsitem.model.dto.UpdateReportDetailStatisticsItemRelDTO;
-import com.persagy.apm.report.config.rel.detailstatisticsitem.service.IReportDetailStatisticsItemRelService;
-import org.apache.commons.lang.StringUtils;
-import org.springframework.stereotype.Service;
-import org.springframework.util.CollectionUtils;
-
-import java.util.List;
-
-/**
- * 报告详情与统计条目的关联(ReportDetailStatisticsItemRel) service层
- *
- * @author lixing
- * @version V1.0 2021-05-20 19:19:39
- */
-@Service
-public class ReportDetailStatisticsItemRelServiceImpl extends ServiceImpl<ReportDetailStatisticsItemRelMapper, ReportDetailStatisticsItemRel>
-        implements IReportDetailStatisticsItemRelService {
-
-    /**
-     * 创建报告详情与统计条目的关联
-     *
-     * @return 报告详情与统计条目的关联主键
-     * @author lixing
-     * @version V1.0 2021-05-20 19:19:39
-     */
-    @Override
-    public String createReportDetailStatisticsItemRel(AddReportDetailStatisticsItemRelDTO addReportDetailStatisticsItemRelDTO) {
-        ReportDetailStatisticsItemRel reportDetailStatisticsItemRel = ConvertReportDetailStatisticsItemRelTool.INSTANCE.convertAddDto2Entity(addReportDetailStatisticsItemRelDTO);
-        // 设置默认值
-        setDefaultValue(reportDetailStatisticsItemRel);
-        save(reportDetailStatisticsItemRel);
-        return reportDetailStatisticsItemRel.getId();
-    }
-
-    /**
-     * 如果某些字段没有赋值,使用默认的值
-     *
-     * @param reportDetailStatisticsItemRel 报告详情与统计条目的关联实体
-     * @author lixing
-     * @version V1.0 2021/3/12 12:29 下午
-     */
-    private void setDefaultValue(ReportDetailStatisticsItemRel reportDetailStatisticsItemRel) {
-        reportDetailStatisticsItemRel.setCreator(AppContext.getContext().getAccountId());
-        
-
-    }
-
-    /**
-     * 报告详情与统计条目的关联详情
-     *
-     * @param id 主键
-     * @return 部门do类
-     * @author lixing
-     * @version V1.0 2021-05-20 19:19:39
-     */
-    @Override
-    public ReportDetailStatisticsItemRel queryReportDetailStatisticsItemRelDetail(String id) {
-        ReportDetailStatisticsItemRel reportDetailStatisticsItemRel = getById(id);
-        if (reportDetailStatisticsItemRel == null) {
-            throw new IllegalArgumentException("查看ReportDetailStatisticsItemRel详情时发生异常,找不到要查看的记录,id=" + id);
-        }
-        return reportDetailStatisticsItemRel;
-    }
-
-    /**
-     * 更新报告详情与统计条目的关联
-     *
-     * @author lixing
-     * @version V1.0 2021-05-20 19:19:39
-     */
-    @Override
-    public void updateReportDetailStatisticsItemRel(UpdateReportDetailStatisticsItemRelDTO updateReportDetailStatisticsItemRelDTO) {
-        ReportDetailStatisticsItemRel reportDetailStatisticsItemRel = getById(updateReportDetailStatisticsItemRelDTO.getId());
-        reportDetailStatisticsItemRel = ConvertReportDetailStatisticsItemRelTool.INSTANCE.convertUpdateDto2Entity(reportDetailStatisticsItemRel, updateReportDetailStatisticsItemRelDTO);
-        reportDetailStatisticsItemRel.setModifier(AppContext.getContext().getAccountId());
-        updateById(reportDetailStatisticsItemRel);
-    }
-
-    /**
-     * 校验报告详情与统计条目的关联是否可删除
-     *
-     * @param id 报告详情与统计条目的关联主键
-     * @return 报告详情与统计条目的关联do类
-     * @author lixing
-     * @version V1.0 2021-05-20 19:19:39
-     */
-    public ReportDetailStatisticsItemRel checkDeletable(String id) {
-        if (id == null) {
-            throw new IllegalArgumentException("删除ReportDetailStatisticsItemRel时发生异常,主键为空");
-        }
-
-        ReportDetailStatisticsItemRel reportDetailStatisticsItemRel = getById(id);
-
-        if (reportDetailStatisticsItemRel == null) {
-            throw new IllegalArgumentException("删除ReportDetailStatisticsItemRel时发生异常,找不到要删除的数据,id:" + id);
-        }
-
-        return reportDetailStatisticsItemRel;
-    }
-
-    /**
-     * 删除报告详情与统计条目的关联
-     *
-     * @param id 主键
-     * @author lixing
-     * @version V1.0 2021-05-20 19:19:39
-     */
-    @Override
-    public void deleteReportDetailStatisticsItemRel(String id) {
-        // 校验是否可删除
-        ReportDetailStatisticsItemRel reportDetailStatisticsItemRel = checkDeletable(id);
-
-        reportDetailStatisticsItemRel.setValid(ValidEnum.FALSE.getType());
-        updateById(reportDetailStatisticsItemRel);
-    }
-
-    /**
-     * 查询报告详情与统计条目的关联
-     *
-     * @return List<ReportDetailStatisticsItemRel>
-     * @author lixing
-     * @version V1.0 2021-05-20 19:19:39
-     */
-    @Override
-    public List<ReportDetailStatisticsItemRel> queryReportDetailStatisticsItemRelList(QueryReportDetailStatisticsItemRelDTO queryReportDetailStatisticsItemRelDTO) {
-        QueryWrapper<ReportDetailStatisticsItemRel> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq(ReportDetailStatisticsItemRel.PROP_VALID, ValidEnum.TRUE.getType());
-        // 默认按创建时间倒序排序
-        queryWrapper.orderBy(true, false, ReportDetailStatisticsItemRel.PROP_CREATIONTIME);
-
-        if (queryReportDetailStatisticsItemRelDTO != null) {
-
-            
-            if (StringUtils.isNotEmpty(queryReportDetailStatisticsItemRelDTO.getReportDetailId())) {
-                queryWrapper.like(ReportDetailStatisticsItemRel.PROP_REPORT_DETAIL_ID, queryReportDetailStatisticsItemRelDTO.getReportDetailId());
-            }
-
-            
-            if (StringUtils.isNotEmpty(queryReportDetailStatisticsItemRelDTO.getReportTypeId())) {
-                queryWrapper.like(ReportDetailStatisticsItemRel.PROP_REPORT_TYPE_ID, queryReportDetailStatisticsItemRelDTO.getReportTypeId());
-            }
-
-            
-            if (StringUtils.isNotEmpty(queryReportDetailStatisticsItemRelDTO.getStatisticsItemId())) {
-                queryWrapper.like(ReportDetailStatisticsItemRel.PROP_STATISTICS_ITEM_ID, queryReportDetailStatisticsItemRelDTO.getStatisticsItemId());
-            }
-
-            
-            if (StringUtils.isNotEmpty(queryReportDetailStatisticsItemRelDTO.getUnqualifiedReason())) {
-                queryWrapper.like(ReportDetailStatisticsItemRel.PROP_UNQUALIFIED_REASON, queryReportDetailStatisticsItemRelDTO.getUnqualifiedReason());
-            }
-
-            
-            if (StringUtils.isNotEmpty(queryReportDetailStatisticsItemRelDTO.getRemark())) {
-                queryWrapper.like(ReportDetailStatisticsItemRel.PROP_REMARK, queryReportDetailStatisticsItemRelDTO.getRemark());
-            }
-
-        }
-
-        return list(queryWrapper);
-    }
-
-    /**
-     * 分页查询报告详情与统计条目的关联
-     *
-     * @return IPage<ReportDetailStatisticsItemRel>
-     * @author lixing
-     * @version V1.0 2021-05-20 19:19:39
-     */
-    @Override
-    public IPage<ReportDetailStatisticsItemRel> pageQueryReportDetailStatisticsItemRel(PageQueryReportDetailStatisticsItemRelDTO pageQueryReportDetailStatisticsItemRelDTO) {
-        QueryWrapper<ReportDetailStatisticsItemRel> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq(ReportDetailStatisticsItemRel.PROP_VALID, ValidEnum.TRUE.getType());
-        // 这里认为pageQueryDTO是经过校验的,肯定包含分页信息
-        IPage<ReportDetailStatisticsItemRel> pageParam = new Page<>(pageQueryReportDetailStatisticsItemRelDTO.getPage(), pageQueryReportDetailStatisticsItemRelDTO.getSize(), true);
-        // 排序信息
-        if (CollectionUtils.isEmpty(pageQueryReportDetailStatisticsItemRelDTO.getOrders())) {
-            // 默认按创建时间倒序排序
-            queryWrapper.orderBy(true, false, ReportDetailStatisticsItemRel.PROP_CREATIONTIME);
-        } else {
-            List<Sort> orders = pageQueryReportDetailStatisticsItemRelDTO.getOrders();
-            for (Sort sort : orders) {
-                // 将驼峰转换为下划线格式
-                sort.setColumn(CaseFormat.LOWER_CAMEL.to(CaseFormat.LOWER_UNDERSCORE, sort.getColumn()));
-                queryWrapper.orderBy(true, sort.isAsc(), sort.getColumn());
-            }
-        }
-
-        
-        if (StringUtils.isNotEmpty(pageQueryReportDetailStatisticsItemRelDTO.getReportDetailId())) {
-            queryWrapper.like(ReportDetailStatisticsItemRel.PROP_REPORT_DETAIL_ID, pageQueryReportDetailStatisticsItemRelDTO.getReportDetailId());
-        }
-
-        
-        if (StringUtils.isNotEmpty(pageQueryReportDetailStatisticsItemRelDTO.getReportTypeId())) {
-            queryWrapper.like(ReportDetailStatisticsItemRel.PROP_REPORT_TYPE_ID, pageQueryReportDetailStatisticsItemRelDTO.getReportTypeId());
-        }
-
-        
-        if (StringUtils.isNotEmpty(pageQueryReportDetailStatisticsItemRelDTO.getStatisticsItemId())) {
-            queryWrapper.like(ReportDetailStatisticsItemRel.PROP_STATISTICS_ITEM_ID, pageQueryReportDetailStatisticsItemRelDTO.getStatisticsItemId());
-        }
-
-        
-        if (StringUtils.isNotEmpty(pageQueryReportDetailStatisticsItemRelDTO.getUnqualifiedReason())) {
-            queryWrapper.like(ReportDetailStatisticsItemRel.PROP_UNQUALIFIED_REASON, pageQueryReportDetailStatisticsItemRelDTO.getUnqualifiedReason());
-        }
-
-        
-        if (StringUtils.isNotEmpty(pageQueryReportDetailStatisticsItemRelDTO.getRemark())) {
-            queryWrapper.like(ReportDetailStatisticsItemRel.PROP_REMARK, pageQueryReportDetailStatisticsItemRelDTO.getRemark());
-        }
-
-        return getBaseMapper().selectPage(pageParam, queryWrapper);
-    }
-}

+ 0 - 16
src/main/java/com/persagy/apm/report/config/rel/typefunction/dao/ReportTypeFunctionRelMapper.java

@@ -1,16 +0,0 @@
-package com.persagy.apm.report.config.rel.typefunction.dao;
-
-import com.persagy.apm.report.config.rel.typefunction.model.ReportTypeFunctionRel;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Mapper;
-
-/**
- * 报告类型(ReportTypeFunctionRel)dao层
- *
- * @author lixing
- * @version V1.0 2021-05-24 16:02:41
- */
-@Mapper
-public interface ReportTypeFunctionRelMapper extends BaseMapper<ReportTypeFunctionRel> {
-
-}

+ 0 - 78
src/main/java/com/persagy/apm/report/config/rel/typefunction/model/ConvertReportTypeFunctionRelTool.java

@@ -1,78 +0,0 @@
-package com.persagy.apm.report.config.rel.typefunction.model;
-
-import com.persagy.apm.report.config.rel.typefunction.model.dto.AddReportTypeFunctionRelDTO;
-import com.persagy.apm.report.config.rel.typefunction.model.dto.UpdateReportTypeFunctionRelDTO;
-import com.persagy.apm.report.config.rel.typefunction.model.vo.ResponseReportTypeFunctionRelItemVO;
-import com.persagy.apm.report.config.rel.typefunction.model.vo.ResponseReportTypeFunctionRelListItemVO;
-import org.mapstruct.Mapper;
-import org.mapstruct.MappingTarget;
-import org.mapstruct.NullValueCheckStrategy;
-import org.mapstruct.NullValueMappingStrategy;
-import org.mapstruct.factory.Mappers;
-
-import java.util.List;
-
-/**
- * 报告类型(ReportTypeFunctionRel) dto、vo、do转换工具类
- *
- * @author lixing
- * @version V1.0 2021-05-24 16:02:45 2021-05-24 16:02:45
- */
-@Mapper(nullValueMappingStrategy = NullValueMappingStrategy.RETURN_DEFAULT,
-        nullValueCheckStrategy = NullValueCheckStrategy.ALWAYS)
-public interface ConvertReportTypeFunctionRelTool {
-
-    ConvertReportTypeFunctionRelTool INSTANCE = Mappers.getMapper(ConvertReportTypeFunctionRelTool.class);
-
-    /**
-     * do转换为ResponseItemVO
-     *
-     * @param reportTypeFunctionRel do对象
-     * @return ResponseItemVO
-     * @author lixing
-     * @version V1.0 2021-05-24 16:02:45
-     */
-    ResponseReportTypeFunctionRelItemVO convert2ResponseItemDTO(ReportTypeFunctionRel reportTypeFunctionRel);
-
-    /**
-     * do转换为ResponseListItemVO
-     *
-     * @param reportTypeFunctionRel do对象
-     * @return ResponseListItemVO
-     * @author lixing
-     * @version V1.0 2021-05-24 16:02:45
-     */
-    ResponseReportTypeFunctionRelListItemVO convert2ResponseListItemDTO(ReportTypeFunctionRel reportTypeFunctionRel);
-
-    /**
-     * do列表转换为ResponseListItemVO列表
-     *
-     * @param reportTypeFunctionRelList do列表
-     * @return ResponseListItemVO列表
-     * @author lixing
-     * @version V1.0 2021-05-24 16:02:45
-     */
-    List<ResponseReportTypeFunctionRelListItemVO> convert2List(List<ReportTypeFunctionRel> reportTypeFunctionRelList);
-
-    /**
-     * addDTO转换为do
-     *
-     * @param addReportTypeFunctionRelDTO addDTO
-     * @return 要创建的do对象
-     * @author lixing
-     * @version V1.0 2021-05-24 16:02:45
-     */
-    ReportTypeFunctionRel convertAddDto2Entity(AddReportTypeFunctionRelDTO addReportTypeFunctionRelDTO);
-
-    /**
-     * updateDTO转换为实体
-     *
-     * @param reportTypeFunctionRel          更新前的do对象
-     * @param updateReportTypeFunctionRelDTO updateDTO
-     * @return 更新后的do对象
-     * @author lixing
-     * @version V1.0 2021-05-24 16:02:45
-     */
-    ReportTypeFunctionRel convertUpdateDto2Entity(@MappingTarget ReportTypeFunctionRel reportTypeFunctionRel, UpdateReportTypeFunctionRelDTO updateReportTypeFunctionRelDTO);
-}
-

+ 0 - 37
src/main/java/com/persagy/apm/report/config/rel/typefunction/model/ReportTypeFunctionRel.java

@@ -1,37 +0,0 @@
-package com.persagy.apm.report.config.rel.typefunction.model;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import com.persagy.apm.common.model.entity.AuditableEntity;
-
-import java.io.Serializable;
-
-/**
- * 报告类型(ReportTypeFunctionRel)实体类
- *
- * @author lixing
- * @version V1.0 2021-05-24 16:02:42
- */
-@EqualsAndHashCode(callSuper = true)
-@Data
-@ApiModel(description = "报告类型")
-public class ReportTypeFunctionRel extends AuditableEntity<ReportTypeFunctionRel> implements Serializable {
-    private static final long serialVersionUID = 496688571929587378L;
-
-    @ApiModelProperty("报告类型id")
-    private String reportTypeId;
-
-    @ApiModelProperty("信息点id")
-    private String functionId;
-
-    @ApiModelProperty("所属段落")
-    private String belongParagraph;
-
-
-    public static String PROP_REPORT_TYPE_ID = "report_type_id";
-    public static String PROP_FUNCTION_ID = "function_id";
-    public static String PROP_BELONG_PARAGRAPH = "belong_paragraph";
-
-}

+ 0 - 31
src/main/java/com/persagy/apm/report/config/rel/typefunction/model/dto/AddReportTypeFunctionRelDTO.java

@@ -1,31 +0,0 @@
-package com.persagy.apm.report.config.rel.typefunction.model.dto;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-
-import javax.validation.constraints.NotNull;
-
-import lombok.Data;
-
-import java.util.Date;
-
-/**
- * @author lixing
- * @version V1.0 2021-05-24 16:02:42
- */
-@Data
-@ApiModel(value = "创建报告类型入参")
-public class AddReportTypeFunctionRelDTO {
-    @ApiModelProperty(value = "报告类型id", required = true)
-    @NotNull(message = "报告类型id不能为空") 
-    private String reportTypeId;
-
-    @ApiModelProperty(value = "信息点id", required = true)
-    @NotNull(message = "信息点id不能为空") 
-    private String functionId;
-
-    @ApiModelProperty(value = "所属段落", required = true)
-    @NotNull(message = "所属段落不能为空") 
-    private String belongParagraph;
-
-}

+ 0 - 32
src/main/java/com/persagy/apm/report/config/rel/typefunction/model/dto/PageQueryReportTypeFunctionRelDTO.java

@@ -1,32 +0,0 @@
-package com.persagy.apm.report.config.rel.typefunction.model.dto;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-
-import java.util.Date;
-
-import com.persagy.apm.common.model.dto.PageDTO;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * @author lixing
- * @version V1.0 2021-05-24 16:02:45
- */
-@EqualsAndHashCode(callSuper = true)
-@Data
-@ApiModel(value = "分页查询报告类型入参")
-public class PageQueryReportTypeFunctionRelDTO extends PageDTO {
-    @ApiModelProperty(value = "主键", required = true)
-    private String id;
-
-    @ApiModelProperty(value = "报告类型id", required = true)
-    private String reportTypeId;
-
-    @ApiModelProperty(value = "信息点id", required = true)
-    private String functionId;
-
-    @ApiModelProperty(value = "所属段落", required = true)
-    private String belongParagraph;
-
-}

+ 0 - 25
src/main/java/com/persagy/apm/report/config/rel/typefunction/model/dto/QueryReportTypeFunctionRelDTO.java

@@ -1,25 +0,0 @@
-package com.persagy.apm.report.config.rel.typefunction.model.dto;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.util.Date;
-
-/**
- * @author lixing
- * @version V1.0 2021-05-24 16:02:44
- */
-@Data
-@ApiModel(value = "查询报告类型入参")
-public class QueryReportTypeFunctionRelDTO {
-    @ApiModelProperty(value = "报告类型id", required = true)
-    private String reportTypeId;
-
-    @ApiModelProperty(value = "信息点id", required = true)
-    private String functionId;
-
-    @ApiModelProperty(value = "所属段落", required = true)
-    private String belongParagraph;
-
-}

+ 0 - 35
src/main/java/com/persagy/apm/report/config/rel/typefunction/model/dto/UpdateReportTypeFunctionRelDTO.java

@@ -1,35 +0,0 @@
-package com.persagy.apm.report.config.rel.typefunction.model.dto;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-
-import javax.validation.constraints.NotNull;
-
-import lombok.Data;
-
-import java.util.Date;
-
-/**
- * @author lixing
- * @version V1.0 2021-05-24 16:02:43
- */
-@Data
-@ApiModel(value = "更新报告类型入参")
-public class UpdateReportTypeFunctionRelDTO {
-    @ApiModelProperty(value = "主键", required = true)
-    @NotNull(message = "主键不能为空") 
-    private String id;
-
-    @ApiModelProperty(value = "报告类型id", required = true)
-    @NotNull(message = "报告类型id不能为空") 
-    private String reportTypeId;
-
-    @ApiModelProperty(value = "信息点id", required = true)
-    @NotNull(message = "信息点id不能为空") 
-    private String functionId;
-
-    @ApiModelProperty(value = "所属段落", required = true)
-    @NotNull(message = "所属段落不能为空") 
-    private String belongParagraph;
-
-}

+ 0 - 43
src/main/java/com/persagy/apm/report/config/rel/typefunction/model/vo/ResponseReportTypeFunctionRelListItemVO.java

@@ -1,43 +0,0 @@
-package com.persagy.apm.report.config.rel.typefunction.model.vo;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.util.Date;
-
-import com.fasterxml.jackson.annotation.JsonInclude;
-
-/**
- * @author lixing
- * @version V1.0 2021-05-24 16:02:45
- */
-@Data
-@ApiModel(value = "报告类型列表返回结果参数")
-@JsonInclude(JsonInclude.Include.NON_NULL)
-public class ResponseReportTypeFunctionRelListItemVO {
-    @ApiModelProperty("主键")
-    private String id;
-
-    @ApiModelProperty("报告类型id")
-    private String reportTypeId;
-
-    @ApiModelProperty("信息点id")
-    private String functionId;
-
-    @ApiModelProperty("所属段落")
-    private String belongParagraph;
-
-    @ApiModelProperty("创建人")
-    private String creator;
-
-    @ApiModelProperty("创建时间")
-    private Date creationTime;
-
-    @ApiModelProperty("最后修改人")
-    private String modifier;
-
-    @ApiModelProperty("最后修改时间")
-    private Date modifiedTime;
-
-}

+ 0 - 77
src/main/java/com/persagy/apm/report/config/rel/typefunction/service/IReportTypeFunctionRelService.java

@@ -1,77 +0,0 @@
-package com.persagy.apm.report.config.rel.typefunction.service;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.persagy.apm.report.config.rel.typefunction.model.ReportTypeFunctionRel;
-import com.persagy.apm.report.config.rel.typefunction.model.dto.AddReportTypeFunctionRelDTO;
-import com.persagy.apm.report.config.rel.typefunction.model.dto.PageQueryReportTypeFunctionRelDTO;
-import com.persagy.apm.report.config.rel.typefunction.model.dto.QueryReportTypeFunctionRelDTO;
-import com.persagy.apm.report.config.rel.typefunction.model.dto.UpdateReportTypeFunctionRelDTO;
-
-import java.util.List;
-
-/**
- * 报告类型(ReportTypeFunctionRel) service接口
- *
- * @author lixing
- * @version V1.0 2021-05-24 16:02:40
- */
-public interface IReportTypeFunctionRelService {
-
-    /**
-     * 创建报告类型
-     *
-     * @param addReportTypeFunctionRelDTO addDTO
-     * @return 报告类型主键
-     * @author lixing
-     * @version V1.0 2021-05-24 16:02:40
-     */
-    String createReportTypeFunctionRel(AddReportTypeFunctionRelDTO addReportTypeFunctionRelDTO);
-
-    /**
-     * 报告类型详情
-     *
-     * @param id 主键
-     * @return 报告类型do对象
-     * @author lixing
-     * @version V1.0 2021-05-24 16:02:40
-     */
-    ReportTypeFunctionRel queryReportTypeFunctionRelDetail(String id);
-
-    /**
-     * 更新报告类型
-     *
-     * @param updateReportTypeFunctionRelDTO updateDTO
-     * @author lixing
-     * @version V1.0 2021-05-24 16:02:40
-     */
-    void updateReportTypeFunctionRel(UpdateReportTypeFunctionRelDTO updateReportTypeFunctionRelDTO);
-
-    /**
-     * 删除报告类型
-     *
-     * @param id 主键
-     * @author lixing
-     * @version V1.0 2021-05-24 16:02:40
-     */
-    void deleteReportTypeFunctionRel(String id);
-
-    /**
-     * 查询报告类型
-     *
-     * @param queryReportTypeFunctionRelDTO queryDTO
-     * @return List<ReportTypeFunctionRel>
-     * @author lixing
-     * @version V1.0 2021-05-24 16:02:40
-     */
-    List<ReportTypeFunctionRel> queryReportTypeFunctionRelList(QueryReportTypeFunctionRelDTO queryReportTypeFunctionRelDTO);
-
-    /**
-     * 分页查询报告类型
-     *
-     * @param pageQueryReportTypeFunctionRelDTO pageQueryDTO
-     * @return IPage<ReportTypeFunctionRel>
-     * @author lixing
-     * @version V1.0 2021-05-24 16:02:40
-     */
-    IPage<ReportTypeFunctionRel> pageQueryReportTypeFunctionRel(PageQueryReportTypeFunctionRelDTO pageQueryReportTypeFunctionRelDTO);
-}

+ 0 - 212
src/main/java/com/persagy/apm/report/config/rel/typefunction/service/impl/ReportTypeFunctionRelServiceImpl.java

@@ -1,212 +0,0 @@
-package com.persagy.apm.report.config.rel.typefunction.service.impl;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.google.common.base.CaseFormat;
-import com.persagy.apm.common.constant.enums.ValidEnum;
-import com.persagy.apm.common.context.AppContext;
-import com.persagy.apm.common.model.dto.Sort;
-import com.persagy.apm.report.config.rel.typefunction.dao.ReportTypeFunctionRelMapper;
-import com.persagy.apm.report.config.rel.typefunction.model.ConvertReportTypeFunctionRelTool;
-import com.persagy.apm.report.config.rel.typefunction.model.ReportTypeFunctionRel;
-import com.persagy.apm.report.config.rel.typefunction.model.dto.AddReportTypeFunctionRelDTO;
-import com.persagy.apm.report.config.rel.typefunction.model.dto.PageQueryReportTypeFunctionRelDTO;
-import com.persagy.apm.report.config.rel.typefunction.model.dto.QueryReportTypeFunctionRelDTO;
-import com.persagy.apm.report.config.rel.typefunction.model.dto.UpdateReportTypeFunctionRelDTO;
-import com.persagy.apm.report.config.rel.typefunction.service.IReportTypeFunctionRelService;
-import org.apache.commons.lang.StringUtils;
-import org.springframework.stereotype.Service;
-import org.springframework.util.CollectionUtils;
-
-import java.util.List;
-
-/**
- * 报告类型(ReportTypeFunctionRel) service层
- *
- * @author lixing
- * @version V1.0 2021-05-24 16:02:41
- */
-@Service
-public class ReportTypeFunctionRelServiceImpl extends ServiceImpl<ReportTypeFunctionRelMapper, ReportTypeFunctionRel>
-        implements IReportTypeFunctionRelService {
-
-    /**
-     * 创建报告类型
-     *
-     * @return 报告类型主键
-     * @author lixing
-     * @version V1.0 2021-05-24 16:02:41
-     */
-    @Override
-    public String createReportTypeFunctionRel(AddReportTypeFunctionRelDTO addReportTypeFunctionRelDTO) {
-        ReportTypeFunctionRel reportTypeFunctionRel = ConvertReportTypeFunctionRelTool.INSTANCE.convertAddDto2Entity(addReportTypeFunctionRelDTO);
-        // 设置默认值
-        setDefaultValue(reportTypeFunctionRel);
-        save(reportTypeFunctionRel);
-        return reportTypeFunctionRel.getId();
-    }
-
-    /**
-     * 如果某些字段没有赋值,使用默认的值
-     *
-     * @param reportTypeFunctionRel 报告类型实体
-     * @author lixing
-     * @version V1.0 2021/3/12 12:29 下午
-     */
-    private void setDefaultValue(ReportTypeFunctionRel reportTypeFunctionRel) {
-        reportTypeFunctionRel.setCreator(AppContext.getContext().getAccountId());
-        
-
-    }
-
-    /**
-     * 报告类型详情
-     *
-     * @param id 主键
-     * @return 部门do类
-     * @author lixing
-     * @version V1.0 2021-05-24 16:02:41
-     */
-    @Override
-    public ReportTypeFunctionRel queryReportTypeFunctionRelDetail(String id) {
-        ReportTypeFunctionRel reportTypeFunctionRel = getById(id);
-        if (reportTypeFunctionRel == null) {
-            throw new IllegalArgumentException("查看ReportTypeFunctionRel详情时发生异常,找不到要查看的记录,id=" + id);
-        }
-        return reportTypeFunctionRel;
-    }
-
-    /**
-     * 更新报告类型
-     *
-     * @author lixing
-     * @version V1.0 2021-05-24 16:02:41
-     */
-    @Override
-    public void updateReportTypeFunctionRel(UpdateReportTypeFunctionRelDTO updateReportTypeFunctionRelDTO) {
-        ReportTypeFunctionRel reportTypeFunctionRel = getById(updateReportTypeFunctionRelDTO.getId());
-        reportTypeFunctionRel = ConvertReportTypeFunctionRelTool.INSTANCE.convertUpdateDto2Entity(reportTypeFunctionRel, updateReportTypeFunctionRelDTO);
-        reportTypeFunctionRel.setModifier(AppContext.getContext().getAccountId());
-        updateById(reportTypeFunctionRel);
-    }
-
-    /**
-     * 校验报告类型是否可删除
-     *
-     * @param id 报告类型主键
-     * @return 报告类型do类
-     * @author lixing
-     * @version V1.0 2021-05-24 16:02:41
-     */
-    public ReportTypeFunctionRel checkDeletable(String id) {
-        if (id == null) {
-            throw new IllegalArgumentException("删除ReportTypeFunctionRel时发生异常,主键为空");
-        }
-
-        ReportTypeFunctionRel reportTypeFunctionRel = getById(id);
-
-        if (reportTypeFunctionRel == null) {
-            throw new IllegalArgumentException("删除ReportTypeFunctionRel时发生异常,找不到要删除的数据,id:" + id);
-        }
-
-        return reportTypeFunctionRel;
-    }
-
-    /**
-     * 删除报告类型
-     *
-     * @param id 主键
-     * @author lixing
-     * @version V1.0 2021-05-24 16:02:41
-     */
-    @Override
-    public void deleteReportTypeFunctionRel(String id) {
-        // 校验是否可删除
-        ReportTypeFunctionRel reportTypeFunctionRel = checkDeletable(id);
-
-        reportTypeFunctionRel.setValid(ValidEnum.FALSE.getType());
-        updateById(reportTypeFunctionRel);
-    }
-
-    /**
-     * 查询报告类型
-     *
-     * @return List<ReportTypeFunctionRel>
-     * @author lixing
-     * @version V1.0 2021-05-24 16:02:41
-     */
-    @Override
-    public List<ReportTypeFunctionRel> queryReportTypeFunctionRelList(QueryReportTypeFunctionRelDTO queryReportTypeFunctionRelDTO) {
-        QueryWrapper<ReportTypeFunctionRel> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq(ReportTypeFunctionRel.PROP_VALID, ValidEnum.TRUE.getType());
-        // 默认按创建时间倒序排序
-        queryWrapper.orderBy(true, false, ReportTypeFunctionRel.PROP_CREATIONTIME);
-
-        if (queryReportTypeFunctionRelDTO != null) {
-
-            
-            if (StringUtils.isNotEmpty(queryReportTypeFunctionRelDTO.getReportTypeId())) {
-                queryWrapper.like(ReportTypeFunctionRel.PROP_REPORT_TYPE_ID, queryReportTypeFunctionRelDTO.getReportTypeId());
-            }
-
-            
-            if (StringUtils.isNotEmpty(queryReportTypeFunctionRelDTO.getFunctionId())) {
-                queryWrapper.like(ReportTypeFunctionRel.PROP_FUNCTION_ID, queryReportTypeFunctionRelDTO.getFunctionId());
-            }
-
-            
-            if (StringUtils.isNotEmpty(queryReportTypeFunctionRelDTO.getBelongParagraph())) {
-                queryWrapper.like(ReportTypeFunctionRel.PROP_BELONG_PARAGRAPH, queryReportTypeFunctionRelDTO.getBelongParagraph());
-            }
-
-        }
-
-        return list(queryWrapper);
-    }
-
-    /**
-     * 分页查询报告类型
-     *
-     * @return IPage<ReportTypeFunctionRel>
-     * @author lixing
-     * @version V1.0 2021-05-24 16:02:41
-     */
-    @Override
-    public IPage<ReportTypeFunctionRel> pageQueryReportTypeFunctionRel(PageQueryReportTypeFunctionRelDTO pageQueryReportTypeFunctionRelDTO) {
-        QueryWrapper<ReportTypeFunctionRel> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq(ReportTypeFunctionRel.PROP_VALID, ValidEnum.TRUE.getType());
-        // 这里认为pageQueryDTO是经过校验的,肯定包含分页信息
-        IPage<ReportTypeFunctionRel> pageParam = new Page<>(pageQueryReportTypeFunctionRelDTO.getPage(), pageQueryReportTypeFunctionRelDTO.getSize(), true);
-        // 排序信息
-        if (CollectionUtils.isEmpty(pageQueryReportTypeFunctionRelDTO.getOrders())) {
-            // 默认按创建时间倒序排序
-            queryWrapper.orderBy(true, false, ReportTypeFunctionRel.PROP_CREATIONTIME);
-        } else {
-            List<Sort> orders = pageQueryReportTypeFunctionRelDTO.getOrders();
-            for (Sort sort : orders) {
-                // 将驼峰转换为下划线格式
-                sort.setColumn(CaseFormat.LOWER_CAMEL.to(CaseFormat.LOWER_UNDERSCORE, sort.getColumn()));
-                queryWrapper.orderBy(true, sort.isAsc(), sort.getColumn());
-            }
-        }
-
-        
-        if (StringUtils.isNotEmpty(pageQueryReportTypeFunctionRelDTO.getReportTypeId())) {
-            queryWrapper.like(ReportTypeFunctionRel.PROP_REPORT_TYPE_ID, pageQueryReportTypeFunctionRelDTO.getReportTypeId());
-        }
-
-        
-        if (StringUtils.isNotEmpty(pageQueryReportTypeFunctionRelDTO.getFunctionId())) {
-            queryWrapper.like(ReportTypeFunctionRel.PROP_FUNCTION_ID, pageQueryReportTypeFunctionRelDTO.getFunctionId());
-        }
-
-        
-        if (StringUtils.isNotEmpty(pageQueryReportTypeFunctionRelDTO.getBelongParagraph())) {
-            queryWrapper.like(ReportTypeFunctionRel.PROP_BELONG_PARAGRAPH, pageQueryReportTypeFunctionRelDTO.getBelongParagraph());
-        }
-
-        return getBaseMapper().selectPage(pageParam, queryWrapper);
-    }
-}

+ 0 - 16
src/main/java/com/persagy/apm/report/config/rel/typefunctiongroup/dao/ReportTypeFunctionGroupRelMapper.java

@@ -1,16 +0,0 @@
-package com.persagy.apm.report.config.rel.typefunctiongroup.dao;
-
-import com.persagy.apm.report.config.rel.typefunctiongroup.model.ReportTypeFunctionGroupRel;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Mapper;
-
-/**
- * 报告类型(ReportTypeFunctionGroupRel)dao层
- *
- * @author lixing
- * @version V1.0 2021-05-24 16:02:15
- */
-@Mapper
-public interface ReportTypeFunctionGroupRelMapper extends BaseMapper<ReportTypeFunctionGroupRel> {
-
-}

+ 0 - 78
src/main/java/com/persagy/apm/report/config/rel/typefunctiongroup/model/ConvertReportTypeFunctionGroupRelTool.java

@@ -1,78 +0,0 @@
-package com.persagy.apm.report.config.rel.typefunctiongroup.model;
-
-import com.persagy.apm.report.config.rel.typefunctiongroup.model.dto.AddReportTypeFunctionGroupRelDTO;
-import com.persagy.apm.report.config.rel.typefunctiongroup.model.dto.UpdateReportTypeFunctionGroupRelDTO;
-import com.persagy.apm.report.config.rel.typefunctiongroup.model.vo.ResponseReportTypeFunctionGroupRelItemVO;
-import com.persagy.apm.report.config.rel.typefunctiongroup.model.vo.ResponseReportTypeFunctionGroupRelListItemVO;
-import org.mapstruct.Mapper;
-import org.mapstruct.MappingTarget;
-import org.mapstruct.NullValueCheckStrategy;
-import org.mapstruct.NullValueMappingStrategy;
-import org.mapstruct.factory.Mappers;
-
-import java.util.List;
-
-/**
- * 报告类型(ReportTypeFunctionGroupRel) dto、vo、do转换工具类
- *
- * @author lixing
- * @version V1.0 2021-05-24 16:02:18 2021-05-24 16:02:18
- */
-@Mapper(nullValueMappingStrategy = NullValueMappingStrategy.RETURN_DEFAULT,
-        nullValueCheckStrategy = NullValueCheckStrategy.ALWAYS)
-public interface ConvertReportTypeFunctionGroupRelTool {
-
-    ConvertReportTypeFunctionGroupRelTool INSTANCE = Mappers.getMapper(ConvertReportTypeFunctionGroupRelTool.class);
-
-    /**
-     * do转换为ResponseItemVO
-     *
-     * @param reportTypeFunctionGroupRel do对象
-     * @return ResponseItemVO
-     * @author lixing
-     * @version V1.0 2021-05-24 16:02:18
-     */
-    ResponseReportTypeFunctionGroupRelItemVO convert2ResponseItemDTO(ReportTypeFunctionGroupRel reportTypeFunctionGroupRel);
-
-    /**
-     * do转换为ResponseListItemVO
-     *
-     * @param reportTypeFunctionGroupRel do对象
-     * @return ResponseListItemVO
-     * @author lixing
-     * @version V1.0 2021-05-24 16:02:18
-     */
-    ResponseReportTypeFunctionGroupRelListItemVO convert2ResponseListItemDTO(ReportTypeFunctionGroupRel reportTypeFunctionGroupRel);
-
-    /**
-     * do列表转换为ResponseListItemVO列表
-     *
-     * @param reportTypeFunctionGroupRelList do列表
-     * @return ResponseListItemVO列表
-     * @author lixing
-     * @version V1.0 2021-05-24 16:02:18
-     */
-    List<ResponseReportTypeFunctionGroupRelListItemVO> convert2List(List<ReportTypeFunctionGroupRel> reportTypeFunctionGroupRelList);
-
-    /**
-     * addDTO转换为do
-     *
-     * @param addReportTypeFunctionGroupRelDTO addDTO
-     * @return 要创建的do对象
-     * @author lixing
-     * @version V1.0 2021-05-24 16:02:18
-     */
-    ReportTypeFunctionGroupRel convertAddDto2Entity(AddReportTypeFunctionGroupRelDTO addReportTypeFunctionGroupRelDTO);
-
-    /**
-     * updateDTO转换为实体
-     *
-     * @param reportTypeFunctionGroupRel          更新前的do对象
-     * @param updateReportTypeFunctionGroupRelDTO updateDTO
-     * @return 更新后的do对象
-     * @author lixing
-     * @version V1.0 2021-05-24 16:02:18
-     */
-    ReportTypeFunctionGroupRel convertUpdateDto2Entity(@MappingTarget ReportTypeFunctionGroupRel reportTypeFunctionGroupRel, UpdateReportTypeFunctionGroupRelDTO updateReportTypeFunctionGroupRelDTO);
-}
-

+ 0 - 37
src/main/java/com/persagy/apm/report/config/rel/typefunctiongroup/model/ReportTypeFunctionGroupRel.java

@@ -1,37 +0,0 @@
-package com.persagy.apm.report.config.rel.typefunctiongroup.model;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import com.persagy.apm.common.model.entity.AuditableEntity;
-
-import java.io.Serializable;
-
-/**
- * 报告类型(ReportTypeFunctionGroupRel)实体类
- *
- * @author lixing
- * @version V1.0 2021-05-24 16:02:15
- */
-@EqualsAndHashCode(callSuper = true)
-@Data
-@ApiModel(description = "报告类型")
-public class ReportTypeFunctionGroupRel extends AuditableEntity<ReportTypeFunctionGroupRel> implements Serializable {
-    private static final long serialVersionUID = 279475542066816931L;
-
-    @ApiModelProperty("报告类型id")
-    private String reportTypeId;
-
-    @ApiModelProperty("信息点分组id")
-    private String functionGroupId;
-
-    @ApiModelProperty("所属段落")
-    private String belongParagraph;
-
-
-    public static String PROP_REPORT_TYPE_ID = "report_type_id";
-    public static String PROP_FUNCTION_GROUP_ID = "function_group_id";
-    public static String PROP_BELONG_PARAGRAPH = "belong_paragraph";
-
-}

+ 0 - 31
src/main/java/com/persagy/apm/report/config/rel/typefunctiongroup/model/dto/AddReportTypeFunctionGroupRelDTO.java

@@ -1,31 +0,0 @@
-package com.persagy.apm.report.config.rel.typefunctiongroup.model.dto;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-
-import javax.validation.constraints.NotNull;
-
-import lombok.Data;
-
-import java.util.Date;
-
-/**
- * @author lixing
- * @version V1.0 2021-05-24 16:02:16
- */
-@Data
-@ApiModel(value = "创建报告类型入参")
-public class AddReportTypeFunctionGroupRelDTO {
-    @ApiModelProperty(value = "报告类型id", required = true)
-    @NotNull(message = "报告类型id不能为空") 
-    private String reportTypeId;
-
-    @ApiModelProperty(value = "信息点分组id", required = true)
-    @NotNull(message = "信息点分组id不能为空") 
-    private String functionGroupId;
-
-    @ApiModelProperty(value = "所属段落", required = true)
-    @NotNull(message = "所属段落不能为空") 
-    private String belongParagraph;
-
-}

+ 0 - 20
src/main/java/com/persagy/apm/report/config/rel/typefunctiongroup/model/dto/DeleteReportTypeFunctionGroupRelDTO.java

@@ -1,20 +0,0 @@
-package com.persagy.apm.report.config.rel.typefunctiongroup.model.dto;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import javax.validation.constraints.NotNull;
-
-/**
- * @author lixing
- * @version V1.0 2021-05-24 16:02:17
- */
-@Data
-@ApiModel(value = "删除报告类型入参")
-public class DeleteReportTypeFunctionGroupRelDTO {
-    @NotNull(message = "id不能为空")
-    @ApiModelProperty(value = "主键", required = true)
-    private String id;
-
-}

+ 0 - 32
src/main/java/com/persagy/apm/report/config/rel/typefunctiongroup/model/dto/PageQueryReportTypeFunctionGroupRelDTO.java

@@ -1,32 +0,0 @@
-package com.persagy.apm.report.config.rel.typefunctiongroup.model.dto;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-
-import java.util.Date;
-
-import com.persagy.apm.common.model.dto.PageDTO;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * @author lixing
- * @version V1.0 2021-05-24 16:02:17
- */
-@EqualsAndHashCode(callSuper = true)
-@Data
-@ApiModel(value = "分页查询报告类型入参")
-public class PageQueryReportTypeFunctionGroupRelDTO extends PageDTO {
-    @ApiModelProperty(value = "主键", required = true)
-    private String id;
-
-    @ApiModelProperty(value = "报告类型id", required = true)
-    private String reportTypeId;
-
-    @ApiModelProperty(value = "信息点分组id", required = true)
-    private String functionGroupId;
-
-    @ApiModelProperty(value = "所属段落", required = true)
-    private String belongParagraph;
-
-}

+ 0 - 25
src/main/java/com/persagy/apm/report/config/rel/typefunctiongroup/model/dto/QueryReportTypeFunctionGroupRelDTO.java

@@ -1,25 +0,0 @@
-package com.persagy.apm.report.config.rel.typefunctiongroup.model.dto;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.util.Date;
-
-/**
- * @author lixing
- * @version V1.0 2021-05-24 16:02:17
- */
-@Data
-@ApiModel(value = "查询报告类型入参")
-public class QueryReportTypeFunctionGroupRelDTO {
-    @ApiModelProperty(value = "报告类型id", required = true)
-    private String reportTypeId;
-
-    @ApiModelProperty(value = "信息点分组id", required = true)
-    private String functionGroupId;
-
-    @ApiModelProperty(value = "所属段落", required = true)
-    private String belongParagraph;
-
-}

+ 0 - 20
src/main/java/com/persagy/apm/report/config/rel/typefunctiongroup/model/dto/QueryReportTypeFunctionGroupRelDetailDTO.java

@@ -1,20 +0,0 @@
-package com.persagy.apm.report.config.rel.typefunctiongroup.model.dto;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import javax.validation.constraints.NotNull;
-
-/**
- * @author lixing
- * @version V1.0 2021-05-24 16:02:16
- */
-@Data
-@ApiModel(value = "获取报告类型详情入参")
-public class QueryReportTypeFunctionGroupRelDetailDTO {
-    @NotNull(message = "主键不能为空")
-    @ApiModelProperty(value = "主键", required = true)
-    private String id;
-
-}

+ 0 - 35
src/main/java/com/persagy/apm/report/config/rel/typefunctiongroup/model/dto/UpdateReportTypeFunctionGroupRelDTO.java

@@ -1,35 +0,0 @@
-package com.persagy.apm.report.config.rel.typefunctiongroup.model.dto;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-
-import javax.validation.constraints.NotNull;
-
-import lombok.Data;
-
-import java.util.Date;
-
-/**
- * @author lixing
- * @version V1.0 2021-05-24 16:02:16
- */
-@Data
-@ApiModel(value = "更新报告类型入参")
-public class UpdateReportTypeFunctionGroupRelDTO {
-    @ApiModelProperty(value = "主键", required = true)
-    @NotNull(message = "主键不能为空") 
-    private String id;
-
-    @ApiModelProperty(value = "报告类型id", required = true)
-    @NotNull(message = "报告类型id不能为空") 
-    private String reportTypeId;
-
-    @ApiModelProperty(value = "信息点分组id", required = true)
-    @NotNull(message = "信息点分组id不能为空") 
-    private String functionGroupId;
-
-    @ApiModelProperty(value = "所属段落", required = true)
-    @NotNull(message = "所属段落不能为空") 
-    private String belongParagraph;
-
-}

+ 0 - 43
src/main/java/com/persagy/apm/report/config/rel/typefunctiongroup/model/vo/ResponseReportTypeFunctionGroupRelItemVO.java

@@ -1,43 +0,0 @@
-package com.persagy.apm.report.config.rel.typefunctiongroup.model.vo;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.util.Date;
-
-import com.fasterxml.jackson.annotation.JsonInclude;
-
-/**
- * @author lixing
- * @version V1.0 2021-05-24 16:02:18
- */
-@Data
-@ApiModel(value = "报告类型返回结果参数")
-@JsonInclude(JsonInclude.Include.NON_NULL)
-public class ResponseReportTypeFunctionGroupRelItemVO {
-    @ApiModelProperty("主键")
-    private String id;
-
-    @ApiModelProperty("报告类型id")
-    private String reportTypeId;
-
-    @ApiModelProperty("信息点分组id")
-    private String functionGroupId;
-
-    @ApiModelProperty("所属段落")
-    private String belongParagraph;
-
-    @ApiModelProperty("创建人")
-    private String creator;
-
-    @ApiModelProperty("创建时间")
-    private Date creationTime;
-
-    @ApiModelProperty("最后修改人")
-    private String modifier;
-
-    @ApiModelProperty("最后修改时间")
-    private Date modifiedTime;
-
-}

+ 0 - 43
src/main/java/com/persagy/apm/report/config/rel/typefunctiongroup/model/vo/ResponseReportTypeFunctionGroupRelListItemVO.java

@@ -1,43 +0,0 @@
-package com.persagy.apm.report.config.rel.typefunctiongroup.model.vo;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.util.Date;
-
-import com.fasterxml.jackson.annotation.JsonInclude;
-
-/**
- * @author lixing
- * @version V1.0 2021-05-24 16:02:18
- */
-@Data
-@ApiModel(value = "报告类型列表返回结果参数")
-@JsonInclude(JsonInclude.Include.NON_NULL)
-public class ResponseReportTypeFunctionGroupRelListItemVO {
-    @ApiModelProperty("主键")
-    private String id;
-
-    @ApiModelProperty("报告类型id")
-    private String reportTypeId;
-
-    @ApiModelProperty("信息点分组id")
-    private String functionGroupId;
-
-    @ApiModelProperty("所属段落")
-    private String belongParagraph;
-
-    @ApiModelProperty("创建人")
-    private String creator;
-
-    @ApiModelProperty("创建时间")
-    private Date creationTime;
-
-    @ApiModelProperty("最后修改人")
-    private String modifier;
-
-    @ApiModelProperty("最后修改时间")
-    private Date modifiedTime;
-
-}

+ 0 - 77
src/main/java/com/persagy/apm/report/config/rel/typefunctiongroup/service/IReportTypeFunctionGroupRelService.java

@@ -1,77 +0,0 @@
-package com.persagy.apm.report.config.rel.typefunctiongroup.service;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.persagy.apm.report.config.rel.typefunctiongroup.model.ReportTypeFunctionGroupRel;
-import com.persagy.apm.report.config.rel.typefunctiongroup.model.dto.AddReportTypeFunctionGroupRelDTO;
-import com.persagy.apm.report.config.rel.typefunctiongroup.model.dto.PageQueryReportTypeFunctionGroupRelDTO;
-import com.persagy.apm.report.config.rel.typefunctiongroup.model.dto.QueryReportTypeFunctionGroupRelDTO;
-import com.persagy.apm.report.config.rel.typefunctiongroup.model.dto.UpdateReportTypeFunctionGroupRelDTO;
-
-import java.util.List;
-
-/**
- * 报告类型(ReportTypeFunctionGroupRel) service接口
- *
- * @author lixing
- * @version V1.0 2021-05-24 16:02:14
- */
-public interface IReportTypeFunctionGroupRelService {
-
-    /**
-     * 创建报告类型
-     *
-     * @param addReportTypeFunctionGroupRelDTO addDTO
-     * @return 报告类型主键
-     * @author lixing
-     * @version V1.0 2021-05-24 16:02:14
-     */
-    String createReportTypeFunctionGroupRel(AddReportTypeFunctionGroupRelDTO addReportTypeFunctionGroupRelDTO);
-
-    /**
-     * 报告类型详情
-     *
-     * @param id 主键
-     * @return 报告类型do对象
-     * @author lixing
-     * @version V1.0 2021-05-24 16:02:14
-     */
-    ReportTypeFunctionGroupRel queryReportTypeFunctionGroupRelDetail(String id);
-
-    /**
-     * 更新报告类型
-     *
-     * @param updateReportTypeFunctionGroupRelDTO updateDTO
-     * @author lixing
-     * @version V1.0 2021-05-24 16:02:14
-     */
-    void updateReportTypeFunctionGroupRel(UpdateReportTypeFunctionGroupRelDTO updateReportTypeFunctionGroupRelDTO);
-
-    /**
-     * 删除报告类型
-     *
-     * @param id 主键
-     * @author lixing
-     * @version V1.0 2021-05-24 16:02:14
-     */
-    void deleteReportTypeFunctionGroupRel(String id);
-
-    /**
-     * 查询报告类型
-     *
-     * @param queryReportTypeFunctionGroupRelDTO queryDTO
-     * @return List<ReportTypeFunctionGroupRel>
-     * @author lixing
-     * @version V1.0 2021-05-24 16:02:14
-     */
-    List<ReportTypeFunctionGroupRel> queryReportTypeFunctionGroupRelList(QueryReportTypeFunctionGroupRelDTO queryReportTypeFunctionGroupRelDTO);
-
-    /**
-     * 分页查询报告类型
-     *
-     * @param pageQueryReportTypeFunctionGroupRelDTO pageQueryDTO
-     * @return IPage<ReportTypeFunctionGroupRel>
-     * @author lixing
-     * @version V1.0 2021-05-24 16:02:14
-     */
-    IPage<ReportTypeFunctionGroupRel> pageQueryReportTypeFunctionGroupRel(PageQueryReportTypeFunctionGroupRelDTO pageQueryReportTypeFunctionGroupRelDTO);
-}

+ 0 - 209
src/main/java/com/persagy/apm/report/config/rel/typefunctiongroup/service/impl/ReportTypeFunctionGroupRelServiceImpl.java

@@ -1,209 +0,0 @@
-package com.persagy.apm.report.config.rel.typefunctiongroup.service.impl;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.google.common.base.CaseFormat;
-import com.persagy.apm.common.constant.enums.ValidEnum;
-import com.persagy.apm.common.context.AppContext;
-import com.persagy.apm.common.model.dto.Sort;
-import com.persagy.apm.report.config.rel.typefunctiongroup.dao.ReportTypeFunctionGroupRelMapper;
-import com.persagy.apm.report.config.rel.typefunctiongroup.model.ConvertReportTypeFunctionGroupRelTool;
-import com.persagy.apm.report.config.rel.typefunctiongroup.model.ReportTypeFunctionGroupRel;
-import com.persagy.apm.report.config.rel.typefunctiongroup.model.dto.AddReportTypeFunctionGroupRelDTO;
-import com.persagy.apm.report.config.rel.typefunctiongroup.model.dto.PageQueryReportTypeFunctionGroupRelDTO;
-import com.persagy.apm.report.config.rel.typefunctiongroup.model.dto.QueryReportTypeFunctionGroupRelDTO;
-import com.persagy.apm.report.config.rel.typefunctiongroup.model.dto.UpdateReportTypeFunctionGroupRelDTO;
-import com.persagy.apm.report.config.rel.typefunctiongroup.service.IReportTypeFunctionGroupRelService;
-import org.apache.commons.lang.StringUtils;
-import org.springframework.stereotype.Service;
-import org.springframework.util.CollectionUtils;
-
-import java.util.List;
-
-/**
- * 报告类型(ReportTypeFunctionGroupRel) service层
- *
- * @author lixing
- * @version V1.0 2021-05-24 16:02:14
- */
-@Service
-public class ReportTypeFunctionGroupRelServiceImpl extends ServiceImpl<ReportTypeFunctionGroupRelMapper, ReportTypeFunctionGroupRel>
-        implements IReportTypeFunctionGroupRelService {
-
-    /**
-     * 创建报告类型
-     *
-     * @return 报告类型主键
-     * @author lixing
-     * @version V1.0 2021-05-24 16:02:14
-     */
-    @Override
-    public String createReportTypeFunctionGroupRel(AddReportTypeFunctionGroupRelDTO addReportTypeFunctionGroupRelDTO) {
-        ReportTypeFunctionGroupRel reportTypeFunctionGroupRel = ConvertReportTypeFunctionGroupRelTool.INSTANCE.convertAddDto2Entity(addReportTypeFunctionGroupRelDTO);
-        // 设置默认值
-        setDefaultValue(reportTypeFunctionGroupRel);
-        save(reportTypeFunctionGroupRel);
-        return reportTypeFunctionGroupRel.getId();
-    }
-
-    /**
-     * 如果某些字段没有赋值,使用默认的值
-     *
-     * @param reportTypeFunctionGroupRel 报告类型实体
-     * @author lixing
-     * @version V1.0 2021/3/12 12:29 下午
-     */
-    private void setDefaultValue(ReportTypeFunctionGroupRel reportTypeFunctionGroupRel) {
-        reportTypeFunctionGroupRel.setCreator(AppContext.getContext().getAccountId());
-        
-
-    }
-
-    /**
-     * 报告类型详情
-     *
-     * @param id 主键
-     * @return 部门do类
-     * @author lixing
-     * @version V1.0 2021-05-24 16:02:14
-     */
-    @Override
-    public ReportTypeFunctionGroupRel queryReportTypeFunctionGroupRelDetail(String id) {
-        ReportTypeFunctionGroupRel reportTypeFunctionGroupRel = getById(id);
-        if (reportTypeFunctionGroupRel == null) {
-            throw new IllegalArgumentException("查看ReportTypeFunctionGroupRel详情时发生异常,找不到要查看的记录,id=" + id);
-        }
-        return reportTypeFunctionGroupRel;
-    }
-
-    /**
-     * 更新报告类型
-     *
-     * @author lixing
-     * @version V1.0 2021-05-24 16:02:14
-     */
-    @Override
-    public void updateReportTypeFunctionGroupRel(UpdateReportTypeFunctionGroupRelDTO updateReportTypeFunctionGroupRelDTO) {
-        ReportTypeFunctionGroupRel reportTypeFunctionGroupRel = getById(updateReportTypeFunctionGroupRelDTO.getId());
-        reportTypeFunctionGroupRel = ConvertReportTypeFunctionGroupRelTool.INSTANCE.convertUpdateDto2Entity(reportTypeFunctionGroupRel, updateReportTypeFunctionGroupRelDTO);
-        reportTypeFunctionGroupRel.setModifier(AppContext.getContext().getAccountId());
-        updateById(reportTypeFunctionGroupRel);
-    }
-
-    /**
-     * 校验报告类型是否可删除
-     *
-     * @param id 报告类型主键
-     * @return 报告类型do类
-     * @author lixing
-     * @version V1.0 2021-05-24 16:02:14
-     */
-    public ReportTypeFunctionGroupRel checkDeletable(String id) {
-        if (id == null) {
-            throw new IllegalArgumentException("删除ReportTypeFunctionGroupRel时发生异常,主键为空");
-        }
-
-        ReportTypeFunctionGroupRel reportTypeFunctionGroupRel = getById(id);
-
-        if (reportTypeFunctionGroupRel == null) {
-            throw new IllegalArgumentException("删除ReportTypeFunctionGroupRel时发生异常,找不到要删除的数据,id:" + id);
-        }
-
-        return reportTypeFunctionGroupRel;
-    }
-
-    /**
-     * 删除报告类型
-     *
-     * @param id 主键
-     * @author lixing
-     * @version V1.0 2021-05-24 16:02:14
-     */
-    @Override
-    public void deleteReportTypeFunctionGroupRel(String id) {
-        // 校验是否可删除
-        ReportTypeFunctionGroupRel reportTypeFunctionGroupRel = checkDeletable(id);
-
-        reportTypeFunctionGroupRel.setValid(ValidEnum.FALSE.getType());
-        updateById(reportTypeFunctionGroupRel);
-    }
-
-    /**
-     * 查询报告类型
-     *
-     * @return List<ReportTypeFunctionGroupRel>
-     * @author lixing
-     * @version V1.0 2021-05-24 16:02:14
-     */
-    @Override
-    public List<ReportTypeFunctionGroupRel> queryReportTypeFunctionGroupRelList(QueryReportTypeFunctionGroupRelDTO queryReportTypeFunctionGroupRelDTO) {
-        QueryWrapper<ReportTypeFunctionGroupRel> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq(ReportTypeFunctionGroupRel.PROP_VALID, ValidEnum.TRUE.getType());
-        // 默认按创建时间倒序排序
-        queryWrapper.orderBy(true, true, ReportTypeFunctionGroupRel.PROP_CREATIONTIME);
-
-        if (queryReportTypeFunctionGroupRelDTO != null) {
-
-            if (StringUtils.isNotEmpty(queryReportTypeFunctionGroupRelDTO.getReportTypeId())) {
-                queryWrapper.eq(ReportTypeFunctionGroupRel.PROP_REPORT_TYPE_ID, queryReportTypeFunctionGroupRelDTO.getReportTypeId());
-            }
-
-            if (StringUtils.isNotEmpty(queryReportTypeFunctionGroupRelDTO.getFunctionGroupId())) {
-                queryWrapper.eq(ReportTypeFunctionGroupRel.PROP_FUNCTION_GROUP_ID, queryReportTypeFunctionGroupRelDTO.getFunctionGroupId());
-            }
-
-            if (StringUtils.isNotEmpty(queryReportTypeFunctionGroupRelDTO.getBelongParagraph())) {
-                queryWrapper.eq(ReportTypeFunctionGroupRel.PROP_BELONG_PARAGRAPH, queryReportTypeFunctionGroupRelDTO.getBelongParagraph());
-            }
-
-        }
-
-        return list(queryWrapper);
-    }
-
-    /**
-     * 分页查询报告类型
-     *
-     * @return IPage<ReportTypeFunctionGroupRel>
-     * @author lixing
-     * @version V1.0 2021-05-24 16:02:14
-     */
-    @Override
-    public IPage<ReportTypeFunctionGroupRel> pageQueryReportTypeFunctionGroupRel(PageQueryReportTypeFunctionGroupRelDTO pageQueryReportTypeFunctionGroupRelDTO) {
-        QueryWrapper<ReportTypeFunctionGroupRel> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq(ReportTypeFunctionGroupRel.PROP_VALID, ValidEnum.TRUE.getType());
-        // 这里认为pageQueryDTO是经过校验的,肯定包含分页信息
-        IPage<ReportTypeFunctionGroupRel> pageParam = new Page<>(pageQueryReportTypeFunctionGroupRelDTO.getPage(), pageQueryReportTypeFunctionGroupRelDTO.getSize(), true);
-        // 排序信息
-        if (CollectionUtils.isEmpty(pageQueryReportTypeFunctionGroupRelDTO.getOrders())) {
-            // 默认按创建时间倒序排序
-            queryWrapper.orderBy(true, false, ReportTypeFunctionGroupRel.PROP_CREATIONTIME);
-        } else {
-            List<Sort> orders = pageQueryReportTypeFunctionGroupRelDTO.getOrders();
-            for (Sort sort : orders) {
-                // 将驼峰转换为下划线格式
-                sort.setColumn(CaseFormat.LOWER_CAMEL.to(CaseFormat.LOWER_UNDERSCORE, sort.getColumn()));
-                queryWrapper.orderBy(true, sort.isAsc(), sort.getColumn());
-            }
-        }
-
-        
-        if (StringUtils.isNotEmpty(pageQueryReportTypeFunctionGroupRelDTO.getReportTypeId())) {
-            queryWrapper.like(ReportTypeFunctionGroupRel.PROP_REPORT_TYPE_ID, pageQueryReportTypeFunctionGroupRelDTO.getReportTypeId());
-        }
-
-        
-        if (StringUtils.isNotEmpty(pageQueryReportTypeFunctionGroupRelDTO.getFunctionGroupId())) {
-            queryWrapper.like(ReportTypeFunctionGroupRel.PROP_FUNCTION_GROUP_ID, pageQueryReportTypeFunctionGroupRelDTO.getFunctionGroupId());
-        }
-
-        
-        if (StringUtils.isNotEmpty(pageQueryReportTypeFunctionGroupRelDTO.getBelongParagraph())) {
-            queryWrapper.like(ReportTypeFunctionGroupRel.PROP_BELONG_PARAGRAPH, pageQueryReportTypeFunctionGroupRelDTO.getBelongParagraph());
-        }
-
-        return getBaseMapper().selectPage(pageParam, queryWrapper);
-    }
-}

+ 0 - 101
src/main/java/com/persagy/apm/report/config/rel/typestatisticsitem/controller/ReportTypeStatisticsItemRelController.java

@@ -1,101 +0,0 @@
-package com.persagy.apm.report.config.rel.typestatisticsitem.controller;
-
-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.report.config.rel.typestatisticsitem.model.ConvertReportTypeStatisticsItemRelTool;
-import com.persagy.apm.report.config.rel.typestatisticsitem.model.ReportTypeStatisticsItemRel;
-import com.persagy.apm.report.config.rel.typestatisticsitem.model.dto.*;
-import com.persagy.apm.report.config.rel.typestatisticsitem.model.vo.ResponseReportTypeStatisticsItemRelItemVO;
-import com.persagy.apm.report.config.rel.typestatisticsitem.model.vo.ResponseReportTypeStatisticsItemRelListItemVO;
-import com.persagy.apm.report.config.rel.typestatisticsitem.service.IReportTypeStatisticsItemRelService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-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 springfox.documentation.annotations.ApiIgnore;
-
-import javax.validation.Valid;
-import java.util.List;
-
-/**
- * 报告类型和统计条目关联关系控制层
- *
- * @author lixing
- * @version V1.0 2021-05-20 19:20:19
- */
-@ApiIgnore
-@Api(tags = "报告类型和统计条目关联关系", hidden = true)
-@Validated
-@RestController
-@RequestMapping("reportTypeStatisticsItemRels")
-public class ReportTypeStatisticsItemRelController {
-    @Autowired
-    private IReportTypeStatisticsItemRelService reportTypeStatisticsItemRelService;
-
-    @ApiOperation(value = "创建报告类型和统计条目关联关系")
-    @PostMapping("/create")
-    public CommonResult<ApmResponseUpsertVO> createReportTypeStatisticsItemRel(
-            @Valid @RequestBody AddReportTypeStatisticsItemRelDTO addReportTypeStatisticsItemRelDTO) {
-        String id = reportTypeStatisticsItemRelService.createReportTypeStatisticsItemRel(addReportTypeStatisticsItemRelDTO);
-        return ResultHelper.single(new ApmResponseUpsertVO(id));
-    }
-
-    @ApiOperation(value = "报告类型和统计条目关联关系详情")
-    @PostMapping("/get")
-    public CommonResult<ResponseReportTypeStatisticsItemRelItemVO> queryReportTypeStatisticsItemRelDetail(
-            @Valid @RequestBody QueryReportTypeStatisticsItemRelDetailDTO queryReportTypeStatisticsItemRelDetailDTO) {
-        ReportTypeStatisticsItemRel reportTypeStatisticsItemRel = reportTypeStatisticsItemRelService.queryReportTypeStatisticsItemRelDetail(queryReportTypeStatisticsItemRelDetailDTO.getId());
-        ResponseReportTypeStatisticsItemRelItemVO responseReportTypeStatisticsItemRelItemVO = ConvertReportTypeStatisticsItemRelTool.INSTANCE.convert2ResponseItemDTO(reportTypeStatisticsItemRel);
-        return ResultHelper.single(responseReportTypeStatisticsItemRelItemVO);
-    }
-
-
-    @ApiOperation(value = "更新报告类型和统计条目关联关系")
-    @PostMapping("/update")
-    public CommonResult<ApmResponseUpsertVO> updateReportTypeStatisticsItemRel(
-            @Valid @RequestBody UpdateReportTypeStatisticsItemRelDTO updateReportTypeStatisticsItemRelDTO) {
-        reportTypeStatisticsItemRelService.updateReportTypeStatisticsItemRel(updateReportTypeStatisticsItemRelDTO);
-        return ResultHelper.single(new ApmResponseUpsertVO(updateReportTypeStatisticsItemRelDTO.getId()));
-    }
-
-
-    @ApiOperation(value = "删除报告类型和统计条目关联关系")
-    @PostMapping("/delete")
-    public CommonResult deleteReportTypeStatisticsItemRel(
-            @RequestBody @Valid DeleteReportTypeStatisticsItemRelDTO deleteReportTypeStatisticsItemRelDTO) {
-        reportTypeStatisticsItemRelService.deleteReportTypeStatisticsItemRel(deleteReportTypeStatisticsItemRelDTO.getId());
-        return ResultHelper.success();
-    }
-
-
-    @ApiOperation(value = "报告类型和统计条目关联关系列表")
-    @PostMapping("/query")
-    public CommonResult<PageList<ResponseReportTypeStatisticsItemRelListItemVO>> queryReportTypeStatisticsItemRel(
-            @Valid @RequestBody QueryReportTypeStatisticsItemRelDTO queryReportTypeStatisticsItemRelDTO) {
-        List<ReportTypeStatisticsItemRel> reportTypeStatisticsItemRelList = reportTypeStatisticsItemRelService.queryReportTypeStatisticsItemRelList(queryReportTypeStatisticsItemRelDTO);
-        List<ResponseReportTypeStatisticsItemRelListItemVO> resultList = ConvertReportTypeStatisticsItemRelTool.INSTANCE.convert2List(reportTypeStatisticsItemRelList);
-        return ResultHelper.multi(resultList);
-    }
-
-    //@ApiOperation(value = "报告类型和统计条目关联关系列表, 分页查询")
-    //@PostMapping("/query")
-    //public CommonResult<PageList<ResponseReportTypeStatisticsItemRelListItemVO>> queryReportTypeStatisticsItemRel(
-    //        @Valid @RequestBody PageQueryReportTypeStatisticsItemRelDTO pageQueryReportTypeStatisticsItemRelDTO) {
-    //    IPage<ReportTypeStatisticsItemRel> pagedList = reportTypeStatisticsItemRelService.pageQueryReportTypeStatisticsItemRel(pageQueryReportTypeStatisticsItemRelDTO);
-    //    IPage<ResponseReportTypeStatisticsItemRelListItemVO> pagedResultList = pagedList.convert(item -> {
-    //        try {
-    //           return ConvertReportTypeStatisticsItemRelTool.INSTANCE.convert2ResponseListItemDTO(item);
-    //        } catch (Exception e) {
-    //            throw new IllegalArgumentException("分页查询,ReportTypeStatisticsItemRel实体类转换为列表对象发生异常", e);
-    //        }
-    //    });
-    //    return ResultHelper.multi(pagedResultList);
-    //}
-}
-

+ 0 - 16
src/main/java/com/persagy/apm/report/config/rel/typestatisticsitem/dao/ReportTypeStatisticsItemRelMapper.java

@@ -1,16 +0,0 @@
-package com.persagy.apm.report.config.rel.typestatisticsitem.dao;
-
-import com.persagy.apm.report.config.rel.typestatisticsitem.model.ReportTypeStatisticsItemRel;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Mapper;
-
-/**
- * 报告类型和统计条目关联关系(ReportTypeStatisticsItemRel)dao层
- *
- * @author lixing
- * @version V1.0 2021-05-20 19:20:21
- */
-@Mapper
-public interface ReportTypeStatisticsItemRelMapper extends BaseMapper<ReportTypeStatisticsItemRel> {
-
-}

+ 0 - 78
src/main/java/com/persagy/apm/report/config/rel/typestatisticsitem/model/ConvertReportTypeStatisticsItemRelTool.java

@@ -1,78 +0,0 @@
-package com.persagy.apm.report.config.rel.typestatisticsitem.model;
-
-import com.persagy.apm.report.config.rel.typestatisticsitem.model.dto.AddReportTypeStatisticsItemRelDTO;
-import com.persagy.apm.report.config.rel.typestatisticsitem.model.dto.UpdateReportTypeStatisticsItemRelDTO;
-import com.persagy.apm.report.config.rel.typestatisticsitem.model.vo.ResponseReportTypeStatisticsItemRelItemVO;
-import com.persagy.apm.report.config.rel.typestatisticsitem.model.vo.ResponseReportTypeStatisticsItemRelListItemVO;
-import org.mapstruct.Mapper;
-import org.mapstruct.MappingTarget;
-import org.mapstruct.NullValueCheckStrategy;
-import org.mapstruct.NullValueMappingStrategy;
-import org.mapstruct.factory.Mappers;
-
-import java.util.List;
-
-/**
- * 报告类型和统计条目关联关系(ReportTypeStatisticsItemRel) dto、vo、do转换工具类
- *
- * @author lixing
- * @version V1.0 2021-05-20 19:20:23 2021-05-20 19:20:23
- */
-@Mapper(nullValueMappingStrategy = NullValueMappingStrategy.RETURN_DEFAULT,
-        nullValueCheckStrategy = NullValueCheckStrategy.ALWAYS)
-public interface ConvertReportTypeStatisticsItemRelTool {
-
-    ConvertReportTypeStatisticsItemRelTool INSTANCE = Mappers.getMapper(ConvertReportTypeStatisticsItemRelTool.class);
-
-    /**
-     * do转换为ResponseItemVO
-     *
-     * @param reportTypeStatisticsItemRel do对象
-     * @return ResponseItemVO
-     * @author lixing
-     * @version V1.0 2021-05-20 19:20:23
-     */
-    ResponseReportTypeStatisticsItemRelItemVO convert2ResponseItemDTO(ReportTypeStatisticsItemRel reportTypeStatisticsItemRel);
-
-    /**
-     * do转换为ResponseListItemVO
-     *
-     * @param reportTypeStatisticsItemRel do对象
-     * @return ResponseListItemVO
-     * @author lixing
-     * @version V1.0 2021-05-20 19:20:23
-     */
-    ResponseReportTypeStatisticsItemRelListItemVO convert2ResponseListItemDTO(ReportTypeStatisticsItemRel reportTypeStatisticsItemRel);
-
-    /**
-     * do列表转换为ResponseListItemVO列表
-     *
-     * @param reportTypeStatisticsItemRelList do列表
-     * @return ResponseListItemVO列表
-     * @author lixing
-     * @version V1.0 2021-05-20 19:20:23
-     */
-    List<ResponseReportTypeStatisticsItemRelListItemVO> convert2List(List<ReportTypeStatisticsItemRel> reportTypeStatisticsItemRelList);
-
-    /**
-     * addDTO转换为do
-     *
-     * @param addReportTypeStatisticsItemRelDTO addDTO
-     * @return 要创建的do对象
-     * @author lixing
-     * @version V1.0 2021-05-20 19:20:23
-     */
-    ReportTypeStatisticsItemRel convertAddDto2Entity(AddReportTypeStatisticsItemRelDTO addReportTypeStatisticsItemRelDTO);
-
-    /**
-     * updateDTO转换为实体
-     *
-     * @param reportTypeStatisticsItemRel          更新前的do对象
-     * @param updateReportTypeStatisticsItemRelDTO updateDTO
-     * @return 更新后的do对象
-     * @author lixing
-     * @version V1.0 2021-05-20 19:20:23
-     */
-    ReportTypeStatisticsItemRel convertUpdateDto2Entity(@MappingTarget ReportTypeStatisticsItemRel reportTypeStatisticsItemRel, UpdateReportTypeStatisticsItemRelDTO updateReportTypeStatisticsItemRelDTO);
-}
-

+ 0 - 33
src/main/java/com/persagy/apm/report/config/rel/typestatisticsitem/model/ReportTypeStatisticsItemRel.java

@@ -1,33 +0,0 @@
-package com.persagy.apm.report.config.rel.typestatisticsitem.model;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import com.persagy.apm.common.model.entity.AuditableEntity;
-
-import java.io.Serializable;
-
-/**
- * 报告类型和统计条目关联关系(ReportTypeStatisticsItemRel)实体类
- *
- * @author lixing
- * @version V1.0 2021-05-20 19:20:21
- */
-@EqualsAndHashCode(callSuper = true)
-@Data
-@ApiModel(description = "报告类型和统计条目关联关系")
-public class ReportTypeStatisticsItemRel extends AuditableEntity<ReportTypeStatisticsItemRel> implements Serializable {
-    private static final long serialVersionUID = -21196831096124914L;
-
-    @ApiModelProperty("报告类型id")
-    private String reportTypeId;
-
-    @ApiModelProperty("统计条目id")
-    private String statisticsItemId;
-
-
-    public static String PROP_REPORT_TYPE_ID = "report_type_id";
-    public static String PROP_STATISTICS_ITEM_ID = "statistics_item_id";
-
-}

+ 0 - 27
src/main/java/com/persagy/apm/report/config/rel/typestatisticsitem/model/dto/AddReportTypeStatisticsItemRelDTO.java

@@ -1,27 +0,0 @@
-package com.persagy.apm.report.config.rel.typestatisticsitem.model.dto;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-
-import javax.validation.constraints.NotNull;
-
-import lombok.Data;
-
-import java.util.Date;
-
-/**
- * @author lixing
- * @version V1.0 2021-05-20 19:20:21
- */
-@Data
-@ApiModel(value = "创建报告类型和统计条目关联关系入参")
-public class AddReportTypeStatisticsItemRelDTO {
-    @ApiModelProperty(value = "报告类型id", required = true)
-    @NotNull(message = "报告类型id不能为空") 
-    private String reportTypeId;
-
-    @ApiModelProperty(value = "统计条目id", required = true)
-    @NotNull(message = "统计条目id不能为空") 
-    private String statisticsItemId;
-
-}

+ 0 - 20
src/main/java/com/persagy/apm/report/config/rel/typestatisticsitem/model/dto/DeleteReportTypeStatisticsItemRelDTO.java

@@ -1,20 +0,0 @@
-package com.persagy.apm.report.config.rel.typestatisticsitem.model.dto;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import javax.validation.constraints.NotNull;
-
-/**
- * @author lixing
- * @version V1.0 2021-05-20 19:20:23
- */
-@Data
-@ApiModel(value = "删除报告类型和统计条目关联关系入参")
-public class DeleteReportTypeStatisticsItemRelDTO {
-    @NotNull(message = "id不能为空")
-    @ApiModelProperty(value = "主键", required = true)
-    private String id;
-
-}

+ 0 - 29
src/main/java/com/persagy/apm/report/config/rel/typestatisticsitem/model/dto/PageQueryReportTypeStatisticsItemRelDTO.java

@@ -1,29 +0,0 @@
-package com.persagy.apm.report.config.rel.typestatisticsitem.model.dto;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-
-import java.util.Date;
-
-import com.persagy.apm.common.model.dto.PageDTO;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * @author lixing
- * @version V1.0 2021-05-20 19:20:23
- */
-@EqualsAndHashCode(callSuper = true)
-@Data
-@ApiModel(value = "分页查询报告类型和统计条目关联关系入参")
-public class PageQueryReportTypeStatisticsItemRelDTO extends PageDTO {
-    @ApiModelProperty(value = "主键", required = true)
-    private String id;
-
-    @ApiModelProperty(value = "报告类型id", required = true)
-    private String reportTypeId;
-
-    @ApiModelProperty(value = "统计条目id", required = true)
-    private String statisticsItemId;
-
-}

+ 0 - 22
src/main/java/com/persagy/apm/report/config/rel/typestatisticsitem/model/dto/QueryReportTypeStatisticsItemRelDTO.java

@@ -1,22 +0,0 @@
-package com.persagy.apm.report.config.rel.typestatisticsitem.model.dto;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.util.Date;
-
-/**
- * @author lixing
- * @version V1.0 2021-05-20 19:20:23
- */
-@Data
-@ApiModel(value = "查询报告类型和统计条目关联关系入参")
-public class QueryReportTypeStatisticsItemRelDTO {
-    @ApiModelProperty(value = "报告类型id", required = true)
-    private String reportTypeId;
-
-    @ApiModelProperty(value = "统计条目id", required = true)
-    private String statisticsItemId;
-
-}

+ 0 - 20
src/main/java/com/persagy/apm/report/config/rel/typestatisticsitem/model/dto/QueryReportTypeStatisticsItemRelDetailDTO.java

@@ -1,20 +0,0 @@
-package com.persagy.apm.report.config.rel.typestatisticsitem.model.dto;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import javax.validation.constraints.NotNull;
-
-/**
- * @author lixing
- * @version V1.0 2021-05-20 19:20:22
- */
-@Data
-@ApiModel(value = "获取报告类型和统计条目关联关系详情入参")
-public class QueryReportTypeStatisticsItemRelDetailDTO {
-    @NotNull(message = "主键不能为空")
-    @ApiModelProperty(value = "主键", required = true)
-    private String id;
-
-}

+ 0 - 31
src/main/java/com/persagy/apm/report/config/rel/typestatisticsitem/model/dto/UpdateReportTypeStatisticsItemRelDTO.java

@@ -1,31 +0,0 @@
-package com.persagy.apm.report.config.rel.typestatisticsitem.model.dto;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-
-import javax.validation.constraints.NotNull;
-
-import lombok.Data;
-
-import java.util.Date;
-
-/**
- * @author lixing
- * @version V1.0 2021-05-20 19:20:22
- */
-@Data
-@ApiModel(value = "更新报告类型和统计条目关联关系入参")
-public class UpdateReportTypeStatisticsItemRelDTO {
-    @ApiModelProperty(value = "主键", required = true)
-    @NotNull(message = "主键不能为空") 
-    private String id;
-
-    @ApiModelProperty(value = "报告类型id", required = true)
-    @NotNull(message = "报告类型id不能为空") 
-    private String reportTypeId;
-
-    @ApiModelProperty(value = "统计条目id", required = true)
-    @NotNull(message = "统计条目id不能为空") 
-    private String statisticsItemId;
-
-}

+ 0 - 77
src/main/java/com/persagy/apm/report/config/rel/typestatisticsitem/service/IReportTypeStatisticsItemRelService.java

@@ -1,77 +0,0 @@
-package com.persagy.apm.report.config.rel.typestatisticsitem.service;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.persagy.apm.report.config.rel.typestatisticsitem.model.ReportTypeStatisticsItemRel;
-import com.persagy.apm.report.config.rel.typestatisticsitem.model.dto.AddReportTypeStatisticsItemRelDTO;
-import com.persagy.apm.report.config.rel.typestatisticsitem.model.dto.PageQueryReportTypeStatisticsItemRelDTO;
-import com.persagy.apm.report.config.rel.typestatisticsitem.model.dto.QueryReportTypeStatisticsItemRelDTO;
-import com.persagy.apm.report.config.rel.typestatisticsitem.model.dto.UpdateReportTypeStatisticsItemRelDTO;
-
-import java.util.List;
-
-/**
- * 报告类型和统计条目关联关系(ReportTypeStatisticsItemRel) service接口
- *
- * @author lixing
- * @version V1.0 2021-05-20 19:20:20
- */
-public interface IReportTypeStatisticsItemRelService {
-
-    /**
-     * 创建报告类型和统计条目关联关系
-     *
-     * @param addReportTypeStatisticsItemRelDTO addDTO
-     * @return 报告类型和统计条目关联关系主键
-     * @author lixing
-     * @version V1.0 2021-05-20 19:20:20
-     */
-    String createReportTypeStatisticsItemRel(AddReportTypeStatisticsItemRelDTO addReportTypeStatisticsItemRelDTO);
-
-    /**
-     * 报告类型和统计条目关联关系详情
-     *
-     * @param id 主键
-     * @return 报告类型和统计条目关联关系do对象
-     * @author lixing
-     * @version V1.0 2021-05-20 19:20:20
-     */
-    ReportTypeStatisticsItemRel queryReportTypeStatisticsItemRelDetail(String id);
-
-    /**
-     * 更新报告类型和统计条目关联关系
-     *
-     * @param updateReportTypeStatisticsItemRelDTO updateDTO
-     * @author lixing
-     * @version V1.0 2021-05-20 19:20:20
-     */
-    void updateReportTypeStatisticsItemRel(UpdateReportTypeStatisticsItemRelDTO updateReportTypeStatisticsItemRelDTO);
-
-    /**
-     * 删除报告类型和统计条目关联关系
-     *
-     * @param id 主键
-     * @author lixing
-     * @version V1.0 2021-05-20 19:20:20
-     */
-    void deleteReportTypeStatisticsItemRel(String id);
-
-    /**
-     * 查询报告类型和统计条目关联关系
-     *
-     * @param queryReportTypeStatisticsItemRelDTO queryDTO
-     * @return List<ReportTypeStatisticsItemRel>
-     * @author lixing
-     * @version V1.0 2021-05-20 19:20:20
-     */
-    List<ReportTypeStatisticsItemRel> queryReportTypeStatisticsItemRelList(QueryReportTypeStatisticsItemRelDTO queryReportTypeStatisticsItemRelDTO);
-
-    /**
-     * 分页查询报告类型和统计条目关联关系
-     *
-     * @param pageQueryReportTypeStatisticsItemRelDTO pageQueryDTO
-     * @return IPage<ReportTypeStatisticsItemRel>
-     * @author lixing
-     * @version V1.0 2021-05-20 19:20:20
-     */
-    IPage<ReportTypeStatisticsItemRel> pageQueryReportTypeStatisticsItemRel(PageQueryReportTypeStatisticsItemRelDTO pageQueryReportTypeStatisticsItemRelDTO);
-}

+ 0 - 202
src/main/java/com/persagy/apm/report/config/rel/typestatisticsitem/service/impl/ReportTypeStatisticsItemRelServiceImpl.java

@@ -1,202 +0,0 @@
-package com.persagy.apm.report.config.rel.typestatisticsitem.service.impl;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.google.common.base.CaseFormat;
-import com.persagy.apm.common.constant.enums.ValidEnum;
-import com.persagy.apm.common.context.AppContext;
-import com.persagy.apm.common.model.dto.Sort;
-import com.persagy.apm.report.config.rel.typestatisticsitem.dao.ReportTypeStatisticsItemRelMapper;
-import com.persagy.apm.report.config.rel.typestatisticsitem.model.ConvertReportTypeStatisticsItemRelTool;
-import com.persagy.apm.report.config.rel.typestatisticsitem.model.ReportTypeStatisticsItemRel;
-import com.persagy.apm.report.config.rel.typestatisticsitem.model.dto.AddReportTypeStatisticsItemRelDTO;
-import com.persagy.apm.report.config.rel.typestatisticsitem.model.dto.PageQueryReportTypeStatisticsItemRelDTO;
-import com.persagy.apm.report.config.rel.typestatisticsitem.model.dto.QueryReportTypeStatisticsItemRelDTO;
-import com.persagy.apm.report.config.rel.typestatisticsitem.model.dto.UpdateReportTypeStatisticsItemRelDTO;
-import com.persagy.apm.report.config.rel.typestatisticsitem.service.IReportTypeStatisticsItemRelService;
-import org.apache.commons.lang.StringUtils;
-import org.springframework.stereotype.Service;
-import org.springframework.util.CollectionUtils;
-
-import java.util.List;
-
-/**
- * 报告类型和统计条目关联关系(ReportTypeStatisticsItemRel) service层
- *
- * @author lixing
- * @version V1.0 2021-05-20 19:20:20
- */
-@Service
-public class ReportTypeStatisticsItemRelServiceImpl extends ServiceImpl<ReportTypeStatisticsItemRelMapper, ReportTypeStatisticsItemRel>
-        implements IReportTypeStatisticsItemRelService {
-
-    /**
-     * 创建报告类型和统计条目关联关系
-     *
-     * @return 报告类型和统计条目关联关系主键
-     * @author lixing
-     * @version V1.0 2021-05-20 19:20:20
-     */
-    @Override
-    public String createReportTypeStatisticsItemRel(AddReportTypeStatisticsItemRelDTO addReportTypeStatisticsItemRelDTO) {
-        ReportTypeStatisticsItemRel reportTypeStatisticsItemRel = ConvertReportTypeStatisticsItemRelTool.INSTANCE.convertAddDto2Entity(addReportTypeStatisticsItemRelDTO);
-        // 设置默认值
-        setDefaultValue(reportTypeStatisticsItemRel);
-        save(reportTypeStatisticsItemRel);
-        return reportTypeStatisticsItemRel.getId();
-    }
-
-    /**
-     * 如果某些字段没有赋值,使用默认的值
-     *
-     * @param reportTypeStatisticsItemRel 报告类型和统计条目关联关系实体
-     * @author lixing
-     * @version V1.0 2021/3/12 12:29 下午
-     */
-    private void setDefaultValue(ReportTypeStatisticsItemRel reportTypeStatisticsItemRel) {
-        reportTypeStatisticsItemRel.setCreator(AppContext.getContext().getAccountId());
-        
-
-    }
-
-    /**
-     * 报告类型和统计条目关联关系详情
-     *
-     * @param id 主键
-     * @return 部门do类
-     * @author lixing
-     * @version V1.0 2021-05-20 19:20:20
-     */
-    @Override
-    public ReportTypeStatisticsItemRel queryReportTypeStatisticsItemRelDetail(String id) {
-        ReportTypeStatisticsItemRel reportTypeStatisticsItemRel = getById(id);
-        if (reportTypeStatisticsItemRel == null) {
-            throw new IllegalArgumentException("查看ReportTypeStatisticsItemRel详情时发生异常,找不到要查看的记录,id=" + id);
-        }
-        return reportTypeStatisticsItemRel;
-    }
-
-    /**
-     * 更新报告类型和统计条目关联关系
-     *
-     * @author lixing
-     * @version V1.0 2021-05-20 19:20:20
-     */
-    @Override
-    public void updateReportTypeStatisticsItemRel(UpdateReportTypeStatisticsItemRelDTO updateReportTypeStatisticsItemRelDTO) {
-        ReportTypeStatisticsItemRel reportTypeStatisticsItemRel = getById(updateReportTypeStatisticsItemRelDTO.getId());
-        reportTypeStatisticsItemRel = ConvertReportTypeStatisticsItemRelTool.INSTANCE.convertUpdateDto2Entity(reportTypeStatisticsItemRel, updateReportTypeStatisticsItemRelDTO);
-        reportTypeStatisticsItemRel.setModifier(AppContext.getContext().getAccountId());
-        updateById(reportTypeStatisticsItemRel);
-    }
-
-    /**
-     * 校验报告类型和统计条目关联关系是否可删除
-     *
-     * @param id 报告类型和统计条目关联关系主键
-     * @return 报告类型和统计条目关联关系do类
-     * @author lixing
-     * @version V1.0 2021-05-20 19:20:20
-     */
-    public ReportTypeStatisticsItemRel checkDeletable(String id) {
-        if (id == null) {
-            throw new IllegalArgumentException("删除ReportTypeStatisticsItemRel时发生异常,主键为空");
-        }
-
-        ReportTypeStatisticsItemRel reportTypeStatisticsItemRel = getById(id);
-
-        if (reportTypeStatisticsItemRel == null) {
-            throw new IllegalArgumentException("删除ReportTypeStatisticsItemRel时发生异常,找不到要删除的数据,id:" + id);
-        }
-
-        return reportTypeStatisticsItemRel;
-    }
-
-    /**
-     * 删除报告类型和统计条目关联关系
-     *
-     * @param id 主键
-     * @author lixing
-     * @version V1.0 2021-05-20 19:20:20
-     */
-    @Override
-    public void deleteReportTypeStatisticsItemRel(String id) {
-        // 校验是否可删除
-        ReportTypeStatisticsItemRel reportTypeStatisticsItemRel = checkDeletable(id);
-
-        reportTypeStatisticsItemRel.setValid(ValidEnum.FALSE.getType());
-        updateById(reportTypeStatisticsItemRel);
-    }
-
-    /**
-     * 查询报告类型和统计条目关联关系
-     *
-     * @return List<ReportTypeStatisticsItemRel>
-     * @author lixing
-     * @version V1.0 2021-05-20 19:20:20
-     */
-    @Override
-    public List<ReportTypeStatisticsItemRel> queryReportTypeStatisticsItemRelList(QueryReportTypeStatisticsItemRelDTO queryReportTypeStatisticsItemRelDTO) {
-        QueryWrapper<ReportTypeStatisticsItemRel> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq(ReportTypeStatisticsItemRel.PROP_VALID, ValidEnum.TRUE.getType());
-        // 默认按创建时间倒序排序
-        queryWrapper.orderBy(true, false, ReportTypeStatisticsItemRel.PROP_CREATIONTIME);
-
-        if (queryReportTypeStatisticsItemRelDTO != null) {
-
-            
-            if (StringUtils.isNotEmpty(queryReportTypeStatisticsItemRelDTO.getReportTypeId())) {
-                queryWrapper.like(ReportTypeStatisticsItemRel.PROP_REPORT_TYPE_ID, queryReportTypeStatisticsItemRelDTO.getReportTypeId());
-            }
-
-            
-            if (StringUtils.isNotEmpty(queryReportTypeStatisticsItemRelDTO.getStatisticsItemId())) {
-                queryWrapper.like(ReportTypeStatisticsItemRel.PROP_STATISTICS_ITEM_ID, queryReportTypeStatisticsItemRelDTO.getStatisticsItemId());
-            }
-
-        }
-
-        return list(queryWrapper);
-    }
-
-    /**
-     * 分页查询报告类型和统计条目关联关系
-     *
-     * @return IPage<ReportTypeStatisticsItemRel>
-     * @author lixing
-     * @version V1.0 2021-05-20 19:20:20
-     */
-    @Override
-    public IPage<ReportTypeStatisticsItemRel> pageQueryReportTypeStatisticsItemRel(PageQueryReportTypeStatisticsItemRelDTO pageQueryReportTypeStatisticsItemRelDTO) {
-        QueryWrapper<ReportTypeStatisticsItemRel> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq(ReportTypeStatisticsItemRel.PROP_VALID, ValidEnum.TRUE.getType());
-        // 这里认为pageQueryDTO是经过校验的,肯定包含分页信息
-        IPage<ReportTypeStatisticsItemRel> pageParam = new Page<>(pageQueryReportTypeStatisticsItemRelDTO.getPage(), pageQueryReportTypeStatisticsItemRelDTO.getSize(), true);
-        // 排序信息
-        if (CollectionUtils.isEmpty(pageQueryReportTypeStatisticsItemRelDTO.getOrders())) {
-            // 默认按创建时间倒序排序
-            queryWrapper.orderBy(true, false, ReportTypeStatisticsItemRel.PROP_CREATIONTIME);
-        } else {
-            List<Sort> orders = pageQueryReportTypeStatisticsItemRelDTO.getOrders();
-            for (Sort sort : orders) {
-                // 将驼峰转换为下划线格式
-                sort.setColumn(CaseFormat.LOWER_CAMEL.to(CaseFormat.LOWER_UNDERSCORE, sort.getColumn()));
-                queryWrapper.orderBy(true, sort.isAsc(), sort.getColumn());
-            }
-        }
-
-        
-        if (StringUtils.isNotEmpty(pageQueryReportTypeStatisticsItemRelDTO.getReportTypeId())) {
-            queryWrapper.like(ReportTypeStatisticsItemRel.PROP_REPORT_TYPE_ID, pageQueryReportTypeStatisticsItemRelDTO.getReportTypeId());
-        }
-
-        
-        if (StringUtils.isNotEmpty(pageQueryReportTypeStatisticsItemRelDTO.getStatisticsItemId())) {
-            queryWrapper.like(ReportTypeStatisticsItemRel.PROP_STATISTICS_ITEM_ID, pageQueryReportTypeStatisticsItemRelDTO.getStatisticsItemId());
-        }
-
-        return getBaseMapper().selectPage(pageParam, queryWrapper);
-    }
-}

+ 0 - 101
src/main/java/com/persagy/apm/report/config/statisticsitems/controller/StatisticItemsController.java

@@ -1,101 +0,0 @@
-package com.persagy.apm.report.config.statisticsitems.controller;
-
-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.report.config.statisticsitems.model.ConvertStatisticItemsTool;
-import com.persagy.apm.report.config.statisticsitems.model.StatisticItems;
-import com.persagy.apm.report.config.statisticsitems.model.dto.*;
-import com.persagy.apm.report.config.statisticsitems.model.vo.ResponseStatisticItemsItemVO;
-import com.persagy.apm.report.config.statisticsitems.model.vo.ResponseStatisticItemsListItemVO;
-import com.persagy.apm.report.config.statisticsitems.service.IStatisticItemsService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-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 springfox.documentation.annotations.ApiIgnore;
-
-import javax.validation.Valid;
-import java.util.List;
-
-/**
- * 统计条目控制层
- *
- * @author lixing
- * @version V1.0 2021-05-20 19:21:08
- */
-@ApiIgnore
-@Api(tags = "统计条目", hidden = true)
-@Validated
-@RestController
-@RequestMapping("statisticItemss")
-public class StatisticItemsController {
-    @Autowired
-    private IStatisticItemsService statisticItemsService;
-
-    @ApiOperation(value = "创建统计条目")
-    @PostMapping("/create")
-    public CommonResult<ApmResponseUpsertVO> createStatisticItems(
-            @Valid @RequestBody AddStatisticItemsDTO addStatisticItemsDTO) {
-        String id = statisticItemsService.createStatisticItems(addStatisticItemsDTO);
-        return ResultHelper.single(new ApmResponseUpsertVO(id));
-    }
-
-    @ApiOperation(value = "统计条目详情")
-    @PostMapping("/get")
-    public CommonResult<ResponseStatisticItemsItemVO> queryStatisticItemsDetail(
-            @Valid @RequestBody QueryStatisticItemsDetailDTO queryStatisticItemsDetailDTO) {
-        StatisticItems statisticItems = statisticItemsService.queryStatisticItemsDetail(queryStatisticItemsDetailDTO.getId());
-        ResponseStatisticItemsItemVO responseStatisticItemsItemVO = ConvertStatisticItemsTool.INSTANCE.convert2ResponseItemDTO(statisticItems);
-        return ResultHelper.single(responseStatisticItemsItemVO);
-    }
-
-
-    @ApiOperation(value = "更新统计条目")
-    @PostMapping("/update")
-    public CommonResult<ApmResponseUpsertVO> updateStatisticItems(
-            @Valid @RequestBody UpdateStatisticItemsDTO updateStatisticItemsDTO) {
-        statisticItemsService.updateStatisticItems(updateStatisticItemsDTO);
-        return ResultHelper.single(new ApmResponseUpsertVO(updateStatisticItemsDTO.getId()));
-    }
-
-
-    @ApiOperation(value = "删除统计条目")
-    @PostMapping("/delete")
-    public CommonResult deleteStatisticItems(
-            @RequestBody @Valid DeleteStatisticItemsDTO deleteStatisticItemsDTO) {
-        statisticItemsService.deleteStatisticItems(deleteStatisticItemsDTO.getId());
-        return ResultHelper.success();
-    }
-
-
-    @ApiOperation(value = "统计条目列表")
-    @PostMapping("/query")
-    public CommonResult<PageList<ResponseStatisticItemsListItemVO>> queryStatisticItems(
-            @Valid @RequestBody QueryStatisticItemsDTO queryStatisticItemsDTO) {
-        List<StatisticItems> statisticItemsList = statisticItemsService.queryStatisticItemsList(queryStatisticItemsDTO);
-        List<ResponseStatisticItemsListItemVO> resultList = ConvertStatisticItemsTool.INSTANCE.convert2List(statisticItemsList);
-        return ResultHelper.multi(resultList);
-    }
-
-    //@ApiOperation(value = "统计条目列表, 分页查询")
-    //@PostMapping("/query")
-    //public CommonResult<PageList<ResponseStatisticItemsListItemVO>> queryStatisticItems(
-    //        @Valid @RequestBody PageQueryStatisticItemsDTO pageQueryStatisticItemsDTO) {
-    //    IPage<StatisticItems> pagedList = statisticItemsService.pageQueryStatisticItems(pageQueryStatisticItemsDTO);
-    //    IPage<ResponseStatisticItemsListItemVO> pagedResultList = pagedList.convert(item -> {
-    //        try {
-    //           return ConvertStatisticItemsTool.INSTANCE.convert2ResponseListItemDTO(item);
-    //        } catch (Exception e) {
-    //            throw new IllegalArgumentException("分页查询,StatisticItems实体类转换为列表对象发生异常", e);
-    //        }
-    //    });
-    //    return ResultHelper.multi(pagedResultList);
-    //}
-}
-

+ 0 - 16
src/main/java/com/persagy/apm/report/config/statisticsitems/dao/StatisticItemsMapper.java

@@ -1,16 +0,0 @@
-package com.persagy.apm.report.config.statisticsitems.dao;
-
-import com.persagy.apm.report.config.statisticsitems.model.StatisticItems;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Mapper;
-
-/**
- * 统计条目(StatisticItems)dao层
- *
- * @author lixing
- * @version V1.0 2021-05-20 19:21:09
- */
-@Mapper
-public interface StatisticItemsMapper extends BaseMapper<StatisticItems> {
-
-}

+ 0 - 78
src/main/java/com/persagy/apm/report/config/statisticsitems/model/ConvertStatisticItemsTool.java

@@ -1,78 +0,0 @@
-package com.persagy.apm.report.config.statisticsitems.model;
-
-import com.persagy.apm.report.config.statisticsitems.model.dto.AddStatisticItemsDTO;
-import com.persagy.apm.report.config.statisticsitems.model.dto.UpdateStatisticItemsDTO;
-import com.persagy.apm.report.config.statisticsitems.model.vo.ResponseStatisticItemsItemVO;
-import com.persagy.apm.report.config.statisticsitems.model.vo.ResponseStatisticItemsListItemVO;
-import org.mapstruct.Mapper;
-import org.mapstruct.MappingTarget;
-import org.mapstruct.NullValueCheckStrategy;
-import org.mapstruct.NullValueMappingStrategy;
-import org.mapstruct.factory.Mappers;
-
-import java.util.List;
-
-/**
- * 统计条目(StatisticItems) dto、vo、do转换工具类
- *
- * @author lixing
- * @version V1.0 2021-05-20 19:21:12 2021-05-20 19:21:12
- */
-@Mapper(nullValueMappingStrategy = NullValueMappingStrategy.RETURN_DEFAULT,
-        nullValueCheckStrategy = NullValueCheckStrategy.ALWAYS)
-public interface ConvertStatisticItemsTool {
-
-    ConvertStatisticItemsTool INSTANCE = Mappers.getMapper(ConvertStatisticItemsTool.class);
-
-    /**
-     * do转换为ResponseItemVO
-     *
-     * @param statisticItems do对象
-     * @return ResponseItemVO
-     * @author lixing
-     * @version V1.0 2021-05-20 19:21:12
-     */
-    ResponseStatisticItemsItemVO convert2ResponseItemDTO(StatisticItems statisticItems);
-
-    /**
-     * do转换为ResponseListItemVO
-     *
-     * @param statisticItems do对象
-     * @return ResponseListItemVO
-     * @author lixing
-     * @version V1.0 2021-05-20 19:21:12
-     */
-    ResponseStatisticItemsListItemVO convert2ResponseListItemDTO(StatisticItems statisticItems);
-
-    /**
-     * do列表转换为ResponseListItemVO列表
-     *
-     * @param statisticItemsList do列表
-     * @return ResponseListItemVO列表
-     * @author lixing
-     * @version V1.0 2021-05-20 19:21:12
-     */
-    List<ResponseStatisticItemsListItemVO> convert2List(List<StatisticItems> statisticItemsList);
-
-    /**
-     * addDTO转换为do
-     *
-     * @param addStatisticItemsDTO addDTO
-     * @return 要创建的do对象
-     * @author lixing
-     * @version V1.0 2021-05-20 19:21:12
-     */
-    StatisticItems convertAddDto2Entity(AddStatisticItemsDTO addStatisticItemsDTO);
-
-    /**
-     * updateDTO转换为实体
-     *
-     * @param statisticItems          更新前的do对象
-     * @param updateStatisticItemsDTO updateDTO
-     * @return 更新后的do对象
-     * @author lixing
-     * @version V1.0 2021-05-20 19:21:12
-     */
-    StatisticItems convertUpdateDto2Entity(@MappingTarget StatisticItems statisticItems, UpdateStatisticItemsDTO updateStatisticItemsDTO);
-}
-

+ 0 - 47
src/main/java/com/persagy/apm/report/config/statisticsitems/model/StatisticItems.java

@@ -1,47 +0,0 @@
-package com.persagy.apm.report.config.statisticsitems.model;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import com.persagy.apm.common.model.entity.AuditableEntity;
-
-import java.io.Serializable;
-
-/**
- * 统计条目(StatisticItems)实体类
- *
- * @author lixing
- * @version V1.0 2021-05-20 19:21:10
- */
-@EqualsAndHashCode(callSuper = true)
-@Data
-@ApiModel(description = "统计条目")
-public class StatisticItems extends AuditableEntity<StatisticItems> implements Serializable {
-    private static final long serialVersionUID = -97538698360555468L;
-
-    @ApiModelProperty("条目编码")
-    private String itemCode;
-
-    @ApiModelProperty("条目名称")
-    private String itemName;
-
-    @ApiModelProperty("条目来源")
-    private String itemSource;
-
-    @ApiModelProperty("合格的标准")
-    private String standardValue;
-
-    @ApiModelProperty("合格的判断公式")
-    private String qualifyFormula;
-
-    @ApiModelProperty("合格的判断公式")
-    private String standardFlag;
-
-
-    public static String PROP_ITEM_CODE = "item_code";
-    public static String PROP_ITEM_SOURCE = "item_source";
-    public static String PROP_STANDARD_VALUE = "standard_value";
-    public static String PROP_QUALIFY_FORMULA = "qualify_formula";
-
-}

+ 0 - 35
src/main/java/com/persagy/apm/report/config/statisticsitems/model/dto/AddStatisticItemsDTO.java

@@ -1,35 +0,0 @@
-package com.persagy.apm.report.config.statisticsitems.model.dto;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-
-import javax.validation.constraints.NotNull;
-
-import lombok.Data;
-
-import java.util.Date;
-
-/**
- * @author lixing
- * @version V1.0 2021-05-20 19:21:10
- */
-@Data
-@ApiModel(value = "创建统计条目入参")
-public class AddStatisticItemsDTO {
-    @ApiModelProperty(value = "条目编码", required = true)
-    @NotNull(message = "条目编码不能为空") 
-    private String itemCode;
-
-    @ApiModelProperty(value = "条目来源", required = true)
-    @NotNull(message = "条目来源不能为空") 
-    private String itemSource;
-
-    @ApiModelProperty(value = "合格的标准", required = true)
-    @NotNull(message = "合格的标准不能为空") 
-    private String standardValue;
-
-    @ApiModelProperty(value = "合格的判断公式", required = true)
-    @NotNull(message = "合格的判断公式不能为空") 
-    private String qualifyFormula;
-
-}

+ 0 - 35
src/main/java/com/persagy/apm/report/config/statisticsitems/model/dto/PageQueryStatisticItemsDTO.java

@@ -1,35 +0,0 @@
-package com.persagy.apm.report.config.statisticsitems.model.dto;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-
-import java.util.Date;
-
-import com.persagy.apm.common.model.dto.PageDTO;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * @author lixing
- * @version V1.0 2021-05-20 19:21:12
- */
-@EqualsAndHashCode(callSuper = true)
-@Data
-@ApiModel(value = "分页查询统计条目入参")
-public class PageQueryStatisticItemsDTO extends PageDTO {
-    @ApiModelProperty(value = "主键", required = true)
-    private String id;
-
-    @ApiModelProperty(value = "条目编码", required = true)
-    private String itemCode;
-
-    @ApiModelProperty(value = "条目来源", required = true)
-    private String itemSource;
-
-    @ApiModelProperty(value = "合格的标准", required = true)
-    private String standardValue;
-
-    @ApiModelProperty(value = "合格的判断公式", required = true)
-    private String qualifyFormula;
-
-}

+ 0 - 32
src/main/java/com/persagy/apm/report/config/statisticsitems/model/dto/QueryStatisticItemsDTO.java

@@ -1,32 +0,0 @@
-package com.persagy.apm.report.config.statisticsitems.model.dto;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.util.Date;
-import java.util.List;
-
-/**
- * @author lixing
- * @version V1.0 2021-05-20 19:21:11
- */
-@Data
-@ApiModel(value = "查询统计条目入参")
-public class QueryStatisticItemsDTO {
-    @ApiModelProperty(value = "统计条目id列表")
-    private List<String> statisticItemIdList;
-    
-    @ApiModelProperty(value = "条目编码")
-    private String itemCode;
-
-    @ApiModelProperty(value = "条目来源")
-    private String itemSource;
-
-    @ApiModelProperty(value = "合格的标准")
-    private String standardValue;
-
-    @ApiModelProperty(value = "合格的判断公式")
-    private String qualifyFormula;
-
-}

+ 0 - 39
src/main/java/com/persagy/apm/report/config/statisticsitems/model/dto/UpdateStatisticItemsDTO.java

@@ -1,39 +0,0 @@
-package com.persagy.apm.report.config.statisticsitems.model.dto;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-
-import javax.validation.constraints.NotNull;
-
-import lombok.Data;
-
-import java.util.Date;
-
-/**
- * @author lixing
- * @version V1.0 2021-05-20 19:21:11
- */
-@Data
-@ApiModel(value = "更新统计条目入参")
-public class UpdateStatisticItemsDTO {
-    @ApiModelProperty(value = "主键", required = true)
-    @NotNull(message = "主键不能为空") 
-    private String id;
-
-    @ApiModelProperty(value = "条目编码", required = true)
-    @NotNull(message = "条目编码不能为空") 
-    private String itemCode;
-
-    @ApiModelProperty(value = "条目来源", required = true)
-    @NotNull(message = "条目来源不能为空") 
-    private String itemSource;
-
-    @ApiModelProperty(value = "合格的标准", required = true)
-    @NotNull(message = "合格的标准不能为空") 
-    private String standardValue;
-
-    @ApiModelProperty(value = "合格的判断公式", required = true)
-    @NotNull(message = "合格的判断公式不能为空") 
-    private String qualifyFormula;
-
-}

+ 0 - 77
src/main/java/com/persagy/apm/report/config/statisticsitems/service/IStatisticItemsService.java

@@ -1,77 +0,0 @@
-package com.persagy.apm.report.config.statisticsitems.service;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.persagy.apm.report.config.statisticsitems.model.StatisticItems;
-import com.persagy.apm.report.config.statisticsitems.model.dto.AddStatisticItemsDTO;
-import com.persagy.apm.report.config.statisticsitems.model.dto.PageQueryStatisticItemsDTO;
-import com.persagy.apm.report.config.statisticsitems.model.dto.QueryStatisticItemsDTO;
-import com.persagy.apm.report.config.statisticsitems.model.dto.UpdateStatisticItemsDTO;
-
-import java.util.List;
-
-/**
- * 统计条目(StatisticItems) service接口
- *
- * @author lixing
- * @version V1.0 2021-05-20 19:21:08
- */
-public interface IStatisticItemsService {
-
-    /**
-     * 创建统计条目
-     *
-     * @param addStatisticItemsDTO addDTO
-     * @return 统计条目主键
-     * @author lixing
-     * @version V1.0 2021-05-20 19:21:08
-     */
-    String createStatisticItems(AddStatisticItemsDTO addStatisticItemsDTO);
-
-    /**
-     * 统计条目详情
-     *
-     * @param id 主键
-     * @return 统计条目do对象
-     * @author lixing
-     * @version V1.0 2021-05-20 19:21:08
-     */
-    StatisticItems queryStatisticItemsDetail(String id);
-
-    /**
-     * 更新统计条目
-     *
-     * @param updateStatisticItemsDTO updateDTO
-     * @author lixing
-     * @version V1.0 2021-05-20 19:21:08
-     */
-    void updateStatisticItems(UpdateStatisticItemsDTO updateStatisticItemsDTO);
-
-    /**
-     * 删除统计条目
-     *
-     * @param id 主键
-     * @author lixing
-     * @version V1.0 2021-05-20 19:21:08
-     */
-    void deleteStatisticItems(String id);
-
-    /**
-     * 查询统计条目
-     *
-     * @param queryStatisticItemsDTO queryDTO
-     * @return List<StatisticItems>
-     * @author lixing
-     * @version V1.0 2021-05-20 19:21:08
-     */
-    List<StatisticItems> queryStatisticItemsList(QueryStatisticItemsDTO queryStatisticItemsDTO);
-
-    /**
-     * 分页查询统计条目
-     *
-     * @param pageQueryStatisticItemsDTO pageQueryDTO
-     * @return IPage<StatisticItems>
-     * @author lixing
-     * @version V1.0 2021-05-20 19:21:08
-     */
-    IPage<StatisticItems> pageQueryStatisticItems(PageQueryStatisticItemsDTO pageQueryStatisticItemsDTO);
-}

+ 0 - 222
src/main/java/com/persagy/apm/report/config/statisticsitems/service/impl/StatisticItemsServiceImpl.java

@@ -1,222 +0,0 @@
-package com.persagy.apm.report.config.statisticsitems.service.impl;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.google.common.base.CaseFormat;
-import com.persagy.apm.common.constant.enums.ValidEnum;
-import com.persagy.apm.common.context.AppContext;
-import com.persagy.apm.common.model.dto.Sort;
-import com.persagy.apm.report.config.statisticsitems.dao.StatisticItemsMapper;
-import com.persagy.apm.report.config.statisticsitems.model.ConvertStatisticItemsTool;
-import com.persagy.apm.report.config.statisticsitems.model.StatisticItems;
-import com.persagy.apm.report.config.statisticsitems.model.dto.AddStatisticItemsDTO;
-import com.persagy.apm.report.config.statisticsitems.model.dto.PageQueryStatisticItemsDTO;
-import com.persagy.apm.report.config.statisticsitems.model.dto.QueryStatisticItemsDTO;
-import com.persagy.apm.report.config.statisticsitems.model.dto.UpdateStatisticItemsDTO;
-import com.persagy.apm.report.config.statisticsitems.service.IStatisticItemsService;
-import org.apache.commons.lang.StringUtils;
-import org.springframework.stereotype.Service;
-import org.springframework.util.CollectionUtils;
-
-import java.util.List;
-
-/**
- * 统计条目(StatisticItems) service层
- *
- * @author lixing
- * @version V1.0 2021-05-20 19:21:09
- */
-@Service
-public class StatisticItemsServiceImpl extends ServiceImpl<StatisticItemsMapper, StatisticItems>
-        implements IStatisticItemsService {
-
-    /**
-     * 创建统计条目
-     *
-     * @return 统计条目主键
-     * @author lixing
-     * @version V1.0 2021-05-20 19:21:09
-     */
-    @Override
-    public String createStatisticItems(AddStatisticItemsDTO addStatisticItemsDTO) {
-        StatisticItems statisticItems = ConvertStatisticItemsTool.INSTANCE.convertAddDto2Entity(addStatisticItemsDTO);
-        // 设置默认值
-        setDefaultValue(statisticItems);
-        save(statisticItems);
-        return statisticItems.getId();
-    }
-
-    /**
-     * 如果某些字段没有赋值,使用默认的值
-     *
-     * @param statisticItems 统计条目实体
-     * @author lixing
-     * @version V1.0 2021/3/12 12:29 下午
-     */
-    private void setDefaultValue(StatisticItems statisticItems) {
-        statisticItems.setCreator(AppContext.getContext().getAccountId());
-        
-
-    }
-
-    /**
-     * 统计条目详情
-     *
-     * @param id 主键
-     * @return 部门do类
-     * @author lixing
-     * @version V1.0 2021-05-20 19:21:09
-     */
-    @Override
-    public StatisticItems queryStatisticItemsDetail(String id) {
-        StatisticItems statisticItems = getById(id);
-        if (statisticItems == null) {
-            throw new IllegalArgumentException("查看StatisticItems详情时发生异常,找不到要查看的记录,id=" + id);
-        }
-        return statisticItems;
-    }
-
-    /**
-     * 更新统计条目
-     *
-     * @author lixing
-     * @version V1.0 2021-05-20 19:21:09
-     */
-    @Override
-    public void updateStatisticItems(UpdateStatisticItemsDTO updateStatisticItemsDTO) {
-        StatisticItems statisticItems = getById(updateStatisticItemsDTO.getId());
-        statisticItems = ConvertStatisticItemsTool.INSTANCE.convertUpdateDto2Entity(statisticItems, updateStatisticItemsDTO);
-        statisticItems.setModifier(AppContext.getContext().getAccountId());
-        updateById(statisticItems);
-    }
-
-    /**
-     * 校验统计条目是否可删除
-     *
-     * @param id 统计条目主键
-     * @return 统计条目do类
-     * @author lixing
-     * @version V1.0 2021-05-20 19:21:09
-     */
-    public StatisticItems checkDeletable(String id) {
-        if (id == null) {
-            throw new IllegalArgumentException("删除StatisticItems时发生异常,主键为空");
-        }
-
-        StatisticItems statisticItems = getById(id);
-
-        if (statisticItems == null) {
-            throw new IllegalArgumentException("删除StatisticItems时发生异常,找不到要删除的数据,id:" + id);
-        }
-
-        return statisticItems;
-    }
-
-    /**
-     * 删除统计条目
-     *
-     * @param id 主键
-     * @author lixing
-     * @version V1.0 2021-05-20 19:21:09
-     */
-    @Override
-    public void deleteStatisticItems(String id) {
-        // 校验是否可删除
-        StatisticItems statisticItems = checkDeletable(id);
-
-        statisticItems.setValid(ValidEnum.FALSE.getType());
-        updateById(statisticItems);
-    }
-
-    /**
-     * 查询统计条目
-     *
-     * @return List<StatisticItems>
-     * @author lixing
-     * @version V1.0 2021-05-20 19:21:09
-     */
-    @Override
-    public List<StatisticItems> queryStatisticItemsList(QueryStatisticItemsDTO queryStatisticItemsDTO) {
-        QueryWrapper<StatisticItems> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq(StatisticItems.PROP_VALID, ValidEnum.TRUE.getType());
-        // 默认按创建时间倒序排序
-        queryWrapper.orderBy(true, false, StatisticItems.PROP_CREATIONTIME);
-
-        if (queryStatisticItemsDTO != null) {
-
-            if (StringUtils.isNotEmpty(queryStatisticItemsDTO.getItemCode())) {
-                queryWrapper.eq(StatisticItems.PROP_ITEM_CODE, queryStatisticItemsDTO.getItemCode());
-            }
-
-            if (StringUtils.isNotEmpty(queryStatisticItemsDTO.getItemSource())) {
-                queryWrapper.eq(StatisticItems.PROP_ITEM_SOURCE, queryStatisticItemsDTO.getItemSource());
-            }
-
-            if (StringUtils.isNotEmpty(queryStatisticItemsDTO.getStandardValue())) {
-                queryWrapper.eq(StatisticItems.PROP_STANDARD_VALUE, queryStatisticItemsDTO.getStandardValue());
-            }
-
-            if (StringUtils.isNotEmpty(queryStatisticItemsDTO.getQualifyFormula())) {
-                queryWrapper.eq(StatisticItems.PROP_QUALIFY_FORMULA, queryStatisticItemsDTO.getQualifyFormula());
-            }
-
-            if (queryStatisticItemsDTO.getStatisticItemIdList() != null) {
-                queryWrapper.in(StatisticItems.PROP_ID, queryStatisticItemsDTO.getStatisticItemIdList());
-            }
-
-        }
-
-        return list(queryWrapper);
-    }
-
-    /**
-     * 分页查询统计条目
-     *
-     * @return IPage<StatisticItems>
-     * @author lixing
-     * @version V1.0 2021-05-20 19:21:09
-     */
-    @Override
-    public IPage<StatisticItems> pageQueryStatisticItems(PageQueryStatisticItemsDTO pageQueryStatisticItemsDTO) {
-        QueryWrapper<StatisticItems> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq(StatisticItems.PROP_VALID, ValidEnum.TRUE.getType());
-        // 这里认为pageQueryDTO是经过校验的,肯定包含分页信息
-        IPage<StatisticItems> pageParam = new Page<>(pageQueryStatisticItemsDTO.getPage(), pageQueryStatisticItemsDTO.getSize(), true);
-        // 排序信息
-        if (CollectionUtils.isEmpty(pageQueryStatisticItemsDTO.getOrders())) {
-            // 默认按创建时间倒序排序
-            queryWrapper.orderBy(true, false, StatisticItems.PROP_CREATIONTIME);
-        } else {
-            List<Sort> orders = pageQueryStatisticItemsDTO.getOrders();
-            for (Sort sort : orders) {
-                // 将驼峰转换为下划线格式
-                sort.setColumn(CaseFormat.LOWER_CAMEL.to(CaseFormat.LOWER_UNDERSCORE, sort.getColumn()));
-                queryWrapper.orderBy(true, sort.isAsc(), sort.getColumn());
-            }
-        }
-
-        
-        if (StringUtils.isNotEmpty(pageQueryStatisticItemsDTO.getItemCode())) {
-            queryWrapper.like(StatisticItems.PROP_ITEM_CODE, pageQueryStatisticItemsDTO.getItemCode());
-        }
-
-        
-        if (StringUtils.isNotEmpty(pageQueryStatisticItemsDTO.getItemSource())) {
-            queryWrapper.like(StatisticItems.PROP_ITEM_SOURCE, pageQueryStatisticItemsDTO.getItemSource());
-        }
-
-        
-        if (StringUtils.isNotEmpty(pageQueryStatisticItemsDTO.getStandardValue())) {
-            queryWrapper.like(StatisticItems.PROP_STANDARD_VALUE, pageQueryStatisticItemsDTO.getStandardValue());
-        }
-
-        
-        if (StringUtils.isNotEmpty(pageQueryStatisticItemsDTO.getQualifyFormula())) {
-            queryWrapper.like(StatisticItems.PROP_QUALIFY_FORMULA, pageQueryStatisticItemsDTO.getQualifyFormula());
-        }
-
-        return getBaseMapper().selectPage(pageParam, queryWrapper);
-    }
-}

+ 0 - 32
src/main/java/com/persagy/apm/report/config/type/constant/enums/BuildingTypeEnum.java

@@ -1,32 +0,0 @@
-package com.persagy.apm.report.config.type.constant.enums;
-
-import com.persagy.apm.common.model.annotation.SwaggerDisplayEnum;
-import lombok.Getter;
-import lombok.Setter;
-
-/**
- * 业态
- *
- * @author lixing
- * @version V1.0 2021/5/17 10:51 上午
- */
-@SwaggerDisplayEnum
-public enum BuildingTypeEnum {
-    /**
-     * 业态
-     */
-    BUSINESS("B00", "商业"),
-    HOTEL("A00", "酒店");
-
-    @Setter
-    @Getter
-    private String type;
-    @Setter
-    @Getter
-    private String desc;
-
-    BuildingTypeEnum(String type, String desc) {
-        this.type = type;
-        this.desc = desc;
-    }
-}

+ 0 - 87
src/main/java/com/persagy/apm/report/config/type/service/IReportTypeService.java

@@ -1,87 +0,0 @@
-package com.persagy.apm.report.config.type.service;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.persagy.apm.report.config.type.model.ReportType;
-import com.persagy.apm.report.config.type.model.dto.AddReportTypeDTO;
-import com.persagy.apm.report.config.type.model.dto.PageQueryReportTypeDTO;
-import com.persagy.apm.report.config.type.model.dto.QueryReportTypeDTO;
-import com.persagy.apm.report.config.type.model.dto.UpdateReportTypeDTO;
-import com.persagy.apm.report.config.type.model.vo.ResponseReportTypeListItemVO;
-
-import java.util.List;
-
-/**
- * 报告类型(ReportType) service接口
- *
- * @author lixing
- * @version V1.0 2021-05-19 10:39:15
- */
-public interface IReportTypeService {
-
-    /**
-     * 创建报告类型
-     *
-     * @param addReportTypeDTO addDTO
-     * @return 报告类型主键
-     * @author lixing
-     * @version V1.0 2021-05-19 10:39:15
-     */
-    String createReportType(AddReportTypeDTO addReportTypeDTO);
-
-    /**
-     * 报告类型详情
-     *
-     * @param id 主键
-     * @return 报告类型do对象
-     * @author lixing
-     * @version V1.0 2021-05-19 10:39:15
-     */
-    ReportType queryReportTypeDetail(String id);
-
-    /**
-     * 更新报告类型
-     *
-     * @param updateReportTypeDTO updateDTO
-     * @author lixing
-     * @version V1.0 2021-05-19 10:39:15
-     */
-    void updateReportType(UpdateReportTypeDTO updateReportTypeDTO);
-
-    /**
-     * 删除报告类型
-     *
-     * @param id 主键
-     * @author lixing
-     * @version V1.0 2021-05-19 10:39:15
-     */
-    void deleteReportType(String id);
-
-    /**
-     * 查询报告类型
-     *
-     * @param queryReportTypeDTO queryDTO
-     * @return List<ReportType>
-     * @author lixing
-     * @version V1.0 2021-05-19 10:39:15
-     */
-    List<ReportType> queryReportTypeList(QueryReportTypeDTO queryReportTypeDTO);
-
-    /**
-     * 分页查询报告类型
-     *
-     * @param pageQueryReportTypeDTO pageQueryDTO
-     * @return IPage<ReportType>
-     * @author lixing
-     * @version V1.0 2021-05-19 10:39:15
-     */
-    IPage<ReportType> pageQueryReportType(PageQueryReportTypeDTO pageQueryReportTypeDTO);
-
-    /**
-     * 查询当前用户可用的报告类型
-     *
-     * @return 当前用户可用的报告类型
-     * @author lixing
-     * @version V1.0 2021/5/19 4:39 下午
-     */
-    IPage<ResponseReportTypeListItemVO> queryAvailableReportTypes();
-}

+ 2 - 2
src/main/java/com/persagy/apm/report/dependencies/centermiddleware/client/CenterMiddlewareWebClient.java

@@ -10,8 +10,8 @@ import com.persagy.apm.report.dependencies.centermiddleware.model.vo.EnergyDataI
 import com.persagy.apm.report.dependencies.centermiddleware.model.vo.EnergyItemInfoVO;
 import com.persagy.apm.report.dependencies.centermiddleware.model.vo.ObjectInfoVO;
 import com.persagy.apm.report.dependencies.centermiddleware.model.vo.PeriodDataInfoVO;
-import com.persagy.apm.report.dependencies.common.FeignClientNameConstants;
-import com.persagy.apm.report.dependencies.common.FeignConfig;
+import com.persagy.apm.report.common.constants.FeignClientNameConstants;
+import com.persagy.apm.report.common.config.FeignConfig;
 import feign.Headers;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;

+ 0 - 28
src/main/java/com/persagy/apm/report/dependencies/centermiddleware/model/vo/ProjectEERDataVo.java

@@ -1,28 +0,0 @@
-package com.persagy.apm.report.dependencies.centermiddleware.model.vo;
-
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.persagy.apm.report.detail.common.model.vo.DateGraphItemVO;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.util.Date;
-import java.util.List;
-
-@Data
-@ApiModel
-@JsonInclude(JsonInclude.Include.NON_NULL)
-public class ProjectEERDataVo {
-    @ApiModelProperty(value = "项目id")
-    private String projectId;
-    @ApiModelProperty(value = "eer")
-    private Double eer;
-    @ApiModelProperty(value = "最高eer发生时间")
-    private List<Date> maxEerTimeList;
-    @ApiModelProperty(value = "最低eer发生时间")
-    private List<Date> minEerTimeList;
-    @ApiModelProperty(value = "本月制冷量")
-    private Double coolingCapacityCurrentMonth;
-    @ApiModelProperty(value = "图表信息")
-    private List<DateGraphItemVO> eerDetailInfo;
-}

+ 0 - 24
src/main/java/com/persagy/apm/report/dependencies/centermiddleware/service/ICenterMiddlewareWebService.java

@@ -1,28 +1,15 @@
 package com.persagy.apm.report.dependencies.centermiddleware.service;
 
 import com.persagy.apm.report.dependencies.centermiddleware.model.dto.QueryEnergyDataDTO;
-import com.persagy.apm.report.dependencies.centermiddleware.model.dto.QueryItemInfoDTO;
-import com.persagy.apm.report.dependencies.centermiddleware.model.vo.ProjectEERDataVo;
 import io.swagger.annotations.Api;
 
 import java.util.Date;
-import java.util.List;
 import java.util.Map;
 import java.util.TreeMap;
 
 @Api(value = "中间件service接口")
 public interface ICenterMiddlewareWebService {
     /**
-     * 获取分项名称
-     *
-     * @param queryItemInfoDTO 查询条件对象
-     * @return 分项名称信息 {分项id:分项名称}
-     * @author wch
-     * @version V1.0 2021/5/19 4:04 下午
-     */
-    Map<String, String> getItemNameMap(QueryItemInfoDTO queryItemInfoDTO);
-
-    /**
      * 获取分项能耗数据
      *
      * @param queryEnergyDataDTO 查询条件对象
@@ -31,15 +18,4 @@ public interface ICenterMiddlewareWebService {
      * @version V1.0 2021/5/19 4:04 下午
      */
     Map<String, TreeMap<Date, Double>> getItemEnergyDataMap(QueryEnergyDataDTO queryEnergyDataDTO);
-
-    /**
-     * 获取项目效率总览相关数据
-     *
-     * @param pjIdList   项目id殂
-     * @param groupCode  集团编码
-     * @param reportDate 报告月
-     * @return
-     */
-    List<ProjectEERDataVo> getProjectEERDataList(List<String> pjIdList, String groupCode, Date reportDate);
-
 }

+ 6 - 198
src/main/java/com/persagy/apm/report/dependencies/centermiddleware/service/impl/ICenterMiddlewareWebServiceImp.java

@@ -1,17 +1,16 @@
 package com.persagy.apm.report.dependencies.centermiddleware.service.impl;
 
-import com.alibaba.fastjson.JSONObject;
 import com.persagy.apm.common.response.PoemsFeignResponse;
+import com.persagy.apm.report.common.utils.DateUtils;
 import com.persagy.apm.report.dependencies.centermiddleware.client.CenterMiddlewareWebClient;
-import com.persagy.apm.report.dependencies.centermiddleware.model.dto.*;
-import com.persagy.apm.report.dependencies.centermiddleware.model.vo.*;
+import com.persagy.apm.report.dependencies.centermiddleware.model.dto.Criteria;
+import com.persagy.apm.report.dependencies.centermiddleware.model.dto.QueryEnergyDataDTO;
+import com.persagy.apm.report.dependencies.centermiddleware.model.dto.QueryObjectInfoDTO;
+import com.persagy.apm.report.dependencies.centermiddleware.model.vo.EnergyDataInfoVO;
+import com.persagy.apm.report.dependencies.centermiddleware.model.vo.ObjectInfoVO;
 import com.persagy.apm.report.dependencies.centermiddleware.service.ICenterMiddlewareWebService;
-import com.persagy.apm.report.dependencies.common.utils.DataUtils;
-import com.persagy.apm.report.dependencies.common.utils.DateUtils;
-import com.persagy.apm.report.detail.common.model.vo.DateGraphItemVO;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.StringUtils;
@@ -25,29 +24,6 @@ public class ICenterMiddlewareWebServiceImp implements ICenterMiddlewareWebServi
     @Autowired
     private CenterMiddlewareWebClient centerMiddlewareWebClient;
 
-//    @Value("${cooling.capacity}")
-    String coolingCapacity;
-
-//    @Value("${power.consumption}")
-    String powerConsumption;
-
-    @Override
-    public Map<String, String> getItemNameMap(QueryItemInfoDTO queryItemInfoDTO) {
-        if (null == queryItemInfoDTO) {
-            return new HashMap<>();
-        }
-        PoemsFeignResponse<EnergyItemInfoVO> response = centerMiddlewareWebClient.getItemNameInfo(queryItemInfoDTO);
-        List<EnergyItemInfoVO> energyItemInfoVOList = response.getContent();
-        if (CollectionUtils.isEmpty(energyItemInfoVOList)) {
-            return new HashMap<>();
-        }
-        Map<String, String> resultMap = new HashMap<>();
-        for (EnergyItemInfoVO energyItemInfoVO : energyItemInfoVOList) {
-            resultMap.put(energyItemInfoVO.getItemId(), energyItemInfoVO.getItemName());
-        }
-        return resultMap;
-    }
-
     @Override
     public Map<String, TreeMap<Date, Double>> getItemEnergyDataMap(QueryEnergyDataDTO queryEnergyDataDTO) {
         if (null == queryEnergyDataDTO) {
@@ -74,107 +50,6 @@ public class ICenterMiddlewareWebServiceImp implements ICenterMiddlewareWebServi
         return resultMap;
     }
 
-    @Override
-    public List<ProjectEERDataVo> getProjectEERDataList(List<String> pjIdList, String groupCode, Date reportDate) {
-        log.info("项目列表:" + pjIdList + "查询EER数据开始");
-        if (CollectionUtils.isEmpty(pjIdList) || StringUtils.isEmpty(groupCode) || null == reportDate) {
-            log.info("查询ProjectEERDataVo时参数为空,故不进行查询");
-            return new ArrayList<>();
-        }
-        List<ProjectEERDataVo> resultList = new ArrayList<>();
-        try {
-            for (String pjId : pjIdList) {
-                ProjectEERDataVo projectEERDataVo = new ProjectEERDataVo();
-                List<Date> dateList = DateUtils.getDayList(reportDate, DateUtils.getMonthOff(reportDate, 1));
-                List<String> coolClassCodeList = JSONObject.parseArray(coolingCapacity, String.class);
-                TreeMap<Date, Double> date_coolingCapacityMap = getDayCountData(pjId, groupCode, reportDate, "accCool", coolClassCodeList, dateList);
-                List<String> powerClassCodeList = JSONObject.parseArray(powerConsumption, String.class);
-                TreeMap<Date, Double> date_powerConsumptionMap = getDayCountData(pjId, groupCode, reportDate, "accElecConsum", powerClassCodeList, dateList);
-                List<DateGraphItemVO> dateGraphItemVOList = new ArrayList<>();
-                Double allCoolingCapacity = null;
-                Double allPowerConsumption = null;
-                for (Date date : dateList) {
-                    DateGraphItemVO dateGraphItemVO = new DateGraphItemVO();
-                    dateGraphItemVO.setDate(date);
-                    Double coolingCapacity = date_coolingCapacityMap.get(date);
-                    Double powerConsumption = date_powerConsumptionMap.get(date);
-                    Double eer = null;
-                    if (coolingCapacity != null && powerConsumption != null && powerConsumption != 0.0) {
-                        eer = coolingCapacity / powerConsumption;
-                    }
-                    if (coolingCapacity != null) {
-                        if (null == allCoolingCapacity) {
-                            allCoolingCapacity = 0.0;
-                        }
-                        allCoolingCapacity = allCoolingCapacity + coolingCapacity;
-                    }
-                    if (powerConsumption != null) {
-                        if (null == allPowerConsumption) {
-                            allPowerConsumption = 0.0;
-                        }
-                        allPowerConsumption = allPowerConsumption + powerConsumption;
-                    }
-                    dateGraphItemVO.setValue(eer);
-                    dateGraphItemVOList.add(dateGraphItemVO);
-                }
-                log.info("项目:" + pjId + "allCoolingCapacity:" + allCoolingCapacity);
-                log.info("项目:" + pjId + "allPowerConsumption:" + allPowerConsumption);
-                Double allEer = null;
-                if (allCoolingCapacity != null && allPowerConsumption != null && allPowerConsumption != 0.0) {
-                    allEer = allCoolingCapacity / allPowerConsumption;
-                }
-                projectEERDataVo.setProjectId(pjId);
-                projectEERDataVo.setEer(allEer);
-                projectEERDataVo.setCoolingCapacityCurrentMonth(allCoolingCapacity);
-                projectEERDataVo.setEerDetailInfo(dateGraphItemVOList);
-                projectEERDataVo.setMaxEerTimeList(getMaxOrMinDateList(dateGraphItemVOList, -1));
-                projectEERDataVo.setMinEerTimeList(getMaxOrMinDateList(dateGraphItemVOList, 1));
-                resultList.add(projectEERDataVo);
-            }
-        } catch (Exception e) {
-            log.error("计算ProjectEERDataVo异常:", e);
-        }
-        log.info("项目列表:" + pjIdList + "查询EER数据结束");
-        return resultList;
-    }
-
-    private List<Date> getMaxOrMinDateList(List<DateGraphItemVO> dateGraphItemVOList, Integer orderType) {
-        if (CollectionUtils.isEmpty(dateGraphItemVOList)) {
-            return new ArrayList<>();
-        }
-        List<DateGraphItemVO> dataList = new ArrayList<>();
-        for (DateGraphItemVO vo : dateGraphItemVOList) {
-            if (vo.getValue() == null) {
-                continue;
-            }
-            dataList.add(vo);
-        }
-        Map<String, Integer> sortMap = new HashMap<>();
-        sortMap.put("value", orderType);
-        DataUtils.sort(dataList, sortMap);
-        List<Date> resultList = new ArrayList<>();
-        Double maxOrMinData = null;
-        for (DateGraphItemVO vo : dataList) {
-            if (vo.getValue() == null) {
-                continue;
-            }
-            if (maxOrMinData == null) {
-                maxOrMinData = vo.getValue();
-            } else if (maxOrMinData.compareTo(vo.getValue()) != 0) {
-                break;
-            }
-            resultList.add(vo.getDate());
-        }
-        return resultList;
-    }
-
-    private TreeMap<Date, Double> getDayCountData(String pjId, String groupCode, Date reportDate, String infoCode, List<String> classCodeList, List<Date> dateList) {
-        List<String> objectIdList = getObjectIdList(pjId, groupCode, classCodeList);
-        if (!CollectionUtils.isEmpty(objectIdList)) {
-            return getInfoCodePeriodDataCountMap(pjId, groupCode, objectIdList, reportDate, infoCode, "1d",dateList);
-        }
-        return new TreeMap<>();
-    }
 
     private List<String> getObjectIdList(String pjId, String groupCode, List<String> classCodeList) {
         log.info("查询对象信息列表开始,项目:" + pjId + "groupCode:" + groupCode + "classCodeList:" + classCodeList);
@@ -204,71 +79,4 @@ public class ICenterMiddlewareWebServiceImp implements ICenterMiddlewareWebServi
         log.info("查询对象信息列表结束");
         return resultList;
     }
-
-    private TreeMap<Date, Double> getInfoCodePeriodDataCountMap(String pjId, String groupCode, List<String> objectIdList, Date reportDate, String infoCode, String period, List<Date> dateList) {
-        log.info("项目:" + pjId + "infoCod:" + infoCode + "查询数据列表开始");
-        if (StringUtils.isEmpty(pjId) || StringUtils.isEmpty(groupCode) || CollectionUtils.isEmpty(objectIdList) || null == reportDate) {
-            log.info("查询历史数据时参数为空,故不进行查询");
-            return new TreeMap<>();
-        }
-        TreeMap<Date, Double> dataMap = new TreeMap<>();
-        try {
-            BatchQueryPeriodDataDTO batchQueryPeriodDataDTO = new BatchQueryPeriodDataDTO();
-            batchQueryPeriodDataDTO.setProjectId(pjId);
-            batchQueryPeriodDataDTO.setGroupCode(groupCode);
-            List<CriteriasObjDTO> criteriasObjDTOList = new ArrayList<>();
-            Map receivetime = new HashMap();
-            String startTime = DateUtils.date2Str(reportDate, DateUtils.SDFSECOND);
-            String endTime = DateUtils.date2Str(DateUtils.getDayOff(DateUtils.getMonthOff(reportDate, 1), 1), DateUtils.SDFSECOND);
-            receivetime.put("$gte", startTime);
-            receivetime.put("$lt", endTime);
-            for (String objectId : objectIdList) {
-                CriteriasObjDTO dto = new CriteriasObjDTO();
-                dto.setId(objectId);
-                dto.setCode(infoCode);
-                dto.setInterpolation(true);
-                dto.setPeriod(period);
-                dto.setReceivetime(receivetime);
-                criteriasObjDTOList.add(dto);
-            }
-            batchQueryPeriodDataDTO.setCriterias(criteriasObjDTOList);
-            PoemsFeignResponse<PoemsFeignResponse<PeriodDataInfoVO>> response = centerMiddlewareWebClient.getPeriodDataInfo(batchQueryPeriodDataDTO);
-            List<PoemsFeignResponse<PeriodDataInfoVO>> responseList = response.getContent();
-            log.info("项目:" + pjId + "infoCod:" + infoCode + "数据列表:" + responseList);
-            if (!CollectionUtils.isEmpty(responseList)) {
-                for (PoemsFeignResponse<PeriodDataInfoVO> responseVo : responseList) {
-                    List<PeriodDataInfoVO> periodDataInfoVOList = responseVo.getContent();
-                    if (CollectionUtils.isEmpty(periodDataInfoVOList)) {
-                        continue;
-                    }
-                    // 每个设备每天的数据
-                    Map<Date, Double> day_coolDataMap = new TreeMap<>();
-                    for (PeriodDataInfoVO vo : periodDataInfoVOList) {
-                        if (null == vo.getData_value() || StringUtils.isEmpty(vo.getData_time())) {
-                            continue;
-                        }
-                        day_coolDataMap.put(DateUtils.str2Date(vo.getData_time(), DateUtils.SDFSECOND), vo.getData_value());
-                    }
-                    for (Date date : dateList) {
-                        Double currentDayCoolData = day_coolDataMap.get(date);
-                        Double nextDayCoolData = day_coolDataMap.get(DateUtils.getDayOff(date, 1));
-                        Double allCool = dataMap.get(date);
-                        if (currentDayCoolData != null && nextDayCoolData != null) {
-                            if (allCool == null) {
-                                allCool = 0.0;
-                            }
-                            Double cool = nextDayCoolData - currentDayCoolData;
-                            allCool = allCool + cool;
-                        }
-                        dataMap.put(date, allCool);
-                    }
-                }
-            }
-        } catch (Exception e) {
-            log.error("查询中台对象信息时异常:", e);
-        }
-        log.info("项目:" + pjId + "infoCod:" + infoCode + "查询数据列表结束");
-        return dataMap;
-    }
-
 }

+ 0 - 29
src/main/java/com/persagy/apm/report/dependencies/common/dto/QueryAreaPlatformParamDTO.java

@@ -1,29 +0,0 @@
-package com.persagy.apm.report.dependencies.common.dto;
-
-import com.persagy.apm.common.model.dto.PoemsFeignBaseDTO;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.util.Date;
-import java.util.List;
-
-@EqualsAndHashCode(callSuper = true)
-@Data
-@ApiModel
-public class QueryAreaPlatformParamDTO extends PoemsFeignBaseDTO {
-
-    @ApiModelProperty("用户id")
-    private String userId;
-
-    @ApiModelProperty("集团编码")
-    private String groupCode;
-
-    @ApiModelProperty("项目id列表")
-    private List<String> projectIdList;
-
-    @ApiModelProperty("生成报告时间")
-    private Date reportDate;
-
-}

+ 0 - 28
src/main/java/com/persagy/apm/report/dependencies/common/dto/QueryPjPlatformParamDTO.java

@@ -1,28 +0,0 @@
-package com.persagy.apm.report.dependencies.common.dto;
-
-import com.persagy.apm.common.model.dto.PoemsFeignBaseDTO;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.util.Date;
-
-@EqualsAndHashCode(callSuper = true)
-@Data
-@ApiModel
-public class QueryPjPlatformParamDTO extends PoemsFeignBaseDTO {
-
-    @ApiModelProperty("用户id")
-    private String userId;
-
-    @ApiModelProperty("集团编码")
-    private String groupCode;
-
-    @ApiModelProperty("项目id")
-    private String projectId;
-
-    @ApiModelProperty("生成报告时间")
-    private Date reportDate;
-
-}

+ 0 - 32
src/main/java/com/persagy/apm/report/dependencies/common/dto/QueryPlatformParamDTO.java

@@ -1,32 +0,0 @@
-package com.persagy.apm.report.dependencies.common.dto;
-
-import com.persagy.apm.common.model.dto.PoemsFeignBaseDTO;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.util.Date;
-import java.util.List;
-
-@EqualsAndHashCode(callSuper = true)
-@Data
-@ApiModel
-public class QueryPlatformParamDTO extends PoemsFeignBaseDTO {
-
-    @ApiModelProperty("用户id")
-    private String userId;
-
-    @ApiModelProperty("集团编码")
-    private String groupCode;
-
-    @ApiModelProperty("项目id列表")
-    private List<String> projectIdList;
-
-    @ApiModelProperty("生成报告时间")
-    private Date reportDate;
-
-    @ApiModelProperty("报告所属类型")
-    private String belongType;
-
-}

+ 0 - 103
src/main/java/com/persagy/apm/report/dependencies/common/service/CommonService.java

@@ -1,103 +0,0 @@
-package com.persagy.apm.report.dependencies.common.service;
-
-import com.persagy.apm.report.config.function.model.Function;
-import com.persagy.apm.report.config.statisticsitems.model.StatisticItems;
-import com.persagy.apm.report.dependencies.common.dto.QueryPlatformParamDTO;
-import com.persagy.apm.report.detail.business.model.Platform;
-import com.persagy.apm.report.detail.hotel.project.model.vo.*;
-import io.swagger.annotations.Api;
-
-import java.util.Date;
-import java.util.List;
-
-@Api(value = "公共service接口")
-public interface CommonService {
-
-    /**
-     * @param pjIdList 项目id列表
-     * @return
-     */
-    List<String> getPjNameByPjId(List<String> pjIdList);
-
-    /**
-     * 根据配置条目信息获取能耗管理平台运维数据
-     *
-     * @param statisticItems        条目信息
-     * @param queryPlatformParamDTO 查询条件对象
-     * @return 能耗管理平台运维数据
-     */
-    Platform getPlatform(StatisticItems statisticItems, QueryPlatformParamDTO queryPlatformParamDTO);
-
-    /**
-     * 获取酒店项目报警处理信息
-     *
-     * @param projectId  项目id
-     * @param reportDate 报告月
-     * @return 酒店项目报警处理信息
-     */
-    HotelProjectAlarmDealInfo getHotelProjectAlarmDealInfo(String projectId, Date reportDate);
-
-    /**
-     * 获取酒店项目环境指标条目信息
-     *
-     * @param projectId     项目id
-     * @param reportDate    报告月
-     * @param projectIdList 当前报告类型下的所有项目id列表
-     * @param function      function信息
-     * @return 酒店项目环境指标条目信息
-     */
-    HotelProjectKpiItem getHotelProjectKpiItem(String projectId, Date reportDate, List<String> projectIdList, Function function);
-
-    /**
-     * 获取酒店平台数据质量信息
-     *
-     * @param userId     用户id
-     * @param projectId  项目id
-     * @param reportDate 报告月
-     * @param function   function信息
-     * @return 酒店项目环境指标条目信息
-     */
-    HotelProjectMaintenanceGraph getHotelProjectMaintenanceGraph(String userId, String projectId, Date reportDate, Function function);
-
-    /**
-     * 获取酒店项目维护信息
-     *
-     * @param userId        用户id
-     * @param projectId     项目id
-     * @param reportDate    报告月
-     * @param functionList  function信息列表
-     * @param projectIdList 当前报告类型下的所有项目id列表
-     * @return 酒店项目环境指标条目信息
-     */
-    HotelProjectMaintenanceInfo getHotelProjectMaintenanceInfo(String userId, String projectId, Date reportDate, List<Function> functionList, List<String> projectIdList);
-
-    /**
-     * 获取酒店项目节能工单信息
-     *
-     * @param projectId  项目id
-     * @param reportDate 报告月
-     * @return
-     */
-    HotelProjectEnergyWorkerOrderInfo getHotelProjectEnergyWorkerOrderInfo(String projectId, Date reportDate);
-
-    /**
-     * 获取项目变损和总支不平衡率信息
-     *
-     * @param projectId  项目id
-     * @param reportDate 报告月
-     * @param userId     用户id
-     * @return
-     */
-    HotelProjectMaintenanceBaseInfo getHotelProjectMaintenanceBaseInfo(String projectId, Date reportDate, String userId);
-
-    /**
-     * 获取酒店项目冷站效率
-     *
-     * @param projectId  项目id
-     * @param reportDate 报告月
-     * @param pjIdList   项目id列表
-     * @return
-     */
-    HotelProjectChillerPlantEfficiency getHotelProjectChillerPlantEfficiency(String projectId, Date reportDate, List<String> pjIdList);
-
-}

+ 0 - 33
src/main/java/com/persagy/apm/report/dependencies/common/service/PlatformService.java

@@ -1,33 +0,0 @@
-package com.persagy.apm.report.dependencies.common.service;
-
-import com.persagy.apm.report.dependencies.common.dto.QueryPlatformParamDTO;
-import com.persagy.apm.report.dependencies.common.vo.PlatformAreaInfoVO;
-import com.persagy.apm.report.config.statisticsitems.model.StatisticItems;
-import io.swagger.annotations.Api;
-
-import java.util.List;
-
-@Api(value = "platform能源平台管理service接口")
-public interface PlatformService {
-
-    /**
-     * 获取项目能源管理平台运维信息
-     *
-     * @param queryPlatformParamDTO 查询条件对象
-     * @return
-     * @author wch
-     * @version V1.0 2021/5/19 4:04 下午
-     */
-    List<Double> getPjPlatformRate(QueryPlatformParamDTO queryPlatformParamDTO);
-    /**
-     * 获取大区能源管理平台运维信息
-     *
-     * @param statisticItems 配置的条目信息
-     * @param queryPlatformParamDTO 查询条件对象
-     * @return
-     * @author wch
-     * @version V1.0 2021/5/19 4:04 下午
-     */
-    PlatformAreaInfoVO getAreaPlatformRate(StatisticItems statisticItems, QueryPlatformParamDTO queryPlatformParamDTO);
-
-}

+ 0 - 113
src/main/java/com/persagy/apm/report/dependencies/common/service/impl/BianSunDataAnalysisPlatformServiceImpl.java

@@ -1,113 +0,0 @@
-package com.persagy.apm.report.dependencies.common.service.impl;
-
-import com.alibaba.fastjson.JSONObject;
-import com.persagy.apm.report.dependencies.common.dto.QueryPlatformParamDTO;
-import com.persagy.apm.report.dependencies.common.service.CommonService;
-import com.persagy.apm.report.dependencies.common.service.PlatformService;
-import com.persagy.apm.report.dependencies.common.utils.DataUtils;
-import com.persagy.apm.report.dependencies.common.utils.DateUtils;
-import com.persagy.apm.report.dependencies.common.utils.HttpUtils;
-import com.persagy.apm.report.dependencies.common.vo.PlatformAreaInfoVO;
-import com.persagy.apm.report.config.statisticsitems.model.StatisticItems;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.collections.CollectionUtils;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.stereotype.Service;
-
-import javax.annotation.Resource;
-import java.util.*;
-import java.util.stream.Collectors;
-
-@Service("bianSunRateDataAnalysisWebService")
-@Slf4j
-public class BianSunDataAnalysisPlatformServiceImpl implements PlatformService {
-    @Value("${iot.data.analysis.url}")
-    private String iotDataAnalysisUrl;
-
-    @Resource
-    private CommonService commonService;
-
-    public final static String SUCCESS = "success";
-
-    @Override
-    public List<Double> getPjPlatformRate(QueryPlatformParamDTO queryPlatformParamDTO) {
-        if (null == queryPlatformParamDTO || org.springframework.util.CollectionUtils.isEmpty(queryPlatformParamDTO.getProjectIdList()) || null == queryPlatformParamDTO.getReportDate()) {
-            return new ArrayList<>();
-        }
-        String pjId = queryPlatformParamDTO.getProjectIdList().get(0);
-        TreeMap<Date, Double> date_rateMap = new TreeMap<>();
-        Date reportDate = queryPlatformParamDTO.getReportDate();
-        Date startDate = DateUtils.getFirstDayOfYear(reportDate);
-        while (startDate.before(DateUtils.getMonthOff(reportDate, 1))) {
-            date_rateMap.put(startDate, getBianSunRate(queryPlatformParamDTO.getUserId(), queryPlatformParamDTO.getGroupCode(), pjId, startDate));
-            startDate = DateUtils.getMonthOff(startDate, 1);
-        }
-        List<Double> monthlySummaries = date_rateMap.values().stream().collect(Collectors.toList());
-        return monthlySummaries;
-    }
-
-    private Double getBianSunRate(String userId, String groupCode, String projectId, Date reportDate) {
-        Double rate = null;
-        try {
-            JSONObject paramObject = new JSONObject();
-            paramObject.put("userId", userId);
-            paramObject.put("groupCode", groupCode);
-            List<String> pjIdList = new ArrayList<>();
-            pjIdList.add(projectId);
-            paramObject.put("projectIdList", pjIdList);
-            Date startTime = DateUtils.getStartTimeOfDay(reportDate);
-            Date endTime = DateUtils.getMonthOff(startTime, 1);
-            paramObject.put("alarmStartTime", startTime);
-            paramObject.put("alarmEndTime", endTime);
-            String url = iotDataAnalysisUrl + "/alarm/show/view/queryList";
-            String response = HttpUtils.postJson(url, paramObject.toString());
-            JSONObject responseObject = JSONObject.parseObject(response);
-            if (SUCCESS.equals(responseObject.getString("respMsg"))) {
-                List<Map> content = (List<Map>) responseObject.get("content");
-                if (CollectionUtils.isNotEmpty(content)) {
-                    Map data = content.get(0);
-                    rate = DataUtils.parseDouble(data.get("bianSunRate"));
-                }
-            }
-        } catch (Exception e) {
-            log.error("获取数据质量服务变损数据异常", e);
-        }
-        return rate;
-    }
-
-    @Override
-    public PlatformAreaInfoVO getAreaPlatformRate(StatisticItems statisticItems, QueryPlatformParamDTO queryPlatformParamDTO) {
-        if (null == queryPlatformParamDTO || org.springframework.util.CollectionUtils.isEmpty(queryPlatformParamDTO.getProjectIdList()) || null == queryPlatformParamDTO.getReportDate()) {
-            return new PlatformAreaInfoVO();
-        }
-        // 合格标准
-        String standardValueStr = statisticItems.getStandardValue();
-        Double standardValue = DataUtils.parseDouble(standardValueStr);
-        // 校验规则
-        String qualifyFormula = statisticItems.getQualifyFormula();
-        // 达标数量
-        Integer satisfiedCount = 0;
-        // 未达标数量
-        Integer unsatisfiedCount = 0;
-        // 未达标项目id列表
-        List<String> unsatisfiedPjIdList = new ArrayList<>();
-        for (String pjId : queryPlatformParamDTO.getProjectIdList()) {
-            Double bianSunRate = getBianSunRate(queryPlatformParamDTO.getUserId(), queryPlatformParamDTO.getGroupCode(), pjId, queryPlatformParamDTO.getReportDate());
-            if (null != bianSunRate && null != standardValue) {
-                if (DataUtils.getQualifyResult(standardValue, qualifyFormula, bianSunRate) == 0.0) {
-                    unsatisfiedCount++;
-                    unsatisfiedPjIdList.add(pjId);
-                } else {
-                    satisfiedCount++;
-                }
-            }
-        }
-        // 根据未达标项目id列表获取不达标项目名称
-        List<String> unsatisfiedPjNameList = commonService.getPjNameByPjId(unsatisfiedPjIdList);
-        PlatformAreaInfoVO platformAreaInfoVO = new PlatformAreaInfoVO();
-        platformAreaInfoVO.setSatisfiedCount(satisfiedCount);
-        platformAreaInfoVO.setUnsatisfiedCount(unsatisfiedCount);
-        platformAreaInfoVO.setUnsatisfiedProjects(unsatisfiedPjNameList);
-        return platformAreaInfoVO;
-    }
-}

+ 0 - 476
src/main/java/com/persagy/apm/report/dependencies/common/service/impl/CommonServiceImpl.java

@@ -1,476 +0,0 @@
-package com.persagy.apm.report.dependencies.common.service.impl;
-
-import com.persagy.apm.common.model.dto.PoemsPuser;
-import com.persagy.apm.common.response.PoemsFeignResponse;
-import com.persagy.apm.report.config.function.model.Function;
-import com.persagy.apm.report.config.statisticsitems.model.StatisticItems;
-import com.persagy.apm.report.config.statisticsitems.model.dto.QueryStatisticItemsDTO;
-import com.persagy.apm.report.config.statisticsitems.service.IStatisticItemsService;
-import com.persagy.apm.report.config.type.constant.enums.BelongTypeEnum;
-import com.persagy.apm.report.dependencies.centermiddleware.model.vo.ProjectEERDataVo;
-import com.persagy.apm.report.dependencies.centermiddleware.service.ICenterMiddlewareWebService;
-import com.persagy.apm.report.dependencies.common.DataConstants;
-import com.persagy.apm.report.dependencies.common.dto.QueryPlatformParamDTO;
-import com.persagy.apm.report.dependencies.common.service.CommonService;
-import com.persagy.apm.report.dependencies.common.service.PlatformService;
-import com.persagy.apm.report.dependencies.common.utils.DataUtils;
-import com.persagy.apm.report.dependencies.common.utils.DateUtils;
-import com.persagy.apm.report.dependencies.common.utils.SpringContextHolder;
-import com.persagy.apm.report.dependencies.common.vo.PlatformAreaInfoVO;
-import com.persagy.apm.report.dependencies.common.vo.WorkOrderVO;
-import com.persagy.apm.report.dependencies.emsweather.service.EMSWeatherWebService;
-import com.persagy.apm.report.dependencies.environment.model.dto.BatchQueryEnvListByParamDTO;
-import com.persagy.apm.report.dependencies.environment.service.IEnvironmentWebService;
-import com.persagy.apm.report.dependencies.equiprunmanager.service.IEquipRunManagerService;
-import com.persagy.apm.report.dependencies.iotdataanalysis.model.AlarmInfoVo;
-import com.persagy.apm.report.dependencies.iotdataanalysis.model.CountAndDayRateDataVo;
-import com.persagy.apm.report.dependencies.iotdataanalysis.service.IDataAnalysisWebService;
-import com.persagy.apm.report.dependencies.saasweb.model.dto.QueryProjectDTO;
-import com.persagy.apm.report.dependencies.saasweb.model.vo.PoemsProjectVO;
-import com.persagy.apm.report.dependencies.saasweb.model.vo.ReportProjectVO;
-import com.persagy.apm.report.dependencies.saasweb.service.ISaasWebService;
-import com.persagy.apm.report.dependencies.saasweb.service.impl.SaasWebClientWrapper;
-import com.persagy.apm.report.dependencies.workorder.model.WorkOrder;
-import com.persagy.apm.report.dependencies.workorder.service.IWorkOrderWebService;
-import com.persagy.apm.report.detail.business.model.Platform;
-import com.persagy.apm.report.detail.common.model.vo.DateGraphItemVO;
-import com.persagy.apm.report.detail.hotel.project.model.vo.*;
-import io.swagger.annotations.Api;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.stereotype.Service;
-import org.springframework.util.CollectionUtils;
-import org.springframework.util.StringUtils;
-
-import java.util.*;
-
-@Api(value = "公共service实现类")
-@Service
-@Slf4j
-public class CommonServiceImpl implements CommonService {
-
-    @Autowired
-    SaasWebClientWrapper saasWebClientWrapper;
-
-    @Autowired
-    SpringContextHolder holder;
-
-    @Autowired
-    IWorkOrderWebService iWorkOrderWebService;
-
-    @Autowired
-    IEnvironmentWebService iEnvironmentWebService;
-
-    @Autowired
-    IDataAnalysisWebService iDataAnalysisWebService;
-
-    @Value("${group.code}")
-    String groupCode;
-
-    @Autowired
-    IStatisticItemsService iStatisticItemsService;
-
-    @Autowired
-    ISaasWebService saasWebService;
-
-//    @Value("${work.order.type}")
-    String workOrderType;
-
-//    @Value("${energy.save.work.order.type}")
-    String energySaveWorkOrderType;
-
-    @Autowired
-    IEquipRunManagerService iEquipRunManagerService;
-
-    @Autowired
-    EMSWeatherWebService emsWeatherWebService;
-
-    @Autowired
-    ICenterMiddlewareWebService iCenterMiddlewareWebService;
-
-    @Override
-    public List<String> getPjNameByPjId(List<String> pjIdList) {
-        if (CollectionUtils.isEmpty(pjIdList)) {
-            return new ArrayList<>();
-        }
-        QueryProjectDTO queryProjectDTO = new QueryProjectDTO();
-        PoemsPuser poemsPuser = new PoemsPuser();
-        poemsPuser.setUserId(DataConstants.USER_ID);
-        poemsPuser.setLoginDevice(DataConstants.LOGIN_DEVICE);
-        poemsPuser.setPd(DataConstants.PD);
-        queryProjectDTO.setPuser(poemsPuser);
-        PoemsFeignResponse<PoemsProjectVO> projectsResponse = saasWebClientWrapper.queryProjects(queryProjectDTO);
-        List<PoemsProjectVO> projectVOList = projectsResponse.getContent();
-        if (!CollectionUtils.isEmpty(projectVOList)) {
-            List<String> pjNameList = new ArrayList<>();
-            for (PoemsProjectVO poemsProjectVO : projectVOList) {
-                if (!pjIdList.contains(poemsProjectVO.getProjectId())) {
-                    continue;
-                }
-                pjNameList.add(poemsProjectVO.getProjectLocalName());
-            }
-            return pjNameList;
-        }
-        return new ArrayList<>();
-    }
-
-    @Override
-    public Platform getPlatform(StatisticItems statisticItems, QueryPlatformParamDTO queryPlatformParamDTO) {
-        String serviceName = statisticItems.getItemCode() + statisticItems.getItemSource() + "WebService";
-        PlatformService platformService = holder.getPlatformService(serviceName);
-        Platform platform = new Platform();
-        platform.setItemCode(statisticItems.getItemCode());
-        platform.setModelName(statisticItems.getItemName());
-        if (queryPlatformParamDTO.getBelongType().equals(BelongTypeEnum.PROJECT.getType())) {
-            platform.setMonthlySummaries(platformService.getPjPlatformRate(queryPlatformParamDTO));
-        } else if (queryPlatformParamDTO.getBelongType().equals(BelongTypeEnum.AREA.getType())) {
-            // 合格标准
-            String standardValueStr = statisticItems.getStandardValue();
-            Double standardValue = DataUtils.parseDouble(standardValueStr);
-            platform.setStandardValue(standardValue);
-            platform.setQualifyFormula(statisticItems.getQualifyFormula());
-            platform.setStandardFlag(statisticItems.getStandardFlag());
-            PlatformAreaInfoVO platformAreaInfoVO = platformService.getAreaPlatformRate(statisticItems, queryPlatformParamDTO);
-            if (null != platformAreaInfoVO) {
-                platform.setSatisfiedCount(platformAreaInfoVO.getSatisfiedCount());
-                platform.setUnsatisfiedCount(platformAreaInfoVO.getUnsatisfiedCount());
-                platform.setUnsatisfiedProjects(platformAreaInfoVO.getUnsatisfiedProjects());
-            }
-        }
-        return platform;
-    }
-
-    @Override
-    public HotelProjectAlarmDealInfo getHotelProjectAlarmDealInfo(String projectId, Date reportDate) {
-        if (StringUtils.isEmpty(projectId) || null == reportDate) {
-            log.info("获取HotelProjectAlarmDealInfo信息时传入参为空,故不进行查询");
-            return new HotelProjectAlarmDealInfo();
-        }
-        Integer workCount = 0;
-        Integer dealCount = 0;
-        List<WorkOrder> askEndTimeList = iWorkOrderWebService.getWorkOrderNumByParam(projectId, reportDate, "ask_end_time", null, "8");
-        if (null != askEndTimeList) {
-            dealCount = askEndTimeList.size();
-        }
-        List<WorkOrder> createTimeWorkList = iWorkOrderWebService.getWorkOrderNumByParam(projectId, reportDate, "create_time", null, null);
-        if (null != createTimeWorkList) {
-            workCount = createTimeWorkList.size();
-        }
-        Double completeRate = null;
-        if (null != workCount && workCount != 0 && null != dealCount) {
-            completeRate = DataUtils.parseDouble(dealCount) / workCount * 100;
-        }
-        HotelProjectAlarmDealInfo hotelProjectAlarmDealInfo = new HotelProjectAlarmDealInfo();
-        hotelProjectAlarmDealInfo.setHandledCount(dealCount);
-        hotelProjectAlarmDealInfo.setHandledPercent(completeRate);
-        hotelProjectAlarmDealInfo.setTotalCount(workCount);
-        // 获取项目信息
-        ReportProjectVO reportProjectInfo = saasWebService.getReportProjectInfo(projectId);
-        hotelProjectAlarmDealInfo.setProjectName(null == reportProjectInfo ? "" : reportProjectInfo.getProjectName());
-        return hotelProjectAlarmDealInfo;
-    }
-
-    @Override
-    public HotelProjectKpiItem getHotelProjectKpiItem(String projectId, Date reportDate, List<String> projectIdList, Function function) {
-        if (CollectionUtils.isEmpty(projectIdList) || StringUtils.isEmpty(projectId) || null == reportDate || null == function || StringUtils.isEmpty(function.getItemId())) {
-            log.info("获取HotelProjectKpiItem信息时传入参为空,故不进行查询");
-            return new HotelProjectKpiItem();
-        }
-        try {
-            String startTime = DateUtils.date2Str(reportDate, DateUtils.SDF_SECOND);
-            String endTime = DateUtils.date2Str(DateUtils.getMonthOff(reportDate, 1), DateUtils.SDF_SECOND);
-            String itemId = function.getItemId();
-            String[] itemIdList = itemId.split("_");
-            String envTypdId = itemIdList[0];
-            String envParentTypeId = itemIdList[1];
-            BatchQueryEnvListByParamDTO batchQueryEnvListByParamDTO = new BatchQueryEnvListByParamDTO();
-            batchQueryEnvListByParamDTO.setProjectIdList(projectIdList);
-            batchQueryEnvListByParamDTO.setEnvTypeId(envTypdId);
-            batchQueryEnvListByParamDTO.setEnvParentTypeId(envParentTypeId);
-            batchQueryEnvListByParamDTO.setStartTime(startTime);
-            batchQueryEnvListByParamDTO.setEndTime(endTime);
-            List<HotelProjectKpiItem> hotelProjectKpiItemList = iEnvironmentWebService.getPjEnvRateInfoMap(batchQueryEnvListByParamDTO);
-            Map<String, Integer> sortMap = new HashMap<>();
-            sortMap.put("controlRates", -1);
-            DataUtils.sort(hotelProjectKpiItemList, sortMap);
-            for (int i = 0; i < hotelProjectKpiItemList.size(); i++) {
-                HotelProjectKpiItem hotelProjectKpiItem = hotelProjectKpiItemList.get(i);
-                if (!hotelProjectKpiItem.getProjectId().equals(projectId)) {
-                    continue;
-                }
-                if (hotelProjectKpiItem.getControlRates() != null) {
-                    hotelProjectKpiItem.setRank(i + 1);
-                }
-                hotelProjectKpiItem.setName(function.getName());
-                return hotelProjectKpiItem;
-            }
-        } catch (Exception e) {
-            log.error("获取HotelProjectKpiItem的" + function.getItemId() + "数据失败:", e);
-        }
-        return new HotelProjectKpiItem();
-    }
-
-    @Override
-    public HotelProjectMaintenanceGraph getHotelProjectMaintenanceGraph(String userId, String projectId, Date reportDate, Function function) {
-        if (StringUtils.isEmpty(projectId) || null == reportDate || null == function || StringUtils.isEmpty(function.getItemId())) {
-            log.info("获取HotelProjectMaintenanceGraph信息时传入参为空,故不进行查询");
-            return new HotelProjectMaintenanceGraph();
-        }
-        HotelProjectMaintenanceGraph hotelProjectMaintenanceGraph = new HotelProjectMaintenanceGraph();
-        try {
-            String userCode = DataConstants.USER_ID;
-            if (!StringUtils.isEmpty(userId)) {
-                userCode = userId;
-            }
-            String[] itemIdList = function.getItemId().split("_");
-            String itemId = itemIdList[0];
-            String itemStandardCode = itemIdList[1];
-            String targetCode = iDataAnalysisWebService.getTargetCode(userCode, groupCode, itemId);
-            CountAndDayRateDataVo dataVo = iDataAnalysisWebService.getIotDataAnalysisData(userCode, groupCode, projectId, reportDate, targetCode);
-            List<DateGraphItemVO> dateGraphItemVOList = new ArrayList<>();
-            TreeMap<Date, Double> dataMap = dataVo.getDataMap();
-            /*if (null != dataMap && dataMap.size() != 0) {
-                for (Map.Entry<Date, Double> entry : dataMap.entrySet()) {
-                    DateGraphItemVO dateGraphItemVO = new DateGraphItemVO();
-                    dateGraphItemVO.setDate(entry.getKey());
-                    dateGraphItemVO.setValue(entry.getValue());
-                    dateGraphItemVOList.add(dateGraphItemVO);
-                }
-            }*/
-            List<Date> dateList = DateUtils.getDayList(reportDate, DateUtils.getMonthOff(reportDate, 1));
-            for (Date date : dateList) {
-                DateGraphItemVO dateGraphItemVO = new DateGraphItemVO();
-                dateGraphItemVO.setDate(date);
-                dateGraphItemVO.setValue(null == dataMap ? null : dataMap.get(date));
-                dateGraphItemVOList.add(dateGraphItemVO);
-            }
-            hotelProjectMaintenanceGraph.setMonthlyValue(dataVo.getCountRate());
-            String standardValue = null;
-            QueryStatisticItemsDTO queryStatisticItemsDTO = new QueryStatisticItemsDTO();
-            queryStatisticItemsDTO.setItemCode(itemStandardCode);
-            List<StatisticItems> statisticItemList = iStatisticItemsService.queryStatisticItemsList(queryStatisticItemsDTO);
-            if (!CollectionUtils.isEmpty(statisticItemList)) {
-                StatisticItems statisticItems = statisticItemList.get(0);
-                standardValue = statisticItems.getStandardValue();
-            }
-            hotelProjectMaintenanceGraph.setStandardValue(DataUtils.parseDouble(standardValue));
-            hotelProjectMaintenanceGraph.setName(function.getName());
-            hotelProjectMaintenanceGraph.setValue(dateGraphItemVOList);
-        } catch (Exception e) {
-            log.error("获取HotelProjectMaintenanceGraph的" + function.getItemId() + "数据失败:", e);
-        }
-        return hotelProjectMaintenanceGraph;
-    }
-
-    @Override
-    public HotelProjectMaintenanceInfo getHotelProjectMaintenanceInfo(String userId, String projectId, Date reportDate, List<Function> functionList, List<String> projectIdList) {
-        if (StringUtils.isEmpty(projectId) || null == reportDate || CollectionUtils.isEmpty(functionList) || CollectionUtils.isEmpty(projectIdList)) {
-            log.info("获取HotelProjectMaintenanceInfo信息时传入参为空,故不进行查询");
-            return new HotelProjectMaintenanceInfo();
-        }
-        HotelProjectMaintenanceInfo hotelProjectMaintenanceInfo = new HotelProjectMaintenanceInfo();
-        // 设置默认值
-        hotelProjectMaintenanceInfo.setBreakCount(0);
-        hotelProjectMaintenanceInfo.setBreakLostTime(0.0);
-        List<HotelProjectMaintenanceGraph> hotelProjectMaintenanceGraphList = new ArrayList<>();
-        if (!CollectionUtils.isEmpty(functionList)) {
-            for (Function function : functionList) {
-                hotelProjectMaintenanceGraphList.add(getHotelProjectMaintenanceGraph(userId, projectId, reportDate, function));
-            }
-        }
-        List<AlarmInfoVo> alarmInfoVoList = iDataAnalysisWebService.getAlarmInfoVo(groupCode, projectIdList, reportDate);
-        Map<String, Integer> sortMap = new HashMap<>();
-        sortMap.put("alarmCount", -1);
-        sortMap.put("projectId", 1);
-        DataUtils.sort(alarmInfoVoList, sortMap);
-        for (int i = 0; i < alarmInfoVoList.size(); i++) {
-            AlarmInfoVo vo = alarmInfoVoList.get(i);
-            if (!vo.getProjectId().equals(projectId)) {
-                continue;
-            }
-            hotelProjectMaintenanceInfo.setBreakCount(vo.getAlarmCount());
-            hotelProjectMaintenanceInfo.setBreakLostTime(vo.getTotalDuration());
-            if (vo.getAlarmCount() != null) {
-                hotelProjectMaintenanceInfo.setRank(i + 1);
-            }
-            break;
-        }
-        hotelProjectMaintenanceInfo.setProjectTotalCount(projectIdList.size());
-        hotelProjectMaintenanceInfo.setGraphs(hotelProjectMaintenanceGraphList);
-        return hotelProjectMaintenanceInfo;
-    }
-
-    @Override
-    public HotelProjectEnergyWorkerOrderInfo getHotelProjectEnergyWorkerOrderInfo(String projectId, Date reportDate) {
-        if (StringUtils.isEmpty(projectId) || null == reportDate) {
-            log.info("获取HotelProjectEnergyWorkerOrderInfo信息时传入参为空,故不进行查询");
-            return new HotelProjectEnergyWorkerOrderInfo();
-        }
-        HotelProjectEnergyWorkerOrderInfo hotelProjectEnergyWorkerOrderInfo = new HotelProjectEnergyWorkerOrderInfo();
-        try {
-            List<WorkOrder> createTimeWorkList = iWorkOrderWebService.getWorkOrderNumByParam(projectId, reportDate, "create_time", workOrderType, null);
-            Integer totalCount = 0;
-            if (null != createTimeWorkList) {
-                totalCount = createTimeWorkList.size();
-            }
-            List<WorkOrder> realFinishTimeWorkList = iWorkOrderWebService.getWorkOrderNumByParam(projectId, reportDate, "real_finish_time", workOrderType, null);
-            Integer executeCount = 0;
-            if (null != realFinishTimeWorkList) {
-                executeCount = realFinishTimeWorkList.size();
-            }
-            hotelProjectEnergyWorkerOrderInfo.setTotalCount(totalCount);
-            hotelProjectEnergyWorkerOrderInfo.setExecuteCount(executeCount);
-            Double executePercent = null;
-            if (null != totalCount && totalCount != 0 && null != executeCount) {
-                executePercent = DataUtils.parseDouble(executeCount) / totalCount * 100;
-            }
-            hotelProjectEnergyWorkerOrderInfo.setExecutePercent(executePercent);
-            List<WorkOrder> energySaveRealFinishTimeWorkList = iWorkOrderWebService.getWorkOrderNumByParam(projectId, reportDate, "real_finish_time", energySaveWorkOrderType, null);
-            Integer initiativeCount = 0;
-            if (null != energySaveRealFinishTimeWorkList) {
-                initiativeCount = energySaveRealFinishTimeWorkList.size();
-            }
-            hotelProjectEnergyWorkerOrderInfo.setInitiativeCount(initiativeCount);
-            List<String> workOrderIdList = new ArrayList<>();
-            List<WorkOrderVO> workOrderVOList = new ArrayList<>();
-            for (WorkOrder workOrder : energySaveRealFinishTimeWorkList) {
-                workOrderIdList.add(workOrder.getOrderId());
-                WorkOrderVO vo = new WorkOrderVO();
-                vo.setOrderId(workOrder.getOrderId());
-                vo.setOrderName(workOrder.getWoName());
-                if (!StringUtils.isEmpty(workOrder.getRealFinishTime())) {
-                    vo.setRealFinishTime(DateUtils.str2Date(workOrder.getRealFinishTime(), DateUtils.SDFSECOND));
-                }
-                workOrderVOList.add(vo);
-            }
-            // {工单id:工单节能量}
-            Map<String, Double> workId_energyMap = iEquipRunManagerService.getEnergySaveWorderMap(workOrderIdList);
-            Map<String, Integer> sortMap = new HashMap<>();
-            sortMap.put("realFinishTime", -1);
-            DataUtils.sort(workOrderVOList, sortMap);
-            List<HotelProjectEnergyWorkOrderItem> hotelProjectEnergyWorkOrderItemList = new ArrayList<>();
-            Double totalEnergySave = null;
-            for (WorkOrderVO workOrder : workOrderVOList) {
-                HotelProjectEnergyWorkOrderItem hotelProjectEnergyWorkOrderItem = new HotelProjectEnergyWorkOrderItem();
-                hotelProjectEnergyWorkOrderItem.setWorkName(workOrder.getOrderName());
-                String completeTimeStr = "";
-                if (!StringUtils.isEmpty(workOrder.getRealFinishTime())) {
-                    completeTimeStr = DateUtils.date2Str(workOrder.getRealFinishTime(), DateUtils.SDF_DOT_DAY);
-                }
-                hotelProjectEnergyWorkOrderItem.setCompletedTime(completeTimeStr);
-                hotelProjectEnergyWorkOrderItem.setEnergySaved(workId_energyMap.get(workOrder.getOrderId()));
-                hotelProjectEnergyWorkOrderItemList.add(hotelProjectEnergyWorkOrderItem);
-                Double energySave = workId_energyMap.get(workOrder.getOrderId());
-                if (energySave != null) {
-                    if (null == totalEnergySave) {
-                        totalEnergySave = 0.0;
-                    }
-                    totalEnergySave = totalEnergySave + energySave;
-                }
-            }
-            hotelProjectEnergyWorkerOrderInfo.setDetailInfo(hotelProjectEnergyWorkOrderItemList);
-            hotelProjectEnergyWorkerOrderInfo.setTotalEnergySave(totalEnergySave);
-            // 获取项目信息
-            ReportProjectVO reportProjectInfo = saasWebService.getReportProjectInfo(projectId);
-            hotelProjectEnergyWorkerOrderInfo.setProjectName(null == reportProjectInfo ? "" : reportProjectInfo.getProjectName());
-
-        } catch (Exception e) {
-            log.error("获取HotelProjectEnergyWorkerOrderInfo的数据失败:", e);
-        }
-        return hotelProjectEnergyWorkerOrderInfo;
-    }
-
-    @Override
-    public HotelProjectMaintenanceBaseInfo getHotelProjectMaintenanceBaseInfo(String projectId, Date reportDate, String userId) {
-        if (StringUtils.isEmpty(projectId) || null == reportDate) {
-            log.info("获取HotelProjectMaintenanceBaseInfo信息时传入参为空,故不进行查询");
-            return new HotelProjectMaintenanceBaseInfo();
-        }
-        String userCode = DataConstants.USER_ID;
-        if (!StringUtils.isEmpty(userId)) {
-            userCode = userId;
-        }
-        HotelProjectMaintenanceBaseInfo hotelProjectMaintenanceBaseInfo = iDataAnalysisWebService.getHotelProjectMaintenanceBaseInfo(userCode, groupCode, projectId, reportDate);
-        // 获取项目信息
-        ReportProjectVO reportProjectInfo = saasWebService.getReportProjectInfo(projectId);
-        hotelProjectMaintenanceBaseInfo.setProjectName(null == reportProjectInfo ? "" : reportProjectInfo.getProjectName());
-        return hotelProjectMaintenanceBaseInfo;
-    }
-
-    @Override
-    public HotelProjectChillerPlantEfficiency getHotelProjectChillerPlantEfficiency(String projectId, Date reportDate, List<String> pjIdList) {
-        log.info("获取HotelProjectChillerPlantEfficiency开始");
-        if (StringUtils.isEmpty(projectId) || null == reportDate) {
-            log.info("获取HotelProjectChillerPlantEfficiency信息时传入参为空,故不进行查询");
-            return new HotelProjectChillerPlantEfficiency();
-        }
-        HotelProjectChillerPlantEfficiency hotelProjectChillerPlantEfficiency = new HotelProjectChillerPlantEfficiency();
-        Double avgTempCurrentMonth = emsWeatherWebService.getPjMonthAvgTemp(projectId, reportDate);
-        Double avgTempLastYearMonth = emsWeatherWebService.getPjMonthAvgTemp(projectId, DateUtils.getYearOff(reportDate, -1));
-        emsWeatherWebService.getPjMonthAvgTemp(projectId, DateUtils.getYearOff(reportDate, -1));
-        hotelProjectChillerPlantEfficiency.setAverageTemperatureCurrentMonth(avgTempCurrentMonth);
-        hotelProjectChillerPlantEfficiency.setAverageTemperatureLastYearSameTime(avgTempLastYearMonth);
-        Double avgTempGrowth = null;
-        if (avgTempCurrentMonth != null && avgTempLastYearMonth != null) {
-            avgTempGrowth = avgTempCurrentMonth - avgTempLastYearMonth;
-        }
-        hotelProjectChillerPlantEfficiency.setAverageTemperatureGrowth(avgTempGrowth);
-        List<ProjectEERDataVo> projectEERDataVoList = iCenterMiddlewareWebService.getProjectEERDataList(pjIdList, groupCode, reportDate);
-        Map<String, Integer> sortMap = new HashMap<>();
-        sortMap.put("eer", -1);
-        DataUtils.sort(projectEERDataVoList, sortMap);
-        for (int i = 0; i < projectEERDataVoList.size(); i++) {
-            ProjectEERDataVo vo = projectEERDataVoList.get(i);
-            if (!vo.getProjectId().equals(projectId)) {
-                continue;
-            }
-            hotelProjectChillerPlantEfficiency.setEer(vo.getEer());
-            hotelProjectChillerPlantEfficiency.setMaxEerTime(vo.getMaxEerTimeList());
-            hotelProjectChillerPlantEfficiency.setMinEerTime(vo.getMinEerTimeList());
-            hotelProjectChillerPlantEfficiency.setCoolingCapacityCurrentMonth(vo.getCoolingCapacityCurrentMonth());
-            List<DateGraphItemVO> eerDetailInfo = vo.getEerDetailInfo();
-            sortMap.put("date", 1);
-            DataUtils.sort(vo.getEerDetailInfo(), sortMap);
-            hotelProjectChillerPlantEfficiency.setEerDetailInfo(vo.getEerDetailInfo());
-            if (vo.getEer() != null) {
-                hotelProjectChillerPlantEfficiency.setRank(i + 1);
-            }
-            break;
-        }
-        hotelProjectChillerPlantEfficiency.setProjectTotalCount(pjIdList.size());
-        List<String> currentProjectIdList = new ArrayList<>();
-        currentProjectIdList.add(projectId);
-        List<ProjectEERDataVo> currentPjLastYearEERDataVoList = iCenterMiddlewareWebService.getProjectEERDataList(currentProjectIdList, groupCode, DateUtils.getYearOff(reportDate, -1));
-        if (!CollectionUtils.isEmpty(currentPjLastYearEERDataVoList)) {
-            ProjectEERDataVo currentPjLastYearEERDataVo = currentPjLastYearEERDataVoList.get(0);
-            if (currentPjLastYearEERDataVo != null) {
-                hotelProjectChillerPlantEfficiency.setCoolingCapacityLastYearSameTime(currentPjLastYearEERDataVo.getCoolingCapacityCurrentMonth());
-                Double currentMonth = hotelProjectChillerPlantEfficiency.getCoolingCapacityCurrentMonth();
-                Double lastYearSameMonth = currentPjLastYearEERDataVo.getCoolingCapacityCurrentMonth();
-                Double coolingCapacityRange = null;
-                if (lastYearSameMonth != null && lastYearSameMonth != 0.0 && currentMonth != null) {
-                    coolingCapacityRange = (currentMonth - lastYearSameMonth) / lastYearSameMonth * 100;
-                }
-                hotelProjectChillerPlantEfficiency.setCoolingCapacityRange(coolingCapacityRange);
-            }
-        }
-        List<ProjectEERDataVo> currentPjLastMonthEERDataVoList = iCenterMiddlewareWebService.getProjectEERDataList(currentProjectIdList, groupCode, DateUtils.getMonthOff(reportDate, -1));
-        if (!CollectionUtils.isEmpty(currentPjLastMonthEERDataVoList)) {
-            ProjectEERDataVo currentPjLastMonthEERDataVo = currentPjLastMonthEERDataVoList.get(0);
-            if (currentPjLastMonthEERDataVo != null) {
-                hotelProjectChillerPlantEfficiency.setEerLastMonth(currentPjLastMonthEERDataVo.getEer());
-                Double currentMonth = hotelProjectChillerPlantEfficiency.getEer();
-                Double lastMonth = currentPjLastMonthEERDataVo.getEer();
-                Double eerMonthRange = null;
-                if (lastMonth != null && lastMonth != 0.0 && currentMonth != null) {
-                    eerMonthRange = (currentMonth - lastMonth) / lastMonth * 100;
-                }
-                hotelProjectChillerPlantEfficiency.setEerMonthRange(eerMonthRange);
-            }
-        }
-        log.info("获取HotelProjectChillerPlantEfficiency结束");
-        return hotelProjectChillerPlantEfficiency;
-    }
-
-}

+ 0 - 111
src/main/java/com/persagy/apm/report/dependencies/common/service/impl/EnvironmentPlatformServiceImpl.java

@@ -1,111 +0,0 @@
-package com.persagy.apm.report.dependencies.common.service.impl;
-
-import com.persagy.apm.common.response.PoemsFeignResponse;
-import com.persagy.apm.report.dependencies.common.DataConstants;
-import com.persagy.apm.report.dependencies.common.dto.QueryPlatformParamDTO;
-import com.persagy.apm.report.dependencies.common.service.CommonService;
-import com.persagy.apm.report.dependencies.common.service.PlatformService;
-import com.persagy.apm.report.dependencies.common.utils.DataUtils;
-import com.persagy.apm.report.dependencies.common.utils.DateUtils;
-import com.persagy.apm.report.dependencies.common.vo.PlatformAreaInfoVO;
-import com.persagy.apm.report.dependencies.environment.model.dto.QueryEnvListByParamDTO;
-import com.persagy.apm.report.dependencies.environment.model.vo.EnvAvgRateVO;
-import com.persagy.apm.report.dependencies.environment.service.impl.EnvironmentWebClientWrapper;
-import com.persagy.apm.report.config.statisticsitems.model.StatisticItems;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.util.CollectionUtils;
-
-import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.TreeMap;
-import java.util.stream.Collectors;
-
-@Service("TemperatureRateEnvironmentWebService")
-@Slf4j
-public class EnvironmentPlatformServiceImpl implements PlatformService {
-
-    @Autowired
-    private EnvironmentWebClientWrapper environmentWebClientWrapper;
-    @Resource
-    private CommonService commonService;
-
-    @Override
-    public List<Double> getPjPlatformRate(QueryPlatformParamDTO queryPlatformParamDTO) {
-        if (null == queryPlatformParamDTO || CollectionUtils.isEmpty(queryPlatformParamDTO.getProjectIdList()) || null == queryPlatformParamDTO.getReportDate()) {
-            return new ArrayList<>();
-        }
-        String pjId = queryPlatformParamDTO.getProjectIdList().get(0);
-        TreeMap<Date, Double> date_rateMap = new TreeMap<>();
-        Date reportDate = queryPlatformParamDTO.getReportDate();
-        Date startDate = DateUtils.getFirstDayOfYear(reportDate);
-        while (startDate.before(DateUtils.getMonthOff(reportDate, 1))) {
-            date_rateMap.put(startDate, getEnvAvgRate(pjId, startDate));
-            startDate = DateUtils.getMonthOff(startDate, 1);
-        }
-        List<Double> monthlySummaries = date_rateMap.values().stream().collect(Collectors.toList());
-        return monthlySummaries;
-    }
-
-    private Double getEnvAvgRate(String pjId, Date reportDate) {
-        Double avgRate = null;
-        try {
-            QueryEnvListByParamDTO paramDTO = new QueryEnvListByParamDTO();
-            paramDTO.setProjectId(pjId);
-            paramDTO.setEnvTypeId(DataConstants.ENV_TYPE_ID);
-            paramDTO.setEnvParentTypeId(DataConstants.ENV_PARENT_TYPE_ID);
-            paramDTO.setStartTime(DateUtils.date2Str(reportDate, DateUtils.SDF_SECOND));
-            paramDTO.setEndTime(DateUtils.date2Str(DateUtils.getMonthOff(reportDate, 1), DateUtils.SDF_SECOND));
-            PoemsFeignResponse<EnvAvgRateVO> response = environmentWebClientWrapper.listEnvTypeAvgRateByParam(paramDTO);
-            List<EnvAvgRateVO> envAvgRateVOList = response.getContent();
-            if (!CollectionUtils.isEmpty(envAvgRateVOList)) {
-                EnvAvgRateVO envAvgRateVO = envAvgRateVOList.get(0);
-                if (null != envAvgRateVO) {
-                    return envAvgRateVO.getAvgNum();
-                }
-            }
-        } catch (Exception e) {
-            log.error("获取环境健康服务温度达标率数据异常", e);
-        }
-        return avgRate;
-    }
-
-    @Override
-    public PlatformAreaInfoVO getAreaPlatformRate(StatisticItems statisticItems, QueryPlatformParamDTO queryPlatformParamDTO) {
-        if (null == queryPlatformParamDTO || CollectionUtils.isEmpty(queryPlatformParamDTO.getProjectIdList()) || null == queryPlatformParamDTO.getReportDate()) {
-            return new PlatformAreaInfoVO();
-        }
-        // 合格标准
-        String standardValueStr = statisticItems.getStandardValue();
-        Double standardValue = DataUtils.parseDouble(standardValueStr);
-        // 校验规则
-        String qualifyFormula = statisticItems.getQualifyFormula();
-        // 达标数量
-        Integer satisfiedCount = 0;
-        // 未达标数量
-        Integer unsatisfiedCount = 0;
-        // 未达标项目id列表
-        List<String> unsatisfiedPjIdList = new ArrayList<>();
-        for (String pjId : queryPlatformParamDTO.getProjectIdList()) {
-            Double completeRate = getEnvAvgRate(pjId, queryPlatformParamDTO.getReportDate());
-            if (null != completeRate && null != standardValue) {
-                if (DataUtils.getQualifyResult(standardValue, qualifyFormula, completeRate) == 0.0) {
-                    unsatisfiedCount++;
-                    unsatisfiedPjIdList.add(pjId);
-                } else {
-                    satisfiedCount++;
-                }
-            }
-        }
-        // 根据未达标项目id列表获取不达标项目名称
-        List<String> pjNameList = commonService.getPjNameByPjId(unsatisfiedPjIdList);
-        PlatformAreaInfoVO platformAreaInfoVO = new PlatformAreaInfoVO();
-        platformAreaInfoVO.setSatisfiedCount(satisfiedCount);
-        platformAreaInfoVO.setUnsatisfiedCount(unsatisfiedCount);
-        platformAreaInfoVO.setUnsatisfiedProjects(pjNameList);
-        return platformAreaInfoVO;
-    }
-}

+ 0 - 150
src/main/java/com/persagy/apm/report/dependencies/common/service/impl/WorkOrderPlatformServiceImpl.java

@@ -1,150 +0,0 @@
-package com.persagy.apm.report.dependencies.common.service.impl;
-
-import com.persagy.apm.report.dependencies.common.dto.QueryPlatformParamDTO;
-import com.persagy.apm.report.dependencies.common.service.CommonService;
-import com.persagy.apm.report.dependencies.common.service.PlatformService;
-import com.persagy.apm.report.dependencies.common.utils.DataUtils;
-import com.persagy.apm.report.dependencies.common.utils.DateUtils;
-import com.persagy.apm.report.dependencies.common.vo.PlatformAreaInfoVO;
-import com.persagy.apm.report.config.statisticsitems.model.StatisticItems;
-import com.persagy.apm.report.dependencies.workorder.model.WorkOrder;
-import com.persagy.apm.report.dependencies.workorder.repository.WorkOrderRepository;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang.StringUtils;
-import org.elasticsearch.index.query.BoolQueryBuilder;
-import org.elasticsearch.index.query.QueryBuilders;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Page;
-import org.springframework.data.elasticsearch.core.query.NativeSearchQuery;
-import org.springframework.data.elasticsearch.core.query.NativeSearchQueryBuilder;
-import org.springframework.stereotype.Service;
-import org.springframework.util.CollectionUtils;
-
-import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.TreeMap;
-import java.util.stream.Collectors;
-
-@Service("OrderCompleteRateWorkOrderWebService")
-@Slf4j
-public class WorkOrderPlatformServiceImpl implements PlatformService {
-
-    @Resource
-    private CommonService commonService;
-    @Autowired
-    private WorkOrderRepository workOrderRepository;
-
-    @Override
-    public List<Double> getPjPlatformRate(QueryPlatformParamDTO queryPlatformParamDTO) {
-        if (null == queryPlatformParamDTO || CollectionUtils.isEmpty(queryPlatformParamDTO.getProjectIdList()) || null == queryPlatformParamDTO.getReportDate()) {
-            return new ArrayList<>();
-        }
-        String pjId = queryPlatformParamDTO.getProjectIdList().get(0);
-        TreeMap<Date, Double> date_rateMap = new TreeMap<>();
-        Date reportDate = queryPlatformParamDTO.getReportDate();
-        Date startDate = DateUtils.getFirstDayOfYear(reportDate);
-        while (startDate.before(DateUtils.getMonthOff(reportDate, 1))) {
-            date_rateMap.put(startDate, getWorkOrderCompleteRate(pjId, startDate));
-            startDate = DateUtils.getMonthOff(startDate, 1);
-        }
-        List<Double> monthlySummaries = date_rateMap.values().stream().collect(Collectors.toList());
-        return monthlySummaries;
-    }
-
-    private Double getWorkOrderCompleteRate(String projectId, Date reportDate) {
-        Double completeRate = null;
-        try {
-            Integer workCount = getWorkOrderNumByParam(projectId, reportDate, "create_time", null);
-            Integer dealCount = getWorkOrderNumByParam(projectId, reportDate, "ask_end_time", "8");
-            if (null != workCount && workCount != 0 && null != dealCount) {
-                completeRate = DataUtils.parseDouble(dealCount) / workCount * 100;
-            }
-            return completeRate;
-        } catch (Exception e) {
-            log.error("计算工单完成率异常", e);
-        }
-        return completeRate;
-    }
-
-    private Integer getWorkOrderNumByParam(String projectId, Date reportDate, String timeType, String orderState) {
-        try {
-            String startTime = DateUtils.date2Str(reportDate, DateUtils.SDFSECOND);
-            String endTime = DateUtils.date2Str(DateUtils.getMonthOff(reportDate, 1), DateUtils.SDFSECOND);
-            BoolQueryBuilder queryOrderNumBuilder = createQueryParam(projectId, timeType, startTime, endTime, orderState);
-            NativeSearchQueryBuilder nativeSearchQueryBuilder = new NativeSearchQueryBuilder();
-            nativeSearchQueryBuilder.withQuery(queryOrderNumBuilder);
-            NativeSearchQuery query = nativeSearchQueryBuilder.build();
-            Page<WorkOrder> resultList = workOrderRepository.search(query);
-            if (null != resultList) {
-                return resultList.getSize();
-            }
-        } catch (Exception e) {
-            log.error("获取工单数据异常", e);
-        }
-        return null;
-    }
-
-    private BoolQueryBuilder createQueryParam(String pjId, String timeType, String startTime, String endTime, String orderState) {
-        BoolQueryBuilder queryBuilder = QueryBuilders.boolQuery();
-        queryBuilder.must(QueryBuilders.matchQuery("project_id", pjId));
-        //时间查询
-        if (StringUtils.isNotBlank(timeType)) {
-            if (StringUtils.isNotBlank(startTime)) {
-                if ("create_time".equals(timeType)) {
-                    queryBuilder.must(QueryBuilders.rangeQuery("create_time").gte(startTime));
-                } else if ("ask_end_time".equals(timeType)) {
-                    queryBuilder.must(QueryBuilders.rangeQuery("ask_end_time").gte(startTime));
-                }
-            }
-            if (StringUtils.isNotBlank(endTime)) {
-                if ("create_time".equals(timeType)) {
-                    queryBuilder.must(QueryBuilders.rangeQuery("create_time").lt(endTime));
-                } else if ("ask_end_time".equals(timeType)) {
-                    queryBuilder.must(QueryBuilders.rangeQuery("ask_end_time").lt(endTime));
-                }
-            }
-        }
-        if (StringUtils.isNotEmpty(orderState)) {
-            queryBuilder.must(QueryBuilders.matchQuery("order_state", orderState));
-        }
-        return queryBuilder;
-    }
-
-    @Override
-    public PlatformAreaInfoVO getAreaPlatformRate(StatisticItems statisticItems, QueryPlatformParamDTO queryPlatformParamDTO) {
-        if (null == queryPlatformParamDTO || CollectionUtils.isEmpty(queryPlatformParamDTO.getProjectIdList()) || null == queryPlatformParamDTO.getReportDate()) {
-            return new PlatformAreaInfoVO();
-        }
-        // 合格标准
-        String standardValueStr = statisticItems.getStandardValue();
-        Double standardValue = DataUtils.parseDouble(standardValueStr);
-        // 校验规则
-        String qualifyFormula = statisticItems.getQualifyFormula();
-        // 达标数量
-        Integer satisfiedCount = 0;
-        // 未达标数量
-        Integer unsatisfiedCount = 0;
-        // 未达标项目id列表
-        List<String> unsatisfiedPjIdList = new ArrayList<>();
-        for (String pjId : queryPlatformParamDTO.getProjectIdList()) {
-            Double completeRate = getWorkOrderCompleteRate(pjId, queryPlatformParamDTO.getReportDate());
-            if (null != completeRate && null != standardValue) {
-                if (DataUtils.getQualifyResult(standardValue, qualifyFormula, completeRate) == 0.0) {
-                    unsatisfiedCount++;
-                    unsatisfiedPjIdList.add(pjId);
-                } else {
-                    satisfiedCount++;
-                }
-            }
-        }
-        // 根据未达标项目id列表获取不达标项目名称
-        List<String> pjNameList = commonService.getPjNameByPjId(unsatisfiedPjIdList);
-        PlatformAreaInfoVO platformAreaInfoVO = new PlatformAreaInfoVO();
-        platformAreaInfoVO.setSatisfiedCount(satisfiedCount);
-        platformAreaInfoVO.setUnsatisfiedCount(unsatisfiedCount);
-        platformAreaInfoVO.setUnsatisfiedProjects(pjNameList);
-        return platformAreaInfoVO;
-    }
-}

+ 0 - 114
src/main/java/com/persagy/apm/report/dependencies/common/service/impl/ZongZhiDataAnalysisPlatformServiceImpl.java

@@ -1,114 +0,0 @@
-package com.persagy.apm.report.dependencies.common.service.impl;
-
-import com.alibaba.fastjson.JSONObject;
-import com.persagy.apm.report.dependencies.common.dto.QueryPlatformParamDTO;
-import com.persagy.apm.report.dependencies.common.service.CommonService;
-import com.persagy.apm.report.dependencies.common.service.PlatformService;
-import com.persagy.apm.report.dependencies.common.utils.DataUtils;
-import com.persagy.apm.report.dependencies.common.utils.DateUtils;
-import com.persagy.apm.report.dependencies.common.utils.HttpUtils;
-import com.persagy.apm.report.dependencies.common.vo.PlatformAreaInfoVO;
-import com.persagy.apm.report.config.statisticsitems.model.StatisticItems;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.collections.CollectionUtils;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.stereotype.Service;
-
-import javax.annotation.Resource;
-import java.util.*;
-import java.util.stream.Collectors;
-
-@Service("zongZhiRateDataAnalysisWebService")
-@Slf4j
-public class ZongZhiDataAnalysisPlatformServiceImpl implements PlatformService {
-
-    @Value("${iot.data.analysis.url}")
-    private String iotDataAnalysisUrl;
-
-    @Resource
-    private CommonService commonService;
-
-    public final static String SUCCESS = "success";
-
-    @Override
-    public List<Double> getPjPlatformRate(QueryPlatformParamDTO queryPlatformParamDTO) {
-        if (null == queryPlatformParamDTO || org.springframework.util.CollectionUtils.isEmpty(queryPlatformParamDTO.getProjectIdList()) || null == queryPlatformParamDTO.getReportDate()) {
-            return new ArrayList<>();
-        }
-        String pjId = queryPlatformParamDTO.getProjectIdList().get(0);
-        TreeMap<Date, Double> date_rateMap = new TreeMap<>();
-        Date reportDate = queryPlatformParamDTO.getReportDate();
-        Date startDate = DateUtils.getFirstDayOfYear(reportDate);
-        while (startDate.before(DateUtils.getMonthOff(reportDate, 1))) {
-            date_rateMap.put(startDate, getZongZhiRate(queryPlatformParamDTO.getUserId(), queryPlatformParamDTO.getGroupCode(), pjId, startDate));
-            startDate = DateUtils.getMonthOff(startDate, 1);
-        }
-        List<Double> monthlySummaries = date_rateMap.values().stream().collect(Collectors.toList());
-        return monthlySummaries;
-    }
-
-    private Double getZongZhiRate(String userId, String groupCode, String projectId, Date reportDate) {
-        Double rate = null;
-        try {
-            JSONObject paramObject = new JSONObject();
-            paramObject.put("userId", userId);
-            paramObject.put("groupCode", groupCode);
-            List<String> pjIdList = new ArrayList<>();
-            pjIdList.add(projectId);
-            paramObject.put("projectIdList", pjIdList);
-            Date startTime = DateUtils.getStartTimeOfDay(reportDate);
-            Date endTime = DateUtils.getMonthOff(startTime, 1);
-            paramObject.put("alarmStartTime", startTime);
-            paramObject.put("alarmEndTime", endTime);
-            String url = iotDataAnalysisUrl + "/alarm/show/view/queryList";
-            String response = HttpUtils.postJson(url, paramObject.toString());
-            JSONObject responseObject = JSONObject.parseObject(response);
-            if (SUCCESS.equals(responseObject.getString("respMsg"))) {
-                List<Map> content = (List<Map>) responseObject.get("content");
-                if (CollectionUtils.isNotEmpty(content)) {
-                    Map data = content.get(0);
-                    rate = DataUtils.parseDouble(data.get("zongZhiRate"));
-                }
-            }
-        } catch (Exception e) {
-            log.error("获取数据质量服务总支不平衡数据异常", e);
-        }
-        return rate;
-    }
-
-    @Override
-    public PlatformAreaInfoVO getAreaPlatformRate(StatisticItems statisticItems, QueryPlatformParamDTO queryPlatformParamDTO) {
-        if (null == queryPlatformParamDTO || org.springframework.util.CollectionUtils.isEmpty(queryPlatformParamDTO.getProjectIdList()) || null == queryPlatformParamDTO.getReportDate()) {
-            return new PlatformAreaInfoVO();
-        }
-        // 合格标准
-        String standardValueStr = statisticItems.getStandardValue();
-        Double standardValue = DataUtils.parseDouble(standardValueStr);
-        // 校验规则
-        String qualifyFormula = statisticItems.getQualifyFormula();
-        // 达标数量
-        Integer satisfiedCount = 0;
-        // 未达标数量
-        Integer unsatisfiedCount = 0;
-        // 未达标项目id列表
-        List<String> unsatisfiedPjIdList = new ArrayList<>();
-        for (String pjId : queryPlatformParamDTO.getProjectIdList()) {
-            Double zongZhiRate = getZongZhiRate(queryPlatformParamDTO.getUserId(), queryPlatformParamDTO.getGroupCode(), pjId, queryPlatformParamDTO.getReportDate());
-            if (null != zongZhiRate && null != standardValue) {
-                if (DataUtils.getQualifyResult(standardValue, qualifyFormula, zongZhiRate) == 0.0) {
-                    unsatisfiedCount++;
-                    unsatisfiedPjIdList.add(pjId);
-                } else {
-                    satisfiedCount++;
-                }
-            }
-        }
-        // 根据未达标项目id列表获取不达标项目名称
-        List<String> unsatisfiedPjNameList = commonService.getPjNameByPjId(unsatisfiedPjIdList);
-        PlatformAreaInfoVO platformAreaInfoVO = new PlatformAreaInfoVO();
-        platformAreaInfoVO.setSatisfiedCount(satisfiedCount);
-        platformAreaInfoVO.setUnsatisfiedCount(unsatisfiedCount);
-        platformAreaInfoVO.setUnsatisfiedProjects(unsatisfiedPjNameList);
-        return platformAreaInfoVO;
-    }
-}

+ 0 - 14
src/main/java/com/persagy/apm/report/dependencies/common/utils/SpringContextHolder.java

@@ -1,14 +0,0 @@
-package com.persagy.apm.report.dependencies.common.utils;
-
-import com.persagy.apm.report.dependencies.common.service.PlatformService;
-import org.springframework.context.support.ApplicationObjectSupport;
-import org.springframework.stereotype.Component;
-
-@Component
-public class SpringContextHolder extends ApplicationObjectSupport {
-
-    public PlatformService getPlatformService(String beanName) {
-        return super.getApplicationContext().getBean(beanName, PlatformService.class);
-    }
-
-}

+ 0 - 20
src/main/java/com/persagy/apm/report/dependencies/common/vo/PlatformAreaInfoVO.java

@@ -1,20 +0,0 @@
-package com.persagy.apm.report.dependencies.common.vo;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.util.List;
-
-@ApiModel
-@Data
-public class PlatformAreaInfoVO {
-    @ApiModelProperty("达标数量")
-    private Integer satisfiedCount;
-
-    @ApiModelProperty("未达标数量")
-    private Integer unsatisfiedCount;
-
-    @ApiModelProperty("未达标项目名称")
-    private List<String> unsatisfiedProjects;
-}

+ 0 - 20
src/main/java/com/persagy/apm/report/dependencies/common/vo/WorkOrderVO.java

@@ -1,20 +0,0 @@
-package com.persagy.apm.report.dependencies.common.vo;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.util.Date;
-
-@ApiModel
-@Data
-public class WorkOrderVO {
-    @ApiModelProperty("工单id")
-    private String orderId;
-
-    @ApiModelProperty("工单名称")
-    private String orderName;
-
-    @ApiModelProperty("工单实际完成时间")
-    private Date realFinishTime;
-}

+ 36 - 0
src/main/java/com/persagy/apm/report/dependencies/dmpalarm/client/DmpAlarmClient.java

@@ -0,0 +1,36 @@
+package com.persagy.apm.report.dependencies.dmpalarm.client;
+
+import com.persagy.apm.common.response.DmpPageResponse;
+import com.persagy.apm.report.common.config.FeignConfig;
+import com.persagy.apm.report.dependencies.dmpalarm.client.fallback.DmpAlarmClientFallbackFactory;
+import com.persagy.apm.report.dependencies.dmpalarm.model.AlarmRecord;
+import com.persagy.apm.report.dependencies.dmpalarm.model.dto.AlarmUrlParam;
+import com.persagy.apm.report.dependencies.dmpalarm.model.dto.QueryAlarmRecordDTO;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.cloud.openfeign.SpringQueryMap;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+/**
+ * 报警中台feign客户端
+ *
+ * @author lixing
+ * @version V1.0 2021/8/4 2:41 下午
+ **/
+@FeignClient(name = "dmp-alarm", fallbackFactory = DmpAlarmClientFallbackFactory.class,
+        configuration = FeignConfig.class)
+public interface DmpAlarmClient {
+    /**
+     * 查询报警记录
+     *
+     * @param alarmUrlParam       报警请求 url 通用参数
+     * @param queryAlarmRecordDTO 查询条件
+     * @return 报警记录
+     * @author lixing
+     * @version V1.0 2021/8/4 3:04 下午
+     */
+    @PostMapping("/alarm/record/query")
+    DmpPageResponse<AlarmRecord> queryAlarmRecord(
+            @SpringQueryMap AlarmUrlParam alarmUrlParam,
+            @RequestBody QueryAlarmRecordDTO queryAlarmRecordDTO);
+}

+ 13 - 0
src/main/java/com/persagy/apm/report/dependencies/dmpalarm/client/fallback/DmpAlarmClientFallbackFactory.java

@@ -0,0 +1,13 @@
+package com.persagy.apm.report.dependencies.dmpalarm.client.fallback;
+
+import com.persagy.apm.report.dependencies.dmpalarm.client.DmpAlarmClient;
+import feign.hystrix.FallbackFactory;
+import org.springframework.stereotype.Component;
+
+@Component
+public class DmpAlarmClientFallbackFactory implements FallbackFactory<DmpAlarmClient> {
+    @Override
+    public DmpAlarmClient create(Throwable throwable) {
+        return null;
+    }
+}

+ 0 - 0
src/main/java/com/persagy/apm/report/dependencies/dmpalarm/enums/EnumAlarmTreatState.java


Some files were not shown because too many files changed in this diff