From ca8d3861b4e9a28beead77e81ecfa23d15d5eb5f Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期日, 29 九月 2024 09:36:42 +0800
Subject: [PATCH] 获取CPU核心数

---
 src/main/java/com/se/simu/controller/SimuController.java |   31 ++++++++++++++++++++++---------
 1 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/src/main/java/com/se/simu/controller/SimuController.java b/src/main/java/com/se/simu/controller/SimuController.java
index a5fa545..4d6fda0 100644
--- a/src/main/java/com/se/simu/controller/SimuController.java
+++ b/src/main/java/com/se/simu/controller/SimuController.java
@@ -1,6 +1,7 @@
 package com.se.simu.controller;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.se.simu.domain.po.DataPo;
 import com.se.simu.domain.po.SimuPo;
 import com.se.simu.domain.vo.CreateSimuVo;
 import com.se.simu.domain.vo.R;
@@ -51,8 +52,8 @@
             if (null == vo.getMinx() || null == vo.getMiny() || null == vo.getMaxx() || null == vo.getMaxy()) {
                 return fail("閫夋嫨鑼冨洿涓嶈兘涓虹┖", false);
             }
-            if (null == vo.getIsFlood() || vo.getIsFlood() < 0) {
-                vo.setIsFlood(0);
+            if (null == vo.getPid() || vo.getPid() < 0) {
+                vo.setPid(0);
             }
             if (StringHelper.isEmpty(vo.getName())) {
                 vo.setName(StringHelper.YMDHMS2_FORMAT.format(new Date()));
@@ -60,8 +61,14 @@
             if (null == vo.getNum() || vo.getNum() < 1) {
                 vo.setNum(simuService.getMaxId() + 1);
             }
-            if (vo.getIsFlood() > 0) {
-                vo.setIsFlood(1);
+            if (null == vo.getPid() || vo.getPid() < 0) {
+                vo.setPid(0);
+            }
+            if (vo.getPid() > 0) {
+                SimuPo pp = simuService.getSimuByPid(vo.getPid());
+                if (null == pp) {
+                    return fail("pid涓嶅瓨鍦�");
+                }
                 if (null == vo.getFloodStart() || vo.getFloodStart() < 1 || vo.getFloodStart() > vo.getDuration() * 60) {
                     return fail("闃叉睕寮�濮嬫椂闂翠笉鑳戒负绌猴紝涓斿彇鍊煎湪1~" + (vo.getDuration() * 60) + "涔嬮棿");
                 }
@@ -131,18 +138,24 @@
         }
     }
 
-    @ApiOperation(value = "* Test *")
+    @ApiOperation(value = "Test *")
     @GetMapping("/test")
-    public R<Object> test(@ApiParam("浠跨湡瑙嗗浘绫�") SimuVo vo) {
+    public R<Object> test() {
         try {
             // 469538.6536261877,4416744.922022615,469853.14714664617,4417049.378602433
-            String bbox = "116.64388473935195,39.884315914604464,116.64754729082588,39.887069143903496";
-            String taskName = "20240913";
-            Object rs = gedbService.test(bbox, taskName);
+            //String bbox = "116.64388473935195,39.884315914604464,116.64754729082588,39.887069143903496";
+            DataPo data = new DataPo("20240913", "20240913", "20240913", 116.64388473935195, 39.884315914604464, 116.64754729082588, 39.887069143903496, 50.0, 25);
+            Object rs = gedbService.test(data);
 
             return success(rs);
         } catch (Exception ex) {
             return fail(ex, null);
         }
     }
+
+    @ApiOperation(value = "褰撳墠鏃堕棿 *")
+    @GetMapping("/getTime")
+    public Object getTime() {
+        return System.currentTimeMillis();
+    }
 }

--
Gitblit v1.9.3