|
@@ -3,11 +3,6 @@ package com.persagy.apm.report.indicator.factory;
|
|
|
import com.alibaba.excel.util.CollectionUtils;
|
|
|
import com.google.gson.Gson;
|
|
|
import com.persagy.apm.report.common.utils.DataUtils;
|
|
|
-import com.persagy.apm.report.userconfig.function.model.Function;
|
|
|
-import com.persagy.apm.report.userconfig.statisticsitems.enums.QualifiedEnum;
|
|
|
-import com.persagy.apm.report.userconfig.statisticsitems.enums.StatisticCodeEnum;
|
|
|
-import com.persagy.apm.report.userconfig.statisticsitems.model.StatisticItem;
|
|
|
-import com.persagy.apm.report.userconfig.statisticsitems.service.IStatisticItemService;
|
|
|
import com.persagy.apm.report.dependencies.dmpalarm.enums.EnumAlarmTreatState;
|
|
|
import com.persagy.apm.report.dependencies.dmpalarm.model.AlarmRecord;
|
|
|
import com.persagy.apm.report.dependencies.dmpalarm.service.AlarmServiceImpl;
|
|
@@ -18,6 +13,11 @@ import com.persagy.apm.report.detail.model.vo.ItemVO;
|
|
|
import com.persagy.apm.report.indicator.codes.env.ProjectEnvContentCodes;
|
|
|
import com.persagy.apm.report.indicator.model.entity.EnvComplianceRateQualifiedStandard;
|
|
|
import com.persagy.apm.report.indicator.model.entity.EnvDefine;
|
|
|
+import com.persagy.apm.report.userconfig.function.model.Function;
|
|
|
+import com.persagy.apm.report.userconfig.statisticsitems.enums.QualifiedEnum;
|
|
|
+import com.persagy.apm.report.userconfig.statisticsitems.enums.StatisticCodeEnum;
|
|
|
+import com.persagy.apm.report.userconfig.statisticsitems.model.StatisticItem;
|
|
|
+import com.persagy.apm.report.userconfig.statisticsitems.service.IStatisticItemService;
|
|
|
import org.apache.commons.lang3.StringUtils;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.stereotype.Service;
|
|
@@ -106,6 +106,7 @@ public class EnvFactory {
|
|
|
return result;
|
|
|
|
|
|
}
|
|
|
+
|
|
|
/**
|
|
|
* 获取达标率
|
|
|
*
|
|
@@ -118,7 +119,7 @@ public class EnvFactory {
|
|
|
*/
|
|
|
public AttrValueVO getComplianceRate(EnvDefine envDefine, String projectId, Date date) {
|
|
|
Double envComplianceRate = environmentWebService.getEnvComplianceRate(projectId, date, envDefine);
|
|
|
- String envComplianceRateStr = envComplianceRate == null? null:String.valueOf(envComplianceRate);
|
|
|
+ String envComplianceRateStr = envComplianceRate == null ? null : String.valueOf(envComplianceRate);
|
|
|
return new AttrValueVO(ProjectEnvContentCodes.complianceRate.name(),
|
|
|
envComplianceRateStr, AttrValueTypeEnum.number);
|
|
|
}
|
|
@@ -179,7 +180,7 @@ public class EnvFactory {
|
|
|
* 获取环境指标报警处理率
|
|
|
*
|
|
|
* @param handledCount 已处理报警数
|
|
|
- * @param totalCount 总报警数
|
|
|
+ * @param totalCount 总报警数
|
|
|
* @return 报警处理率
|
|
|
* @author lixing
|
|
|
* @version V1.0 2021/8/4 4:14 下午
|
|
@@ -203,19 +204,22 @@ public class EnvFactory {
|
|
|
* @version V1.0 2021/8/2 6:49 下午
|
|
|
*/
|
|
|
public String getQualifiedStandardValue(Function function) {
|
|
|
+ String standardEnvComplianceRate = null;
|
|
|
String qualifiedStandardStr = function.getQualifiedStandard();
|
|
|
- if (StringUtils.isBlank(qualifiedStandardStr)) {
|
|
|
- return null;
|
|
|
+ if (StringUtils.isNotBlank(qualifiedStandardStr)) {
|
|
|
+ Gson gson = new Gson();
|
|
|
+ EnvComplianceRateQualifiedStandard envComplianceRateQualifiedStandard = gson.fromJson(
|
|
|
+ qualifiedStandardStr, EnvComplianceRateQualifiedStandard.class);
|
|
|
+ standardEnvComplianceRate = envComplianceRateQualifiedStandard.getStandardEnvComplianceRate();
|
|
|
}
|
|
|
- Gson gson = new Gson();
|
|
|
- EnvComplianceRateQualifiedStandard envComplianceRateQualifiedStandard = gson.fromJson(
|
|
|
- qualifiedStandardStr, EnvComplianceRateQualifiedStandard.class);
|
|
|
- String standardEnvComplianceRate = envComplianceRateQualifiedStandard.getStandardEnvComplianceRate();
|
|
|
+
|
|
|
if (StringUtils.isBlank(standardEnvComplianceRate)) {
|
|
|
// 获取达标率标准判断条件
|
|
|
StatisticItem statisticItem = statisticItemService.getItemByCode(
|
|
|
StatisticCodeEnum.ENV_QUALIFIED_PROPORTION.name());
|
|
|
- standardEnvComplianceRate = statisticItem.getStandardValue();
|
|
|
+ if (statisticItem != null) {
|
|
|
+ standardEnvComplianceRate = statisticItem.getStandardValue();
|
|
|
+ }
|
|
|
}
|
|
|
return standardEnvComplianceRate;
|
|
|
}
|
|
@@ -263,9 +267,9 @@ public class EnvFactory {
|
|
|
/**
|
|
|
* 获取环境指标信息
|
|
|
*
|
|
|
- * @param function 环境指标对象
|
|
|
- * @param envDefine 环境指标定义
|
|
|
- * @param projectId 项目id
|
|
|
+ * @param function 环境指标对象
|
|
|
+ * @param envDefine 环境指标定义
|
|
|
+ * @param projectId 项目id
|
|
|
* @param reportMonth 报告月份
|
|
|
* @return 环境指标信息
|
|
|
* @author lixing
|