王耀栋--修改项目运行参数

api-common/src/main/java/api/common/pojo/param/project/SimulationManualProjectKafkaParam.java

@@ -21,4 +21,6 @@ public class SimulationManualProjectKafkaParam {
     private Long maxSimulationTime;
 
     private Integer parallelism;
+
+    private String type;
 }

simulation-resource-server/src/main/java/com/css/simulation/resource/project/constants/ProjectConstants.java

@@ -6,16 +6,16 @@ package com.css.simulation.resource.project.constants;
 public class ProjectConstants {
 
     //任务运行 Kafka推送主题
-    public static final String RUN_TASK_TOPIC = "manualProject";
+    public static final String RUN_TASK_TOPIC = "project";
 
     //任务终止，kafka推送主题
-    public static final String STOP_TASK_TOPPIC = "stopManualProject";//   manualProject-stop
+    public static final String STOP_TASK_TOPPIC = "stopProject";//   manualProject-stop
 
     //自动任务运行开始
-    public static final String AUTO_PROJECT = "autoProject";
+//    public static final String AUTO_PROJECT = "autoProject";
 
     //自动任务运行中止
-    public static final String STOP_AUTO_PROJECT = "stopAutoProject";
+//    public static final String STOP_AUTO_PROJECT = "stopAutoProject";
 
     //任务运行状态字典
     public static final String TASK_RUN_STATE = "taskRunState";

simulation-resource-server/src/main/java/com/css/simulation/resource/project/impl/SimulationProjectServiceImpl.java

@@ -328,6 +328,7 @@ public class SimulationProjectServiceImpl implements SimulationProjectService {
         kafkaParam.setScenePackageId(po.getScene());
         kafkaParam.setMaxSimulationTime(po.getMaxSimulationTime());
         kafkaParam.setParallelism(Integer.valueOf(po.getParallelism()));
+        kafkaParam.setType(DictConstants.PROJECT_TYPE_MANUAL);
         KafkaParameter kafkaParameter = new KafkaParameter();
         kafkaParameter.setTopic(ProjectConstants.RUN_TASK_TOPIC);
         String data = JsonUtil.beanToJson(kafkaParam);
@@ -338,6 +339,7 @@ public class SimulationProjectServiceImpl implements SimulationProjectService {
     private void projectStopToKafka(SimulationManualProjectPo po) throws JsonProcessingException{
         SimulationManualProjectKafkaParam kafkaParam = new SimulationManualProjectKafkaParam();
         kafkaParam.setProjectId(po.getId());
+        kafkaParam.setType(DictConstants.PROJECT_TYPE_MANUAL);
         KafkaParameter kafkaParameter = new KafkaParameter();
         kafkaParameter.setTopic(ProjectConstants.STOP_TASK_TOPPIC);
         String data = JsonUtil.beanToJson(kafkaParam);
@@ -350,8 +352,9 @@ public class SimulationProjectServiceImpl implements SimulationProjectService {
     private void autoProjectStopToKafka(SimulationAutomaticSubProjectPo po) throws JsonProcessingException{
         SimulationManualProjectKafkaParam kafkaParam = new SimulationManualProjectKafkaParam();
         kafkaParam.setProjectId(po.getId());
+        kafkaParam.setType(DictConstants.PROJECT_TYPE_AUTO_SUB);
         KafkaParameter kafkaParameter = new KafkaParameter();
-        kafkaParameter.setTopic(ProjectConstants.STOP_AUTO_PROJECT);
+        kafkaParameter.setTopic(ProjectConstants.STOP_TASK_TOPPIC);
         String data = JsonUtil.beanToJson(kafkaParam);
         kafkaParameter.setData(data);
         log.info("推送自动项目中止消息到kafka:"+data);
@@ -4030,8 +4033,9 @@ public class SimulationProjectServiceImpl implements SimulationProjectService {
         kafkaParam.setScenePackageId(po.getScene());
         kafkaParam.setMaxSimulationTime(po.getMaxSimulationTime());
         kafkaParam.setParallelism(Integer.valueOf(po.getParallelism()));
+        kafkaParam.setType(DictConstants.PROJECT_TYPE_AUTO_SUB);
         KafkaParameter kafkaParameter = new KafkaParameter();
-        kafkaParameter.setTopic(ProjectConstants.AUTO_PROJECT);
+        kafkaParameter.setTopic(ProjectConstants.RUN_TASK_TOPIC);
         String data = JsonUtil.beanToJson(kafkaParam);
         kafkaParameter.setData(data);
         log.info("自动运行项目推送消息到kafka:"+data);