[修改] 按照修改文档进行修改

application-webadmin/src/main/java/com/orangeforms/webadmin/WebAdminApplication.java

@@ -7,6 +7,7 @@ import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.scheduling.annotation.EnableAsync;
 import org.springframework.scheduling.annotation.EnableScheduling;
+import org.springframework.web.bind.annotation.CrossOrigin;
 
 /**
  * 应用服务启动类。

application-webadmin/src/main/java/com/orangeforms/webadmin/dds/DataReaderListenerImpl.java

@@ -115,25 +115,25 @@ public class DataReaderListenerImpl extends DDS._DataReaderListenerLocalBase {
                 }
                 else if (mh.value.subject.equals("21")) {
                     //收到导调应答
-                    if(Objects.equals(mh.value.from, "2") &&run.platformState!=0){
-                        run.platformState= Integer.parseInt(mh.value.text);
+                    if(Objects.equals(mh.value.from, "2") && run.platformState != 0){
+                        run.platformState = Integer.parseInt(mh.value.text);
                     }
-                    else if(Objects.equals(mh.value.from, "3") &&run.dataChangeState!=0){
+                    else if(Objects.equals(mh.value.from, "3") && run.dataChangeState != 0){
                         run.dataChangeState = Integer.parseInt(mh.value.text);
                     }
                 }
                 else if(mh.value.subject.equals("8")){
                     //收到心跳数据
-                    if(Objects.equals(mh.value.from, "2") &&run.platformState==0){
+                    if(Objects.equals(mh.value.from, "2") && run.platformState == 0){
                         run.platformState=1;
                     }
-                    else if(Objects.equals(mh.value.from, "3") &&run.dataChangeState==0){
+                    else if(Objects.equals(mh.value.from, "3") && run.dataChangeState == 0){
                         run.dataChangeState = 1;
                     }
-                    else if(Objects.equals(mh.value.from, "5") &&run.radarPlatformState==0){
+                    else if(Objects.equals(mh.value.from, "5") && run.radarPlatformState == 0){
                         run.radarPlatformState = 1;
                     }
-                    else if(Objects.equals(mh.value.from, "4") &&run.algPlatformState==0){
+                    else if(Objects.equals(mh.value.from, "4") && run.algPlatformState == 0){
                         run.algPlatformState = 1;
                     }
                 }

application-webadmin/src/main/java/com/orangeforms/webadmin/dds/TestPublisher.java

@@ -36,18 +36,18 @@ public class TestPublisher {
     private final ExecutorService executor = Executors.newSingleThreadExecutor();
     private volatile boolean running = true;
     public TestPublisher() throws Exception {
-//        String[] s = new String[4];
-//        s[0] = "-DCPSBit";
-//        s[1] = "0";
-//        s[2] = "-DCPSConfigFile";
-//        s[3] = "D:/dds/open-dds_3.16/OpenDDS-3.16/OpenDDS-3.16/java/tests/messenger/tcp.ini";
-        String[] s = new String[6];
-        s[0] = "-DCPSBit";               // 启用Bit通信（保持原有配置）
-        s[1] = "0";                      // Bit值
-        s[2] = "-DCPSDefaultDiscovery";  // 指定发现机制为InfoRepo
-        s[3] = "DEFAULT_REPO";           // 使用集中式InfoRepo
-        s[4] = "-DCPSInfoRepo";          // InfoRepo的corbaloc地址
-        s[5] = "corbaloc:iiop:192.168.5.81:12345/DCPSInfoRepo"; // 替换为实际IP和端口
+        String[] s = new String[4];
+        s[0] = "-DCPSBit";
+        s[1] = "0";
+        s[2] = "-DCPSConfigFile";
+        s[3] = "C:/software/OpenDDS-3.16/java/tests/messenger/tcp.ini";
+//        String[] s = new String[6];
+//        s[0] = "-DCPSBit";               // 启用Bit通信（保持原有配置）
+//        s[1] = "0";                      // Bit值
+//        s[2] = "-DCPSDefaultDiscovery";  // 指定发现机制为InfoRepo
+//        s[3] = "DEFAULT_REPO";           // 使用集中式InfoRepo
+//        s[4] = "-DCPSInfoRepo";          // InfoRepo的corbaloc地址
+//        s[5] = "corbaloc:iiop:192.168.5.81:12345/DCPSInfoRepo"; // 替换为实际IP和端口
         executor.submit(() -> initialize(s)); // 初始化放在后台线程
     }
     public static boolean checkReliable(String[] args) {

application-webadmin/src/main/java/com/orangeforms/webadmin/dds/TestSubscriber.java

@@ -41,18 +41,18 @@ public class TestSubscriber {
         return false;
     }
     public TestSubscriber() throws Exception {
-//        String[] s = new String[4];
-//        s[0] = "-DCPSBit";
-//        s[1] = "0";
-//        s[2] = "-DCPSConfigFile";
-//        s[3] = "D:/dds/open-dds_3.16/OpenDDS-3.16/OpenDDS-3.16/java/tests/messenger/tcp.ini";
-        String[] s = new String[6];
-        s[0] = "-DCPSBit";               // 启用Bit通信（保持原有配置）
-        s[1] = "0";                      // Bit值
-        s[2] = "-DCPSDefaultDiscovery";  // 指定发现机制为InfoRepo
-        s[3] = "DEFAULT_REPO";           // 使用集中式InfoRepo
-        s[4] = "-DCPSInfoRepo";          // InfoRepo的corbaloc地址
-        s[5] = "corbaloc:iiop:192.168.5.81:12345/DCPSInfoRepo"; // 替换为实际IP和端口
+        String[] s = new String[4];
+        s[0] = "-DCPSBit";
+        s[1] = "0";
+        s[2] = "-DCPSConfigFile";
+        s[3] = "C:/software/OpenDDS-3.16/java/tests/messenger/tcp.ini";
+//        String[] s = new String[6];
+//        s[0] = "-DCPSBit";               // 启用Bit通信（保持原有配置）
+//        s[1] = "0";                      // Bit值
+//        s[2] = "-DCPSDefaultDiscovery";  // 指定发现机制为InfoRepo
+//        s[3] = "DEFAULT_REPO";           // 使用集中式InfoRepo
+//        s[4] = "-DCPSInfoRepo";          // InfoRepo的corbaloc地址
+//        s[5] = "corbaloc:iiop:192.168.5.81:12345/DCPSInfoRepo"; // 替换为实际IP和端口
         executor.submit(() -> initialize(s));
     }
     public String getText(){

application-webadmin/src/main/java/com/orangeforms/webadmin/dds/jamingRunningState.java

@@ -1,5 +1,8 @@
 package com.orangeforms.webadmin.dds;
 
+import lombok.Data;
+
+@Data
 public class jamingRunningState {
     public String platformID;
     public double x;
@@ -47,6 +50,7 @@ public class jamingRunningState {
     public double y;
     public double z;
     public int isAlive;
+    public String cooperationStatus;
 
     public String getPolicy() {
         return policy;

application-webadmin/src/main/java/com/orangeforms/webadmin/dds/runState.java

@@ -10,4 +10,6 @@ public class runState {
 
     public int algPlatformState = 0;
 
+    public int taskState = 1;
+
 }

application-webadmin/src/main/java/com/orangeforms/webadmin/dds/singleJamingPlatform.java

@@ -1,5 +1,8 @@
 package com.orangeforms.webadmin.dds;
 
+import lombok.Data;
+
+@Data
 public class singleJamingPlatform {
     public int getPlatformID() {
         return platformID;
@@ -78,6 +81,8 @@ public class singleJamingPlatform {
     public int isCoop;
     //平台是否实物
     public int isReal=1;
+    //平台是否在合作条件下
+    public String cooperationStatus;
     //起始坐标
     public double x;
     public double y;

application-webadmin/src/main/java/com/orangeforms/webadmin/dds/singleRadarPlatform.java

@@ -1,5 +1,8 @@
 package com.orangeforms.webadmin.dds;
 
+import lombok.Data;
+
+@Data
 public class singleRadarPlatform {
     //平台唯一id
     public int platformID;
@@ -78,6 +81,8 @@ public class singleRadarPlatform {
     public int isCoop;
     //是否实物模拟
     public int isReal=1;
+    //是否是合作条件
+    public String cooperationStatus;
     //起始坐标
     public double x;
     public double y;

application-webadmin/src/main/java/com/orangeforms/webadmin/upms/service/impl/DdsServiceImpl.java

@@ -68,6 +68,7 @@ public class DdsServiceImpl implements DdsService {
             j.y = single.y;
             j.z = single.z;
             j.policy = single.policy;
+            j.cooperationStatus = single.cooperationStatus;
             subscriber.listener.jamingRunningStates.put(String.valueOf(single.platformID),j);
         }
 
@@ -126,11 +127,11 @@ public class DdsServiceImpl implements DdsService {
         String text = "";
         text += subscriber.listener.jamingList.size()+" "+subscriber.listener.radarList.size()+"\n";
         for (singleJamingPlatform jaming : subscriber.listener.jamingList){
-            text += jaming.platformID+" "+jaming.teamID+" "+jaming.policy+" "+jaming.isReal
+            text += jaming.platformID+" "+jaming.teamID+" "+jaming.policy+" "+jaming.isReal+" "+jaming.cooperationStatus
             +" "+jaming.x+" "+jaming.y+" "+jaming.z+"\n";
         }
         for (singleRadarPlatform radar : subscriber.listener.radarList){
-            text += radar.platformID+" "+radar.teamID+" "+radar.policy+" "+radar.isReal
+            text += radar.platformID+" "+radar.teamID+" "+radar.policy+" "+radar.isReal+" "+radar.cooperationStatus
                     +" "+radar.x+" "+radar.y+" "+radar.z+"\n";
         }
         publisher.publishMessage("1","1",text);