From cfd393ccb56a42f67ffaa35ed0887061ad0f2e66 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Fri, 06 Aug 2021 15:06:20 +0800
Subject: [PATCH] 密码校验规则变更
---
screen-common/src/main/java/com/moral/util/AmendUtils.java | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/screen-common/src/main/java/com/moral/util/AmendUtils.java b/screen-common/src/main/java/com/moral/util/AmendUtils.java
index fde9768..9e15cb5 100644
--- a/screen-common/src/main/java/com/moral/util/AmendUtils.java
+++ b/screen-common/src/main/java/com/moral/util/AmendUtils.java
@@ -91,7 +91,7 @@
continue;
}
size++;
- int windDir = Integer.parseInt(wind.toString());
+ double windDir = Double.parseDouble(wind.toString());
double windSpeed = Double.parseDouble(speed.toString());
double sin = windSpeed * Math.sin(windDir / 180d) * Math.PI;
double cos = windSpeed * Math.cos(windDir / 180d) * Math.PI;
@@ -122,7 +122,6 @@
int n = data.size();
Collections.sort(data);
double v = n / (100 / p);
- System.out.println(n % (100 / p));
if (n % (100 / p) == 0) {
if (v == n) {
return data.get(n - 1);
@@ -132,7 +131,8 @@
return sciCal(data.get((int) v), 4);
}
- public static Object getCOAvgOfWeek(List<Map<String, Object>> list) {
+ //������������������������������
+ public static Object getCOAvgOfWeekOrMonth(List<Map<String, Object>> list) {
List<Double> data = new ArrayList<>();
for (Map<String, Object> dataMap : list) {
Map<String, Object> dataValue = JSONObject.parseObject((String) dataMap.get("value"), Map.class);
@@ -149,7 +149,8 @@
return percentile(data, 95);
}
- public static Object getO3AvgOfWeek(List<Map<String, Object>> list) {
+ //������������������������
+ public static Object getO3AvgOfWeekOrMonth(List<Map<String, Object>> list) {
List<Double> data = new ArrayList<>();
for (Map<String, Object> dataMap : list) {
Map<String, Object> dataValue = JSONObject.parseObject((String) dataMap.get("value"), Map.class);
--
Gitblit v1.8.0