mlx

simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/consumer/ProjectConsumer.java

@@ -39,55 +39,55 @@ public class ProjectConsumer {
 
 
     @Value("${scheduler.host.hostname}")
-    String hostname;
+    private String hostname;
     @Value("${scheduler.host.username}")
-    String username;
+    private String username;
     @Value("${scheduler.host.password}")
-    String password;
+    private String password;
     @Value("${scheduler.linux-path.temp}")
-    String linuxTempPath;
+    private String linuxTempPath;
     @Value("${scheduler.minio-path.project-result}")
-    String projectResultPathOfMinio;
+    private String projectResultPathOfMinio;
     @Value("${minio.bucket-name}")
-    String bucketName;
+    private String bucketName;
 
     // -------------------------------- Comment --------------------------------
     @Resource
-    MinioClient minioClient;
+    private MinioClient minioClient;
     @Resource
-    StringRedisTemplate stringRedisTemplate;
+    private StringRedisTemplate stringRedisTemplate;
     @Resource
-    ManualProjectMapper manualProjectMapper;
+    private ManualProjectMapper manualProjectMapper;
     @Resource
-    AutoSubProjectMapper autoSubProjectMapper;
+    private AutoSubProjectMapper autoSubProjectMapper;
     @Resource
-    VehicleMapper vehicleMapper;
+    private VehicleMapper vehicleMapper;
     @Resource
-    SensorCameraMapper sensorCameraMapper;
+    private SensorCameraMapper sensorCameraMapper;
     @Resource
-    SensorOgtMapper sensorOgtMapper;
+    private SensorOgtMapper sensorOgtMapper;
     @Resource
-    AlgorithmMapper algorithmMapper;
+    private AlgorithmMapper algorithmMapper;
     @Resource
-    UserMapper userMapper;
+    private UserMapper userMapper;
     @Resource
-    ClusterMapper clusterMapper;
+    private ClusterMapper clusterMapper;
     @Resource
-    ProjectService projectService;
+    private ProjectService projectService;
     @Resource
-    ProjectUtil projectUtil;
+    private ProjectUtil projectUtil;
     @Resource
-    IndexMapper indexMapper;
+    private IndexMapper indexMapper;
     @Resource
-    TaskMapper taskMapper;
+    private TaskMapper taskMapper;
     @Resource
-    TaskManager taskManager;
+    private TaskManager taskManager;
     @Resource
-    ProjectManager projectManager;
+    private ProjectManager projectManager;
     @Resource
-    KafkaTemplate<String, String> kafkaTemplate;
+    private KafkaTemplate<String, String> kafkaTemplate;
     @Resource(name = "myKafkaAdmin")
-    Admin kafkaAdminClient;
+    private Admin kafkaAdminClient;
 
     /**
      * 接收到运行信息立即复制一份数据作为运行数据
@@ -101,7 +101,6 @@ public class ProjectConsumer {
         ProjectMessageDTO projectMessageDTO = JsonUtil.jsonToBean(initialProjectJson, ProjectMessageDTO.class);
         String projectId = projectMessageDTO.getProjectId();        // 手动执行项目 id 或 自动执行子项目 id
         new Thread(() -> createTaskAndFixData(projectRecord), "fix-" + projectId).start();
-//        createTaskAndFixData(projectRecord);
     }
 
 

simulation-resource-server/src/main/java/com/css/simulation/resource/project/ctrl/SimulationProjectCtrl.java

@@ -317,7 +317,7 @@ public class SimulationProjectCtrl {
      */
     @RequestMapping("updateAutoProjectNowRunState")
     @ResponseBody
-    public ResponseBodyVO updateAutoProjectNowRunState(@RequestBody SimulationManualProjectParam param) {
+    public ResponseBodyVO<String> updateAutoProjectNowRunState(@RequestBody SimulationManualProjectParam param) {
         return service.updateAutoProjectNowRunState(param);
     }
 

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

@@ -4113,28 +4113,28 @@ public class SimulationProjectServiceImpl implements SimulationProjectService {
     }
 
     @Override
-    public ResponseBodyVO deleteAutomaticSubProjectByIds(SimulationManualProjectParam param) {
+    public ResponseBodyVO<String> deleteAutomaticSubProjectByIds(SimulationManualProjectParam param) {
 
         String ids = param.getIds();
         if (isEmpty(ids)) {
-            return new ResponseBodyVO(ResponseBodyVO.Response.CLIENT_FAILURE);
+            return new ResponseBodyVO<String>(ResponseBodyVO.Response.CLIENT_FAILURE);
         }
         String[] idArr = ids.split(",");
         //仅有执行中的不能删除
         List<SimulationAutomaticSubProjectPo> pos = simulationAutomaticSubProjectMapper.selectProjectNowRunState(idArr);
         for (SimulationAutomaticSubProjectPo p : pos) {
             if (ProjectRunStateEnum.EXECUTION.getCode().equals(p.getNowRunState())) {
-                return new ResponseBodyVO(ResponseBodyVO.Response.SERVER_FAILURE, "数据不支持删除");
+                return new ResponseBodyVO<>(ResponseBodyVO.Response.SERVER_FAILURE, "数据不支持删除");
             }
         }
 
 
         int i = simulationAutomaticSubProjectMapper.deleteProject(idArr);
         if (i > 0) {
-            return new ResponseBodyVO(ResponseBodyVO.Response.SUCCESS);
+            return new ResponseBodyVO<>(ResponseBodyVO.Response.SUCCESS);
 
         }
-        return new ResponseBodyVO(ResponseBodyVO.Response.SERVER_FAILURE, "删除失败");
+        return new ResponseBodyVO<>(ResponseBodyVO.Response.SERVER_FAILURE, "删除失败");
     }
 
 
@@ -4217,30 +4217,30 @@ public class SimulationProjectServiceImpl implements SimulationProjectService {
 
     @SneakyThrows
     @Override
-    public ResponseBodyVO updateAutoProjectNowRunState(SimulationManualProjectParam param) {
+    public ResponseBodyVO<String> updateAutoProjectNowRunState(SimulationManualProjectParam param) {
 
         if (isEmpty(param.getId()) || isEmpty(param.getNowRunState())) {
-            return new ResponseBodyVO(ResponseBodyVO.Response.CLIENT_FAILURE, "id或状态值不能为空");
+            return new ResponseBodyVO<>(ResponseBodyVO.Response.CLIENT_FAILURE, "id或状态值不能为空");
         }
 
         SimulationAutomaticSubProjectPo po = simulationAutomaticSubProjectMapper.selectById(param);
 
         if (po == null) {
-            return new ResponseBodyVO(ResponseBodyVO.Response.SERVER_FAILURE, "数据没有找到");
+            return new ResponseBodyVO<>(ResponseBodyVO.Response.SERVER_FAILURE, "数据没有找到");
         }
 
-        //自动运行仅可以设置中止操作
+        // 自动运行子项目只能终止
         if (ProjectRunStateEnum.DISCONTINUE.getCode().equals(param.getNowRunState())) {
             int i = simulationAutomaticSubProjectMapper.updateNowRunState(param);
             if (i > 0) {
                 //项目终止，推送到kafka
                 autoProjectStopToKafka(po);
-                return new ResponseBodyVO(ResponseBodyVO.Response.SUCCESS);
+                return new ResponseBodyVO<>(ResponseBodyVO.Response.SUCCESS);
             }
 
         }
 
-        return new ResponseBodyVO(ResponseBodyVO.Response.SERVER_FAILURE, "操作失败");
+        return new ResponseBodyVO<>(ResponseBodyVO.Response.SERVER_FAILURE, "操作失败");
     }
 
     private void convertPoToVo(SimulationAutomaticProjectPo po, SimulationManualProjectSingleVo vo) {

simulation-resource-server/src/main/java/com/css/simulation/resource/project/service/SimulationProjectService.java

@@ -67,7 +67,7 @@ public interface SimulationProjectService {
 
     ResponseBodyVO<String> createAutomaticSubProject(SimulationManualProjectParam param);
 
-    ResponseBodyVO deleteAutomaticSubProjectByIds(SimulationManualProjectParam param);
+    ResponseBodyVO<String> deleteAutomaticSubProjectByIds(SimulationManualProjectParam param);
 
     ResponseBodyVO<AutomaticProjectVo> selectSubProjectInfo(SimulationManualProjectParam param);
 
@@ -75,6 +75,6 @@ public interface SimulationProjectService {
 
     ResponseBodyVO<SimulationManualProjectSingleVo> selectAutomaticProjectById(SimulationManualProjectParam param);
 
-    ResponseBodyVO updateAutoProjectNowRunState(SimulationManualProjectParam param);
+    ResponseBodyVO<String> updateAutoProjectNowRunState(SimulationManualProjectParam param);
 
 }