server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/HkInterfaceTestCloudController.java
@@ -35,11 +35,10 @@ * @author 江蹄蹄 * @date 2023/11/30 15:33 */ @Api(tags = "海康数据同步接口") @Api(tags = "海康接口测试工具接口") @RestController @RequestMapping(Constants.CLOUD_SERVICE_URL_INDEX+"/business/hktest") public class HkInterfaceTestCloudController extends BaseController { @Autowired private SystemDictDataBiz systemDictDataBiz; @@ -67,32 +66,32 @@ return ApiResponse.success( HKService.wxAccessToken(configId,tageId)); } @ApiOperation("【海康】测试分页获取告警事件") @GetMapping("/nhEventPageList") @PostMapping("/nhEventPageList") @LoginNoRequired public ApiResponse<BaseResponse> nhEventPageList(@RequestBody NhEventPageListRequest param, HttpServletResponse response) { return ApiResponse.success( HKService.nhEventPageList(param)); } @ApiOperation("【海康】分页查询消防传感器部件状态") @GetMapping("/sensorStatusSearch") @PostMapping("/sensorStatusSearch") @LoginNoRequired public ApiResponse<BaseResponse> sensorStatusSearch(@RequestBody SensorStatusListRequest param, HttpServletResponse response) { return ApiResponse.success( HKService.sensorStatusSearch(param)); } @ApiOperation("【海康】查询消防传感器列表") @GetMapping("/fireChannelSearch") @PostMapping("/fireChannelSearch") @LoginNoRequired public ApiResponse<BaseResponse> fireChannelSearch(@RequestBody FireChannelListRequest param, HttpServletResponse response) { return ApiResponse.success( HKService.fireChannelSearch(param)); } @ApiOperation("【海康】海康询消防设备列表") @GetMapping("/fireDeviceSearch") @PostMapping("/fireDeviceSearch") @LoginNoRequired public ApiResponse<BaseResponse> fireDeviceSearch(@RequestBody FireDeviceListRequest param, HttpServletResponse response) { return ApiResponse.success( HKService.fireDeviceSearch(param)); } @ApiOperation("【海康】分页查询消防设备部件状态") @GetMapping("/fireDeviceStatusSearch") @PostMapping("/fireDeviceStatusSearch") @LoginNoRequired public ApiResponse<BaseResponse> fireDeviceStatusSearch(@RequestBody FireDeviceStatuslListRequest param, HttpServletResponse response) { return ApiResponse.success( HKService.fireDeviceStatusSearch(param)); server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKTools.java
@@ -593,24 +593,24 @@ * @param body * @return */ public static String fireDeviceStatusSearch(Map<String,String> body) { return startDoGetStringArtemis(HKConstants.InterfacePath.fireDeviceStatusSearch,body); public static String fireDeviceStatusSearch(String body) { return startDoPostStringArtemis(HKConstants.InterfacePath.fireDeviceStatusSearch,body); } /** * 分页查询消防传感器部件状态 * @param body * @return */ public static String sensorStatusSearch(Map<String,String> body) { return startDoGetStringArtemis(HKConstants.InterfacePath.sensorStatusSearch,body); public static String sensorStatusSearch(String body) { return startDoPostStringArtemis(HKConstants.InterfacePath.sensorStatusSearch,body); } /** * 询消防设备列表 * @param body * @return */ public static String fireChannelSearch(Map<String,String> body) { return startDoGetStringArtemis(HKConstants.InterfacePath.fireChannelSearch,body); public static String fireChannelSearch(String body) { return startDoPostStringArtemis(HKConstants.InterfacePath.fireChannelSearch,body); } /** @@ -618,8 +618,8 @@ * @param body * @return */ public static String fireDeviceSearch(Map<String,String> body) { return startDoGetStringArtemis(HKConstants.InterfacePath.fireDeviceSearch,body); public static String fireDeviceSearch(String body) { return startDoPostStringArtemis(HKConstants.InterfacePath.fireDeviceSearch,body); } /** * 获取全量用户列表 server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/BaseListPageResponse.java
@@ -13,6 +13,6 @@ private int pageNo ;// number False 当前页码 private int totalPage;// number False 总页数 @JSONField(name="list",alternateNames = {"rows","records"}) @JSONField(name="list",alternateNames = {"rows","list"}) private List<T> list ;// object[] False 权限组对象列表 } server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/respose/FireDeviceStatusListResponse.java
@@ -4,21 +4,16 @@ @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 private String cn ;//String false private String regionIndexCode ;//String false private String indexCode;// String false private String regionName;// String false private String deviceIndexCode;// String false private String deviceType;// Number false private String unitStatus ;//Number false private String online;// Number false private String collectTime;// String false private String faultType;// String false private String faultName;// String false private String faultNum;// String false } server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/service/HKService.java
@@ -926,7 +926,7 @@ public static BaseResponse<BaseListPageResponse<FireDeviceStatusListResponse>> fireDeviceStatusSearch(FireDeviceStatuslListRequest param){ log.info("【海康查询消防设备部件状态】================开始===="+JSONObject.toJSONString(param)); try { String res = HKTools.fireDeviceStatusSearch(toMap(param)); String res = HKTools.fireDeviceStatusSearch(JSONObject.toJSONString(param)); TypeReference typeReference = new TypeReference<BaseResponse<BaseListPageResponse<FireDeviceStatusListResponse>>>(){}; BaseResponse<BaseListPageResponse<FireDeviceStatusListResponse>> result = JSONObject.parseObject(res, typeReference.getType()); @@ -944,7 +944,7 @@ public static BaseResponse<BaseListPageResponse<SensorStatusListResponse>> sensorStatusSearch(SensorStatusListRequest param){ log.info("【海康分页查询消防传感器部件状态】================开始===="+JSONObject.toJSONString(param)); try { String res = HKTools.sensorStatusSearch(toMap(param)); String res = HKTools.sensorStatusSearch(JSONObject.toJSONString(param)); TypeReference typeReference = new TypeReference<BaseResponse<BaseListPageResponse<SensorStatusListResponse>>>(){}; BaseResponse<BaseListPageResponse<SensorStatusListResponse>> result = JSONObject.parseObject(res, typeReference.getType()); @@ -963,7 +963,7 @@ public static BaseResponse<BaseListPageResponse<FireChannelListResponse>> fireChannelSearch(FireChannelListRequest param){ log.info("【海康查询消防传感器列表】================开始===="+JSONObject.toJSONString(param)); try { String res = HKTools.fireChannelSearch(toMap(param)); String res = HKTools.fireChannelSearch(JSONObject.toJSONString(param)); TypeReference typeReference = new TypeReference<BaseResponse<BaseListPageResponse<FireChannelListResponse>>>(){}; BaseResponse<BaseListPageResponse<FireChannelListResponse>> result = JSONObject.parseObject(res, typeReference.getType()); @@ -981,7 +981,7 @@ public static BaseResponse<BaseListPageResponse<FireDeviceListResponse>> fireDeviceSearch(FireDeviceListRequest param){ log.info("【海康询消防设备列表】================开始===="+JSONObject.toJSONString(param)); try { String res = HKTools.fireDeviceSearch(toMap(param)); String res = HKTools.fireDeviceSearch(JSONObject.toJSONString(param)); TypeReference typeReference = new TypeReference<BaseResponse<BaseListPageResponse<FireDeviceListResponse>>>(){}; BaseResponse<BaseListPageResponse<FireDeviceListResponse>> result = JSONObject.parseObject(res, typeReference.getType()); @@ -1338,7 +1338,6 @@ log.error("【海康获取全部月台信息】================失败====：\n" + e.getMessage()); } return null; } /** *发送消息给LED server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPushServiceImpl.java
@@ -1027,7 +1027,6 @@ */ private void dealCarsInErrorPlatformBiz( PlatformJob model,EventPlatformCarsStatusInfoRequest status) { //TODO-----------------处理车辆进入错误月台业务逻辑 List<PlatformDevice> deviceList = platformDeviceMapper.selectList(new QueryWrapper<PlatformDevice>().lambda() .eq(PlatformDevice::getPlatformId,model.getPlatformId()) .eq(PlatformDevice::getIsdeleted,Constants.ZERO)); @@ -1041,7 +1040,6 @@ continue; } if(Constants.equalsInteger(device.getType(),Constants.ZERO)){ //如果是LED TransparentChannelBodyRequest body = new TransparentChannelBodyRequest(); TransparentChannelHeadRequest head = new TransparentChannelHeadRequest(); @@ -1053,16 +1051,21 @@ body.setMethod("ControlLedGereral");//固定值 request.setIndexCode(device.getHkId()); request.setOperationType(219);//固定值 regions.setActionType(0); regions.setActionType(32); regions.setContent(content); regions.setRegionNo(1); regions.setRegionType(14); regions.setFontColor(2); regions.setFontColor(1); regions.setCircleTimes(1);//循环次数 regions.setFontSize(31);// regions.setFontSize(32);// regions.setStayTime(1);//单位？？ regions.setRegionLeftTopXPos(0); regions.setRegionLeftTopYPos(0); regions.setRegionRightBottomXPos(255); regions.setRegionRightBottomYPos(31); request.setRegions(new ArrayList<>()); request.getRegions().add(regions); regions.setSpeed(13); body.setParams(request); HKService.transparentchannel(head,body); }else if(Constants.equalsInteger(device.getType(),Constants.ZERO)){ @@ -1073,9 +1076,9 @@ if(broadcastList.size()>0){ CustomBroadcastRequest request = new CustomBroadcastRequest(); request.setAudioPointIndexCode(broadcastList); request.setPlayDuration(60);//单位秒 request.setPlayDuration(15);//单位秒 request.setBroadCastMode("tts"); request.setPriority(15); request.setPriority(1); request.setState(1);//播放/停止标识 1-播放，0-停止 request.setPlayTtsContent(content); HKService.customBroadcast(request);
