优化结果，几乎完成通信状态

src/main/java/com/dc/datachange/communication/controller/CommunicationController.java

@@ -1,11 +1,12 @@
 package com.dc.datachange.communication.controller;
 
 import com.dc.datachange.communication.entity.NetworkGroupVo;
+import com.dc.datachange.communication.entity.PlatformVo;
 import com.dc.datachange.core.entity.graph.EdgeVo;
 import com.dc.datachange.core.entity.graph.NodeVo;
 import com.dc.datachange.core.entity.platformInfo.Platform;
 import com.dc.datachange.core.exchange.DataManager;
-import com.dc.datachange.core.entity.NetworkGroup;
+import com.dc.datachange.core.entity.networkGroup.NetworkGroup;
 import com.dc.datachange.utils.R;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -52,6 +53,11 @@ public class CommunicationController {
     @GetMapping("/getSendMessage")
     public R getSendMessage(@RequestParam Integer id){
         NetworkGroup networkGroup = dataManager.getData(NetworkGroup.class,id);
-        return R.ok();
+        return R.ok().put("data",networkGroup.getHistoryMsg());
+    }
+    @GetMapping("/getMembers")
+    public R getMembers(@RequestParam Integer id){
+        NetworkGroup networkGroup = dataManager.getData(NetworkGroup.class,id);
+        return R.ok().put("data",networkGroup.getPlatformSet().stream().map(PlatformVo::new).collect(Collectors.toList()));
     }
 }

src/main/java/com/dc/datachange/communication/entity/MessageVo.java

@@ -1,4 +0,0 @@
-package com.dc.datachange.communication.entity;
-
-public class MessageVo {
-}

src/main/java/com/dc/datachange/communication/entity/NetworkGroupVo.java

@@ -1,6 +1,6 @@
 package com.dc.datachange.communication.entity;
 
-import com.dc.datachange.core.entity.NetworkGroup;
+import com.dc.datachange.core.entity.networkGroup.NetworkGroup;
 import lombok.Data;
 
 @Data

src/main/java/com/dc/datachange/communication/entity/PlatformVo.java

@@ -0,0 +1,19 @@
+package com.dc.datachange.communication.entity;
+
+import com.dc.datachange.core.entity.platformInfo.Platform;
+import lombok.Data;
+
+@Data
+public class PlatformVo {
+    private Integer id;
+    private String isOnline;
+    private String status;
+    private String linkModel;
+
+    public PlatformVo(Platform platform){
+        this.id =platform.getId();
+        this.isOnline="是";
+        this.status="非静默";
+        this.linkModel="CAN";
+    }
+}

src/main/java/com/dc/datachange/core/common/ConnectionParams.java

@@ -11,23 +11,37 @@ import java.util.List;
 @Configuration
 @ConfigurationProperties(prefix = "dds.connection")
 public class ConnectionParams {
+    private boolean local;
     private String DCPSBit;
-    private String DCPSConfigFile;
     private boolean isReliable;
     private boolean isWaitForAcks;
 
+    private String DCPSDefaultDiscovery;
+    private String DCPSInfoRepo;
+
+    private String DCPSConfigFile;
     public String[] toArgs(){
         List<String> args=new ArrayList<>();
         args.add("-DCPSBit");
         args.add(getDCPSBit());
-        args.add("-DCPSConfigFile");
-        args.add(getDCPSConfigFile());
         if(isReliable()){
             args.add("-r");
         }
         if (isWaitForAcks()){
             args.add("-w");
         }
-        return args.toArray(new String[0]);
+        if(local){
+            args.add("-DCPSConfigFile");
+            args.add(getDCPSConfigFile());
+
+            return args.toArray(new String[0]);
+        }else {
+            args.add("-DCPSDefaultDiscovery");
+            args.add(getDCPSDefaultDiscovery());
+            args.add("-DCPSInfoRepo");
+            args.add(getDCPSInfoRepo());
+            return args.toArray(new String[0]);
+        }
+
     }
 }

