From d5cf76188ad37f062f37ebce3464097203b4db05 Mon Sep 17 00:00:00 2001
From: whycxzp <perryhsu@163.com>
Date: 星期二, 12 十月 2021 15:56:48 +0800
Subject: [PATCH] 去除电池状态-均充
---
src/main/java/com/whyc/util/MathUtil.java | 34 ++++++++++++++++++++++++++++++----
1 files changed, 30 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/whyc/util/MathUtil.java b/src/main/java/com/whyc/util/MathUtil.java
index 7c450cc..fde69fe 100644
--- a/src/main/java/com/whyc/util/MathUtil.java
+++ b/src/main/java/com/whyc/util/MathUtil.java
@@ -8,10 +8,36 @@
*/
public class MathUtil {
- /**鎻愬彇鍏叡鏂规硶,鐩搁櫎鑾峰彇姣斾緥*/
- public static String divide(int num,int num2){
- double res = BigDecimal.valueOf(num).divide(BigDecimal.valueOf(num2), 2, RoundingMode.HALF_UP).doubleValue();
- return (int)(res*100)+"%";
+ /**
+ * 鎻愬彇鍏叡鏂规硶,鐩搁櫎鑾峰彇姣斾緥,杩斿洖鍙�塖tring鎴栬�匜loat
+ * @param type 1琛ㄧず灏忔暟,2琛ㄧず闄ゅ幓%鐨勬瘮渚�,3琛ㄧず%鐨勬瘮渚�
+ * @return Object String鎴栬�匜loat绫诲瀷
+ * */
+ public static Object divide(Object num,Object num2,Integer type){
+ float res = 0;
+ double num2Double=Double.parseDouble(num2.toString());
+ if(num2Double!=0){
+
+ if (num instanceof Integer) {
+ res = BigDecimal.valueOf((Integer) num).divide(BigDecimal.valueOf((Integer) num2), 2, RoundingMode.HALF_UP).floatValue();
+ }
+ if (num instanceof Float) {
+ res = BigDecimal.valueOf((Float) num).divide(BigDecimal.valueOf((Float) num2), 2, RoundingMode.HALF_UP).floatValue();
+ }
+ if (num instanceof Double) {
+ res = BigDecimal.valueOf((Double) num).divide(BigDecimal.valueOf((Double) num2), 2, RoundingMode.HALF_UP).floatValue();
+ }
+ }
+ //0.05
+ if (type == 1) {
+ return res;
+ }
+ //5
+ else if (type == 2) {
+ return (int) (res * 100);
+ }
+ //5%
+ return (int) (res * 100) + "%";
}
}
--
Gitblit v1.9.1