martin 3 роки тому
батько
коміт
766c674049

+ 24 - 0
api-common/src/main/java/api/common/pojo/po/system/SystemServerPO.java

@@ -0,0 +1,24 @@
+package api.common.pojo.po.system;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class SystemServerPO {
+
+    private String id;
+    private String serverId;
+    private String serverAddress;
+    private String serverType;
+    private String cpuUsage;
+    private String memoryUsage;
+    private String memoryAvailable;
+    private String diskUsage;
+    private String diskAvailable;
+    private String taskNumber;
+}

+ 24 - 0
api-common/src/main/java/api/common/pojo/vo/system/SystemServerVO.java

@@ -0,0 +1,24 @@
+package api.common.pojo.vo.system;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class SystemServerVO {
+
+    private String id;
+    private String serverId;
+    private String serverAddress;
+    private String serverType;
+    private String cpuUsage;
+    private String memoryUsage;
+    private String memoryAvailable;
+    private String diskUsage;
+    private String diskAvailable;
+    private String taskNumber;
+}

+ 17 - 8
simulation-resource-server/src/main/java/com/css/simulation/resource/scene/ctrl/HomePageController.java

@@ -1,13 +1,18 @@
 package com.css.simulation.resource.scene.ctrl;
 
+import api.common.pojo.common.PageVO;
 import api.common.pojo.common.ResponseBodyVO;
+import api.common.pojo.vo.system.SystemServerVO;
 import com.css.simulation.resource.algorithm.service.AlgorithmService;
-import com.css.simulation.resource.model.service.ConfigService;
 import com.css.simulation.resource.project.service.SimulationProjectService;
+import com.css.simulation.resource.scene.service.HomePageService;
 import com.css.simulation.resource.scene.service.SceneNaturalService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
 import java.util.Map;
@@ -105,9 +110,6 @@ public class HomePageController {
 
     /**
      * 项目运行状态统计-饼图
-     *
-     * @param
-     * @return
      */
     @RequestMapping("selectRunProjectByState")
     @ResponseBody
@@ -117,13 +119,20 @@ public class HomePageController {
 
     /**
      * 评测等级分布-饼图
-     *
-     * @param
-     * @return
      */
     @RequestMapping("selectEvaluationLevel")
     @ResponseBody
     public ResponseBodyVO selectEvaluationLevel() {
         return simulationProjectService.selectEvaluationLevel();
     }
+
+
+    /**
+     * 评测等级分布-饼图
+     */
+    @PostMapping("selectServerList")
+    @ResponseBody
+    public ResponseBodyVO<SystemServerVO> selectServerList(PageVO pageVO) {
+        return HomePageService.selectServerList(pageVO);
+    }
 }

+ 17 - 0
simulation-resource-server/src/main/java/com/css/simulation/resource/scene/service/HomePageService.java

@@ -0,0 +1,17 @@
+package com.css.simulation.resource.scene.service;
+
+import api.common.pojo.common.PageVO;
+import api.common.pojo.common.ResponseBodyVO;
+import api.common.pojo.vo.system.SystemServerVO;
+import com.github.pagehelper.Page;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+public class HomePageService {
+    public static ResponseBodyVO<SystemServerVO> selectServerList(PageVO pageVO) {
+        Page<List<SystemServerVO>> page = new Page<>();
+        return null;
+    }
+}