自动运行次数统一

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

@@ -3,18 +3,19 @@ package com.css.simulation.resource.scheduler.controller;
 
 import api.common.pojo.common.ResponseBodyVO;
 import com.css.simulation.resource.scheduler.service.AlgorithmService;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.cloud.context.config.annotation.RefreshScope;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.annotation.Resource;
+
 @RefreshScope
 @RestController
 @RequestMapping("/algorithm")
 public class AlgorithmController {
 
-    @Autowired
+    @Resource
     AlgorithmService algorithmService;
 
 

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

@@ -3815,7 +3815,7 @@ public class SimulationProjectServiceImpl implements SimulationProjectService {
     @Override
     public ResponseBodyVO<PageInfo<SimulationManualProjectVo>> selectAutomaticProject(SimulationManualProjectParam param) {
 
-        //当前用户id
+        //1 获取当前用户id
         param.setCreateUserId(AuthUtil.getCurrentUserId());
 
         if (!isEmpty(param.getCreateStartDate())) {

simulation-resource-server/src/main/resources/mapper/project/SimulationAutomaticProjectMapper.xml

@@ -36,7 +36,7 @@
         project_id,
         project_name,
         project_describe,
-        algorithm,
+        sap.algorithm,
         algorithm_type,
         vehicle,
         scene,
@@ -48,7 +48,7 @@
         (select count(1)
         from simulation_automatic_subproject sas
         where sas.is_deleted = '0'
-        and sas.parent_id = '9d0c6879433f48d3903cb414ad1930fe') automatic_run_times,
+        and sas.parent_id = sap.id) automatic_run_times,
         last_run_time,
         automatic_run_state,
         create_time,
@@ -56,7 +56,7 @@
         modify_time,
         modify_user_id,
         is_deleted
-        from simulation_automatic_project
+        from simulation_automatic_project sap
         <where>
             is_deleted = '0'
             <if test="projectId != null and projectId != ''">