From 23b57fc7eab3defc741a0e54e3dac939ad49f13f Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期五, 22 五月 2026 19:14:04 +0800
Subject: [PATCH] 新增智能电表、空调管理
---
server/visits/dmvisit_service/src/main/java/com/doumee/core/device/ElectronicToolTestUtil.java | 79 ++++++++++++++++++++-------------------
1 files changed, 41 insertions(+), 38 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/device/ElectronicToolUitl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/core/device/ElectronicToolTestUtil.java
similarity index 96%
rename from server/visits/dmvisit_service/src/main/java/com/doumee/core/device/ElectronicToolUitl.java
rename to server/visits/dmvisit_service/src/main/java/com/doumee/core/device/ElectronicToolTestUtil.java
index c2db600..17c64bd 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/core/device/ElectronicToolUitl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/core/device/ElectronicToolTestUtil.java
@@ -23,7 +23,7 @@
import java.security.MessageDigest;
import java.util.*;
-public class ElectronicToolUitl {
+public class ElectronicToolTestUtil {
// 鎺堟潈鐮� 鐧诲綍 鍚庡彴鑾峰彇锛� 鑱旂郴浣犵殑鐢叉柟鎴栬�呮槸閿�鍞�
private static String auth_code = "1f29d378fc6792d5d2b735877993ffb7";
@@ -44,43 +44,43 @@
// 娉ㄦ剰 鏈�2涓郴缁� 鎺堟潈鐮佺瓑鍙傛暟 鍚勮嚜鐙珛 鎺ュ彛鍩熷悕鍒嗗埆涓� https://iot.tqdianbiao.com/ http://api1.tqdianbiao.com
// -------- 绯荤粺缁存姢鍏抽敭鍙傛暟妯″紡 鎺ュ彛-------------
-// 閲囬泦鍣ㄦ坊鍔�();
-// 閲囬泦鍣ㄥ垹闄�();
-// 鏌ヨN涓噰闆嗗櫒();
-// 鏌ヨ鍏ㄩ儴閲囬泦鍣�();
-//
-// 鐢佃兘琛ㄦ坊鍔�();
-// 鐢佃兘琛ㄥ垹闄�();
-// 鐢佃兘琛ㄦ。妗堟煡璇�();
-//
-// 姘磋〃娣诲姞();
-// 姘磋〃鍒犻櫎();
-// 姘磋〃妗ｆ鏌ヨ();
+ collectorAdd();
+ 閲囬泦鍣ㄥ垹闄�();
+ 鏌ヨN涓噰闆嗗櫒();
+ 鏌ヨ鍏ㄩ儴閲囬泦鍣�();
-// 鎿嶄綔鐘舵�佹煡璇�();
-// 鍙栨秷鎿嶄綔();
+ 鐢佃兘琛ㄦ坊鍔�();
+ 鐢佃兘琛ㄥ垹闄�();
+ 鐢佃兘琛ㄦ。妗堟煡璇�();
+
+ 姘磋〃娣诲姞();
+ 姘磋〃鍒犻櫎();
+ 姘磋〃妗ｆ鏌ヨ();
+
+ 鎿嶄綔鐘舵�佹煡璇�();
+ 鍙栨秷鎿嶄綔();
// ------------ 鎺ュ叆鏂圭淮鎶ゅ叧閿弬鏁版ā寮� 鏁版嵁鎺ュ彛-------------
-// 鎶勭數琛ㄦ暟鎹�();
-// 璁剧疆鐢佃〃鍙傛暟();
-// 鐢佃〃鎷夐椄();
-// 鐢佃〃鍚堥椄();
-// 鐢佃〃娓呴浂_鍚屾妯″紡();
-// 鐢佃〃娓呴浂_闈炲悓姝ユā寮�();
+ 鎶勭數琛ㄦ暟鎹�();
+ 璁剧疆鐢佃〃鍙傛暟();
+ 鐢佃〃鎷夐椄();
+ 鐢佃〃鍚堥椄();
+ 鐢佃〃娓呴浂_鍚屾妯″紡();
+ 鐢佃〃娓呴浂_闈炲悓姝ユā寮�();
// 鐢佃〃寮�鎴穇鍚屾妯″紡();
-// 鐢佃〃寮�鎴穇闈炲悓姝ユā寮�();
-// 鐢佃〃鍏呭�糭鍚屾妯″紡();
-// 鐢佃〃鍏呭�糭闈炲悓姝ユā寮�();
+ 鐢佃〃寮�鎴穇闈炲悓姝ユā寮�();
+ 鐢佃〃鍏呭�糭鍚屾妯″紡();
+ 鐢佃〃鍏呭�糭闈炲悓姝ユā寮�();
-// 鎶勬按琛ㄦ暟鎹�();
-// 姘磋〃鍏抽榾();
-// 姘磋〃寮�闃�();
-// 姘磋〃娓呴浂();
-// Mbus姘磋〃鍏呭�糭鍚屾妯″紡();
-// Mbus姘磋〃鍏呭�糭闈炲悓姝ユā寮�();
-// Lora姘磋〃鍏呭�糭鍚屾妯″紡();
-// Lora姘磋〃鍏呭�糭闈炲悓姝ユā寮�();
+ 鎶勬按琛ㄦ暟鎹�();
+ 姘磋〃鍏抽榾();
+ 姘磋〃寮�闃�();
+ 姘磋〃娓呴浂();
+ Mbus姘磋〃鍏呭�糭鍚屾妯″紡();
+ Mbus姘磋〃鍏呭�糭闈炲悓姝ユā寮�();
+ Lora姘磋〃鍏呭�糭鍚屾妯″紡();
+ Lora姘磋〃鍏呭�糭闈炲悓姝ユā寮�();
Lora鏅�氶浠樿垂姘磋〃璁剧疆姘翠环();
Lora闃舵棰勪粯璐规按琛ㄨ缃按浠�();
@@ -123,8 +123,6 @@
String url = api_url+"/Api/Collector";
Map<String, Object> params = new HashMap<>();
params.put("auth", auth_code);
-
- // Map<String, Object> 杞垚url鍙傛暟
String urlParams = getUrlParams(params);
url = url + "?" + urlParams;
@@ -239,6 +237,8 @@
simpleRequestPrint(url, resp);
}
+
+
private static void simpleRequestPrint(String url, String resp) {
String name=Thread.currentThread().getStackTrace()[2].getMethodName();
@@ -916,6 +916,7 @@
item = new HashMap<>();
item.put("cid", "19020618114"); // 鍒犻櫎鏈尯鍩熷凡缁忔坊鍔犵殑閲囬泦鍣�
req.add(item);
+
item = new HashMap<>();
item.put("cid", "1902061811411"); // 鍒犻櫎涓嶅悎娉曠殑閲囬泦鍣�
req.add(item);
@@ -924,16 +925,18 @@
testApi(url, request_content);
}
- private static void 閲囬泦鍣ㄦ坊鍔�()
- {
+ /**
+ *
+ */
+ private static void collectorAdd(){
String url = api2_url+"/Api_v2/collector/add";
// 璇锋眰鍐呭锛岃皟鐢ㄦ帴鍙ｆ墍闇�瑕佺殑鏁版嵁(娣诲姞鎸囧畾鐨勯噰闆嗗櫒淇℃伅)
List<Map<String, String>> req = new ArrayList<>();
Map<String, String> item = new HashMap<>();
- item.put("cid", "12345678901"); // 閲囬泦鍣ㄥ彿琚叾浠栧尯鍩熺敤鎴锋坊鍔犺繃鐨�
+ item.put("cid", "300000000003"); // 閲囬泦鍣ㄥ彿琚叾浠栧尯鍩熺敤鎴锋坊鍔犺繃鐨�
req.add(item);
item = new HashMap<>();
- item.put("cid", "19020618114"); // 澶氭璋冪敤鍧囦細杩斿洖娣诲姞鎴愬姛
+ item.put("cid", "300000000004"); // 澶氭璋冪敤鍧囦細杩斿洖娣诲姞鎴愬姛
req.add(item);
String request_content = JSON.toJSONString(req);
--
Gitblit v1.9.3