From 874056988430ab4eab09a813c7a28d60401bc58f Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 26 九月 2024 11:49:25 +0800
Subject: [PATCH] 最新版本
---
server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKConstants.java | 7 +-
server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/service/HKService.java | 18 ++++++
server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKTools.java | 10 +++
server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/FindDeviceAlarmListRequest.java | 21 +++++++
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/HkInterfaceTestCloudController.java | 53 ++++++++++++++++-
server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/respose/FindDeviceAlarmListResponse.java | 27 +++++++++
6 files changed, 128 insertions(+), 8 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 1214156..9b9ea96 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
@@ -5,6 +5,7 @@
import com.doumee.config.annotation.CloudRequiredPermission;
import com.doumee.config.annotation.LoginNoRequired;
import com.doumee.core.annotation.pr.PreventRepeat;
+import com.doumee.core.haikang.model.param.BaseListPageResponse;
import com.doumee.core.haikang.model.param.BaseResponse;
import com.doumee.core.haikang.model.param.request.*;
import com.doumee.core.haikang.model.param.request.event.acs.EventAcsRequest;
@@ -13,12 +14,14 @@
import com.doumee.core.haikang.model.param.request.event.parks.EventPlatformRequest;
import com.doumee.core.haikang.model.param.request.event.visit.EventVisitIccmRequest;
import com.doumee.core.haikang.model.param.request.event.visit.EventVisitRequest;
+import com.doumee.core.haikang.model.param.respose.*;
import com.doumee.core.haikang.service.HKService;
import com.doumee.core.model.ApiResponse;
import com.doumee.core.model.LoginUserInfo;
import com.doumee.core.utils.Constants;
import com.doumee.core.utils.DESUtil;
import com.doumee.dao.business.model.Device;
+import com.doumee.service.business.DeviceService;
import com.doumee.service.business.impl.hksync.*;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
@@ -30,6 +33,10 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
/**
* @author 姹熻箘韫�
@@ -42,7 +49,39 @@
@Autowired
private SystemDictDataBiz systemDictDataBiz;
+ @Autowired
+ private DeviceService deviceService;
+ @ApiOperation("銆愭捣搴枫�戞祴璇昄ED鏄剧ず灞�")
+ @PostMapping("/testLedAll")
+ @LoginNoRequired
+ public ApiResponse<List<Map<String,Object>> > testLedAll(@RequestBody TransparentChannelBodyRequest request, HttpServletResponse response) {
+ TransparentChannelHeadRequest head = new TransparentChannelHeadRequest();
+ head.setAbility("cld");//鍥哄畾鍊�
+ head.setTreatyType("haixuan_led_net");//鍥哄畾鍊�
+ head.setDeviceIndexCode("6a5498e9df924befbb9530e467e5e809");
+ Device p = new Device();
+ p.setType(Constants.TWO);
+ p.setIsdeleted(Constants.ZERO);
+ List<Device> list = deviceService.findList(p);
+ List<Map<String,Object>> dList = new ArrayList<>();
+ String content = request.getParams().getRegions().get(0).getContent();
+ if(list!=null){
+ for(Device d : list){
+ head.setDeviceIndexCode(d.getNo());
+ request.getParams().setIndexCode(d.getNo());
+ request.getParams().getRegions().get(0).setContent( content+"["+d.getName()+"]");
+ BaseResponse res= HKService.transparentchannel(head,request);
+ Map<String,Object> dn = new HashMap<>();
+ dn.put("name",d.getName());
+ dn.put("id",d.getNo());
+ dn.put("content",request.getParams().getRegions().get(0).getContent());
+ dn.put("result",res);
+ dList.add(dn);
+ }
+ }
+ return ApiResponse.success(dList);
+ }
@ApiOperation("銆愭捣搴枫�戞祴璇昄ED鏄剧ず灞�")
@PostMapping("/testLed")
@LoginNoRequired
@@ -75,26 +114,32 @@
@ApiOperation("銆愭捣搴枫�戝垎椤垫煡璇㈡秷闃蹭紶鎰熷櫒閮ㄤ欢鐘舵��")
@PostMapping("/sensorStatusSearch")
@LoginNoRequired
- public ApiResponse<BaseResponse> sensorStatusSearch(@RequestBody SensorStatusListRequest param, HttpServletResponse response) {
+ public ApiResponse<BaseResponse<BaseListPageResponse<SensorStatusListResponse>>> sensorStatusSearch(@RequestBody SensorStatusListRequest param, HttpServletResponse response) {
return ApiResponse.success( HKService.sensorStatusSearch(param));
}
@ApiOperation("銆愭捣搴枫�戞煡璇㈡秷闃蹭紶鎰熷櫒鍒楄〃")
@PostMapping("/fireChannelSearch")
@LoginNoRequired
- public ApiResponse<BaseResponse> fireChannelSearch(@RequestBody FireChannelListRequest param, HttpServletResponse response) {
+ public ApiResponse<BaseResponse<BaseListPageResponse<FireChannelListResponse>>> fireChannelSearch(@RequestBody FireChannelListRequest param, HttpServletResponse response) {
return ApiResponse.success( HKService.fireChannelSearch(param));
}
@ApiOperation("銆愭捣搴枫�戞捣搴疯娑堥槻璁惧鍒楄〃")
@PostMapping("/fireDeviceSearch")
@LoginNoRequired
- public ApiResponse<BaseResponse> fireDeviceSearch(@RequestBody FireDeviceListRequest param, HttpServletResponse response) {
+ public ApiResponse<BaseResponse<BaseListPageResponse<FireDeviceListResponse>> > fireDeviceSearch(@RequestBody FireDeviceListRequest param, HttpServletResponse response) {
return ApiResponse.success( HKService.fireDeviceSearch(param));
}
@ApiOperation("銆愭捣搴枫�戝垎椤垫煡璇㈡秷闃茶澶囬儴浠剁姸鎬�")
@PostMapping("/fireDeviceStatusSearch")
@LoginNoRequired
- public ApiResponse<BaseResponse> fireDeviceStatusSearch(@RequestBody FireDeviceStatuslListRequest param, HttpServletResponse response) {
+ public ApiResponse<BaseResponse<BaseListPageResponse<FireDeviceStatusListResponse>>> fireDeviceStatusSearch(@RequestBody FireDeviceStatuslListRequest param, HttpServletResponse response) {
return ApiResponse.success( HKService.fireDeviceStatusSearch(param));
}
+ @ApiOperation("銆愭捣搴枫�戝垎椤垫煡璇㈣澶囦笅鐨勬墍鏈夋姤璀﹁褰�")
+ @PostMapping("/findDeviceAlarmPage")
+ @LoginNoRequired
+ public ApiResponse<BaseResponse<BaseListPageResponse<FindDeviceAlarmListResponse>> > findDeviceAlarmPage(@RequestBody FindDeviceAlarmListRequest param, HttpServletResponse response) {
+ return ApiResponse.success( HKService.findDeviceAlarmPage(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 4579fe9..a62463a 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
@@ -133,9 +133,10 @@
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","鏌ヨ娑堥槻璁惧閮ㄤ欢鐘舵��"};// 鏌ヨ娑堥槻璁惧閮ㄤ欢鐘舵��
+ 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","鏌ヨ娑堥槻璁惧閮ㄤ欢鐘舵��"};//鏌ヨ娑堥槻璁惧閮ㄤ欢鐘舵��
+ String[] findDeviceAlarmPage= new String[]{"/api/v1/alarm/findDeviceAlarmPage","鍒嗛〉鏌ヨ璁惧涓嬬殑鎵�鏈夋姤璀﹁褰�"};//鍒嗛〉鏌ヨ璁惧涓嬬殑鎵�鏈夋姤璀﹁褰�
}
/**
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 8e39c56..37d4740 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
@@ -597,7 +597,7 @@
return startDoPostStringArtemis(HKConstants.InterfacePath.fireDeviceStatusSearch,body);
}
/**
- * 鍒嗛〉鏌ヨ娑堥槻浼犳劅鍣ㄩ儴浠剁姸鎬�
+ * 鍒嗛〉鏌ヨ娑堥槻浼犳劅鍣ㄩ儴浠剁姸鎬�
* @param body
* @return
*/
@@ -605,6 +605,14 @@
return startDoPostStringArtemis(HKConstants.InterfacePath.sensorStatusSearch,body);
}
/**
+ * 鍒嗛〉鏌ヨ璁惧涓嬬殑鎵�鏈夋姤璀﹁褰�
+ * @param body
+ * @return
+ */
+ public static String findDeviceAlarmPage(String body) {
+ return startDoPostStringArtemis(HKConstants.InterfacePath.findDeviceAlarmPage,body);
+ }
+ /**
* 璇㈡秷闃茶澶囧垪琛�
* @param body
* @return
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/FindDeviceAlarmListRequest.java b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/FindDeviceAlarmListRequest.java
new file mode 100644
index 0000000..edd4faf
--- /dev/null
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/request/FindDeviceAlarmListRequest.java
@@ -0,0 +1,21 @@
+package com.doumee.core.haikang.model.param.request;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class FindDeviceAlarmListRequest {
+ private String deviceIndexCode;// String false 鎵�灞炶澶噄d
+ private String resourceIndexCodes ;//String false 璁惧/浼犳劅鍣╥d
+ private String searchName ;//String false 鍚嶇О/缂栧彿
+ private String alarmTypes ;//String false 鎶ヨ绫诲瀷
+ private String resSubTypes ;//String false 璁惧/浼犳劅鍣ㄧ被鍨�
+ private String partNos ;//String false 鍒嗗尯/鍥炶矾
+ private List<String> subareaNos;// Array false 鍒嗗尯鍙� 绛�
+ private List<String> loopNos ;//Array false 鍥炶矾鍙� 绛�
+ private String alarmStartTime;// String false 鎶ヨ寮�濮嬫椂闂�
+ private String alarmEndTime ;//String false 鎶ヨ缁撴潫鏃堕棿
+ private int pageNo;// Number true 褰撳墠椤电爜
+ private int pageSize;// Number true 鍒嗛〉澶у皬
+}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/respose/FindDeviceAlarmListResponse.java b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/respose/FindDeviceAlarmListResponse.java
new file mode 100644
index 0000000..469575b
--- /dev/null
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/respose/FindDeviceAlarmListResponse.java
@@ -0,0 +1,27 @@
+package com.doumee.core.haikang.model.param.respose;
+
+import lombok.Data;
+
+@Data
+public class FindDeviceAlarmListResponse {
+ private String id ;//String false 鎶ヨID
+ private String resourceId ;//String false 鎶ヨ婧愭墍灞炶祫婧恑d
+ private String resourceName;// String false 鎶ヨ婧愯祫婧愬悕绉�
+ private String resourceCode;// String false 鎶ヨ婧愯祫婧愮紪鍙�
+ private Integer alarmType ;//Number false 鎶ヨ绫诲瀷
+ private String alarmTypeName;// String false 鎶ヨ绫诲瀷鍚嶇О
+ private String equipTypeCode ;//String false 璁惧/浼犳劅鍣� 绫诲瀷鐮�
+ private String loopNo ;//String false 鍥炶矾鍙�
+ private String loopName;// String false 鍥炶矾鍚嶇О
+ private String subarea;// String false 鍒嗗尯鍙�
+ private String subareaName;// String false 鍒嗗尯鍚嶇О
+ private String regionIndexCode ;//String false 鍖哄煙缂栫爜
+ private String regionName ;//String false 鍖哄煙鍚嶇О
+ private String regionPath ;//String false 鍖哄煙璺緞
+ private String location ;//String false 鎶ヨ婧愯缁嗗湴鍧�
+ private String alarmTime;// String false 鎶ヨ鏃堕棿 鏃堕棿鏍煎紡yyyy/MM/dd HH:mm:ss
+ private String recoverAlarmTime ;//String false 鎶ヨ鎭㈠鏃堕棿 鏃堕棿鏍煎紡yyyy/MM/dd HH:mm:ss
+ private Integer alarmLevel;// Number false 鎶ヨ绛夌骇
+ private String parentResourceId;// String false 鎶ヨ婧愭墍灞炶澶噄d
+ private String parentResourceName;// 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 e9f749e..63508a0 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
@@ -975,6 +975,24 @@
return null;
}
/**
+ *鍒嗛〉鏌ヨ璁惧涓嬬殑鎵�鏈夋姤璀﹁褰�
+ * @return
+ */
+ public static BaseResponse<BaseListPageResponse<FindDeviceAlarmListResponse>> findDeviceAlarmPage(FindDeviceAlarmListRequest param){
+ log.info("銆愭捣搴峰垎椤垫煡璇㈣澶囦笅鐨勬墍鏈夋姤璀﹁褰曘��================寮�濮�===="+JSONObject.toJSONString(param));
+ try {
+ String res = HKTools.findDeviceAlarmPage(JSONObject.toJSONString(param));
+ TypeReference typeReference =
+ new TypeReference<BaseResponse<BaseListPageResponse<FindDeviceAlarmListResponse>>>(){};
+ BaseResponse<BaseListPageResponse<FindDeviceAlarmListResponse>> 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