add print telecom nb-iot device reported data i18n messages

sanshengshui · sanshengshui · commit a2af62e28a02 · 2023-02-14T22:10:19.000+08:00
diff --git a/toolkit-app/src/main/resources/i18n/messages.properties b/toolkit-app/src/main/resources/i18n/messages.properties
@@ -163,6 +163,7 @@ nb.operation.del.desc=delete nb-iot device
 nb.operation.get.desc=display detail information of nb-iot device
 nb.operation.list.desc=display all NB-IoT list
 nb.operation.update.desc=update nb-iot device name
+nb.operation.log.desc=print telecom nb-iot device reported data
 nb.settings.desc=nb-iot settings information management
 nb.desc.desc=introduction and description of NB-IoT protocol
 nbSettings.prompt=settings processing...
diff --git a/toolkit-app/src/main/resources/i18n/messages_de.properties b/toolkit-app/src/main/resources/i18n/messages_de.properties
@@ -161,6 +161,7 @@ nb.operation.del.desc=delete nb-iot device
 nb.operation.get.desc=display detail information of nb-iot device
 nb.operation.list.desc=display all NB-IoT list
 nb.operation.update.desc=update nb-iot device name
+nb.operation.log.desc=print telecom nb-iot device reported data
 nb.settings.desc=nb-iot settings information management
 nb.desc.desc=introduction and description of NB-IoT protocol
 nbSettings.prompt=settings processing...
diff --git a/toolkit-app/src/main/resources/i18n/messages_fr.properties b/toolkit-app/src/main/resources/i18n/messages_fr.properties
@@ -162,6 +162,7 @@ nb.operation.del.desc=delete nb-iot device
 nb.operation.get.desc=display detail information of nb-iot device
 nb.operation.list.desc=display all NB-IoT list
 nb.operation.update.desc=update nb-iot device name
+nb.operation.log.desc=print telecom nb-iot device reported data
 nb.settings.desc=nb-iot settings information management
 nb.desc.desc=introduction and description of NB-IoT protocol
 nbSettings.prompt=settings processing...
diff --git a/toolkit-app/src/main/resources/i18n/messages_zh.properties b/toolkit-app/src/main/resources/i18n/messages_zh.properties
@@ -158,6 +158,7 @@ nb.operation.del.desc=\u5220\u9664 NB-IoT \u8bbe\u5907
 nb.operation.get.desc=\u663e\u793a NB-IoT \u8be6\u7ec6\u4fe1\u606f
 nb.operation.list.desc=\u663e\u793a\u6240\u6709 NB-IoT \u8bbe\u5907\u5217\u8868
 nb.operation.update.desc=\u66f4\u65b0 NB-IoT \u8bbe\u5907\u540d\u79f0
+nb.operation.log.desc=\u6253\u5370\u8bbe\u5907\u4e0a\u62a5\u6570\u636e
 nb.settings.desc=nb-iot \u914d\u7f6e\u4fe1\u606f\u7ba1\u7406
 nb.desc.desc=nb-iot \u4ecb\u7ecd\u548c\u63cf\u8ff0
 nbSettings.prompt=\u914d\u7f6e\u5904\u7406\u4e2d...
diff --git a/toolkit-common/src/main/java/iot/technology/client/toolkit/common/utils/DateUtils.java b/toolkit-common/src/main/java/iot/technology/client/toolkit/common/utils/DateUtils.java
@@ -63,8 +63,9 @@ public static String getCurrentDayEndTimeForTel() {
 	 * @return unixTime
 	 */
 	public static String covertNbTimeFormatToUnixTime(String nbTime) {
-		DateTimeFormatter formatter = DateTimeFormatter.ISO_DATE_TIME;
-		Instant instant = Instant.from(formatter.parse(nbTime));
+		DateTimeFormatter nbFormatter = DateTimeFormatter.ISO_DATE_TIME;
+		LocalDateTime dateTime = LocalDateTime.parse(nbTime, nbFormatter);
+		Instant instant = dateTime.atZone(ZoneId.systemDefault()).toInstant();
 		return instant.toEpochMilli() + "";
 
 	}
diff --git a/toolkit-nbiot/src/main/java/iot/technology/client/toolkit/nb/service/processor/mobile/MobHelpProcessor.java b/toolkit-nbiot/src/main/java/iot/technology/client/toolkit/nb/service/processor/mobile/MobHelpProcessor.java
@@ -67,5 +67,11 @@ public void handle(ProcessContext context) {
 				.append(StringUtils.lineSeparator());
 		sb.append("    usage: update imei name").append(StringUtils.lineSeparator());
 		System.out.format(sb.toString());
+
+		// print mobile nb-iot device reported data
+		sb.append(ColorUtils.cyanAnnotation("log:      " + bundle.getString("nb.operation.log.desc")))
+				.append(StringUtils.lineSeparator());
+		sb.append("    usage: log imei startTime endTime pageSize").append(StringUtils.lineSeparator());
+		System.out.format(sb.toString());
 	}
 }
