mlx

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

@@ -595,11 +595,11 @@ public class ProjectConsumer {
         // 将项目状态修改为终止中
         String projectId = jsonNode.path("projectId").asText();
         String type = jsonNode.path("type").asText();
-//        if (DictConstants.PROJECT_TYPE_MANUAL.equals(type)) {
-//            manualProjectMapper.updateProjectState(projectId, DictConstants.PROJECT_TERMINATING, TimeUtil.getNowForMysql());
-//        } else if (DictConstants.PROJECT_TYPE_AUTO_SUB.equals(type)) {
-//            autoSubProjectMapper.updateProjectState(projectId, DictConstants.PROJECT_TERMINATING, TimeUtil.getNowForMysql());
-//        }
+        if (DictConstants.PROJECT_TYPE_MANUAL.equals(type)) {
+            manualProjectMapper.updateProjectState(projectId, DictConstants.PROJECT_TERMINATING, TimeUtil.getNowForMysql());
+        } else if (DictConstants.PROJECT_TYPE_AUTO_SUB.equals(type)) {
+            autoSubProjectMapper.updateProjectState(projectId, DictConstants.PROJECT_TERMINATING, TimeUtil.getNowForMysql());
+        }
         projectService.stopProject(projectId, type);
     }
 

simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/controller/NodeController.java

@@ -15,10 +15,6 @@ public class NodeController {
     @Resource
     private ProjectUtil projectUtil;
 
-
-    /**
-     * 修改任务状态
-     */
     @PostMapping("/resetParallelism")
     public void re() {
         projectUtil.resetNodeParallelism();

simulation-resource-server/src/main/java/com/css/simulation/resource/model/service/VehicleService.java

@@ -61,7 +61,9 @@ public class VehicleService {
     @SneakyThrows
     public VehiclePO saveVehicle(VehicleVO vehicleVO) {
         log.info("车辆 vo 为：" + vehicleVO);
-
+        if ("1".equals(vehicleVO.getSaveOrShare())){
+            VehicleUtil.jsonToList(vehicleVO);
+        }
         VehiclePO vehiclePO = ObjectUtil.vehicleVoToVehiclePo(vehicleVO);
         //车辆模型字段解析
         vehiclePO.setVehicleType(StringUtils.join(Arrays.asList(vehicleVO.getVehicleType()), ','));
@@ -623,6 +625,9 @@ public class VehicleService {
     }
 
     public String convertArrayToTableWithoutHead(List<List<String>> lines) {
+        if (CollectionUtil.isEmpty(lines)) {
+            return "";
+        }
         StringBuilder stringBuilder = new StringBuilder();
         for (int i = 1; i < lines.size(); i++) {
             List<String> words = lines.get(i);

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

@@ -47,7 +47,7 @@ public class SimulationProjectCtrl {
      */
     @RequestMapping("selectProject")
     @ResponseBody
-    public ResponseBodyVO selectProject(@RequestBody SimulationManualProjectParam param) {
+    public ResponseBodyVO<PageInfo<SimulationManualProjectVo>> selectProject(@RequestBody SimulationManualProjectParam param) {
         return service.selectProject(param);
     }
 

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

@@ -160,7 +160,6 @@ public class SimulationProjectServiceImpl implements SimulationProjectService {
 
         // 设置当前用户id
         param.setCreateUserId(AuthUtil.getCurrentUserId());
-
         if (!isEmpty(param.getCreateStartDate())) {
             String createStartDate = param.getCreateStartDate();
             Date startDate = getDate(createStartDate + " 00:00:00", 1);
@@ -1542,7 +1541,6 @@ public class SimulationProjectServiceImpl implements SimulationProjectService {
                 algorithmName = "算法平台已删除该算法";
             }
         } else {
-
             AlgorithmPO algorithmPO = simulationProjectMapper.selectAlgorithmById(algorithmId);
             if (algorithmPO != null && StringUtil.isNotEmpty(algorithmPO.getAlgorithmName())) {
                 algorithmName = algorithmPO.getAlgorithmName();

simulation-resource-server/src/main/java/com/css/simulation/resource/scene/service/ScenePackageService.java

@@ -319,6 +319,9 @@ public class ScenePackageService {
                 scoringRulesParam.setRulesId(vo.getPackageAndRules());
                 ScoringRulesPO syPo = scoringRulesMapper.queryScoringRules(scoringRulesParam);//私有
                 log.info("打分规则为：" + syPo);
+                if (syPo == null) {
+                    return new ResponseBodyVO<>(ResponseBodyVO.Response.SERVER_FAILURE, "该场景包关联的打分规则已被删除，分享失败。", "");
+                }
                 gyParam.setShare("1");
                 gyParam.setRuleName(syPo.getRuleName());
                 ScoringRulesPO gyPo = scoringRulesMapper.queryScoringRulesByRuleName(gyParam);