From 425675051e544cf29b2132615cfbf7a93dc5e51f Mon Sep 17 00:00:00 2001
From: cy <1664593601@qq.com>
Date: 星期三, 22 六月 2022 15:50:59 +0800
Subject: [PATCH] fix(dm): MySQL=》DMSQL

---
 core/cn/ksource/core/util/ConvertUtil.java |   57 +++++++++++++++++++++++++++------------------------------
 1 files changed, 27 insertions(+), 30 deletions(-)

diff --git a/core/cn/ksource/core/util/ConvertUtil.java b/core/cn/ksource/core/util/ConvertUtil.java
index 64328ee..9702a01 100644
--- a/core/cn/ksource/core/util/ConvertUtil.java
+++ b/core/cn/ksource/core/util/ConvertUtil.java
@@ -1,5 +1,8 @@
 package cn.ksource.core.util;
 
+import org.apache.commons.lang.StringEscapeUtils;
+import org.apache.commons.lang.StringUtils;
+
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;
@@ -7,29 +10,26 @@
 import java.net.URLEncoder;
 import java.util.*;
 
-import org.apache.commons.lang.StringEscapeUtils;
-import org.apache.commons.lang.StringUtils;
-
 
 public class ConvertUtil {
-	
+
 	public static Boolean obj2Boolean(Object obj){
 		return obj == null ? false : Boolean.getBoolean(obj.toString());
 	}
-	
+
 	public static Double obj2Double(Object obj){
 		if (obj == null) {
 			return null;
 		}
 		return StringUtil.isBlank(obj2Str(obj)) ? null : Double.valueOf(obj.toString());
 	}
-	
+
 	public static void main(String[] args) {
 		String str = "0.123";
 		System.out.println(obj2Double(str));
 	}
-	
-	
+
+
 	/**
 	 * List杞琈ap
 	 * @param dataList
@@ -48,7 +48,7 @@
 		}
 		return resultMap;
 	}
-	
+
 	/**
 	 * List杞琈ap
 	 * @param dataList
@@ -66,8 +66,8 @@
 		}
 		return resultMap;
 	}
- 	
-	
+
+
 	/**
 	 * 濡傛灉涓虹┖锛屼娇鐢ㄦ彁渚涚殑鍊兼浛鎹�
 	 * @param obj
@@ -78,7 +78,7 @@
 	public static Object defaultIfEmpty(Object obj,Object o){
 		return obj == null || StringUtils.isBlank(obj.toString()) || StringUtils.equalsIgnoreCase(obj.toString(), "null") ? o : obj;
 	}
-	
+
 	/**灏嘒BK杞寲涓篏BK
 	 * @param str
 	 * @return
@@ -95,11 +95,11 @@
 		}
 		return str;
 	}
-	
+
 	public static String html2Text(String html){
 		return html.replaceAll("<[^>]+>", "").replaceAll("&nbsp;","");
 	}
-	
+
 	/**
 	 * 鍔熻兘鎻忚堪锛歄bject绫昏浆鎹负String锛岄伩鍏嶅湪Object涓簄ull鏃讹紝鐩存帴toString()鍑洪敊<BR>
 	 * @param obj
@@ -114,28 +114,25 @@
 		return obj == null ? "" : obj.toString();
 	}
 	public static Integer obj2Integer(Object obj){
-		return obj == null || obj.toString().trim().equals("")  ? null : Integer.parseInt(obj.toString()); 
+		return obj == null || obj.toString().trim().equals("")  ? null : Integer.parseInt(obj.toString());
 	}
-	
+
 	public static int obj2Int(Object obj){
-		if(null==obj) {
-			System.out.println("1121313");
-		}
-		return obj == null || obj.toString().trim().equals("")  ? null : Double.valueOf(obj.toString()).intValue(); 
+		return obj == null || obj.toString().trim().equals("")  ? 0 : Double.valueOf(obj.toString()).intValue();
 	}
-	
+
 	public static Long obj2Long(Object obj){
-		return obj == null || obj.toString().trim().equals("") ? null : Long.parseLong(obj.toString()); 
+		return obj == null || obj.toString().trim().equals("") ? null : Long.parseLong(obj.toString());
 	}
-	
+
 	public static Long obj2Long(Object obj,boolean filter){
 		if (!filter) {
-			return obj == null || obj.toString().trim().equals("") ? null : Long.parseLong(obj.toString()); 
+			return obj == null || obj.toString().trim().equals("") ? null : Long.parseLong(obj.toString());
 		} else {
-			return obj == null || obj.toString().trim().equals("") ? null : Long.parseLong(obj.toString().replaceAll("[^0-9]", "")); 
+			return obj == null || obj.toString().trim().equals("") ? null : Long.parseLong(obj.toString().replaceAll("[^0-9]", ""));
 		}
 	}
-	
+
 	/**
 	 * 鍔熻兘鎻忚堪锛氳繃婊ょ敤鎴疯緭鍏ョ殑html銆乻ql銆乯avascript鑴氭湰<BR>
 	 * @param map
@@ -199,7 +196,7 @@
         }
         return resultMap;
     }
-    
+
     /**
      * 灏哹yte杞寲涓篕鎴朚锛屽ぇ浜�1024K鐨勬寜M璁＄畻锛岃繑鍥�*K鎴�*M
      * @param byteSize
@@ -210,15 +207,15 @@
     	BigDecimal b1 = new BigDecimal(byteSize);
         BigDecimal b2 = new BigDecimal(1024);
         double k = b1.divide(b2, scale, BigDecimal.ROUND_HALF_UP).doubleValue();
-    	
+
         //澶т簬1024锛岃浆鍖栦负M
     	if (k > 1024) {
     		b2 = new BigDecimal(1024*1024);
     		k = b1.divide(b2, scale, BigDecimal.ROUND_HALF_UP).doubleValue();
-    		
+
     		return k + "M";
     	}
-    	
+
     	return k + "K";
     }
 }

--
Gitblit v1.9.1