diff --git a/toolkit-nbiot/src/main/java/iot/technology/client/toolkit/nb/service/processor/telecom/TelHelpProcessor.java b/toolkit-nbiot/src/main/java/iot/technology/client/toolkit/nb/service/processor/telecom/TelHelpProcessor.java
@@ -67,5 +67,11 @@ public void handle(ProcessContext context) {
 				.append(StringUtils.lineSeparator());
 		sb.append("    usage: update imei name").append(StringUtils.lineSeparator());
 		System.out.format(sb.toString());
+
+		// print telecom nb-iot device reported data
+		sb.append(ColorUtils.cyanAnnotation("log:      " + bundle.getString("nb.operation.log.desc")))
+				.append(StringUtils.lineSeparator());
+		sb.append("    usage: log imei startTime endTime pageSize").append(StringUtils.lineSeparator());
+		System.out.format(sb.toString());
 	}
 }
diff --git a/toolkit-nbiot/src/main/java/iot/technology/client/toolkit/nb/service/processor/telecom/TelLogDeviceDataProcessor.java b/toolkit-nbiot/src/main/java/iot/technology/client/toolkit/nb/service/processor/telecom/TelLogDeviceDataProcessor.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright © 2019-2023 The Toolkit Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package iot.technology.client.toolkit.nb.service.processor.telecom;
 
 import com.fasterxml.jackson.databind.JsonNode;
diff --git a/toolkit-nbiot/src/main/java/iot/technology/client/toolkit/nb/service/telecom/TelecomDeviceDataService.java b/toolkit-nbiot/src/main/java/iot/technology/client/toolkit/nb/service/telecom/TelecomDeviceDataService.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright © 2019-2023 The Toolkit Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package iot.technology.client.toolkit.nb.service.telecom;
 
 import iot.technology.client.toolkit.common.constants.NBTypeEnum;
diff --git a/toolkit-nbiot/src/main/java/iot/technology/client/toolkit/nb/service/telecom/domain/action/data/TelQueryDeviceDataListResponse.java b/toolkit-nbiot/src/main/java/iot/technology/client/toolkit/nb/service/telecom/domain/action/data/TelQueryDeviceDataListResponse.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright © 2019-2023 The Toolkit Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package iot.technology.client.toolkit.nb.service.telecom.domain.action.data;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
diff --git a/toolkit-nbiot/src/main/java/iot/technology/client/toolkit/nb/service/telecom/domain/action/data/TelQueryDeviceDataTotalResponse.java b/toolkit-nbiot/src/main/java/iot/technology/client/toolkit/nb/service/telecom/domain/action/data/TelQueryDeviceDataTotalResponse.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright © 2019-2023 The Toolkit Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package iot.technology.client.toolkit.nb.service.telecom.domain.action.data;
 
 import iot.technology.client.toolkit.nb.service.telecom.domain.BaseTelResponse;

Original file line number	Diff line number	Diff line change
`@@ -67,5 +67,11 @@ public void handle(ProcessContext context) {`
`67`	`67`	`.append(StringUtils.lineSeparator());`
`68`	`68`	`sb.append(" usage: update imei name").append(StringUtils.lineSeparator());`
`69`	`69`	`System.out.format(sb.toString());`
	`70`	`+`
	`71`	`+ // print mobile nb-iot device reported data`
	`72`	`+ sb.append(ColorUtils.cyanAnnotation("log: " + bundle.getString("nb.operation.log.desc")))`
	`73`	`+ .append(StringUtils.lineSeparator());`
	`74`	`+ sb.append(" usage: log imei startTime endTime pageSize").append(StringUtils.lineSeparator());`
	`75`	`+ System.out.format(sb.toString());`
`70`	`76`	`}`
`71`	`77`	`}`