分享覆盖

simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/manager/TaskManager.java

@@ -269,7 +269,6 @@ public class TaskManager {
                 try {
                     String runState = taskOfLeaf.getRunState();
                     log.info("TaskManager--score 任务 " + task2Id + " 的运行状态为：" + runState);
-                    // 加上 running 时因为事务原因，初期没有考虑到
                     if (DictConstants.TASK_ANALYSIS.equals(runState)) {
                         taskMapper.updateSuccessStateWithStopTime(task2Id, DictConstants.TASK_ANALYSING, TimeUtil.getNowForMysql());
                         // 计算每个任务的得分
@@ -337,7 +336,7 @@ public class TaskManager {
                 if (scoreTemp == null) {   // 失败状态的任务是没有分数的，计作 0 分。
                     errorSceneNumber++;
                     scoreTemp = 0.0;
-                } else if (!task.getScored()) {  // 如果评分失败，也计作 0 分
+                } else if (task.getScored() == null || !task.getScored()) {  // 如果评分失败，也计作 0 分
                     notScoredSceneNumber++;
                     scoreTemp = 0.0;
                 } else if (scoreTemp < 100.0) {

simulation-resource-server/src/main/java/com/css/simulation/resource/algorithm/mapper/AlgorithmMapper.java

@@ -27,7 +27,7 @@ public interface AlgorithmMapper {
 
     @Select("        select a.is_deleted\n" +
             "        from `algorithm` a \n" +
-            "        where a.id = #{id,jdbcType=VARCHAR}")
+            "        where a.id = #{algorithmId,jdbcType=VARCHAR}")
     String selectIsDeletedById(@Param("algorithmId") String algorithmId);
 
     List<AlgorithmPO> selectAlgorithmName(AlgorithmParameter param);

simulation-resource-server/src/main/java/com/css/simulation/resource/model/ctrl/CameraCtrl.java

@@ -83,12 +83,12 @@ public class CameraCtrl {
     @PreAuthorize("@AuthorityCheck.admin()")
     public ResponseBodyVO<CameraPO> shareCamera(@RequestBody CameraPO cameraPO){
         if(ObjectUtil.isNull(cameraPO)){
-            return new ResponseBodyVO(false, 500, "参数必传！",null);
+            return new ResponseBodyVO<>(false, 500, "参数必传！",null);
         }
-        ResponseBodyVO<CameraPO> response = new ResponseBodyVO<CameraPO>(ResponseBodyVO.Response.SUCCESS);
+        ResponseBodyVO<CameraPO> response = new ResponseBodyVO<>(ResponseBodyVO.Response.SUCCESS);
         CameraPO po = cameraService.shareCamera(cameraPO);
         if(ObjectUtil.isNull(po.getId())){
-            return new ResponseBodyVO(false, 500, "传感器名称重复！",null);
+            return new ResponseBodyVO<>(false, 500, "传感器名称重复！",null);
         }
         response.setInfo(po);
         return response;

simulation-resource-server/src/main/java/com/css/simulation/resource/model/ctrl/VehicleCtrl.java

@@ -83,12 +83,12 @@ public class VehicleCtrl {
     @PreAuthorize("@AuthorityCheck.admin()")
     public ResponseBodyVO<VehiclePO> shareVehicle(@RequestBody VehicleVO vehicleVO){
         if(ObjectUtil.isNull(vehicleVO)){
-            return new ResponseBodyVO(false, 500, "参数必传！",null);
+            return new ResponseBodyVO<>(false, 500, "参数必传！",null);
         }
-        ResponseBodyVO<VehiclePO> response = new ResponseBodyVO<VehiclePO>(ResponseBodyVO.Response.SUCCESS);
+        ResponseBodyVO<VehiclePO> response = new ResponseBodyVO<>(ResponseBodyVO.Response.SUCCESS);
         VehiclePO po = vehicleService.shareVehicle(vehicleVO);
         if(ObjectUtil.isNull(po.getId())){
-            return new ResponseBodyVO(false, 500, "车辆名称重复！",null);
+            return new ResponseBodyVO<>(false, 500, "车辆名称重复！",null);
         }
         response.setInfo(po);
         return response;

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

@@ -80,6 +80,7 @@ public class CameraService {
         if(ObjectUtil.isNotNull(list)){
             String currentUserId = AuthUtil.getCurrentUserId();
             Timestamp currentTime = TimeUtil.getNowForMysql();
+            cameraPO.setId(list.get(0).getId());
             cameraPO.setModifyUserId(currentUserId);
             cameraPO.setModifyTime(currentTime);
             cameraMapper.update(cameraPO);

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

@@ -74,6 +74,7 @@ public class GpsService {
         if(ObjectUtil.isNotNull(list)){
             String currentUserId = AuthUtil.getCurrentUserId();
             Timestamp currentTime = TimeUtil.getNowForMysql();
+            gpsPO.setId(list.get(0).getId());
             gpsPO.setModifyUserId(currentUserId);
             gpsPO.setModifyTime(currentTime);
             gpsMapper.update(gpsPO);

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

@@ -79,6 +79,7 @@ public class LidarService {
         if(ObjectUtil.isNotNull(list)){
             String currentUserId = AuthUtil.getCurrentUserId();
             Timestamp currentTime = TimeUtil.getNowForMysql();
+            lidarPO.setId(list.get(0).getId());
             lidarPO.setModifyUserId(currentUserId);
             lidarPO.setModifyTime(currentTime);
             lidarMapper.update(lidarPO);

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

@@ -81,6 +81,7 @@ public class OgtService {
         if(ObjectUtil.isNotNull(list)){
             String currentUserId = AuthUtil.getCurrentUserId();
             Timestamp currentTime = TimeUtil.getNowForMysql();
+            ogtPO.setId(list.get(0).getId());
             ogtPO.setModifyUserId(currentUserId);
             ogtPO.setModifyTime(currentTime);
             ogtMapper.update(ogtPO);

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

@@ -50,27 +50,27 @@ public class VehicleService {
 
     public VehiclePO saveVehicle(VehicleVO vehicleVO) {
         VehiclePO vehiclePO = new VehiclePO();
-        ObjectUtil.voToPo(vehicleVO,vehiclePO);
+        ObjectUtil.voToPo(vehicleVO, vehiclePO);
         //车辆模型字段解析
         String[] vehicleType = vehicleVO.getVehicleType();
-        String vehicleTypeStr = StringUtils.join(Arrays.asList(vehicleType),',');
+        String vehicleTypeStr = StringUtils.join(Arrays.asList(vehicleType), ',');
         vehiclePO.setVehicleType(vehicleTypeStr);
         //常规字段赋值
         PoUtil.initAddPo(vehiclePO);
         vehiclePO.setShare(DictConstants.NO);//私有
         //名称校验
         List<VehicleVO> list = vehicleMapper.checkVehicleName(vehiclePO);
-        if(ObjectUtil.isNotNull(list)){
+        if (ObjectUtil.isNotNull(list)) {
             vehiclePO.setId(null);
             return vehiclePO;
         }
         String id = vehiclePO.getId();
-        if(ObjectUtil.isNull(id)){//新增
+        if (ObjectUtil.isNull(id)) {//新增
             vehiclePO.setId(StringUtil.getRandomUUID());
             vehiclePO.setVehicleCode(StringUtil.getRandomCode());
             vehicleMapper.insert(vehiclePO);
             LogUtil.insert();
-        }else{//修改
+        } else {//修改
             vehicleMapper.update(vehiclePO);
             LogUtil.update();
         }
@@ -84,14 +84,16 @@ public class VehicleService {
         vehiclePO.setCreateUserId(null);
         //名称校验
         List<VehicleVO> list = vehicleMapper.checkVehicleName(vehiclePO);
-        if(ObjectUtil.isNotNull(list)){
+        if (ObjectUtil.isNotNull(list)) { // 覆盖
+            String id = list.get(0).getId();
+            vehiclePO.setId(id);
             String currentUserId = AuthUtil.getCurrentUserId();
             Timestamp currentTime = TimeUtil.getNowForMysql();
             vehiclePO.setModifyUserId(currentUserId);
             vehiclePO.setModifyTime(currentTime);
             vehicleMapper.update(vehiclePO);
             LogUtil.update();
-        }else {
+        } else { // 新增
             //常规字段赋值
             PoUtil.initAddPo(vehiclePO);
             vehiclePO.setId(StringUtil.getRandomUUID());

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

@@ -3705,7 +3705,7 @@ public class SimulationProjectServiceImpl implements SimulationProjectService {
         Optional.ofNullable(automaticRunState).orElseThrow(() -> new RuntimeException("自动运行状态不能为空。"));
 
         //1 修改父项目停用状态
-        simulationAutomaticProjectMapper.updateAutomaticRunState(param);
+
         SimulationAutomaticProjectPo po = simulationAutomaticProjectMapper.selectById(id);  // 查询父项目信息
         String algorithmId = po.getAlgorithm();
         if ("0".equals(param.getAutomaticRunState())) { // 启动
@@ -3731,12 +3731,14 @@ public class SimulationProjectServiceImpl implements SimulationProjectService {
                 }
             }
             if (isRun) { //启动运行
+                simulationAutomaticProjectMapper.updateAutomaticRunState(param);
                 AlgorithmParameter algorithmParam = new AlgorithmParameter();
                 algorithmParam.setId(algorithmId);
                 algorithmParam.setGitVersion(currentGitVersion);
                 runProject(algorithmParam, param, po);
             }
         } else if ("1".equals(param.getAutomaticRunState())) {  // 停止
+            simulationAutomaticProjectMapper.updateAutomaticRunState(param);
             //推送定时请求
             projectTaskStop(po);
         }