From 20d2f06486e57b82a9045a754dd538a8a37e5c80 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 09 八月 2024 18:05:47 +0800
Subject: [PATCH] 最新版本
---
server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/FetchAudioDeviceRequest.java | 16 ++
server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/FetchAudioChannelRequest.java | 17 ++
server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/LedRecordsRequest.java | 8 +
server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/respose/LedRecordsInfoResponse.java | 10 +
server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/respose/PlatformCameraInfoResponse.java | 11 +
server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/respose/FetchAudioChannelInfoResponse.java | 23 ++
server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/PlatformsListRequest.java | 8 +
server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKConstants.java | 8 +
server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/PlatformStatusRequest.java | 9 +
server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/service/HKService.java | 142 +++++++++++++++++
server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/TransparentChannelBodyRequest.java | 37 ++++
server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/respose/PlatformListInfoResponse.java | 24 +++
server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/TransparentChannelHeadRequest.java | 12 +
server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKTools.java | 72 +++++++++
server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/respose/PlatformStatusInfoResponse.java | 20 ++
server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/respose/FetchAudioDeviceInfoResponse.java | 20 ++
16 files changed, 437 insertions(+), 0 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKConstants.java b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKConstants.java
index 6b8f7d4..2b11cbb 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKConstants.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKConstants.java
@@ -91,6 +91,14 @@
String applyCTGT= "/api/lsm/ssoService/v1/applyCTGT";//鏍规嵁鐢ㄦ埛鏍囪瘑鑾峰彇瀹㈡埛绔疶GC鎺ュ彛
String applyST= "/api/lsm/ssoService/v1/applyST";//鏍规嵁鐧诲綍鏍囪瘑TGC鐢宠鐧诲綍鍑瘉ST鎺ュ彛
String tokenLoginUrl= "/lsm/ssoService/v1/tokenLogin?token=${st}&service=${service}";//缁勪欢鎺堟潈鐧诲綍鎷兼帴鍦板潃
+ String fetchAudioChannel= "/api/ibas/resource/v1/fetchAudioChannel";//1.1.4.1鍒嗛〉鑾峰彇骞挎挱鐐�
+ String fetchAudioDevice= "/api/ibas/resource/v1/fetchAudioDevice";//1.1.4.2鍒嗛〉鑾峰彇骞挎挱璁惧鍒楄〃
+ String fetchAudioChannelByDevice= "/api/ibas/resource/v1/fetchAudioChannelByDevice";//1.1.4.3鏍规嵁璁惧淇℃伅鑾峰彇骞挎挱鐐�
+ String ledRecords= "/api/v1/model/tb_led_info/records";//鑾峰彇鏈堝彴缁勪欢閰嶇疆鐨凩ED璁惧娓呭崟
+ String transparentchannel= "/api/v1/transparentchannel";//鍙戦�佹秷鎭粰LED
+ String platformsList= "/api/platformService/v1/platforms";//鑾峰彇鍏ㄩ儴鏈堝彴淇℃伅
+ String platformStatus= "/api/platformService/v1/platform/status";//鑾峰彇鏈堝彴鐘舵��
+ String customBroadcast= "/api/ibas/v1/customBroadcast";//鐢ㄤ簬璁剧疆骞挎挱鐨勮嚜瀹氭挱鏀惧拰鍋滄
}
/**
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKTools.java b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKTools.java
index 6992fdc..7b55f11 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKTools.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKTools.java
@@ -361,6 +361,14 @@
return result;
}
+ public static String startDoPostStringArtemis(String pathStr,Map<String, String> querys,Map<String, String> header,String body){
+ Map<String, String> path = getPath(pathStr);
+ header.put("tagId", UUID.randomUUID().toString().replace("-", ""));
+ String result = ArtemisHttpUtil.doPostStringArtemis(path, body, querys, null, "application/json", header);// post璇锋眰application/json绫诲瀷鍙傛暟
+ saveInterfaceLog(body,result,path);
+ return result;
+
+ }
/**
* 绛剧璁垮棰勭害
* @param body
@@ -583,6 +591,70 @@
public static String acsDeviceStatus(String body) {
return startDoPostStringArtemis(HKConstants.InterfacePath.acsDeviceStatus,body);
}
+ /**
+ * 鍒嗛〉鑾峰彇骞挎挱鐐�
+ * @param body
+ * @return
+ */
+ public static String fetchAudioChannel(String body) {
+ return startDoPostStringArtemis(HKConstants.InterfacePath.fetchAudioChannel,body);
+ }
+ /**
+ * 鍒嗛〉鑾峰彇骞挎挱璁惧鍒楄〃
+ * @param body
+ * @return
+ */
+ public static String fetchAudioDevice(String body) {
+ return startDoPostStringArtemis(HKConstants.InterfacePath.fetchAudioDevice,body);
+ }
+ /**
+ * 鏍规嵁璁惧淇℃伅鑾峰彇骞挎挱鐐�
+ * @param body
+ * @return
+ */
+ public static String fetchAudioChannelByDevice(String body) {
+ return startDoPostStringArtemis(HKConstants.InterfacePath.fetchAudioChannelByDevice,body);
+ }
+ /**
+ * 鑾峰彇鍏ㄩ儴鏈堝彴淇℃伅
+ * @param body
+ * @return
+ */
+ public static String platformsList(String body) {
+ return startDoPostStringArtemis(HKConstants.InterfacePath.platformsList,body);
+ }
+ /**
+ * 鑾峰彇鏈堝彴鐘舵��
+ * @param body
+ * @return
+ */
+ public static String platformStatus(String body) {
+ return startDoPostStringArtemis(HKConstants.InterfacePath.platformStatus,body);
+ }
+ /**
+ * 鑾峰彇鏈堝彴缁勪欢閰嶇疆鐨凩ED璁惧娓呭崟
+ * @param body
+ * @return
+ */
+ public static String ledRecords(String body) {
+ return startDoPostStringArtemis(HKConstants.InterfacePath.ledRecords,body);
+ }
+ /**
+ * 鐢ㄤ簬璁剧疆骞挎挱鐨勮嚜瀹氭挱鏀惧拰鍋滄
+ * @param body
+ * @return
+ */
+ public static String customBroadcast(String body) {
+ return startDoPostStringArtemis(HKConstants.InterfacePath.customBroadcast,body);
+ }
+ /**
+ * 鍙戦�佹秷鎭粰LED
+ * @param body
+ * @return
+ */
+ public static String transparentchannel(Map<String,String> header,String body) {
+ return startDoPostStringArtemis(HKConstants.InterfacePath.transparentchannel,null,header,body);
+ }
/**
* 鏌ヨ鍦哄唴杞﹀仠杞︿俊鎭�
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/FetchAudioChannelRequest.java b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/FetchAudioChannelRequest.java
new file mode 100644
index 0000000..eb8b95b
--- /dev/null
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/FetchAudioChannelRequest.java
@@ -0,0 +1,17 @@
+package com.doumee.core.haikang.model.param.request;
+
+import lombok.Data;
+
+@Data
+public class FetchAudioChannelRequest {
+ private String audioChannelName ;//String false 骞挎挱鐐瑰悕绉�
+ private String audioChannelIndexCode ;//String false 骞挎挱鐐瑰敮涓�鏍囪瘑锛屽涓敤鈥�,鈥濆垎闅�
+ private String channelType ;//String false 閫氶亾绫诲瀷,audioTalk-骞挎挱璁惧骞挎挱鐐癸紱talk-瑙嗛璁惧瀵硅閫氶亾
+ private String regionIndexCode ;//String false 鍖哄煙鍞竴鏍囪瘑锛屽涓敤鈥�,鈥濆垎闅�
+ private String audioArea ;//String false 骞挎挱鍒嗗尯鍞竴鏍囪瘑锛屽涓敤鈥�,鈥濆垎闅�
+ private Integer pageNo ;//String true 鍒嗛〉椤电爜
+ private Integer pageSize ;//String true 鍒嗛〉澶у皬
+ private Integer hasChild ;// Number false 鏄惁鍖呭惈涓嬬骇鍖哄煙 1-鍖呭惈涓嬬骇 0-鏈骇锛岄粯璁ゆ湰绾э紝褰撻�夋嫨鍖呭惈涓嬬骇鏃讹紝鍖哄煙鏍囪瘑蹇呭~
+ private Integer isMachineSync ;// Number false 绛涢�夋槸鍚﹀箍鎾富鏈哄悓姝ユ暟鎹紝1-骞挎挱涓绘満鍚屾鏁版嵁锛�0-鏈骇娣诲姞鏁版嵁
+ private Integer isCascadeSync ;// Number false 绛涢�夋槸鍚﹀箍鎾骇鑱斿悓姝ユ暟鎹紝1-骞挎挱绾ц仈鍚屾鏁版嵁锛�0-鏈骇娣诲姞鏁版嵁
+}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/FetchAudioDeviceRequest.java b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/FetchAudioDeviceRequest.java
new file mode 100644
index 0000000..5c0de3d
--- /dev/null
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/FetchAudioDeviceRequest.java
@@ -0,0 +1,16 @@
+package com.doumee.core.haikang.model.param.request;
+
+import lombok.Data;
+
+@Data
+public class FetchAudioDeviceRequest {
+ private String deviceName ;//String false 骞挎挱璁惧鎸夌収鍚嶇О妯$硦鏌ヨ
+ private String regionIndexCode ;//String false 鍖哄煙缂栧彿,鍙互涓虹┖;
+ private String subRegion;// Boolean false 鏄惁鍖呭惈涓嬬骇鍖哄煙锛屾敞锛� 1銆佸弬鏁皊ubRegion浣跨敤鏃讹紝regionIndexCode涓哄繀濉�,true鍖呭惈涓嬬骇锛宖alse涓轰笉鍖呭惈锛岄粯璁や笉鍖呭惈
+ private String deviceTreaty ;//String false 鍗忚绫诲瀷锛宨sapi_net锛宨sup5_reg锛宱tap_iot,sip_reg
+ private Integer pageNo ;//Number true 褰撳墠椤电爜锛�0 < pageNo
+ private Integer pageSize ;// Number true 鍒嗛〉澶у皬锛�0<pageSize鈮�1000
+ private String deviceUseType ;//String false 璁惧绫诲瀷loudspeaker: '缃戠粶鍔熸斁', box: '缃戠粶闊崇', microphone: '缃戠粶瀵诲懠璇濈瓛', machine: '骞挎挱涓绘満'
+ private String ip ;//String false 璁惧瀵瑰簲ip,鏀寔妯$硦鏌ヨ
+ private String port ;//String false 璁惧瀵瑰簲绔彛锛屾敮鎸佹ā绯婃煡璇�
+}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/LedRecordsRequest.java b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/LedRecordsRequest.java
new file mode 100644
index 0000000..6485703
--- /dev/null
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/LedRecordsRequest.java
@@ -0,0 +1,8 @@
+package com.doumee.core.haikang.model.param.request;
+
+import lombok.Data;
+
+@Data
+public class LedRecordsRequest {
+
+}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/PlatformStatusRequest.java b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/PlatformStatusRequest.java
new file mode 100644
index 0000000..1f0970c
--- /dev/null
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/PlatformStatusRequest.java
@@ -0,0 +1,9 @@
+package com.doumee.core.haikang.model.param.request;
+
+import lombok.Data;
+
+@Data
+public class PlatformStatusRequest {
+ private String platformIds ;//Query String false 鏈堝彴ID
+
+}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/PlatformsListRequest.java b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/PlatformsListRequest.java
new file mode 100644
index 0000000..8a5c29b
--- /dev/null
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/PlatformsListRequest.java
@@ -0,0 +1,8 @@
+package com.doumee.core.haikang.model.param.request;
+
+import lombok.Data;
+
+@Data
+public class PlatformsListRequest {
+
+}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/TransparentChannelBodyRequest.java b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/TransparentChannelBodyRequest.java
new file mode 100644
index 0000000..43b57b2
--- /dev/null
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/TransparentChannelBodyRequest.java
@@ -0,0 +1,37 @@
+package com.doumee.core.haikang.model.param.request;
+
+import lombok.Data;
+
+@Data
+public class TransparentChannelBodyRequest {
+ private String method ; //String true 鏂规硶鍚嶏紝鎺у埗led蹇呴』鍐機ontrolLedGereral
+ private String indexCode ; // String false 璁惧缂栫爜
+ private Integer operationType ; //Number false 鎿嶄綔绫诲瀷
+ private Integer regionNo ; // Number false 鏄剧ず鍖哄煙鍙�
+ private Integer regionType ; // Number false 鍖哄煙绫诲瀷(14:鍙戦�佹枃瀛楋紝45锛氳闊虫挱鎶�)
+ private String content ; //String false 鍐呭
+ private Integer circleTimes ; // Number false 寰幆娆℃暟
+ private Integer regionLeftTopXPos ; // Number false 鍖哄煙宸︿笂瑙抶鍧愭爣
+ private Integer regionLeftTopYPos ; //Number false 鍖哄煙宸︿笂瑙抷鍧愭爣
+ private Integer regionRightBottomXPos ; // Number false 鍖哄煙鍙充笅瑙抶鍧愭爣
+ private Integer regionRightBottomYPos ; //Number false 鍖哄煙鍙充笅瑙抷鍧愭爣
+
+ /**
+ * Number false 婊氬姩鏂瑰紡锛圫TATIC_DISPLAY = 0x01,
+ * // 闈欐鏄剧ず/绔嬪嵆鏄剧ず/缈婚〉鏄剧ず LEFT_MOVE = 0x1C,
+ * // 鍚戝乏绉诲姩 RIGHT_MOVE = 0x1D,
+ * // 鍚戝彸绉诲姩 UP_MOVE = 0x1A,
+ * // 鍚戜笂绉诲姩 DOWN_MOVE = 0x1B,
+ * // 鍚戜笅绉诲姩 LEFT_LOOP = 0x1E,
+ * // 鍚戝乏杩炵画绉诲姩 RIGHT_LOOP = 0x1F,
+ * // 鍚戝彸杩炵画绉诲姩 UP_LOOP = 0x20,
+ * // 鍚戜笂杩炵画绉诲姩 DOWN_LOOP = 0x21,
+ * // 鍚戜笅杩炵画绉诲姩 TWINKLE = 0x29
+ * // 闂儊锛�
+ */
+ private Integer actionType ; //
+ private Integer speed ; // Number false 閫熷害
+ private Integer stayTime ; //Number false 鍋滅暀鏃堕棿
+ private Integer fontSize ; //Number false 瀛椾綋澶у皬
+
+}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/TransparentChannelHeadRequest.java b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/TransparentChannelHeadRequest.java
new file mode 100644
index 0000000..1b799d3
--- /dev/null
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/TransparentChannelHeadRequest.java
@@ -0,0 +1,12 @@
+package com.doumee.core.haikang.model.param.request;
+
+import lombok.Data;
+
+@Data
+public class TransparentChannelHeadRequest {
+ private String deviceIndexCode ;// Head String true 璁惧缂栫爜
+ private String ability ;// Head String true 鑳藉姏鏍囪瘑
+ private String treatyType ;// Head String true 鍗忚鍚�
+
+
+}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/respose/FetchAudioChannelInfoResponse.java b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/respose/FetchAudioChannelInfoResponse.java
new file mode 100644
index 0000000..1ce91a7
--- /dev/null
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/respose/FetchAudioChannelInfoResponse.java
@@ -0,0 +1,23 @@
+package com.doumee.core.haikang.model.param.respose;
+
+import lombok.Data;
+
+@Data
+public class FetchAudioChannelInfoResponse {
+
+ private String audioChannelName ;//String false 骞挎挱鐐瑰悕绉�
+ private String audioChannelIndexCode ;//String false 骞挎挱鐐瑰敮涓�鏍囪瘑
+ private String audioChannelType ;//String false 骞挎挱鐐圭被鍨�
+ private String channelType ;//String false 閫氶亾绫诲瀷锛宎udioTalk-骞挎挱璁惧骞挎挱鐐癸紝talk-瑙嗛璁惧瀵硅閫氶亾
+ private String channelNo ;//String false 閫氶亾鍙�
+ private String parentDevIndexCode ;//String false 鍏宠仈璁惧鍞竴鏍囪瘑
+ private String parentDevTreaty ;//String false 鍏宠仈璁惧鐨勫崗璁被鍨�
+ private String regionIndexCode ;//String false 鍖哄煙鍞竴鏍囪瘑锛屽涓敤鈥�,鈥濆垎闅�
+ private String audioArea ;//String false 骞挎挱鍒嗗尯鍞竴鏍囪瘑锛屽涓敤鈥�,鈥濆垎闅�
+ private Integer state ;//Number false 骞挎挱鐐瑰湪绾跨姸鎬�0-鍦ㄧ嚎 1-绂荤嚎
+ private String regionName ;//String false 鍖哄煙鍚嶇О
+ private String volume ;//String false 骞挎挱鐐归煶閲�
+ private Integer isMachineSync ;//Number false 鏄惁骞挎挱涓绘満鏁版嵁锛�1-鍚屾鏁版嵁锛�0-鏈骇鏁版嵁
+ private Integer isCascadeSync;// Number false 鏄惁骞挎挱绾ц仈鏁版嵁锛�1-鍚屾鏁版嵁锛�0-鏈骇鏁版嵁
+
+}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/respose/FetchAudioDeviceInfoResponse.java b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/respose/FetchAudioDeviceInfoResponse.java
new file mode 100644
index 0000000..6b0c07a
--- /dev/null
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/respose/FetchAudioDeviceInfoResponse.java
@@ -0,0 +1,20 @@
+package com.doumee.core.haikang.model.param.respose;
+
+import lombok.Data;
+
+@Data
+public class FetchAudioDeviceInfoResponse {
+
+ private String deviceIndexCode ;//String false 璁惧鍞竴鏍囪瘑
+ private String deviceName ;//String false 璁惧鍚嶇О
+ private String regionIndexCode ;//String false 鍖哄煙缂栧彿
+ private String ip ;//String false ip鍦板潃
+ private String port ;//String false 绔彛
+ private String deviceTreaty ;//String false 鍗忚绫诲瀷
+ private String domainId ;//String false 璁惧鎵�灞炵綉鍩焛d
+ private String deviceType ;//String false 璁惧绫诲瀷
+ private String deviceCode ;//String false 璁惧涓诲姩娉ㄥ唽缂栫爜
+ private String deviceUseType ;//String false 璁惧鍔熻兘绫诲瀷loudspeaker: '缃戠粶鍔熸斁', box: '缃戠粶闊崇', microphone: '缃戠粶瀵诲懠璇濈瓛', machine: '骞挎挱涓绘満'
+ private String desc ;//String false 骞挎挱璁惧鎻忚堪淇℃伅
+
+}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/respose/LedRecordsInfoResponse.java b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/respose/LedRecordsInfoResponse.java
new file mode 100644
index 0000000..071ff26
--- /dev/null
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/respose/LedRecordsInfoResponse.java
@@ -0,0 +1,10 @@
+package com.doumee.core.haikang.model.param.respose;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class LedRecordsInfoResponse {
+
+}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/respose/PlatformCameraInfoResponse.java b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/respose/PlatformCameraInfoResponse.java
new file mode 100644
index 0000000..993861a
--- /dev/null
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/respose/PlatformCameraInfoResponse.java
@@ -0,0 +1,11 @@
+package com.doumee.core.haikang.model.param.respose;
+
+import lombok.Data;
+
+@Data
+public class PlatformCameraInfoResponse {
+
+
+ private String cameraIdompan;// String false 鐩戞帶鐐笽D
+ private String cameraName ;//String false 鐩戞帶鐐瑰悕绉�
+}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/respose/PlatformListInfoResponse.java b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/respose/PlatformListInfoResponse.java
new file mode 100644
index 0000000..e4f2603
--- /dev/null
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/respose/PlatformListInfoResponse.java
@@ -0,0 +1,24 @@
+package com.doumee.core.haikang.model.param.respose;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class PlatformListInfoResponse {
+
+ private String deviceIndexCode ;//String false 璁惧鍞竴鏍囪瘑
+
+ private String platformtId;// String false 鏈堝彴ID
+ private List<PlatformCameraInfoResponse> cameras;// Array false 鍏宠仈鐩戞帶鐐�
+
+ private String cyNames;// String false 鍏宠仈鎵跨鍏徃
+ private String platformName;// String false 鏈堝彴鍚嶇О
+
+ private String createTime;// Number false 鍒涘缓鏃堕棿
+ private Integer x ;//Number false X鍧愭爣
+ private Integer y ;//Number false Y鍧愭爣
+ private Integer width;// Number false 瀹藉害
+ private Integer height;// Number false 闀垮害
+ private Integer angle;// Number false 瑙掑害
+}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/respose/PlatformStatusInfoResponse.java b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/respose/PlatformStatusInfoResponse.java
new file mode 100644
index 0000000..d2baa2c
--- /dev/null
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/respose/PlatformStatusInfoResponse.java
@@ -0,0 +1,20 @@
+package com.doumee.core.haikang.model.param.respose;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class PlatformStatusInfoResponse {
+
+
+ private String platformtId ;//String false 鏈堝彴ID
+ private String cameraIndexcode ;//String false 鏈堝彴鍏宠仈鐩戞帶鐐�
+ private String plateNo ;//String false 杞︾墝鍙�
+ private String name;// String false 鏈堝彴鍚嶇О
+ private String status;// Number false 鏈堝彴鐘舵��
+ private String loadingRate ;//String false 鏈堝彴鏈�鏂扮殑杞﹁締瑁呰浇鐜�
+ private String doorState;// String false 鏈堝彴浣滀笟杞﹁締鐨勫綋鍓嶅紑鍏充箞鐘舵��
+ private String workingPerson;// Number false 鏈堝彴鐨勫綋鍓嶄綔涓氫汉鏁�
+ private String lastEventTime ;//String false 鏈堝彴浜嬩欢鏈�鏂颁笂鎶ユ椂闂�
+}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/service/HKService.java b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/service/HKService.java
index bdbe7c6..5711c81 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/service/HKService.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/service/HKService.java
@@ -10,12 +10,16 @@
import com.doumee.core.haikang.model.param.request.*;
import com.doumee.core.haikang.model.param.respose.*;
import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.ObjectUtils;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.io.InputStream;
+import java.lang.reflect.Field;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
@Slf4j
public class HKService {
@@ -1018,6 +1022,144 @@
return null;
}
/**
+ *鍒嗛〉鑾峰彇骞挎挱鐐癸紙鍒嗛〉锛�
+ * @return
+ */
+ public static BaseResponse<BaseListPageResponse<FetchAudioChannelInfoResponse>> fetchAudioChannel(FetchAudioChannelRequest param){
+ log.info("銆愭捣搴疯幏鍙栧垎椤佃幏鍙栧箍鎾偣銆�================寮�濮�===="+JSONObject.toJSONString(param));
+ try {
+ String res = HKTools.fetchAudioChannel(JSONObject.toJSONString(param));
+ TypeReference typeReference =
+ new TypeReference< BaseResponse<BaseListPageResponse<FetchAudioChannelInfoResponse>> >(){};
+ BaseResponse<BaseListPageResponse<FetchAudioChannelInfoResponse>> result = JSONObject.parseObject(res, typeReference.getType());
+ logResult(result,"娴峰悍鑾峰彇鍒嗛〉鑾峰彇骞挎挱鐐�");
+ return result;
+ }catch (Exception e){
+ log.error("銆愭捣搴疯幏鍙栧垎椤佃幏鍙栧箍鎾偣銆�================澶辫触====锛歕n"+ e.getMessage());
+ }
+ return null;
+ }
+ /**
+ *鍒嗛〉鑾峰彇骞挎挱鐐癸紙鍒嗛〉锛�
+ * @return
+ */
+ public static BaseResponse<BaseListPageResponse<FetchAudioChannelInfoResponse>> fetchAudioDevice(FetchAudioChannelRequest param){
+ log.info("銆愭捣搴疯幏鍙栧垎椤佃幏鍙栧箍鎾偣銆�================寮�濮�===="+JSONObject.toJSONString(param));
+ try {
+ String res = HKTools.fetchAudioDevice(JSONObject.toJSONString(param));
+ TypeReference typeReference =
+ new TypeReference< BaseResponse<BaseListPageResponse<FetchAudioChannelInfoResponse>> >(){};
+ BaseResponse<BaseListPageResponse<FetchAudioChannelInfoResponse>> result = JSONObject.parseObject(res, typeReference.getType());
+ logResult(result,"娴峰悍鑾峰彇鍒嗛〉鑾峰彇骞挎挱鐐�");
+ return result;
+ }catch (Exception e){
+ log.error("銆愭捣搴疯幏鍙栧垎椤佃幏鍙栧箍鎾偣銆�================澶辫触====锛歕n"+ e.getMessage());
+ }
+ return null;
+ }
+ /**
+ *鑾峰彇鍏ㄩ儴鏈堝彴淇℃伅
+ * @return
+ */
+ public static BaseResponse<BaseListPageResponse<PlatformListInfoResponse>> platformsList(PlatformsListRequest param){
+ log.info("銆愭捣搴疯幏鍙栧叏閮ㄦ湀鍙颁俊鎭��================寮�濮�===="+JSONObject.toJSONString(param));
+ try {
+ String res = HKTools.platformsList(JSONObject.toJSONString(param));
+ TypeReference typeReference =
+ new TypeReference< BaseResponse<BaseListPageResponse<PlatformListInfoResponse>> >(){};
+ BaseResponse<BaseListPageResponse<PlatformListInfoResponse>> result = JSONObject.parseObject(res, typeReference.getType());
+ logResult(result,"娴峰悍鑾峰彇鍏ㄩ儴鏈堝彴淇℃伅");
+ return result;
+ }catch (Exception e){
+ log.error("銆愭捣搴疯幏鍙栧叏閮ㄦ湀鍙颁俊鎭��================澶辫触====锛歕n"+ e.getMessage());
+ }
+ return null;
+ }
+ /**
+ *鑾峰彇鏈堝彴缁勪欢閰嶇疆鐨凩ED璁惧娓呭崟
+ * @return
+ */
+ public static BaseResponse<BaseListPageResponse<LedRecordsInfoResponse>> ledRecords(LedRecordsRequest param){
+ log.info("銆愭捣搴疯幏鍙栨湀鍙扮粍浠堕厤缃殑LED璁惧娓呭崟銆�================寮�濮�===="+JSONObject.toJSONString(param));
+ try {
+ String res = HKTools.ledRecords(JSONObject.toJSONString(param));
+ TypeReference typeReference =
+ new TypeReference< BaseResponse<BaseListPageResponse<LedRecordsInfoResponse>> >(){};
+ BaseResponse<BaseListPageResponse<LedRecordsInfoResponse>> result = JSONObject.parseObject(res, typeReference.getType());
+ logResult(result,"娴峰悍鑾峰彇鏈堝彴缁勪欢閰嶇疆鐨凩ED璁惧娓呭崟");
+ return result;
+ }catch (Exception e){
+ log.error("銆愭捣搴疯幏鍙栨湀鍙扮粍浠堕厤缃殑LED璁惧娓呭崟銆�================澶辫触====锛歕n"+ e.getMessage());
+ }
+ return null;
+ }
+ /**
+ *鐢ㄤ簬璁剧疆骞挎挱鐨勮嚜瀹氭挱鏀惧拰鍋滄
+ * @return
+ */
+ public static BaseResponse<BaseListPageResponse<LedRecordsInfoResponse>> customBroadcast(LedRecordsRequest param){
+ log.info("銆愭捣搴风敤浜庤缃箍鎾殑鑷畾鎾斁鍜屽仠姝€��================寮�濮�===="+JSONObject.toJSONString(param));
+ try {
+ String res = HKTools.customBroadcast(JSONObject.toJSONString(param));
+ TypeReference typeReference =
+ new TypeReference< BaseResponse<BaseListPageResponse<LedRecordsInfoResponse>> >(){};
+ BaseResponse<BaseListPageResponse<LedRecordsInfoResponse>> result = JSONObject.parseObject(res, typeReference.getType());
+ logResult(result,"娴峰悍鐢ㄤ簬璁剧疆骞挎挱鐨勮嚜瀹氭挱鏀惧拰鍋滄");
+ return result;
+ }catch (Exception e){
+ log.error("銆愭捣搴风敤浜庤缃箍鎾殑鑷畾鎾斁鍜屽仠姝€��================澶辫触====锛歕n"+ e.getMessage());
+ }
+ return null;
+ }
+ /**
+ *鑾峰彇鍏ㄩ儴鏈堝彴淇℃伅
+ * @return
+ */
+ public static BaseResponse<BaseListPageResponse<PlatformStatusInfoResponse>> platformStatus(PlatformStatusRequest param) {
+ log.info("銆愭捣搴疯幏鍙栧叏閮ㄦ湀鍙颁俊鎭��================寮�濮�====" + JSONObject.toJSONString(param));
+ try {
+ String res = HKTools.platformStatus(JSONObject.toJSONString(param));
+ TypeReference typeReference =
+ new TypeReference<BaseResponse<BaseListPageResponse<PlatformStatusInfoResponse>>>() {
+ };
+ BaseResponse<BaseListPageResponse<PlatformStatusInfoResponse>> result = JSONObject.parseObject(res, typeReference.getType());
+ logResult(result, "娴峰悍鑾峰彇鍏ㄩ儴鏈堝彴淇℃伅");
+ return result;
+ } catch (Exception e) {
+ log.error("銆愭捣搴疯幏鍙栧叏閮ㄦ湀鍙颁俊鎭��================澶辫触====锛歕n" + e.getMessage());
+ }
+ return null;
+
+ }
+ /**
+ *鍙戦�佹秷鎭粰LED
+ * @return
+ */
+ public static BaseResponse transparentchannel(TransparentChannelHeadRequest head,TransparentChannelBodyRequest param){
+ log.info("銆愭捣搴峰彂閫佹秷鎭粰LED銆�================寮�濮�===="+JSONObject.toJSONString(param));
+ try {
+ Map<String,String> header = toMap(head);
+ String res = HKTools.transparentchannel(header,JSONObject.toJSONString(param));
+ TypeReference typeReference =
+ new TypeReference<BaseResponse>(){};
+ BaseResponse result = JSONObject.parseObject(res, typeReference.getType());
+ logResult(result,"娴峰悍鍙戦�佹秷鎭粰LED");
+ return result;
+ }catch (Exception e){
+ log.error("銆愭捣搴峰彂閫佹秷鎭粰LED銆�================澶辫触====锛歕n"+ e.getMessage());
+ }
+ return null;
+ }
+ public static Map<String, String> toMap(Object obj) throws IllegalAccessException {
+ Map<String, String> map = new HashMap<>();
+ Class<?> clazz = obj.getClass();
+ for (Field field : clazz.getDeclaredFields()) {
+ field.setAccessible(true); // 浣垮緱绉佹湁瀛楁涔熷彲浠ヨ闂�
+ map.put(field.getName(), (String) field.get(obj));
+ }
+ return map;
+ }
+ /**
*鏌ヨ鍦哄唴杞﹀仠杞︿俊鎭紙鍒嗛〉锛�
* @return
*/
--
Gitblit v1.9.3