xmcommon - npm Package Compare versions

Comparing version 0.0.8 to 0.0.9

example/testdatetime.js

 let {datetimeUtils}= require("../lib/datetimeUtils");
+let {utils} = require("../lib/utils");
 
-let v = datetimeUtils.DateTimeStringToUTC("2018-12-12 23:00:19.123");
-let vv = datetimeUtils.dateStringByUTC(v)
-let datenow = datetimeUtils.getNow();
-let datenowutc = datetimeUtils.getUTCNow();
-let datesecondnow = datetimeUtils.getNowSecond();
-let datesecondutcnow = datetimeUtils.getUTCNowSecond();
+let u1 = datetimeUtils.getUTCNow();
+let l1 = datetimeUtils.getLocalNow();
+let u2 = datetimeUtils.getUTCNowSecond();
+let l2 = datetimeUtils.getLocalNowSecond();
+let u3 = u1 + 86400000 * 5;
 
-console.log('version:'+datetimeUtils.version());
-console.log("toLocaleString:",new Date(v).toLocaleString());
-console.log("dateStringByUTC:", vv);
-console.log("dateStringByMillis:", datetimeUtils.dateStringByMillis(datetimeUtils.ToLocalTime(v)));
-console.log(datenow, datenowutc, datenow - datenowutc);
-console.log(datesecondnow, datesecondutcnow, datesecondnow - datesecondutcnow);
-console.log(datetimeUtils.dateStringByUTC(datetimeUtils.getTodayZeroTime(datenowutc)));
+let d1 = new Date();
+let d2 = new Date("2019-2-13 0:0:0");
 
-let a = new Date();
-console.log(a.getTime(), Date.now());
+console.log(datetimeUtils.getTimeZoneMinute(), datetimeUtils.getTimeZoneSecond(), datetimeUtils.getTimeZoneMillis());
+console.log(u1, l1, l1 - u1);
+console.log(u2, l2, l2 - u2);
+console.log(datetimeUtils.diffLocalDays(u3,u1));
+console.log(datetimeUtils.diffLocalDays(d2.getTime(),d1.getTime()));
+
+// let v = datetimeUtils.DateTimeStringToUTC("2018-12-12 23:00:19.123");
+// let vv = datetimeUtils.dateStringByUTC(v)
+// let datenow = datetimeUtils.getNow();
+// let datenowutc = datetimeUtils.getUTCNow();
+// let datesecondnow = datetimeUtils.getNowSecond();
+// let datesecondutcnow = datetimeUtils.getUTCNowSecond();
+
+// console.log('version:'+datetimeUtils.version());
+// console.log("toLocaleString:",new Date(v).toLocaleString());
+// console.log("dateStringByUTC:", vv);
+// console.log("dateStringByMillis:", datetimeUtils.dateStringByMillis(datetimeUtils.ToLocalTime(v)));
+// console.log(datenow, datenowutc, datenow - datenowutc);
+// console.log(datesecondnow, datesecondutcnow, datesecondnow - datesecondutcnow);
+// console.log(datetimeUtils.dateStringByUTC(datetimeUtils.getTodayZeroTime(datenowutc)));
+
+// console.log(utils.isNotNullOrEmptyString(""));
+// console.log(utils.isNotNullOrEmptyString(null));
+// console.log(utils.isNotNullOrEmptyString(undefined));
+// console.log(utils.isNotNullOrEmptyString("aaaa"));
+// console.log(utils.isNotNullOrEmptyString(123));
+
+// function randomPrice(paramPrice, paramFloatInterval, paramDights) {
+// 	let deta =  Math.random() * (paramFloatInterval * 2);
+// 	let r = paramPrice * (100 - paramFloatInterval + deta)/100;
+// 	return Number.parseFloat(r.toFixed(paramDights));
+// }
+// let v = [];
+// let max = 2;
+// for(let i = 0; i < max; i++) {
+// 	v[i] = 0;
+// }
+
+// function randomInteger(paramMaxInteger) {
+// 	return Math.floor(Math.random() * paramMaxInteger);
+// }
+
+
+// let price = 5.00;
+// let interval = 20;
+// let dights = 4;
+// for(let i = 0; i < 100000; i++) {
+// 	//console.log(randomPrice(price, interval, dights));
+// 	v[randomInteger(max)]++;
+// }
+
+// for(let i = 0; i < max; i++) {
+// 	console.log(`v[${i}]=${v[i]}`);
+// 	//v[i] = 0;
+// }
+
+// //let a = new Date();
+// //console.log(a.getTime(), Date.now());

