Merge branch 'develop-0.6.4'

sanshengshui · sanshengshui · commit 2c57b6610f4b · 2023-02-14T22:10:39.000+08:00
diff --git a/.github/workflows/release_pre.yml b/.github/workflows/release_pre.yml
diff --git a/toolkit-app/src/main/resources/META-INF/native-image/reflection-config.json b/toolkit-app/src/main/resources/META-INF/native-image/reflection-config.json
@@ -661,5 +661,23 @@
     "allPublicClasses" : true,
     "allDeclaredConstructors" : true,
     "allPublicConstructors" : true
+  },
+  {
+    "name" : "iot.technology.client.toolkit.nb.service.telecom.domain.action.data.TelQueryDeviceDataListResponse",
+    "allDeclaredMethods" : true,
+    "allPublicMethods" : true,
+    "allDeclaredClasses" : true,
+    "allPublicClasses" : true,
+    "allDeclaredConstructors" : true,
+    "allPublicConstructors" : true
+  },
+  {
+    "name" : "iot.technology.client.toolkit.nb.service.telecom.domain.action.data.TelQueryDeviceDataTotalResponse",
+    "allDeclaredMethods" : true,
+    "allPublicMethods" : true,
+    "allDeclaredClasses" : true,
+    "allPublicClasses" : true,
+    "allDeclaredConstructors" : true,
+    "allPublicConstructors" : true
   }
 ]
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/constants/TelecomSettings.java b/toolkit-common/src/main/java/iot/technology/client/toolkit/common/constants/TelecomSettings.java
@@ -70,4 +70,13 @@ public interface TelecomSettings {
     String TEL_BATCH_ADD_NB_DEVICE_API_VERSION = "20200828140355";
     String TEL_UPDATE_DEVICE_API_VERSION = "20181031202122";
     String TEL_QUERY_DEVICE_LIST_API_VERSION = "20190507012134";
+
+    /**
+     * device data
+     */
+    String TEL_QUERY_DEVICE_DATA_URL = TEL_ROOT_URL + "/aep_device_status";
+    String TEL_QUERY_DEVICE_DATA_LIST_URL = TEL_QUERY_DEVICE_DATA_URL + "/getDeviceStatusHisInPage";
+    String TEL_QUERY_DEVICE_DATA_TOTAL_URL = TEL_QUERY_DEVICE_DATA_URL + "/api/v1/getDeviceStatusHisInTotal";
+    String TEL_QUERY_DEVICE_DATA_TOTAL_VERSION = "20190928013529";
+    String TEL_QUERY_DEVICE_DATA_LIST_VERSION = "20190928013337";
 }
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
@@ -15,10 +15,7 @@
  */
 package iot.technology.client.toolkit.common.utils;
 
