From dca4aae965647cf8411931ed44d7cdfff92e386f Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期四, 26 九月 2024 17:59:41 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit

---
 server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/HkInterfaceTestCloudController.java |   53 +++++++++++++++++++++++++++++++++++++++++++++++++----
 1 files changed, 49 insertions(+), 4 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));
+    }
 
 }

--
Gitblit v1.9.3