From 3aa9f732b013c778a666b00e4936462372878a5c Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期一, 26 五月 2025 14:07:42 +0800
Subject: [PATCH] 集成MQTT对接公交主防数据

---
 ruoyi-service/ruoyi-dataInterchange/src/main/java/com/ruoyi/dataInterchange/util/haikang/Artemis.java |   62 +++++++++++++-----------------
 1 files changed, 27 insertions(+), 35 deletions(-)

diff --git a/ruoyi-service/ruoyi-dataInterchange/src/main/java/com/ruoyi/dataInterchange/util/haikang/Artemis.java b/ruoyi-service/ruoyi-dataInterchange/src/main/java/com/ruoyi/dataInterchange/util/haikang/Artemis.java
index d8614a1..673ec87 100644
--- a/ruoyi-service/ruoyi-dataInterchange/src/main/java/com/ruoyi/dataInterchange/util/haikang/Artemis.java
+++ b/ruoyi-service/ruoyi-dataInterchange/src/main/java/com/ruoyi/dataInterchange/util/haikang/Artemis.java
@@ -1,7 +1,6 @@
 package com.ruoyi.dataInterchange.util.haikang;
 
 import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.hikvision.artemis.sdk.ArtemisHttpUtil;
 import com.hikvision.artemis.sdk.config.ArtemisConfig;
@@ -11,12 +10,8 @@
 import com.ruoyi.dataInterchange.util.haikang.model.GetTopicInfoRequest;
 import lombok.extern.slf4j.Slf4j;
 
-import javax.servlet.ServletContextEvent;
-import javax.servlet.ServletContextListener;
-import javax.servlet.annotation.WebListener;
 import java.util.ArrayList;
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
 
 /**
@@ -53,20 +48,35 @@
 		return result;
 	}
 
-
-	//按事件类型获取事件订阅信息
-	public static String getTopicInfo(GetTopicInfoRequest getTopicInfoRequest)throws Exception {
-		String getTopicInfoDataApi = ARTEMIS_PATH +"/api/common/v1/event/getTopicInfo";
+	//查询事件订阅信息
+	public static String eventSubscriptionView(EventSubscriptionViewRequest eventSubscriptionViewRequest) throws Exception {
+		String eventSubscriptionViewDataApi = ARTEMIS_PATH +"/api/eventService/v1/eventSubscriptionView";
 		Map<String,String> path = new HashMap<String,String>(2){
 			{
-				put("https://",getTopicInfoDataApi);
+				put("https://",eventSubscriptionViewDataApi);
 			}
 		};
-		String body=JSON.toJSONString(getTopicInfoRequest);
+		String body=JSON.toJSONString(eventSubscriptionViewRequest);
 		String result =ArtemisHttpUtil.doPostStringArtemis(artemisConfig,path,body,null,null,"application/json");
 		return result;
 	}
 
+	//按事件类型订阅事件
+	public static String eventSubscriptionByEventTypes(EventSubscriptionByEventTypesRequest eventSubscriptionByEventTypesRequest) throws Exception {
+		String eventSubscriptionByEventTypesDataApi = ARTEMIS_PATH +"/api/eventService/v1/eventSubscriptionByEventTypes";
+		Map<String,String> path = new HashMap<String,String>(2){
+			{
+				put("https://",eventSubscriptionByEventTypesDataApi);
+			}
+		};
+		String body=JSON.toJSONString(eventSubscriptionByEventTypesRequest);
+		String result = ArtemisHttpUtil.doPostStringArtemis(artemisConfig,path,body,null,null,"application/json");
+		return result;
+	}
+	
+	public static void main(String[] args) {
+		Artemis.run();
+	}
 	
 	public static void run() {
 		try {
@@ -82,35 +92,17 @@
 			e.printStackTrace();
 		}
 	}
-	
-	//查询事件订阅信息
-	public static String eventSubscriptionView(EventSubscriptionViewRequest eventSubscriptionViewRequest) throws Exception {
-		String eventSubscriptionViewDataApi = ARTEMIS_PATH +"/api/eventService/v1/eventSubscriptionView";
+
+	//按事件类型获取事件订阅信息
+	public static String getTopicInfo(GetTopicInfoRequest getTopicInfoRequest)throws Exception {
+		String getTopicInfoDataApi = ARTEMIS_PATH +"/api/common/v1/event/getTopicInfo";
 		Map<String,String> path = new HashMap<String,String>(2){
 			{
-				put("https://",eventSubscriptionViewDataApi);
+				put("https://",getTopicInfoDataApi);
 			}
 		};
-		String body=JSON.toJSONString(eventSubscriptionViewRequest);
+		String body=JSON.toJSONString(getTopicInfoRequest);
 		String result =ArtemisHttpUtil.doPostStringArtemis(artemisConfig,path,body,null,null,"application/json");
 		return result;
-	}
-	
-	//按事件类型订阅事件
-	public static String eventSubscriptionByEventTypes(EventSubscriptionByEventTypesRequest eventSubscriptionByEventTypesRequest) throws Exception {
-		String eventSubscriptionByEventTypesDataApi = ARTEMIS_PATH +"/api/eventService/v1/eventSubscriptionByEventTypes";
-		Map<String,String> path = new HashMap<String,String>(2){
-			{
-				put("https://",eventSubscriptionByEventTypesDataApi);
-			}
-		};
-		String body=JSON.toJSONString(eventSubscriptionByEventTypesRequest);
-		String result = ArtemisHttpUtil.doPostStringArtemis(artemisConfig,path,body,null,null,"application/json");
-		return result;
-	}
-
-
-	public static void main(String[] args) {
-		Artemis.run();
 	}
 }

--
Gitblit v1.7.1