lib/datetimeUtils.js

@@ -36,3 +36,2 @@ //这里将提供日期相关的工具函数
 	MILLIS_PRE_DAY:86400000,
-
 };
@@ -53,4 +52,2 @@
 
-
-
 /**
@@ -67,21 +64,30 @@ * 日期相关的工具类
     static version() {
-        return 'datetimeUtils 1.2.0';
+        return 'datetimeUtils 1.3.0';
     }
     /**
-     * 取当前本地时间戳,毫秒数
-     * @return {number} 当前本地时间戳
+     * 取当前UTC时间戳,毫秒数
+     * @return {number} 当前UTC时间戳
      */
     static getNow() {
         return Date.now();
-    }
+	}
+	/**
+	 * 取当前本地时间戳
+	 * @return {number} 当前本地时间戳
+	 */
+	static getLocalNow() {
+		return Date.now() - TimeZoneMillis;
+	}
+
     /**
      * 取当前UTC时间戳,毫秒数
+	 * @see getNow()
      * @return {number} 当前UTC时间戳
      */
     static getUTCNow() {
-        return Date.now() + TimeZoneMillis;
+        return Date.now();
     }
     /**
-     * 取当前本地时间戳,秒数
-     * @return {number} 当前本地时间戳
+     * 取当前UTC时间戳,秒数
+     * @return {number} 当前UTC时间戳
      */
@@ -93,7 +99,15 @@ static getNowSecond() {
      * 取当前UTC时间戳,秒数
+	 * @see getNowSecond()
      * @return {number} 当前UTC时间戳
      */
     static getUTCNowSecond() {
-        return Math.floor((Date.now() + TimeZoneMillis)/1000);
-    }
+        return Math.floor(Date.now()/1000);
+	}
+	/**
+	 * 取当前本地时间戳，秒数
+	 * @return {number} 当前本地时间戳
+	 */
+	static getLocalNowSecond() {
+		return this.getUTCNowSecond() - TimeZoneSecond;
+	}
     /**
@@ -290,10 +304,32 @@ * 取时区，单位分
 
-	// /**
-	//  * 取本地时间相关的天数
-	//  * @param {*} paramDate1
-	//  * @param {*} paramDate2
-	//  */
-	// static diffLocalDays(paramDate1, paramDate2) {
+	/**
+	 * 取本地时间相关的天数
+	 * @param {number} paramUTC1 毫秒数
+	 * @param {number} paramUTC2 毫秒数
+	 * @return {number} 相关的开数，同一天，返回0
+	 */
+	static diffLocalDays(paramUTC1, paramUTC2) {
+		let t1 = this.CalcLocalDaysByUTC(paramUTC1);
+		let t2 = this.CalcLocalDaysByUTC(paramUTC2);
+		return t1 - t2;
+	}
 
-	// }
+	/**
+	 * 计算，元年到指定时间戳的本地天数
+	 * @param {number} paramUTC
+	 * @return {number} 计算出来的本地天数
+	 */
+	static CalcLocalDaysByUTC(paramUTC) {
+		let localTime = this.ToLocalTime(paramUTC);
+		return (localTime - localTime % DatetimeConstant.MILLIS_PRE_DAY) / DatetimeConstant.MILLIS_PRE_DAY;
+	}
+
+	/**
+	 * 计算，元年到指定时间的本地天数
+	 * @param {Date} paramDate 指定的日期
+	 * @return {number} 计算出来的本地天数
+	 */
+	static CalcLocalDaysByDate(paramDate) {
+		return this.CalcLocalDaysByUTC(paramDate.getTime());
+	}
 }
@@ -300,0 +336,0 @@

package.json

 {
   "name": "xmcommon",
-  "version": "0.0.8",
+  "version": "0.0.9",
   "description": "javascript common lib for es6",
@@ -5,0 +5,0 @@ "main": "index.js",

README.md

@@ -11,2 +11,8 @@ # xmcommon
 # 版本变更说明
+## 0.09
+- 2019-02-10
+- \+ datetimeUtils 增加diffLocalDays，CalcLocalDaysByUTC，CalcLocalDaysByDate等函数
+- \+ datetimeUtils 修改getNow()的描述错误
+- \+ datetimeUtils 增加getLocalNow()和getLocalNowSecond()
+
 ## 0.08
@@ -13,0 +19,0 @@ - 2018-12-21

No alert changes

Improved metrics

Total package byte prevSize

65831

increased by9.52%

Number of package files

18

increased by5.88%

Lines of code

1999

increased by9.59%

Number of lines in readme file

46

increased by15%

No dependency changes