修改等级判断

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/controller/TDBigScreenAnalyseController.java

@@ -1201,26 +1201,26 @@ public class TDBigScreenAnalyseController extends BaseController {
 				throw new RuntimeException("安全的分数上限只能是100");
 			}
 			List<IdxBizFanHealthLevel> list = idxBizFanHealthLevelMapper.selectList(
-					new LambdaQueryWrapper<IdxBizFanHealthLevel>().eq(IdxBizFanHealthLevel::getAnalysisObjType, "注意"));
+					new LambdaQueryWrapper<IdxBizFanHealthLevel>().eq(IdxBizFanHealthLevel::getAnalysisObjType, kv.get("ANALYSIS_OBJ_TYPE")));
 			Map<String, Double> map = list.stream().collect(
 					Collectors.toMap(IdxBizFanHealthLevel::getHealthLevel, IdxBizFanHealthLevel::getGroupLowerLimit));
-			if (Double.valueOf(kv.get("GROUP_LOWER_LIMIT").toString()) <= map.get("groupUpperLimit")) {
+			if (Double.valueOf(kv.get("GROUP_LOWER_LIMIT").toString()) <= map.get("注意")) {
 				throw new RuntimeException("安全的下限和注意的上限不能低于注意的下限");
 			}
 		} else if ("注意".equals(kv.get("HEALTH_LEVEL").toString())) {
 			List<IdxBizFanHealthLevel> list = idxBizFanHealthLevelMapper.selectList(
-					new LambdaQueryWrapper<IdxBizFanHealthLevel>().eq(IdxBizFanHealthLevel::getAnalysisObjType, "警告"));
+					new LambdaQueryWrapper<IdxBizFanHealthLevel>().eq(IdxBizFanHealthLevel::getAnalysisObjType, kv.get("ANALYSIS_OBJ_TYPE")));
 			Map<String, Double> map = list.stream().collect(
 					Collectors.toMap(IdxBizFanHealthLevel::getHealthLevel, IdxBizFanHealthLevel::getGroupLowerLimit));
-			if (Double.valueOf(kv.get("GROUP_LOWER_LIMIT").toString()) <= map.get("groupUpperLimit")) {
+			if (Double.valueOf(kv.get("GROUP_LOWER_LIMIT").toString()) <= map.get("警告")) {
 				throw new RuntimeException("注意的下限和安全的上限不能低于安全的下限");
 			}
 		} else if ("警告".equals(kv.get("HEALTH_LEVEL").toString())) {
 			List<IdxBizFanHealthLevel> list = idxBizFanHealthLevelMapper.selectList(
-					new LambdaQueryWrapper<IdxBizFanHealthLevel>().eq(IdxBizFanHealthLevel::getAnalysisObjType, "危险"));
+					new LambdaQueryWrapper<IdxBizFanHealthLevel>().eq(IdxBizFanHealthLevel::getAnalysisObjType, kv.get("ANALYSIS_OBJ_TYPE")));
 			Map<String, Double> map = list.stream().collect(
 					Collectors.toMap(IdxBizFanHealthLevel::getHealthLevel, IdxBizFanHealthLevel::getGroupLowerLimit));
-			if (Double.valueOf(kv.get("GROUP_LOWER_LIMIT").toString()) <= map.get("groupUpperLimit")) {
+			if (Double.valueOf(kv.get("GROUP_LOWER_LIMIT").toString()) <= map.get("危险")) {
 				throw new RuntimeException("警告的下限和注意的上限不能低于注意的下限");
 			}
 		} else if ("危险".equals(kv.get("HEALTH_LEVEL").toString())) {
@@ -1229,7 +1229,7 @@ public class TDBigScreenAnalyseController extends BaseController {
 				throw new RuntimeException("危险的分数下限只能是0");
 			}
 		}
-		if (Integer.valueOf(kv.get("GROUP_UPPER_LIMIT").toString()) <= Integer
+		if (Double.valueOf(kv.get("GROUP_UPPER_LIMIT").toString()) <= Double
 				.valueOf(kv.get("GROUP_LOWER_LIMIT").toString())) {
 			throw new RuntimeException(kv.get("HEALTH_LEVEL").toString() + "的分数上限不能小于或等于本身下限");
 		}