-import java.time.Instant;
-import java.time.LocalDate;
-import java.time.LocalDateTime;
-import java.time.ZoneId;
+import java.time.*;
 import java.time.format.DateTimeFormatter;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -28,11 +25,11 @@
  */
 public class DateUtils {
 
-	private static ZoneId zoneId = ZoneId.of("Asia/Shanghai");
+	private static final ZoneId zoneId = ZoneId.of("Asia/Shanghai");
+	private static final DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
 
 	public static String timestampToFormatterTime(long timestamp) {
 		LocalDateTime resultDateTime = Instant.ofEpochMilli(timestamp).atZone(zoneId).toLocalDateTime();
-		DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
 		return formatter.format(resultDateTime);
 	}
 
@@ -46,6 +43,33 @@ public static String getCurrentDayEndTimeForMob() {
 		return today + "T" + "23:59:59";
 	}
 
+	public static String getCurrentDayStartTimeForTel() {
+		LocalDate today = LocalDate.now();
+		LocalDateTime todayStart = today.atStartOfDay();
+		return todayStart.toInstant(ZoneOffset.ofHours(8)).toEpochMilli() + "";
+
+	}
+
+	public static String getCurrentDayEndTimeForTel() {
+		LocalDateTime endOfDay = LocalDateTime.of(LocalDateTime.now().getYear(),
+				LocalDateTime.now().getMonthValue(),
+				LocalDateTime.now().getDayOfMonth(),
+				23, 59, 59);
+		return endOfDay.toInstant(ZoneOffset.ofHours(8)).toEpochMilli() + "";
+	}
+
+	/**
+	 * @param nbTime 2019-02-01T00:01:01
+	 * @return unixTime
+	 */
+	public static String covertNbTimeFormatToUnixTime(String nbTime) {
+		DateTimeFormatter nbFormatter = DateTimeFormatter.ISO_DATE_TIME;
+		LocalDateTime dateTime = LocalDateTime.parse(nbTime, nbFormatter);
+		Instant instant = dateTime.atZone(ZoneId.systemDefault()).toInstant();
+		return instant.toEpochMilli() + "";
+
+	}
+
 	public static boolean mobileTimePattern(String dateTime) {
 		String pattern = "^\\d{4}-\\d{1,2}-\\d{1,2}T\\d{1,2}:\\d{1,2}:\\d{1,2}$";
 		Pattern r = Pattern.compile(pattern);
diff --git a/toolkit-common/src/main/java/iot/technology/client/toolkit/common/utils/JsonUtils.java b/toolkit-common/src/main/java/iot/technology/client/toolkit/common/utils/JsonUtils.java
@@ -18,6 +18,7 @@
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.SerializationFeature;
 
@@ -72,6 +73,16 @@ public static String object2Json(Object o) {
         }
     }
 
+    public static JsonNode stringToJsonNode(String jsonString) {
+        try {
+            return objectMapper.readTree(jsonString);
+        } catch (JsonProcessingException e) {
+            System.out.format("Parse json to JsonNode error %s", e);
+            e.printStackTrace();
+            return null;
+        }
+    }
+
     public static String object2JsonWithInclude(Object o) {
         try {
             objectMapper.setSerializationInclusion(JsonInclude.Include.ALWAYS);
diff --git a/toolkit-nbiot/src/main/java/iot/technology/client/toolkit/nb/service/processor/TelecomBizService.java b/toolkit-nbiot/src/main/java/iot/technology/client/toolkit/nb/service/processor/TelecomBizService.java
@@ -43,6 +43,7 @@ public final List<TkProcessor> getTkProcessorList() {
 		tkProcessorList.add(new TelAddDeviceProcessor());
 		tkProcessorList.add(new TelListDeviceProcessor());
 		tkProcessorList.add(new TelHelpProcessor());
+		tkProcessorList.add(new TelLogDeviceDataProcessor());
 		return tkProcessorList;
 	}
 
@@ -58,8 +59,10 @@ public final List<TkProcessor> getTkProcessorList() {
 
 	Completer helpCompleter = new ArgumentCompleter(new StringsCompleter("help"), NullCompleter.INSTANCE);
 
+	Completer logCompleter = new ArgumentCompleter(new StringsCompleter("log"), NullCompleter.INSTANCE);
+
 	Completer nbTelecomCompleter =
-			new AggregateCompleter(listCompleter, showCompleter, delCompleter, addCompleter, helpCompleter, updateCompleter);
+			new AggregateCompleter(listCompleter, showCompleter, delCompleter, addCompleter, helpCompleter, updateCompleter, logCompleter);
 
 	public boolean call(TelecomConfigDomain telecomConfigDomain, Terminal terminal) {
 		try {
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/mobile/MobLogDeviceDataProcessor.java b/toolkit-nbiot/src/main/java/iot/technology/client/toolkit/nb/service/processor/mobile/MobLogDeviceDataProcessor.java
@@ -124,7 +124,8 @@ public void handle(ProcessContext context) {
 						mobileDeviceDataService.getHisDataPoints(mobileConfigDomain, deviceId, dataStreamIdStr, startTime, endTime, limit);
 				if (deviceHisDataResponse.isSuccess()) {
 					int count = deviceHisDataResponse.getData().getCount();
-					System.out.println(ColorUtils.colorBold(String.format("--- %s 至 %s 历史设备数据点 ---", startTime, endTime), "green"));
+					System.out.println(
+							ColorUtils.colorBold(String.format("--- %s %s至%s 历史设备数据点 ---", imei, startTime, endTime), "green"));
 					System.out.println(String.format("日志数量:    %s", count));
 					List<MobDeviceHisDataStreamsBody> deviceHisDataStreamsBodies = deviceHisDataResponse.getData().getDatastreams();
 					deviceHisDataStreamsBodies.forEach(hds -> {
@@ -134,6 +135,7 @@ public void handle(ProcessContext context) {
 						deviceHisDataPointsBodies.forEach(dpBody -> {
 							sb.append(String.format("数据值: %s", dpBody.getValue())).append(StringUtils.lineSeparator());
 							sb.append(String.format("数据上报时间:    %s", dpBody.getAt())).append(StringUtils.lineSeparator());
+							sb.append(StringUtils.lineSeparator());
 						});
 						System.out.println(sb);
 					});
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
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
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
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
