From 46c0be4ad0028db3d9a41e29d9a5b46ab46056a0 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期四, 05 十二月 2024 18:17:46 +0800
Subject: [PATCH] 省厅标签拆分2
---
ycl-server/src/main/java/com/ycl/api/HK/HKApi.java | 42 ++++++++++++++++++++++++++++++++++++++++--
1 files changed, 40 insertions(+), 2 deletions(-)
diff --git a/ycl-server/src/main/java/com/ycl/api/HK/HKApi.java b/ycl-server/src/main/java/com/ycl/api/HK/HKApi.java
index a9711cd..b6c5c17 100644
--- a/ycl-server/src/main/java/com/ycl/api/HK/HKApi.java
+++ b/ycl-server/src/main/java/com/ycl/api/HK/HKApi.java
@@ -33,12 +33,50 @@
@Slf4j
public class HKApi {
- public static OSDResult getOsdByIP(String ip, String userName, String password) {
+ public static OSDResult getOsdByIP(String serialNumber, String ip, String userName, String password) {
OSDResult osdResult = new OSDResult();
String hostUrl = "http://" + ip;
try {
//鑾峰彇OSD
- String OSDString = getHttpResponse(hostUrl + ApiConstants.HK_OSD_PATH, userName, password);
+ /**
+ * 閫氳繃鍥芥爣鍊掓暟绗竷浣嶅垽鏂�氶亾 0/鍏ㄦ櫙 1/缁嗚妭
+ * 瀵逛簬娴峰悍鏉ヨ锛� 鍥芥爣鍊�7 0/鍏ㄦ櫙/閫氶亾2 1/缁嗚妭/閫氶亾1
+ * 瀵逛簬澶у崕鏉ヨ锛� 鍥芥爣鍊�7 0/鍏ㄦ櫙/閫氶亾1 1/缁嗚妭/閫氶亾2
+ * 瀹囪鍗曢�氶亾涓嶈�冭檻
+ */
+ String OSDString = null;
+ if(StringUtils.isEmpty(serialNumber)) return null;
+ if(serialNumber.charAt(ApiConstants.SerialNumber_Channel) == ApiConstants.SerialNumber_All ) {
+ OSDString = getHttpResponse(hostUrl + ApiConstants.HK_OSD_PATH_2, userName, password);
+ }else if(serialNumber.charAt(ApiConstants.SerialNumber_Channel) == ApiConstants.SerialNumber_Detail){
+ OSDString = getHttpResponse(hostUrl + ApiConstants.HK_OSD_PATH_1, userName, password);
+ }
+ //閫氳繃璁惧绫诲瀷鍒ゆ柇锛堝純鐢級
+// if(serialNumber.charAt(ApiConstants.SerialNumber_Category) == 1 ){
+// //鏋満
+// if(serialNumber.charAt(ApiConstants.SerialNumber_Channel) == 1){
+// OSDString = getHttpResponse(hostUrl + ApiConstants.HK_OSD_PATH_1, userName, password);
+// }else if(serialNumber.charAt(ApiConstants.SerialNumber_Channel) == 0){
+// OSDString = getHttpResponse(hostUrl + ApiConstants.HK_OSD_PATH_2, userName, password);
+// }
+// }else if(serialNumber.charAt(ApiConstants.SerialNumber_Category) == 2){
+// //鐞冩満
+// if(serialNumber.charAt(ApiConstants.SerialNumber_Channel) == 0){
+// OSDString = getHttpResponse(hostUrl + ApiConstants.HK_OSD_PATH_1, userName, password);
+// }else if(serialNumber.charAt(ApiConstants.SerialNumber_Channel) == 1){
+// OSDString = getHttpResponse(hostUrl + ApiConstants.HK_OSD_PATH_2, userName, password);
+// }
+// }else if(serialNumber.charAt(ApiConstants.SerialNumber_Category) == 3){
+// //鍗″彛 鍗曢�氶亾
+// OSDString = getHttpResponse(hostUrl + ApiConstants.HK_OSD_PATH_1, userName, password);
+// }else if(serialNumber.charAt(ApiConstants.SerialNumber_Category) == 4){
+// //楂樼┖
+// if(serialNumber.charAt(ApiConstants.SerialNumber_Channel) == 0){
+// OSDString = getHttpResponse(hostUrl + ApiConstants.HK_OSD_PATH_1, userName, password);
+// }else if(serialNumber.charAt(ApiConstants.SerialNumber_Channel) == 1){
+// OSDString = getHttpResponse(hostUrl + ApiConstants.HK_OSD_PATH_2, userName, password);
+// }
+// }
if (OSDString == null) return null;
//瑙ｆ瀽xml
--
Gitblit v1.8.0