Imdroid/security-monitor
2
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

1、修改projectId不为空，但是有空格的判断

Browse Source
This commit is contained in:
weidong 2024-03-09 17:41:38 +08:00
parent cc5a020f5f
commit b04a715e87
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sec-beidou-fwd/pom.xml
View File

@ -114,6 +114,14 @@
</execution> </execution>
</executions> </executions>
</plugin> </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>11</source>
<target>11</target>
</configuration>
</plugin>
</plugins> </plugins>
</build> </build>

4
sec-beidou-fwd/src/main/java/com/imdroid/beidou_fwd/task/Forwarder.java
View File

@ -117,7 +117,7 @@ public class Forwarder {
for(GnssDevice device:gnssDeviceList){ for(GnssDevice device:gnssDeviceList){
if(device.getOpmode() != GnssDevice.OP_MODE_USE) continue; if(device.getOpmode() != GnssDevice.OP_MODE_USE) continue;
String projectId = device.getProject_id(); String projectId = device.getProject_id();
if(device.getProject2_id()!=null) { if(device.getProject2_id()!=null && !device.getProject2_id().isBlank()) {
// 推送组2用项目2的id号 // 推送组2用项目2的id号
String fwdGroupId2 = device.getFwd_group_id2(); String fwdGroupId2 = device.getFwd_group_id2();
if (fwdGroupId2 != null && fwdGroupId2.equals(fwdGroupId)) { if (fwdGroupId2 != null && fwdGroupId2.equals(fwdGroupId)) {
@ -141,7 +141,7 @@ public class Forwarder {
record.setRposn(record.getRposn() - device.getIposn()); record.setRposn(record.getRposn() - device.getIposn());
record.setRposd(record.getRposd() - device.getIposd()); record.setRposd(record.getRposd() - device.getIposd());
} }
if (useFwdId && device.getFwddeviceid() != null && device.getFwddeviceid().trim().length() > 0) { if (useFwdId && device.getFwddeviceid() != null && !device.getFwddeviceid().isBlank()) {
record.setDeviceid(device.getFwddeviceid()); record.setDeviceid(device.getFwddeviceid());
} }
recordsToSend.add(record); recordsToSend.add(record);