diff --git a/data-collect-service/src/main/java/com/ho/datacollect/util/MqttConfigUtil.java b/data-collect-service/src/main/java/com/ho/datacollect/util/MqttConfigUtil.java index 284a039..5950f81 100644 --- a/data-collect-service/src/main/java/com/ho/datacollect/util/MqttConfigUtil.java +++ b/data-collect-service/src/main/java/com/ho/datacollect/util/MqttConfigUtil.java @@ -127,7 +127,8 @@ public class MqttConfigUtil { "+/device/f3c813d5e3d7fd99", "+/device/cd6cb4a64b42bda5", "+/device/436de647bbf01b22", - "1/device/+" + "+/device/e9eee97d793756fa", + "+/device/8c062827b5c1548b" }; /** diff --git a/file-center/src/main/java/com/ho/filecenter/controller/FileController.java b/file-center/src/main/java/com/ho/filecenter/controller/FileController.java index 16ac047..a492489 100644 --- a/file-center/src/main/java/com/ho/filecenter/controller/FileController.java +++ b/file-center/src/main/java/com/ho/filecenter/controller/FileController.java @@ -159,7 +159,7 @@ public class FileController { } String serialNo = vo.getSerialNo(); List snList = MqttConfigUtil.getSnList(); - if(snList.contains(serialNo)){ + if(snList.stream().anyMatch(s -> s.contains(serialNo))){ fileAttributeResp = fileService.getFileAttribute(vo); }else{ fileAttributeResp = anotherFileService.getFileAttribute(vo); @@ -181,7 +181,7 @@ public class FileController { } String serialNo = fileDeleteReqVO.getSerialNo(); List snList = MqttConfigUtil.getSnList(); - if(snList.contains(serialNo)){ + if(snList.stream().anyMatch(s -> s.contains(serialNo))){ fileDeleteResp = fileService.deleteDeviceFiles(fileDeleteReqVO); }else{ fileDeleteResp = anotherFileService.deleteDeviceFiles(fileDeleteReqVO); @@ -211,7 +211,7 @@ public class FileController { resp.setHeartbeatStatus(CommonConstant.ONE); log.info("文件上传(向边端上传)开始上传"); List snList = MqttConfigUtil.getSnList(); - if(snList.contains(serialNo)){ + if(snList.stream().anyMatch(s -> s.contains(serialNo))){ fileService.fileUploadForDevice(file, stationId, serialNo, filePath); }else{ anotherFileService.fileUploadForDevice(file, stationId, serialNo, filePath); @@ -241,7 +241,7 @@ public class FileController { fileService.downloadFromDevice(fileForDeviceReqVO); String serialNo = fileForDeviceReqVO.getSerialNo(); List snList = MqttConfigUtil.getSnList(); - if(snList.contains(serialNo)){ + if(snList.stream().anyMatch(s -> s.contains(serialNo))){ fileService.downloadFromDevice(fileForDeviceReqVO); }else{ anotherFileService.downloadFromDevice(fileForDeviceReqVO); diff --git a/file-center/src/main/java/com/ho/filecenter/util/MqttConfigUtil.java b/file-center/src/main/java/com/ho/filecenter/util/MqttConfigUtil.java index 16d11d2..8d50089 100644 --- a/file-center/src/main/java/com/ho/filecenter/util/MqttConfigUtil.java +++ b/file-center/src/main/java/com/ho/filecenter/util/MqttConfigUtil.java @@ -132,7 +132,9 @@ public class MqttConfigUtil { "+/device/f3c813d5e3d7fd99", "+/device/cd6cb4a64b42bda5", "+/device/436de647bbf01b22", - "1/device/+" + "+/device/e9eee97d793756fa", + "+/device/8c062827b5c1548b" + }; /**