首页最大并行度

simulation-resource-server/src/main/java/com/css/simulation/resource/home/ctrl/HomePageCtrl.java

@@ -39,16 +39,20 @@ public class HomePageCtrl {
     @Autowired
     ClusterService clusterService;
 
-    //首页概况汇总方法
+
+    /**
+     * 首页 -- 系统监控 -- 数据概览
+     * @return
+     */
     @PostMapping("/queryAllNum")
     @ResponseBody
     public ResponseBodyVO<Map<String,Integer>> queryAllNum() {
 
-        Map<String,Integer> map = algorithmService.selectDetailsBySy();//算法文件数量
-        map.put("ConfigTotal", configService.getConfigTotal());//车辆配置数量
-        map.put("SceneNum", sceneNaturalService.querySceneNumBySy());//场景数量
-        map.put("maxConcurrency", clusterService.getLicenseNum());//最大并发数量
-        map.put("currentConcurrency", homePageService.getRuningTask());//当前并发数量
+        Map<String,Integer> map = algorithmService.selectDetailsBySy();     //算法文件数量
+        map.put("SceneNum", sceneNaturalService.querySceneNumBySy());       //场景数量
+        map.put("ConfigTotal", configService.getConfigTotal());             //车辆配置数量
+        map.put("maxConcurrency", clusterService.getLicenseNum());          //最大并发数量
+        map.put("currentConcurrency", homePageService.getRunningTask());    //当前并发数量
         return new ResponseBodyVO<>(ResponseBodyVO.Response.SUCCESS, map);
     }
 

simulation-resource-server/src/main/java/com/css/simulation/resource/home/mapper/HomePageMapper.java

@@ -12,16 +12,16 @@ import java.util.Map;
 /**
  * create table if not exists simulation.system_server
  * (
- * 	id varchar(32) null,
- * 	server_id varchar(64) null,
- * 	server_address varchar(32) null,
- * 	server_type varchar(32) null,
- * 	cpu_useage varchar(32) null,
- * 	memory_useage varchar(32) null,
- * 	memory_available varchar(32) null comment '剩余内存，单位GB',
- * 	disk_usage varchar(32) null,
- * 	disk_abailable varchar(32) null comment '剩余磁盘，单位GB',
- * 	task_number varchar(32) null comment '执行任务数量'
+ * id varchar(32) null,
+ * server_id varchar(64) null,
+ * server_address varchar(32) null,
+ * server_type varchar(32) null,
+ * cpu_useage varchar(32) null,
+ * memory_useage varchar(32) null,
+ * memory_available varchar(32) null comment '剩余内存，单位GB',
+ * disk_usage varchar(32) null,
+ * disk_abailable varchar(32) null comment '剩余磁盘，单位GB',
+ * task_number varchar(32) null comment '执行任务数量'
  * )
  * comment '服务器表';
  */
@@ -73,5 +73,14 @@ public interface HomePageMapper {
 
     List<LineChartVO> selectRunProjectChart(Map<String, String> param);
 
-    Integer getRuningTask(@Param("currentUserId")String currentUserId);
+    @Select("select *\n" +
+            "from simulation_manual_project_task smpt\n" +
+            "         left join simulation_manual_project smp on smpt.p_id = smp.id\n" +
+            "         left join simulation_automatic_subproject sas on smpt.p_id = sas.id\n" +
+            "where smpt.is_deleted = '0'\n" +
+            "  and (smp.is_deleted = '0' or sas.is_deleted = '0')\n" +
+            "  and (smp.now_run_state = '20' or sas.now_run_state = '20')\n" +
+            "  and smpt.run_state in ('Pending', 'Running', 'PendingAnalysis', 'Analysing')\n" +
+            "  and create_user_id = #{currentUserId}")
+    Integer getRunningTask(@Param("currentUserId") String currentUserId);
 }

simulation-resource-server/src/main/java/com/css/simulation/resource/home/service/HomePageService.java

@@ -141,7 +141,7 @@ public class HomePageService {
         return list;
     }
 
-    public Integer getRuningTask() {
-        return homePageMapper.getRuningTask(AuthUtil.getCurrentUserId());
+    public Integer getRunningTask() {
+        return homePageMapper.getRunningTask(AuthUtil.getCurrentUserId());
     }
 }

simulation-resource-server/src/main/resources/mapper/home/HomePageMapper.xml

@@ -27,14 +27,4 @@
         ORDER BY toDate ASC
     </select>
 
-    <select id="getRuningTask" parameterType="java.lang.String" resultType="java.lang.Integer">
-        select
-          COUNT(id) as num
-        FROM simulation_manual_project_task
-        WHERE (run_state = 'Pending'
-          OR run_state = 'Running'
-          OR run_state = 'PendingAnalysis'
-          OR run_state = 'Analysing')
-          and create_user_id = #{currentUserId,jdbcType=VARCHAR}
-    </select>
 </mapper>