zzkj/smart_storage_java
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

代码修改

Browse Source
This commit is contained in:
root
2025-07-09 08:43:36 +08:00
parent a853dafca3
commit 2b70f531b4
3 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
data-collect-service/src/main/java/com/ho/datacollect/util/MqttConfigUtil.java
View File

@ -127,7 +127,8 @@ public class MqttConfigUtil {
"+/device/f3c813d5e3d7fd99", "+/device/f3c813d5e3d7fd99",
"+/device/cd6cb4a64b42bda5", "+/device/cd6cb4a64b42bda5",
"+/device/436de647bbf01b22", "+/device/436de647bbf01b22",
"1/device/+" "+/device/e9eee97d793756fa",
"+/device/8c062827b5c1548b"
}; };
/** /**

8
file-center/src/main/java/com/ho/filecenter/controller/FileController.java
View File

@ -159,7 +159,7 @@ public class FileController {
} }
String serialNo = vo.getSerialNo(); String serialNo = vo.getSerialNo();
List<String> snList = MqttConfigUtil.getSnList(); List<String> snList = MqttConfigUtil.getSnList();
if(snList.contains(serialNo)){ if(snList.stream().anyMatch(s -> s.contains(serialNo))){
fileAttributeResp = fileService.getFileAttribute(vo); fileAttributeResp = fileService.getFileAttribute(vo);
}else{ }else{
fileAttributeResp = anotherFileService.getFileAttribute(vo); fileAttributeResp = anotherFileService.getFileAttribute(vo);
@ -181,7 +181,7 @@ public class FileController {
} }
String serialNo = fileDeleteReqVO.getSerialNo(); String serialNo = fileDeleteReqVO.getSerialNo();
List<String> snList = MqttConfigUtil.getSnList(); List<String> snList = MqttConfigUtil.getSnList();
if(snList.contains(serialNo)){ if(snList.stream().anyMatch(s -> s.contains(serialNo))){
fileDeleteResp = fileService.deleteDeviceFiles(fileDeleteReqVO); fileDeleteResp = fileService.deleteDeviceFiles(fileDeleteReqVO);
}else{ }else{
fileDeleteResp = anotherFileService.deleteDeviceFiles(fileDeleteReqVO); fileDeleteResp = anotherFileService.deleteDeviceFiles(fileDeleteReqVO);
@ -211,7 +211,7 @@ public class FileController {
resp.setHeartbeatStatus(CommonConstant.ONE); resp.setHeartbeatStatus(CommonConstant.ONE);
log.info("文件上传(向边端上传)开始上传"); log.info("文件上传(向边端上传)开始上传");
List<String> snList = MqttConfigUtil.getSnList(); List<String> snList = MqttConfigUtil.getSnList();
if(snList.contains(serialNo)){ if(snList.stream().anyMatch(s -> s.contains(serialNo))){
fileService.fileUploadForDevice(file, stationId, serialNo, filePath); fileService.fileUploadForDevice(file, stationId, serialNo, filePath);
}else{ }else{
anotherFileService.fileUploadForDevice(file, stationId, serialNo, filePath); anotherFileService.fileUploadForDevice(file, stationId, serialNo, filePath);
@ -241,7 +241,7 @@ public class FileController {
fileService.downloadFromDevice(fileForDeviceReqVO); fileService.downloadFromDevice(fileForDeviceReqVO);
String serialNo = fileForDeviceReqVO.getSerialNo(); String serialNo = fileForDeviceReqVO.getSerialNo();
List<String> snList = MqttConfigUtil.getSnList(); List<String> snList = MqttConfigUtil.getSnList();
if(snList.contains(serialNo)){ if(snList.stream().anyMatch(s -> s.contains(serialNo))){
fileService.downloadFromDevice(fileForDeviceReqVO); fileService.downloadFromDevice(fileForDeviceReqVO);
}else{ }else{
anotherFileService.downloadFromDevice(fileForDeviceReqVO); anotherFileService.downloadFromDevice(fileForDeviceReqVO);

4
file-center/src/main/java/com/ho/filecenter/util/MqttConfigUtil.java
View File

@ -132,7 +132,9 @@ public class MqttConfigUtil {
"+/device/f3c813d5e3d7fd99", "+/device/f3c813d5e3d7fd99",
"+/device/cd6cb4a64b42bda5", "+/device/cd6cb4a64b42bda5",
"+/device/436de647bbf01b22", "+/device/436de647bbf01b22",
"1/device/+" "+/device/e9eee97d793756fa",
"+/device/8c062827b5c1548b"
}; };
/** /**