joylink/xian-ncc-da-server
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

设备无关联集中站测试不予处理

Browse Source
This commit is contained in:
tiger_zhou 2023-12-26 11:09:24 +08:00
parent 6afb8fbde8
commit 2e485d0de1
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/club/joylink/xiannccda/mock/message/occ/MockOccServer.java
View File

@ -43,6 +43,7 @@ import java.util.concurrent.locks.Lock;
import java.util.concurrent.locks.ReentrantLock; import java.util.concurrent.locks.ReentrantLock;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import lombok.Data; import lombok.Data;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
@ -55,6 +56,7 @@ import org.springframework.web.bind.annotation.RestController;
//@Component //@Component
@RestController() @RestController()
@RequestMapping("/mock/server") @RequestMapping("/mock/server")
@Slf4j
public class MockOccServer { public class MockOccServer {
@PostMapping("send") @PostMapping("send")
@ -134,6 +136,10 @@ public class MockOccServer {
} }
for (DeviceNameInfo di : md.getDeviceInfos()) { for (DeviceNameInfo di : md.getDeviceInfos()) {
Integer rtuId_ = findDeviceRtuId((int) lineId, di.getDeviceType(), di.getDeviceName(), md.getAlertType()); Integer rtuId_ = findDeviceRtuId((int) lineId, di.getDeviceType(), di.getDeviceName(), md.getAlertType());
if (Objects.isNull(rtuId_)) {
log.error("{}没有找到对应的集中站,不予处理", di.getDeviceName());
continue;
}
if (messageId == MessageId.DEVICE_STATUS_CHANGE) { if (messageId == MessageId.DEVICE_STATUS_CHANGE) {
MockDeviceStatusReq mockDeviceStatusReq = new MockDeviceStatusReq(messageId, lineId, rtuId_.shortValue(), di.getDeviceType(), di.getDeviceName(), MockDeviceStatusReq mockDeviceStatusReq = new MockDeviceStatusReq(messageId, lineId, rtuId_.shortValue(), di.getDeviceType(), di.getDeviceName(),
md.deviceStatus()); md.deviceStatus());