项目自动运行次数过滤掉已删除的子项目

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

@@ -3,11 +3,15 @@ package com.css.simulation.resource.project.ctrl;
 import api.common.pojo.common.ResponseBodyVO;
 import api.common.pojo.param.project.DictParam;
 import api.common.pojo.param.project.SimulationManualProjectParam;
+import api.common.pojo.vo.project.SimulationManualProjectVo;
 import com.css.simulation.resource.project.service.SimulationProjectService;
 import com.css.simulation.resource.system.service.ClusterService;
+import com.github.pagehelper.PageInfo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
 
 /**
  * 工作台模块--项目运行
@@ -276,7 +280,7 @@ public class SimulationProjectCtrl {
      */
     @RequestMapping("selectAutomaticProject")
     @ResponseBody
-    public ResponseBodyVO selectAutomaticProject(@RequestBody SimulationManualProjectParam param) {
+    public ResponseBodyVO<PageInfo<SimulationManualProjectVo>> selectAutomaticProject(@RequestBody SimulationManualProjectParam param) {
         return service.selectAutomaticProject(param);
     }
 

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

@@ -3924,7 +3924,7 @@ public class SimulationProjectServiceImpl implements SimulationProjectService {
     }
 
     @Override
-    public ResponseBodyVO selectAutomaticProject(SimulationManualProjectParam param) {
+    public ResponseBodyVO<PageInfo<SimulationManualProjectVo>> selectAutomaticProject(SimulationManualProjectParam param) {
 
         //当前用户id
         param.setCreateUserId(AuthUtil.getCurrentUserId());
@@ -3933,7 +3933,7 @@ public class SimulationProjectServiceImpl implements SimulationProjectService {
             String createStartDate = param.getCreateStartDate();
             Date startDate = getDate(createStartDate + " 00:00:00", 1);
             if (startDate == null) {
-                return new ResponseBodyVO(ResponseBodyVO.Response.CLIENT_FAILURE);
+                return new ResponseBodyVO<>(ResponseBodyVO.Response.CLIENT_FAILURE);
             }
             param.setCreateTimeStart(startDate);
         }
@@ -3941,20 +3941,20 @@ public class SimulationProjectServiceImpl implements SimulationProjectService {
             String createEndDate = param.getCreateEndDate();
             Date endDate = getDate(createEndDate + " 23:59:59", 1);
             if (endDate == null) {
-                return new ResponseBodyVO(ResponseBodyVO.Response.CLIENT_FAILURE);
+                return new ResponseBodyVO<>(ResponseBodyVO.Response.CLIENT_FAILURE);
             }
             param.setCreateTimeEnd(endDate);
         }
 
         setPage(param.getCurrentPage() == null ? 1 : param.getCurrentPage(), param.getPageSize() == null ? 10 : param.getPageSize());
-        List<SimulationManualProjectVo> vos = simulationAutomaticProjectMapper.selecAutomatictProjectList(param);
-        PageInfo<SimulationManualProjectVo> pageInfo = new PageInfo(vos);
+        List<SimulationManualProjectVo> vos = simulationAutomaticProjectMapper.selectAutomaticProjectList(param);
+        PageInfo<SimulationManualProjectVo> pageInfo = new PageInfo<>(vos);
 
         for (SimulationManualProjectVo p : pageInfo.getList()) {
             convertPoToVo(p, true);
         }
 
-        return new ResponseBodyVO(ResponseBodyVO.Response.SUCCESS, pageInfo);
+        return new ResponseBodyVO<>(ResponseBodyVO.Response.SUCCESS, pageInfo);
 
     }
 

simulation-resource-server/src/main/java/com/css/simulation/resource/project/mapper/SimulationAutomaticProjectMapper.java

@@ -20,7 +20,7 @@ public interface SimulationAutomaticProjectMapper {
 
      SimulationAutomaticProjectPo selectLastProjectId(Integer nowRq);
 
-     List<SimulationManualProjectVo> selecAutomatictProjectList(SimulationManualProjectParam param);
+     List<SimulationManualProjectVo> selectAutomaticProjectList(SimulationManualProjectParam param);
 
      int add(SimulationAutomaticProjectPo po);
 

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

@@ -2,6 +2,8 @@ package com.css.simulation.resource.project.service;
 
 import api.common.pojo.common.ResponseBodyVO;
 import api.common.pojo.param.project.SimulationManualProjectParam;
+import api.common.pojo.vo.project.SimulationManualProjectVo;
+import com.github.pagehelper.PageInfo;
 
 
 public interface SimulationProjectService {
@@ -59,7 +61,7 @@ public interface SimulationProjectService {
 
     ResponseBodyVO updateAutomaticRunState(SimulationManualProjectParam param);
 
-    ResponseBodyVO selectAutomaticProject(SimulationManualProjectParam param);
+    ResponseBodyVO<PageInfo<SimulationManualProjectVo>> selectAutomaticProject(SimulationManualProjectParam param);
 
     ResponseBodyVO createAutomaticSubProject(SimulationManualProjectParam param);
 

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

@@ -29,8 +29,34 @@
     </select>
 
     <!--查询自动项目列表-->
-    <select id="selecAutomatictProjectList" parameterType="api.common.pojo.param.project.SimulationManualProjectParam" resultType="api.common.pojo.vo.project.SimulationManualProjectVo">
-        select * from simulation_automatic_project
+    <select id="selectAutomaticProjectList" parameterType="api.common.pojo.param.project.SimulationManualProjectParam" resultType="api.common.pojo.vo.project.SimulationManualProjectVo">
+        select id,
+        project_date,
+        project_num,
+        project_id,
+        project_name,
+        project_describe,
+        algorithm,
+        algorithm_type,
+        vehicle,
+        scene,
+        operation_cycle,
+        parallelism,
+        rule_view,
+        max_simulation_time,
+        is_choice_gpu,
+        (select count(1)
+        from simulation_automatic_subproject sas
+        where sas.is_deleted = '0'
+        and sas.parent_id = '9d0c6879433f48d3903cb414ad1930fe') automatic_run_times,
+        last_run_time,
+        automatic_run_state,
+        create_time,
+        create_user_id,
+        modify_time,
+        modify_user_id,
+        is_deleted
+        from simulation_automatic_project
         <where>
             is_deleted = '0'
             <if test="projectId != null and projectId != ''">