From 6c79e816ead97b5c78aa492e2d2083b98390629d Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 23 九月 2024 10:32:59 +0800
Subject: [PATCH] 最新版本
---
server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/respose/FireDeviceListResponse.java | 23 +++
server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/respose/SensorStatusListResponse.java | 20 +++
server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/respose/FireDeviceStatusListResponse.java | 24 ++++
server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/respose/FireChannelListResponse.java | 21 +++
server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/FireDeviceExpressionRequest.java | 12 ++
server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/FireDeviceStatuslListRequest.java | 19 +++
server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/FireDeviceListRequest.java | 18 +++
server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/NhEventPageListRequest.java | 4
server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/SensorStatusListRequest.java | 15 ++
server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/FireChannelListRequest.java | 18 +++
server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKConstants.java | 4
server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/BaseListPageResponse.java | 3
server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/service/HKService.java | 75 ++++++++++++
server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKTools.java | 34 +++++
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/HkInterfaceTestCloudController.java | 27 ++++
15 files changed, 314 insertions(+), 3 deletions(-)
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/HkInterfaceTestCloudController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/HkInterfaceTestCloudController.java
index 2b09d07..da445e9 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/HkInterfaceTestCloudController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/HkInterfaceTestCloudController.java
@@ -67,10 +67,35 @@
return ApiResponse.success( HKService.wxAccessToken(configId,tageId));
}
@ApiOperation("銆愭捣搴枫�戞祴璇曞垎椤佃幏鍙栧憡璀︿簨浠�")
- @GetMapping("/testWxToken")
+ @GetMapping("/nhEventPageList")
@LoginNoRequired
public ApiResponse<BaseResponse> nhEventPageList(@RequestBody NhEventPageListRequest param, HttpServletResponse response) {
return ApiResponse.success( HKService.nhEventPageList(param));
}
+ @ApiOperation("銆愭捣搴枫�戝垎椤垫煡璇㈡秷闃蹭紶鎰熷櫒閮ㄤ欢鐘舵��")
+ @GetMapping("/sensorStatusSearch")
+ @LoginNoRequired
+ public ApiResponse<BaseResponse> sensorStatusSearch(@RequestBody SensorStatusListRequest param, HttpServletResponse response) {
+ return ApiResponse.success( HKService.sensorStatusSearch(param));
+ }
+ @ApiOperation("銆愭捣搴枫�戞煡璇㈡秷闃蹭紶鎰熷櫒鍒楄〃")
+ @GetMapping("/fireChannelSearch")
+ @LoginNoRequired
+ public ApiResponse<BaseResponse> fireChannelSearch(@RequestBody FireChannelListRequest param, HttpServletResponse response) {
+ return ApiResponse.success( HKService.fireChannelSearch(param));
+ }
+ @ApiOperation("銆愭捣搴枫�戞捣搴疯娑堥槻璁惧鍒楄〃")
+ @GetMapping("/fireDeviceSearch")
+ @LoginNoRequired
+ public ApiResponse<BaseResponse> fireDeviceSearch(@RequestBody FireDeviceListRequest param, HttpServletResponse response) {
+ return ApiResponse.success( HKService.fireDeviceSearch(param));
+ }
+ @ApiOperation("銆愭捣搴枫�戝垎椤垫煡璇㈡秷闃茶澶囬儴浠剁姸鎬�")
+ @GetMapping("/fireDeviceStatusSearch")
+ @LoginNoRequired
+ public ApiResponse<BaseResponse> fireDeviceStatusSearch(@RequestBody FireDeviceStatuslListRequest param, HttpServletResponse response) {
+ return ApiResponse.success( HKService.fireDeviceStatusSearch(param));
+ }
+
}
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 62d9596c7..733303d 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
@@ -125,6 +125,10 @@
String[] nhEventPageList= new String[]{"/api/ecm/warning/event/v1/pageList","鍒嗛〉鑾峰彇鍛婅浜嬩欢"};//鍒嗛〉鑾峰彇鍛婅浜嬩欢
String[] nhRegionDataRanking= new String[]{"/api/ecm/v1/energy/regionDataRanking","鏍规嵁鏃堕棿缁村害鑾峰彇鍖哄煙鐢ㄩ噺鎺掑悕"};//1.8.5鏍规嵁鏃堕棿缁村害鑾峰彇鍖哄煙鐢ㄩ噺鎺掑悕
String[] nhEnergyDistribution= new String[]{"/api/ecm/v1/energy/energyDistribution","鏍规嵁鏃堕棿缁村害鑾峰彇鑳借�楀垎甯�"};// 鏍规嵁鏃堕棿缁村害鑾峰彇鑳借�楀垎甯�
+ String[] fireDeviceSearch= new String[]{"/api/resource/v1/fireDevice/search","璇㈡秷闃茶澶囧垪琛�"};// 1.12.1.1璇㈡秷闃茶澶囧垪琛�
+ String[] fireChannelSearch= new String[]{"/api/resource/v1/fireChannel/search","鏌ヨ娑堥槻浼犳劅鍣ㄥ垪琛�"};// 鏌ヨ娑堥槻浼犳劅鍣ㄥ垪琛�
+ String[] sensorStatusSearch= new String[]{"/api/fpnms/v2/sensor/status/search","鍒嗛〉鏌ヨ娑堥槻浼犳劅鍣ㄩ儴浠剁姸鎬�"};// 鍒嗛〉鏌ヨ娑堥槻浼犳劅鍣ㄩ儴浠剁姸鎬�
+ String[] fireDeviceStatusSearch= new String[]{"/api/fpnms/v2/device/status/search","鏌ヨ娑堥槻璁惧閮ㄤ欢鐘舵��"};// 鏌ヨ娑堥槻璁惧閮ㄤ欢鐘舵��
}
/**
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 bb99bbb..b9e3b0d 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
@@ -587,6 +587,40 @@
public static String nhEventPageList(Map<String,String> body) {
return startDoGetStringArtemis(HKConstants.InterfacePath.nhEventPageList,body);
}
+
+ /**
+ * 鏌ヨ娑堥槻璁惧閮ㄤ欢鐘舵��
+ * @param body
+ * @return
+ */
+ public static String fireDeviceStatusSearch(Map<String,String> body) {
+ return startDoGetStringArtemis(HKConstants.InterfacePath.fireDeviceStatusSearch,body);
+ }
+ /**
+ * 鍒嗛〉鏌ヨ娑堥槻浼犳劅鍣ㄩ儴浠剁姸鎬�
+ * @param body
+ * @return
+ */
+ public static String sensorStatusSearch(Map<String,String> body) {
+ return startDoGetStringArtemis(HKConstants.InterfacePath.sensorStatusSearch,body);
+ }
+ /**
+ * 璇㈡秷闃茶澶囧垪琛�
+ * @param body
+ * @return
+ */
+ public static String fireChannelSearch(Map<String,String> body) {
+ return startDoGetStringArtemis(HKConstants.InterfacePath.fireChannelSearch,body);
+ }
+
+ /**
+ * 璇㈡秷闃茶澶囧垪琛�
+ * @param body
+ * @return
+ */
+ public static String fireDeviceSearch(Map<String,String> body) {
+ return startDoGetStringArtemis(HKConstants.InterfacePath.fireDeviceSearch,body);
+ }
/**
* 鑾峰彇鍏ㄩ噺鐢ㄦ埛鍒楄〃
* @param body
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/BaseListPageResponse.java b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/BaseListPageResponse.java
index fd8660b..c750997 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/BaseListPageResponse.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/BaseListPageResponse.java
@@ -1,5 +1,6 @@
package com.doumee.core.haikang.model.param;
+import com.alibaba.fastjson.annotation.JSONField;
import lombok.Data;
import java.util.List;
@@ -11,5 +12,7 @@
private int pageSize;// number False 姣忛〉璁板綍鎬绘暟
private int pageNo ;// number False 褰撳墠椤电爜
private int totalPage;// number False 鎬婚〉鏁�
+
+ @JSONField(name="list",alternateNames = {"rows","records"})
private List<T> list ;// object[] False 鏉冮檺缁勫璞″垪琛�
}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/FireChannelListRequest.java b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/FireChannelListRequest.java
new file mode 100644
index 0000000..d81a0dc
--- /dev/null
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/FireChannelListRequest.java
@@ -0,0 +1,18 @@
+package com.doumee.core.haikang.model.param.request;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class FireChannelListRequest {
+ private String name;// String false 鍚嶇О锛屾ā绯婃悳绱紝鏈�澶ч暱搴�32锛岃嫢鍖呭惈涓枃锛屾渶澶ч暱搴︽寚涓嶈秴杩囨寜鐓ф寚瀹氱紪鐮佺殑瀛楄妭闀垮害锛屽嵆getBytes("utf-8").length
+private List<String> regionIndexCodes;// Array false 鍖哄煙缂栧彿,鍙互涓虹┖;String[]锛屾敮鎸佹牴鎹尯鍩熸壒閲忔煡璇紱鍖哄煙缂栧彿涓暟<=1000涓紱鍗曚釜闀垮害<=64Byte锛涳紝鍙粠[鏌ヨ鍖哄煙鍒楄〃v2]@[鏅烘収鍥尯绠＄悊骞冲彴V1.4.301-API鍒楄〃-璧勬簮鐩綍-鍖哄煙淇℃伅鎺ュ彛#鏌ヨ鍖哄煙鍒楄〃v2]鎺ュ彛鑾峰彇杩斿洖鍙傛暟indexCode
+private Boolean isSubRegion;// Boolean false true鏃讹紝鎼滅储regionIndexCodes鍙婂叾瀛愬瓩鍖哄煙鐨勮祫婧愶紱false鏃讹紝鍙悳绱� regionIndexCodes鐨勮祫婧�
+private int pageNo;// Number true 褰撳墠椤电爜
+private int pageSize;// Number true 鍒嗛〉澶у皬
+private String orderBy;// String false 鎺掑簭瀛楁,娉ㄦ剰锛氭帓搴忓瓧娈靛繀椤绘槸鏌ヨ鏉′欢锛屽惁鍒欒繑鍥炲弬鏁伴敊璇�
+private String orderType;// String false 闄嶅簭鍗囧簭,闄嶅簭锛歞esc 鍗囧簭锛歛sc
+private List<FireDeviceExpressionRequest> expressions;// Array false 鏌ヨ琛ㄨ揪寮�
+
+}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/FireDeviceExpressionRequest.java b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/FireDeviceExpressionRequest.java
new file mode 100644
index 0000000..d5fca9a
--- /dev/null
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/FireDeviceExpressionRequest.java
@@ -0,0 +1,12 @@
+package com.doumee.core.haikang.model.param.request;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class FireDeviceExpressionRequest {
+private String key;// String false 璧勬簮灞炴�у悕锛宬ey浼爑pdateTime锛宱perator浼燽etween鍙互鏌ヨ鐗瑰畾鏃堕棿娈垫洿鏂扮殑鏁版嵁锛岃�冭檻鍒版牎鏃跺拰澶忎护鏃讹紝寤鸿鍊兼煡璇㈣繃鍘讳竴澶╃殑鏁版嵁鍙樻洿
+private Integer operator;// Number false 鎿嶄綔杩愮畻绗︼紝 0 锛�=锛� 1 锛�>=锛� 2 锛�<=锛� 3 锛歩n锛� 4 锛歯ot in锛� 5 锛歜etween锛� 6 锛歭ike锛� 7 锛歱re like锛� 8 锛歴uffix like
+private List<String> values ;//Array false 璧勬簮灞炴�у�硷紝=銆�>=銆�<=銆乴ike銆乿alues鏁扮粍闀垮害鍙兘鏄�1锛� in銆乶ot in锛寁alues鏁扮粍闀垮害澶т簬1锛屾渶澶т笉瓒呮椂20锛� in_array鐢ㄤ簬鏌ヨkey鍊兼湁澶氫釜value鐨勬儏鍐碉紝渚嬪琛岃溅鐩戞帶娣诲姞鐨勮澶囩被鍨嬩负encodeDevice銆乪ncodeDeviceMss涓や釜绫诲瀷锛屼娇鐢╡ncodeDevice鎴栬�卐ncodeDeviceMss閮藉彲浠ユ煡璇㈠埌锛� between鍙兘鐢ㄤ簬鏁村舰銆佹棩鏈� 锛� like鍙兘鐢ㄤ簬瀛楃涓层��
+}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/FireDeviceListRequest.java b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/FireDeviceListRequest.java
new file mode 100644
index 0000000..e76bd96
--- /dev/null
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/FireDeviceListRequest.java
@@ -0,0 +1,18 @@
+package com.doumee.core.haikang.model.param.request;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class FireDeviceListRequest {
+ private String name;// String false 鍚嶇О锛屾ā绯婃悳绱紝鏈�澶ч暱搴�32锛岃嫢鍖呭惈涓枃锛屾渶澶ч暱搴︽寚涓嶈秴杩囨寜鐓ф寚瀹氱紪鐮佺殑瀛楄妭闀垮害锛屽嵆getBytes("utf-8").length
+private List<String> regionIndexCodes;// Array false 鍖哄煙缂栧彿,鍙互涓虹┖;String[]锛屾敮鎸佹牴鎹尯鍩熸壒閲忔煡璇紱鍖哄煙缂栧彿涓暟<=1000涓紱鍗曚釜闀垮害<=64Byte锛涳紝鍙粠[鏌ヨ鍖哄煙鍒楄〃v2]@[鏅烘収鍥尯绠＄悊骞冲彴V1.4.301-API鍒楄〃-璧勬簮鐩綍-鍖哄煙淇℃伅鎺ュ彛#鏌ヨ鍖哄煙鍒楄〃v2]鎺ュ彛鑾峰彇杩斿洖鍙傛暟indexCode
+private Boolean isSubRegion;// Boolean false true鏃讹紝鎼滅储regionIndexCodes鍙婂叾瀛愬瓩鍖哄煙鐨勮祫婧愶紱false鏃讹紝鍙悳绱� regionIndexCodes鐨勮祫婧�
+private int pageNo;// Number true 褰撳墠椤电爜
+private int pageSize;// Number true 鍒嗛〉澶у皬
+private String orderBy;// String false 鎺掑簭瀛楁,娉ㄦ剰锛氭帓搴忓瓧娈靛繀椤绘槸鏌ヨ鏉′欢锛屽惁鍒欒繑鍥炲弬鏁伴敊璇�
+private String orderType;// String false 闄嶅簭鍗囧簭,闄嶅簭锛歞esc 鍗囧簭锛歛sc
+private List<FireDeviceExpressionRequest> expressions;// Array false 鏌ヨ琛ㄨ揪寮�
+
+}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/FireDeviceStatuslListRequest.java b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/FireDeviceStatuslListRequest.java
new file mode 100644
index 0000000..e410c80
--- /dev/null
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/FireDeviceStatuslListRequest.java
@@ -0,0 +1,19 @@
+package com.doumee.core.haikang.model.param.request;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class FireDeviceStatuslListRequest {
+private Integer includeSubNode ;//Number true 鏄惁鍖呭惈涓嬬骇 (1-鍖呭惈, 0-涓嶅寘鍚�)
+private String regionIndexCode ;//String true 鎵�灞炲尯鍩焛ndexCode锛屾牴鎹甗鏌ヨ鍖哄煙鍒楄〃v2]@[鏅烘収鍥尯绠＄悊骞冲彴V1.4.301-API鍒楄〃-璧勬簮鐩綍-鍖哄煙淇℃伅鎺ュ彛#鏌ヨ鍖哄煙鍒楄〃v2]鎺ュ彛鑾峰彇杩斿洖鎶ユ枃涓殑indexCode瀛楁
+private String deviceName ;//String false 璁惧鍚嶇О
+private Integer deviceType ;//Number false 娑堥槻璁惧绫诲瀷锛岃瑙乕闄勫綍A.55 娑堥槻璁惧绫诲瀷]@[鏅烘収鍥尯绠＄悊骞冲彴V1.4.301-闄勫綍-闄勫綍A 鏁版嵁瀛楀吀#闄勫綍A.55 娑堥槻璁惧绫诲瀷]
+private Integer online ;//Number false 鍦ㄧ嚎鐘舵�� 0-绂荤嚎 1-鍦ㄧ嚎 绌�-鎵�鏈夌姸鎬�
+private Integer unitStatus ;//Number false 閮ㄤ欢鐘舵�侊紝0锛氭湭娉ㄥ唽 1锛氭甯� 2: 淇涓� 3锛氬紓甯哥姸鎬侊紙淇涓姸鎬佺洰鍓嶆病鐢ㄥ埌锛屾湭娉ㄥ唽鏃惰澶囨病鏈夊湪绂荤嚎鐘舵�侊級 绌�-鎵�鏈夌姸鎬�
+private String deviceIndexCode ;//String false 璁惧缂栧彿锛屾牴鎹甗鏌ヨ娑堥槻璁惧鍒楄〃]@[鏅烘収鍥尯绠＄悊骞冲彴V1.4.301-API鍒楄〃-鎶ヨ妫�娴�-娑堥槻搴旂敤鏈嶅姟-娑堥槻鍔熻兘鎺ュ彛#鏌ヨ娑堥槻璁惧鍒楄〃]鎺ュ彛鑾峰彇杩斿洖鎶ユ枃涓殑devSerialNum瀛楁
+private Integer pageNo ;//Number true 鐩爣椤电爜锛岄粯璁や粠1寮�濮嬶紝琛ㄧず绗竴椤�
+private Integer pageSize;// Number true 姣忛〉璁板綍鏁帮紝姣忛〉鏈�澶ф暟閲�1000,榛樿20
+
+}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/NhEventPageListRequest.java b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/NhEventPageListRequest.java
index 39161f4..de2a985 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/NhEventPageListRequest.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/NhEventPageListRequest.java
@@ -12,6 +12,6 @@
private String startDate ;//Query String false 鍙戠敓鏃堕棿寮�濮嬫椂闂�
private String endDate;// Query String false 鍙戠敓鏃堕棿缁撴潫鏃堕棿
private String handleStatus;// Query String false 澶勭悊鐘舵�侊細0锛氬叏閮紝1锛氭湭澶勭悊锛�2锛氬凡澶勭悊
- private String pageNo;// Query Number false 椤电爜
- private String pageSize;// Query Number false 椤靛ぇ灏�
+ private int pageNo;// Query Number false 椤电爜
+ private int pageSize;// Query Number false 椤靛ぇ灏�
}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/SensorStatusListRequest.java b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/SensorStatusListRequest.java
new file mode 100644
index 0000000..2832eff
--- /dev/null
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/SensorStatusListRequest.java
@@ -0,0 +1,15 @@
+package com.doumee.core.haikang.model.param.request;
+
+import lombok.Data;
+
+@Data
+public class SensorStatusListRequest {
+ private Integer includeSubNode;// Number true 鏄惁鍖呭惈涓嬬骇 (1-鍖呭惈銆�0-涓嶅寘鍚�)
+ private String regionIndexCode ;//String true 鎵�灞炲尯鍩焛ndexCode锛屾牴鎹甗鏌ヨ鍖哄煙鍒楄〃v2]@[鏅烘収鍥尯绠＄悊骞冲彴V1.4.301-API鍒楄〃-璧勬簮鐩綍-鍖哄煙淇℃伅鎺ュ彛#鏌ヨ鍖哄煙鍒楄〃v2]鎺ュ彛鑾峰彇杩斿洖鎶ユ枃涓殑indexCode瀛楁
+ private String cn ;//String false 浼犳劅鍣ㄥ悕绉�
+ private Integer channelType;// Number false 浼犳劅鍣ㄧ被鍨嬶紝璇﹁[闄勫綍A.57 娑堥槻浼犳劅鍣ㄥぇ绫诲瀷]@[鏅烘収鍥尯绠＄悊骞冲彴V1.4.301-闄勫綍-闄勫綍A 鏁版嵁瀛楀吀#闄勫綍A.57 娑堥槻浼犳劅鍣ㄥぇ绫诲瀷]
+ private Integer unitStatus;// Number false 閮ㄤ欢鐘舵�侊紝0锛氭湭娉ㄥ唽 1锛氭甯� 2: 淇涓� 3锛氬紓甯哥姸鎬侊紙淇涓姸鎬佺洰鍓嶆病鐢ㄥ埌锛屾湭娉ㄥ唽鏃惰澶囨病鏈夊湪绂荤嚎鐘舵�侊級 绌�-鎵�鏈夌姸鎬�
+ private String channelIndexCode ;//String false 浼犳劅鍣ㄧ紪鍙�
+ private int pageNo;// Query Number false 椤电爜
+ private int pageSize;// Query Number false 椤靛ぇ灏�
+}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/respose/FireChannelListResponse.java b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/respose/FireChannelListResponse.java
new file mode 100644
index 0000000..b2034e5
--- /dev/null
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/respose/FireChannelListResponse.java
@@ -0,0 +1,21 @@
+package com.doumee.core.haikang.model.param.respose;
+
+import lombok.Data;
+
+@Data
+public class FireChannelListResponse {
+ private String regionPath;// String false 鎵�灞炲尯鍩熻矾寰勶紝鏍煎紡锛欯鏍硅妭鐐笯瀛愬尯鍩�1@
+ private String regionIndexCode;// String false 鎵�灞炲尯鍩熺紪鍙�
+ private String regionPathName;// String false 鎵�灞炲尯鍩熻矾寰勫悕绉�
+ private String fireproChannelSubType ;//Number false 浼犳劅鍣ㄥ皬绫诲瀷锛岃瑙乕闄勫綍A.56]
+ private String indexCode;// String false 璧勬簮鍞竴鏍囧織
+ private String description;// String false 鎻忚堪
+ private String updateTime;// String false 鏇存柊鏃堕棿锛孖SO8601鏍囧噯
+ private String fireproChannelMaxValue ;//String false 鏈�澶ч槇鍊�
+ private String createTime;// String false 鍒涘缓鏃堕棿锛孖SO8601鏍囧噯
+ private String name;// String false 璧勬簮鍚嶇О
+ private String fireproChannelAddressCode;// String false 浼犳劅鍣ㄥ湴鍧�鐮�
+ private String fireproChannelType ;//Number false 浼犳劅鍣ㄥぇ绫诲瀷锛岃瑙乕闄勫綍A.64]
+ private String parentIndexCode;// String false 鎵�灞炶澶囩紪鐮�
+ private String resourceType;// String false 璧勬簮绫诲瀷锛宖ireSensor锛氭秷闃蹭紶鎰熷櫒锛岃瑙乕闄勫綍A.64]
+}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/respose/FireDeviceListResponse.java b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/respose/FireDeviceListResponse.java
new file mode 100644
index 0000000..27c3cad
--- /dev/null
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/respose/FireDeviceListResponse.java
@@ -0,0 +1,23 @@
+package com.doumee.core.haikang.model.param.respose;
+
+import lombok.Data;
+
+@Data
+public class FireDeviceListResponse {
+ private String regionPath;// String false 鎵�灞炲尯鍩熻矾寰勶紝鏍煎紡锛欯鏍硅妭鐐笯瀛愬尯鍩�1@
+private String deviceType;// String false 璁惧绫诲瀷
+private String regionIndexCode;// String false 鎵�灞炲尯鍩熺紪鍙�
+private String fireproDeviceCommunication ;//String false 鎵�灞炶繍钀ュ晢鍙婇�氫俊绫诲瀷
+private String regionPathName;// String false 鎵�灞炲尯鍩熻矾寰勫悕绉�
+private String ip;// String false 璁惧鎵�鍦↖P
+private String indexCode;// String false 璧勬簮鍞竴鏍囧織
+private String description;// String false 鎻忚堪
+private String createTime;// String false 鍒涘缓鏃堕棿锛孖SO8601鏍囧噯
+private String updateTime;// String false 鏇存柊鏃堕棿锛孖SO8601鏍囧噯
+private String deviceCode;// String false 涓诲姩璁惧缂栧彿
+private String manufacturer ;//String false 鍘傚晢
+private String port;// String false 璁惧绔彛
+private String name;// String false 璧勬簮鍚嶇О
+private String resourceType ;//String false 璧勬簮绫诲瀷锛宖ireDevice锛氭秷闃茶澶�
+private String devSerialNum ;//String false 璁惧搴忓垪鍙�
+}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/respose/FireDeviceStatusListResponse.java b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/respose/FireDeviceStatusListResponse.java
new file mode 100644
index 0000000..38407bc
--- /dev/null
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/respose/FireDeviceStatusListResponse.java
@@ -0,0 +1,24 @@
+package com.doumee.core.haikang.model.param.respose;
+
+import lombok.Data;
+
+@Data
+public class FireDeviceStatusListResponse {
+ private String id ;//String false 棰勫憡璀︿簨浠跺敮涓�鏍囪瘑
+ private String warningName ;//String false 棰勫憡璀﹀悕绉�
+ private String nodeType ;//Number false 鑺傜偣绫诲瀷
+ private String nodeId ;//String false 鑺傜偣ID
+ private String nodeName;// String false 鑺傜偣鍚嶇О
+ private String nodePath;// String false 鑺傜偣璺緞
+ private String ruleType ;//String false 棰勫憡璀︾被鍨�
+ private String warningLevel ;//Number false 棰勫憡璀︾瓑绾э紝1锛氫竴鑸紝2锛氫弗閲嶏紝3锛氭晠闅�
+ private String warningValue ;//String false 鏁版嵁椤瑰綋鍓嶅��
+ private String warningEventTip;// String false 寮傚父鍘熷洜
+ private String createTime;// String false 鍙戠敓鏃堕棿
+ private String benchmark;// String false 鍩哄噯鏁版嵁
+ private String handleStatus;// Number false 澶勭悊鐘舵�侊細1锛氭湭澶勭悊锛�2锛氬凡澶勭悊
+ private String note;// String false 澶勭悊鎰忚
+ private String handleTime;// String false 澶勭悊鏃堕棿
+ private String normal;// Boolean false 棰勫憡璀︽槸鍚︽甯�
+ private String deviceId;// String false 璁惧id
+}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/respose/SensorStatusListResponse.java b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/respose/SensorStatusListResponse.java
new file mode 100644
index 0000000..0e78568
--- /dev/null
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/respose/SensorStatusListResponse.java
@@ -0,0 +1,20 @@
+package com.doumee.core.haikang.model.param.respose;
+
+import lombok.Data;
+
+@Data
+public class SensorStatusListResponse {
+ private String cn;// String false 浼犳劅鍣ㄥ悕绉�
+ private String indexCode ;//String false 浼犳劅鍣ㄧ紪鐮�
+ private String regionIndexCode;// String false 鎵�灞炲尯鍩�
+ private String regionName ;//String false 鍖哄煙璺緞鍚嶇О锛屸�淺鈥濆垎闅�
+ private String channelIndexCode;// String false 浼犳劅鍣ㄧ紪鍙�
+ private Integer channelType;// Number false 浼犳劅鍣ㄥぇ绫诲瀷锛岃瑙乕闄勫綍A.57 娑堥槻浼犳劅鍣ㄥぇ绫诲瀷]@[鏅烘収鍥尯绠＄悊骞冲彴V1.4.301-闄勫綍-闄勫綍A 鏁版嵁瀛楀吀#闄勫綍A.57 娑堥槻浼犳劅鍣ㄥぇ绫诲瀷]
+ private String channelSubType ;//String false 浼犳劅鍣ㄥ皬绫诲瀷锛岃瑙乕闄勫綍A.56 娑堥槻浼犳劅鍣ㄥ皬绫诲瀷]@[鏅烘収鍥尯绠＄悊骞冲彴V1.4.301-闄勫綍-闄勫綍A 鏁版嵁瀛楀吀#闄勫綍A.56 娑堥槻浼犳劅鍣ㄥ皬绫诲瀷]
+ private Integer unitStatus ;//Number false 閮ㄤ欢鐘舵�侊紝0锛氭湭娉ㄥ唽 1锛氭甯� 2: 淇涓� 3锛氬紓甯哥姸鎬侊紙淇涓姸鎬佺洰鍓嶆病鐢ㄥ埌锛屾湭娉ㄥ唽鏃惰澶囨病鏈夊湪绂荤嚎鐘舵�侊級 绌�-鎵�鏈夌姸鎬�
+ private String collectTime ;// String false 鏇存柊鏃堕棿锛孖OS8601鏍煎紡
+ private String parentName ;// String false 鐖惰祫婧愬悕绉�
+ private String faultType ;// String false 鏁呴殰绫诲瀷锛�","鍙峰垎闅旓紝璇﹁[闄勫綍A.89 娑堥槻鏁呴殰绫诲瀷@[鏅烘収鍥尯绠＄悊骞冲彴V1.4.301-闄勫綍-闄勫綍A 鏁版嵁瀛楀吀#闄勫綍A.89 娑堥槻鏁呴殰绫诲瀷]
+ private String faultName ;// String false 鏁呴殰绫诲瀷鍚嶇О锛屸�濓紝鈥滃彿鍒嗛殧
+ private String faultNum ;// 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 53f02d8..485b0fc 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
@@ -17,6 +17,8 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.BeanUtils;
+import oshi.hardware.Sensors;
+import sun.management.Sensor;
import java.io.InputStream;
import java.lang.reflect.Field;
@@ -918,6 +920,79 @@
}
/**
+ *鍒嗛〉鏌ヨ娑堥槻璁惧閮ㄤ欢鐘舵��
+ * @return
+ */
+ public static BaseResponse<BaseListPageResponse<FireDeviceStatusListResponse>> fireDeviceStatusSearch(FireDeviceStatuslListRequest param){
+ log.info("銆愭捣搴锋煡璇㈡秷闃茶澶囬儴浠剁姸鎬併��================寮�濮�===="+JSONObject.toJSONString(param));
+ try {
+ String res = HKTools.fireDeviceStatusSearch(toMap(param));
+ TypeReference typeReference =
+ new TypeReference<BaseResponse<BaseListPageResponse<FireDeviceStatusListResponse>>>(){};
+ BaseResponse<BaseListPageResponse<FireDeviceStatusListResponse>> 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<SensorStatusListResponse>> sensorStatusSearch(SensorStatusListRequest param){
+ log.info("銆愭捣搴峰垎椤垫煡璇㈡秷闃蹭紶鎰熷櫒閮ㄤ欢鐘舵�併��================寮�濮�===="+JSONObject.toJSONString(param));
+ try {
+ String res = HKTools.sensorStatusSearch(toMap(param));
+ TypeReference typeReference =
+ new TypeReference<BaseResponse<BaseListPageResponse<SensorStatusListResponse>>>(){};
+ BaseResponse<BaseListPageResponse<SensorStatusListResponse>> 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<FireChannelListResponse>> fireChannelSearch(FireChannelListRequest param){
+ log.info("銆愭捣搴锋煡璇㈡秷闃蹭紶鎰熷櫒鍒楄〃銆�================寮�濮�===="+JSONObject.toJSONString(param));
+ try {
+ String res = HKTools.fireChannelSearch(toMap(param));
+ TypeReference typeReference =
+ new TypeReference<BaseResponse<BaseListPageResponse<FireChannelListResponse>>>(){};
+ BaseResponse<BaseListPageResponse<FireChannelListResponse>> 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<FireDeviceListResponse>> fireDeviceSearch(FireDeviceListRequest param){
+ log.info("銆愭捣搴疯娑堥槻璁惧鍒楄〃銆�================寮�濮�===="+JSONObject.toJSONString(param));
+ try {
+ String res = HKTools.fireDeviceSearch(toMap(param));
+ TypeReference typeReference =
+ new TypeReference<BaseResponse<BaseListPageResponse<FireDeviceListResponse>>>(){};
+ BaseResponse<BaseListPageResponse<FireDeviceListResponse>> result = JSONObject.parseObject(res, typeReference.getType());
+ logResult(result,"娴峰悍璇㈡秷闃茶澶囧垪琛�");
+ return result;
+ }catch (Exception e){
+ log.error("銆愭捣搴疯娑堥槻璁惧鍒楄〃銆�================澶辫触====锛歕n"+ e.getMessage());
+ }
+ return null;
+ }
+ /**
*鍒嗛〉鑾峰彇鍛婅浜嬩欢
* @return
*/
--
Gitblit v1.9.3