From 16d77a440e12c3de262c48c79af5fc0494dd87b7 Mon Sep 17 00:00:00 2001
From: ustcyc <yincun@163.com>
Date: 星期五, 11 四月 2025 18:42:19 +0800
Subject: [PATCH] Merge pull request #52 from zhitan-cloud/zhangjw
---
zhitan-common/src/main/java/com/zhitan/common/constant/CommonConst.java | 24 ++++++++++++------------
1 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/zhitan-common/src/main/java/com/zhitan/common/constant/CommonConst.java b/zhitan-common/src/main/java/com/zhitan/common/constant/CommonConst.java
index c328731..df452a2 100644
--- a/zhitan-common/src/main/java/com/zhitan/common/constant/CommonConst.java
+++ b/zhitan-common/src/main/java/com/zhitan/common/constant/CommonConst.java
@@ -4,7 +4,7 @@
/**
* @Description: 甯搁噺灏佽
- * @author: yxw
+ * @author ZhiTan
* @date: 2022骞�02鏈�02鏃� 11:37
*/
public class CommonConst {
@@ -867,7 +867,7 @@
/**
* 鎬绘湁鍔熷姛鐜囩偣浣嶆ā鏉縞ode
*/
- public static final String TAG_CODE_ZYGGL = "\\_ActivePower_Total";
+ public static final String TAG_CODE_ZYGGL = "ActivePow";
/**
* 鎬绘湁鍔熷姛鐜囩偣浣嶆ā鏉縞ode
*/
@@ -887,19 +887,19 @@
/**
* 鎬诲姛鐜囧洜鏁� 鐐逛綅妯℃澘code
*/
- public static final String TAG_CODE_GLYS = "PowerFactor_Total";
+ public static final String TAG_CODE_GLYS = "PowFactorT";
/**
* 鐢垫祦
*/
- public static final String TAG_CODE_CURRENT = "Current_";
+ public static final String TAG_CODE_CURRENT = "Current";
/**
* 鐢靛帇
*/
- public static final String TAG_CODE_VOLTAGE = "Voltage_";
+ public static final String TAG_CODE_VOLTAGE = "Voltage";
/**
* 鍔熺巼鍥犳暟
*/
- public static final String TAG_CODE_FACTOR = "PowerFactor_";
+ public static final String TAG_CODE_FACTOR = "PowerFactor";
/**
* 鍔熺巼鍥犳暟
*/
@@ -935,27 +935,27 @@
/**
* A鐩哥數娴�
*/
- public static final String TAG_CODE_CURRENT_A = "Current_A";
+ public static final String TAG_CODE_CURRENT_A = "CurrentA";
/**
* B鐩哥數娴�
*/
- public static final String TAG_CODE_CURRENT_B = "Current_B";
+ public static final String TAG_CODE_CURRENT_B = "CurrentB";
/**
* C鐩哥數娴�
*/
- public static final String TAG_CODE_CURRENT_C = "Current_C";
+ public static final String TAG_CODE_CURRENT_C = "CurrentC";
/**
* A鐩哥數鍘�
*/
- public static final String TAG_CODE_VOLTAGE_A = "Voltage_A";
+ public static final String TAG_CODE_VOLTAGE_A = "VoltageA";
/**
* B鐩哥數鍘�
*/
- public static final String TAG_CODE_VOLTAGE_B = "Voltage_B";
+ public static final String TAG_CODE_VOLTAGE_B = "VoltageB";
/**
* C鐩哥數鍘�
*/
- public static final String TAG_CODE_VOLTAGE_C = "Voltage_C";
+ public static final String TAG_CODE_VOLTAGE_C = "VoltageC";
/**
* A鐩稿姛鐜囧洜鏁�
*/
--
Gitblit v1.9.3