src/main/java/com/dc/datachange/core/common/MsgConstants.java

@@ -9,7 +9,7 @@ public class MsgConstants {
     public static final String INITIAL_RES="11";
     public static final String INITIAL_REQ="12";
     public static final String DAOTIAO_MSG="2";
-    public static final String DAOTIAO_REQ="21";
+    public static final String DAOTIAO_RES ="21";
     public static final String PLATFORM_POSITION="3";
     public static final String NETGROUP_MSG ="4";
     public static final String NETGROUP_REQ ="41";
@@ -17,9 +17,6 @@ public class MsgConstants {
     public static final String ELECTRIC_INTERFERE="6";
     public static final String COMPREHEN_INTELL="7";
     public static final String HEART_BEAT="8";
-
-
-
     public static final HashMap<String,String > PLAT_MAP= new HashMap<String,String>(){{
         put("1","支撑平台");
         put("2","任务系统");

src/main/java/com/dc/datachange/core/connection/DDSInitializer.java

@@ -8,15 +8,15 @@ import org.springframework.stereotype.Component;
 @Component
 @Slf4j
 public class DDSInitializer implements ApplicationRunner {
-    private final DDSStateManger ddsStateManger;
+    private final DDSStatusManger ddsStatusManger;
 
-    public DDSInitializer(DDSStateManger ddsStateManger){
-        this.ddsStateManger=ddsStateManger;
+    public DDSInitializer(DDSStatusManger ddsStatusManger){
+        this.ddsStatusManger = ddsStatusManger;
     }
 
     @Override
     public void run(ApplicationArguments args) {
-        ddsStateManger.initialed();
+        ddsStatusManger.initialed();
         log.info("State changed to initialed");
     }
 }

src/main/java/com/dc/datachange/core/connection/DDSStateManger.java → src/main/java/com/dc/datachange/core/connection/DDSStatusManger.java

@@ -16,7 +16,7 @@ import org.springframework.stereotype.Component;
 @Component
 @Slf4j
 @DependsOn("DDSSubscriber")
-public class DDSStateManger {
+public class DDSStatusManger {
     @Autowired
     private SendExecutor sendExecutor;
     @Autowired

src/main/java/com/dc/datachange/core/entity/message/sendMessage/DaoTiaoRes.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Component;
 @Component
 public class DaoTiaoRes extends SendMessage implements ReactiveMsg{
     private static final String from= PlatConstants.EXCHANGE_PLATFORM;
-    private static final String subject= MsgConstants.INITIAL_RES;
+    private static final String subject= MsgConstants.DAOTIAO_RES;
     @Override
     public String getMsgType() {
         return subject;

src/main/java/com/dc/datachange/core/entity/message/sendMessage/NetGroupMsg.java

@@ -4,10 +4,9 @@ import Messenger.Message;
 import com.dc.datachange.core.common.MsgConstants;
 import com.dc.datachange.core.common.PlatConstants;
 import com.dc.datachange.core.entity.message.ReceivedMessage;
-import com.dc.datachange.core.entity.message.receivedMessage.RunningMessage;
 import com.dc.datachange.core.entity.message.SendMessage;
 import com.dc.datachange.core.exchange.DataManager;
-import com.dc.datachange.core.entity.NetworkGroup;
+import com.dc.datachange.core.entity.networkGroup.NetworkGroup;
 import com.dc.datachange.utils.MessageUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;

src/main/java/com/dc/datachange/core/entity/networkGroup/HistoryMsg.java

@@ -0,0 +1,52 @@
+package com.dc.datachange.core.entity.networkGroup;
+
+import com.dc.datachange.core.common.MsgConstants;
+import com.dc.datachange.core.entity.message.ReceivedMessage;
+import lombok.Data;
+
+@Data
+public class HistoryMsg {
+    private String time;
+    private String translation;
+    private String type;
+    private String status;
+
+    public HistoryMsg(ReceivedMessage receivedMessage){
+        this.time=receivedMessage.getTime();
+        this.translation = receivedMessage.getFrom()+"->"+receivedMessage.getTo();
+        this.type=transToChinese(receivedMessage.getMsgType());
+        this.status ="成功";
+    }
+
+    private String transToChinese(String type){
+        switch (type){
+            case MsgConstants.INITIAL_MSG:
+                return "初始化消息";
+            case MsgConstants.INITIAL_REQ:
+                return "初始化应答";
+            case MsgConstants.INITIAL_RES:
+                return "初始化请求";
+            case MsgConstants.DAOTIAO_MSG:
+                return "导调控制消息";
+            case MsgConstants.DAOTIAO_RES:
+                return "导调应答";
+            case MsgConstants.PLATFORM_POSITION:
+                return "平台位置消息";
+            case MsgConstants.NETGROUP_MSG:
+                return "网路分组消息";
+            case MsgConstants.NETGROUP_REQ:
+                return "网路分组请求";
+            case MsgConstants.RADAR_PULSE:
+                return "雷达脉冲数据";
+            case MsgConstants.ELECTRIC_INTERFERE:
+                return "电子干扰数据";
+            case MsgConstants.COMPREHEN_INTELL:
+                return "综合情报";
+            case MsgConstants.HEART_BEAT:
+                return "心跳消息";
+            default:
+                return "未知类型";
+        }
+
+    }
+}

src/main/java/com/dc/datachange/core/entity/NetworkGroup.java → src/main/java/com/dc/datachange/core/entity/networkGroup/NetworkGroup.java

@@ -1,6 +1,6 @@
-package com.dc.datachange.core.entity;
+package com.dc.datachange.core.entity.networkGroup;
 
-import com.dc.datachange.communication.entity.MessageVo;
+import com.dc.datachange.core.entity.message.ReceivedMessage;
 import com.dc.datachange.core.entity.platformInfo.Platform;
 import com.dc.datachange.core.entity.platformInfo.InterferPlatform;
 import com.dc.datachange.core.entity.platformInfo.RadarPlatform;
@@ -39,7 +39,7 @@ public class NetworkGroup {
 
     private String params;
 
-    private List<MessageVo> historyMsg;
+    private List<HistoryMsg> historyMsg;
 
     public NetworkGroup(RawGroup rawGroup) {
         synchronized (NetworkGroup.class){
@@ -97,4 +97,11 @@ public class NetworkGroup {
     public boolean isRadar(){
         return this.type.equals("radar");
     }
+
+    public boolean addHistoryMsg(ReceivedMessage message){
+        return this.historyMsg.add(new HistoryMsg(message));
+    }
+    public void removeName(){
+        nameSet.remove(this.getName());
+    }
 }

src/main/java/com/dc/datachange/core/exchange/DDSListener.java

@@ -47,7 +47,7 @@ public class DDSListener extends DDS._DataReaderListenerLocalBase{
             }
             else {
                 log.error("DataReaderListenerImpl::on_data_available: "
-                        + "ERROR: received unknown instance state "
+                        + "ERROR: received unknown instance status "
                         + sih.value.instance_state);
             }
 

src/main/java/com/dc/datachange/core/exchange/DataManager.java

@@ -5,7 +5,7 @@ import com.dc.datachange.core.entity.message.receivedMessage.EleInterMsg;
 import com.dc.datachange.core.entity.message.receivedMessage.RadarPulseMsg;
 import com.dc.datachange.core.entity.platformInfo.InterferPlatform;
 import com.dc.datachange.core.entity.platformInfo.RadarPlatform;
-import com.dc.datachange.core.entity.NetworkGroup;
+import com.dc.datachange.core.entity.networkGroup.NetworkGroup;
 import com.dc.datachange.utils.ConcurrentIndexedMap;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;

src/main/java/com/dc/datachange/core/exchange/strategy/DaoTiaoStrategy.java

@@ -3,7 +3,7 @@ package com.dc.datachange.core.exchange.strategy;
 import Messenger.Message;
 import com.dc.datachange.core.common.ControlConstans;
 import com.dc.datachange.core.common.MsgConstants;
-import com.dc.datachange.core.connection.DDSStateManger;
+import com.dc.datachange.core.connection.DDSStatusManger;
 import com.dc.datachange.core.entity.message.ReceivedMessage;
 import com.dc.datachange.core.entity.message.receivedMessage.DaoTiaoMsg;
 import com.dc.datachange.core.exchange.SendExecutor;
@@ -15,7 +15,7 @@ import org.springframework.stereotype.Component;
 @Slf4j
 public class DaoTiaoStrategy implements MessageStrategy{
     @Autowired
-    private DDSStateManger stateManger;
+    private DDSStatusManger stateManger;
     @Autowired
     private SendExecutor sendExecutor;
     @Override
@@ -29,6 +29,7 @@ public class DaoTiaoStrategy implements MessageStrategy{
         if (stateManger.stateChecker(daoTiaoMsg)) {
             return daoTiaoMsg.isValidate();
         }
+        log.error(message.toString());
         return false;
     }
 

src/main/java/com/dc/datachange/core/exchange/strategy/InitialMsgStrategy.java

@@ -2,18 +2,20 @@ package com.dc.datachange.core.exchange.strategy;
 
 import Messenger.Message;
 import com.dc.datachange.core.common.MsgConstants;
-import com.dc.datachange.core.connection.DDSStateManger;
+import com.dc.datachange.core.connection.DDSStatusManger;
 import com.dc.datachange.core.entity.message.ReceivedMessage;
 import com.dc.datachange.core.entity.message.receivedMessage.InitialMessage;
 import com.dc.datachange.core.exchange.DataManager;
 import com.dc.datachange.core.exchange.SendExecutor;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 @Component
+@Slf4j
 public class InitialMsgStrategy implements MessageStrategy{
     @Autowired
-    private DDSStateManger stateManger;
+    private DDSStatusManger stateManger;
     @Autowired
     private SendExecutor sendExecutor;
     @Autowired
@@ -30,6 +32,7 @@ public class InitialMsgStrategy implements MessageStrategy{
         if (stateManger.stateChecker(initialMessage)) {
             return initialMessage.isValidate();
         }
+        log.error(message.toString());
         return false;
     }
 

src/main/java/com/dc/datachange/core/exchange/strategy/NetGroupReqStrategy.java

@@ -2,17 +2,19 @@ package com.dc.datachange.core.exchange.strategy;
 
 import Messenger.Message;
 import com.dc.datachange.core.common.MsgConstants;
-import com.dc.datachange.core.connection.DDSStateManger;
+import com.dc.datachange.core.connection.DDSStatusManger;
 import com.dc.datachange.core.entity.message.ReceivedMessage;
 import com.dc.datachange.core.entity.message.receivedMessage.NetGroupReq;
 import com.dc.datachange.core.exchange.SendExecutor;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 @Component
+@Slf4j
 public class NetGroupReqStrategy implements MessageStrategy{
     @Autowired
-    private DDSStateManger stateManger;
+    private DDSStatusManger stateManger;
     @Autowired
     private SendExecutor sendExecutor;
 
@@ -27,6 +29,7 @@ public class NetGroupReqStrategy implements MessageStrategy{
         if(stateManger.stateChecker(netGroupReq)){
             return netGroupReq.isValidate();
         }
+        log.error(message.toString());
         return false;
     }
 

src/main/java/com/dc/datachange/core/exchange/strategy/RunningMsgStrategy.java

@@ -1,7 +1,8 @@
 package com.dc.datachange.core.exchange.strategy;
 
-import com.dc.datachange.core.connection.DDSStateManger;
+import com.dc.datachange.core.connection.DDSStatusManger;
 import com.dc.datachange.core.entity.message.ReceivedMessage;
+import com.dc.datachange.core.entity.networkGroup.NetworkGroup;
 import com.dc.datachange.core.entity.platformInfo.InterferPlatform;
 import com.dc.datachange.core.entity.platformInfo.Platform;
 import com.dc.datachange.core.entity.platformInfo.RadarPlatform;
@@ -16,7 +17,7 @@ import java.util.Map;
 @Slf4j
 public abstract class RunningMsgStrategy implements MessageStrategy {
     @Autowired
-    private DDSStateManger stateManger;
+    private DDSStatusManger stateManger;
     @Autowired
     private DataManager dataManager;
 
@@ -41,16 +42,23 @@ public abstract class RunningMsgStrategy implements MessageStrategy {
 
             Platform fromPlat = dataManager.getData(clazz,from);
             Platform toPlat = dataManager.getData(clazz,to);
-            return fromPlat != null && toPlat != null
+
+            if(fromPlat != null && toPlat != null
                     && fromPlat.isGrouped() && toPlat.isGrouped()
-                    && fromPlat.getGroupId().equals(toPlat.getGroupId());
+                    && fromPlat.getGroupId().equals(toPlat.getGroupId())){
+                NetworkGroup networkGroup = dataManager.getData(NetworkGroup.class, fromPlat.getGroupId());
+                return networkGroup.addHistoryMsg(message);
+            }
+            else {
+                log.error("消息不合法"+message);
+                return false;
+            }
         }
         return false;
     }
 
     @Override
     public void invoke(ReceivedMessage message) {
-        log.info(message.getClass().toString());
         dataManager.addData(message);
     }
 }

src/main/java/com/dc/datachange/networkGroup/controller/NetworkController.java

@@ -1,6 +1,6 @@
 package com.dc.datachange.networkGroup.controller;
 
-import com.dc.datachange.core.entity.NetworkGroup;
+import com.dc.datachange.core.entity.networkGroup.NetworkGroup;
 import com.dc.datachange.core.entity.graph.EdgeVo;
 import com.dc.datachange.core.entity.graph.NodeVo;
 import com.dc.datachange.core.entity.platformInfo.InterferPlatform;
@@ -87,6 +87,7 @@ public class NetworkController {
         if(data.getPlatformSet()!=null){
             deleteNetworkParams(id);
         }
+        data.removeName();
         if (dataManager.deleteData(NetworkGroup.class, id)) {
             return R.ok();
         } else {

src/main/java/com/dc/datachange/networkGroup/entity/NetworkParams.java

@@ -1,6 +1,6 @@
 package com.dc.datachange.networkGroup.entity;
 
-import com.dc.datachange.core.entity.NetworkGroup;
+import com.dc.datachange.core.entity.networkGroup.NetworkGroup;
 import com.dc.datachange.core.entity.platformInfo.Platform;
 import lombok.Data;
 import lombok.NoArgsConstructor;

src/main/java/com/dc/datachange/utils/MessageUtils.java

@@ -2,7 +2,7 @@ package com.dc.datachange.utils;
 
 import com.dc.datachange.core.entity.graph.EdgeVo;
 import com.dc.datachange.core.entity.platformInfo.Platform;
-import com.dc.datachange.core.entity.NetworkGroup;
+import com.dc.datachange.core.entity.networkGroup.NetworkGroup;
 
 import java.time.LocalTime;
 import java.time.format.DateTimeFormatter;

src/main/java/com/dc/datachange/utils/Simulator.java

@@ -9,7 +9,7 @@ import com.dc.datachange.core.entity.platformInfo.InterferPlatform;
 import com.dc.datachange.core.entity.platformInfo.RadarPlatform;
 import com.dc.datachange.core.exchange.DataManager;
 import com.dc.datachange.networkGroup.controller.NetworkController;
-import com.dc.datachange.core.entity.NetworkGroup;
+import com.dc.datachange.core.entity.networkGroup.NetworkGroup;
 import com.dc.datachange.networkGroup.entity.NetworkParams;
 import com.dc.datachange.networkGroup.entity.RawGroup;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -178,4 +178,42 @@ public class Simulator {
         data.setPlatformSet(new HashSet<>(ids));
         return networkController.updateNetworkParams(data);
     }
+    @GetMapping("/addMessage1")
+    public R addMessage1(Integer id1,Integer id2){
+        count++;
+
+        Message message = new Message(
+                id1 + " " + PlatConstants.EXCHANGE_PLATFORM + " " + id2,
+                MsgConstants.RADAR_PULSE,
+                count,
+                "雷达 空中 21 127 10000 5000 " + count,
+                count);
+        publisher.sendMessage(message);
+        return R.ok(message.toString());
+    }
+    @GetMapping("/addMessage2")
+    public R addMessage2(Integer id1,Integer id2){
+        count++;
+        Message message = new Message(
+                id1 + " " + PlatConstants.EXCHANGE_PLATFORM + " " + id2,
+                MsgConstants.ELECTRIC_INTERFERE,
+                count,
+                "宽带干扰 空中 区域A 宽带干扰 未知 否 " + count,
+                count);
+        publisher.sendMessage(message);
+        return R.ok(message.toString());
+    }
+    @GetMapping("/addMessage3")
+    public R addMessage3(Integer id1,Integer id2){
+        count++;
+
+        Message message = new Message(
+                id1 + " " + PlatConstants.EXCHANGE_PLATFORM + " " + id2,
+                MsgConstants.COMPREHEN_INTELL,
+                count,
+                "综合 " + count + " 否 在侦察完成后立刻启动干扰",
+                count);
+        publisher.sendMessage(message);
+        return R.ok(message.toString());
+    }
 }

src/main/resources/application.yml

@@ -3,55 +3,20 @@ spring:
   application:
     name: dataChange
 
-  #远程登录时使用的信息
-  omm:
-    ip: localhost
-    port: 8081
-    clientId: testapp
-    clientSecret: 123123
-
-  datasource:
-    url: jdbc:mysql://localhost:3306/dataChange
-    username: root
-    password: 123456
-    driver-class-name: com.mysql.cj.jdbc.Driver
-
 # 应用服务 WEB 访问端口
 server:
   port: 8081
   #  定时组件的配置，一般不改动
-  quartz:
-    properties:
-      org:
-        quartz:
-          scheduler:
-            instanceName: clusteredScheduler
-            instanceId: AUTO
-          jobStore:
-            class: org.quartz.impl.jdbcjobstore.JobStoreTX
-            driverDelegateClass: org.quartz.impl.jdbcjobstore.StdJDBCDelegate
-            tablePrefix: QRTZ_
-            isClustered: true
-            clusterCheckinInterval: 10000
-            useProperties: false
-          threadPool:
-            class: org.quartz.simpl.SimpleThreadPool
-            threadCount: 10
-            threadPriority: 5
-            threadsInheritContextClassLoaderOfInitializingThread: true
-
-#日志信息显示等级,默认为info
-logging:
-  level:
-    com.dmd.bigdata.mapper: debug
-    com.dmd.bigdata.levelManage.dao: debug
 
 dds:
   connection:
   #  不知道
     DCPSBit: 0
   #  DDS实例位置
+    local: true
     DCPSConfigFile: D:\rocket\OpenDDS-3.16\java\tests\messenger\tcp.ini
+    DCPSDefaultDiscovery: DEFAULT_REPO
+    DCPSInfoRepo: corbaloc:iiop:10.195.84.22:12345/DCPSInfoRepo
     isReliable: false
     isWaitForAcks: false
   config: