From 0404522f9cce6d928eafdf88d08eb78b2e3c5486 Mon Sep 17 00:00:00 2001
From: wangyan <wangyan@zcloudchina.com>
Date: Tue, 14 Oct 2025 11:49:01 +0800
Subject: [PATCH] =?UTF-8?q?refactor(data-push):=20=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E6=8C=87=E6=A0=87=E5=80=BC=E8=BD=AC=E6=8D=A2=E9=80=BB=E8=BE=91?=
 =?UTF-8?q?=E5=B9=B6=E8=B0=83=E6=95=B4=E6=89=93=E5=8C=85=E6=96=B9=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 修改项目打包方式从 jar 调整为 war
- 优化 CURRENT_VALUE 字段的类型转换逻辑，确保其能正确解析为 Float 类型
- 增强对空值的处理，避免因数据缺失导致异常
- 将错误输出语句调整为标准输出，统一日志记录方式
- 更新项目名称及 groupId 以匹配新的命名规范
---
 pom.xml                                        |  8 ++++----
 .../ProvincialPlatformDataPushScheduled.java   | 18 +++++++++++++++---
 2 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/pom.xml b/pom.xml
index e93fa24..714abf2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,12 +2,12 @@
 		 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 
-	<groupId>com.integrated_yjb_dataDocking</groupId>
-	<artifactId>integrated_yjb_dataDocking</artifactId>
+	<groupId>com.sx_yjb_dataDocking</groupId>
+	<artifactId>sx_yjb_dataDocking</artifactId>
 	<version>1.0</version>
-	<packaging>jar</packaging>
+	<packaging>war</packaging>
 
-	<name>integrated_yjb_dataDocking</name>
+	<name>sx_yjb_dataDocking</name>
 	<url>http://maven.apache.org</url>
 
 	<parent>
diff --git a/src/main/java/com/netsdk/utils/ProvincialPlatformDataPushScheduled.java b/src/main/java/com/netsdk/utils/ProvincialPlatformDataPushScheduled.java
index 1a78fcf..314b52e 100644
--- a/src/main/java/com/netsdk/utils/ProvincialPlatformDataPushScheduled.java
+++ b/src/main/java/com/netsdk/utils/ProvincialPlatformDataPushScheduled.java
@@ -84,8 +84,20 @@ public class ProvincialPlatformDataPushScheduled {
             if (dataPd.containsKey("REPORT_ID") && !Tools.isEmpty(dataPd.getString("REPORT_ID"))) {
                 HashMap<String, Object> data = new HashMap<>();
                 data.put("quotaId", dataPd.get("REPORT_ID")); // 传感编码
-                data.put("value", dataPd.get("CURRENT_VALUE")); // 指标当前采集值
-                data.put("datas", true); // 质量戳
+                // 确保 CURRENT_VALUE 转换为 Float 类型
+                Object currentValue = dataPd.get("CURRENT_VALUE");
+                if (currentValue != null) {
+                    if (currentValue instanceof String) {
+                        data.put("value", Float.parseFloat((String) currentValue));
+                    } else if (currentValue instanceof Number) {
+                        data.put("value", ((Number) currentValue).floatValue());
+                    } else {
+                        data.put("value", currentValue);
+                    }
+                } else {
+                    data.put("value", null);
+                }
+                data.put("isValid", true); // 质量戳
                 dataList.add(data);
             }
         }
@@ -187,7 +199,7 @@ public class ProvincialPlatformDataPushScheduled {
             if (response.getStatusCode().is2xxSuccessful()) {
                 System.out.println("数据推送成功，响应内容：" + response.getBody());
             } else {
-                System.err.println("数据推送失败，状态码：" + response.getStatusCodeValue() +
+                System.out.println("数据推送失败，状态码：" + response.getStatusCodeValue() +
                         "，响应内容：" + response.getBody());
             }
         } catch (Exception e) {