From fe487bbf0cd12e1f424afc99c461f6c1907e62f5 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期三, 30 十月 2024 09:59:24 +0800
Subject: [PATCH] 修改 创建 方法

---
 src/main/java/com/se/simu/controller/SimuController.java |   97 ++++++++++++++++++++++++++++++++++++++++--------
 1 files changed, 81 insertions(+), 16 deletions(-)

diff --git a/src/main/java/com/se/simu/controller/SimuController.java b/src/main/java/com/se/simu/controller/SimuController.java
index 8ee0441..265cb39 100644
--- a/src/main/java/com/se/simu/controller/SimuController.java
+++ b/src/main/java/com/se/simu/controller/SimuController.java
@@ -1,6 +1,9 @@
 package com.se.simu.controller;
 
+import cn.hutool.json.JSONArray;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.se.simu.domain.dto.GeDb;
+import com.se.simu.domain.dto.GeLayer;
 import com.se.simu.domain.po.DataPo;
 import com.se.simu.domain.po.SimuPo;
 import com.se.simu.domain.vo.CreateSimuVo;
@@ -10,6 +13,7 @@
 import com.se.simu.service.GedbService;
 import com.se.simu.service.ResultService;
 import com.se.simu.service.SimuService;
+import com.se.simu.service.UwService;
 import io.swagger.annotations.*;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.*;
@@ -33,13 +37,16 @@
 @SuppressWarnings("ALL")
 public class SimuController extends BaseController {
     @Resource
+    UwService uwService;
+
+    @Resource
     GedbService gedbService;
 
     @Resource
-    ResultService resultService;
+    SimuService simuService;
 
     @Resource
-    SimuService simuService;
+    ResultService resultService;
 
     private final List<String> FLOOD_TYPE = new ArrayList<>(Arrays.asList("娌欒", "闃叉按鏉�"));
 
@@ -58,9 +65,6 @@
             }
             if (null == vo.getPid() || vo.getPid() < 0) {
                 vo.setPid(0);
-            }
-            if (StringHelper.isEmpty(vo.getName())) {
-                vo.setName(StringHelper.YMDHMS2_FORMAT.format(new Date()));
             }
             if (null == vo.getNum() || vo.getNum() < 1) {
                 vo.setNum(simuService.getMaxId() + 1);
@@ -145,14 +149,54 @@
         }
     }
 
-    @ApiOperation(value = "Test *")
-    @GetMapping("/test")
-    public R<Object> test() {
-        try {
-            //DataPo data = new DataPo("20240913", "20240913", "20240913", 116.64388473935195, 39.884315914604464, 116.64754729082588, 39.887069143903496, 50.0, 25);
-            //Object rs = gedbService.test(data);
+    @ApiOperation(value = "褰撳墠鏃堕棿 *")
+    @GetMapping("/getTime")
+    public Object getTime() {
+        return System.currentTimeMillis();
+    }
 
-            Object rs = resultService.test();
+    @ApiOperation(value = "testCallExe *")
+    @GetMapping("/testCallExe")
+    public R<Object> testCallExe() {
+        try {
+            DataPo data = new DataPo();
+            data.setInPath("20241010095328");
+
+            String str = uwService.callExe(data);
+
+            return success(str);
+        } catch (Exception ex) {
+            return fail(ex, null);
+        }
+    }
+
+    @ApiOperation(value = "testResuslt *")
+    @GetMapping("/testResuslt")
+    public R<Object> testResuslt() {
+        try {
+            DataPo data = new DataPo();
+            data.setEpsg(4548);
+            data.setInPath("20241010095328");
+            data.setStartTime(StringHelper.YMDHMS_FORMAT.parse("2024-09-30 00:00:00"));
+
+            resultService.process(data);
+
+            return success("ok");
+        } catch (Exception ex) {
+            return fail(ex, null);
+        }
+    }
+
+    @ApiOperation(value = "testSww2Tif *")
+    @GetMapping("/testSww2Tif")
+    public R<Object> testSww2Tif() {
+        try {
+            DataPo data = new DataPo();
+            data.setEpsg(4548);
+            data.setInPath("20241010095328");
+            data.setStartTime(StringHelper.YMDHMS_FORMAT.parse("2024-09-30 00:00:00"));
+
+            Object rs = uwService.copeDrainFiles(data);
 
             return success(rs);
         } catch (Exception ex) {
@@ -160,9 +204,30 @@
         }
     }
 
-    @ApiOperation(value = "褰撳墠鏃堕棿 *")
-    @GetMapping("/getTime")
-    public Object getTime() {
-        return System.currentTimeMillis();
+    /**
+     * 浣跨敤绌洪棿鑼冨洿鏌ヨ 绠＄偣,绠＄嚎,寤虹瓚鐗� 3涓浘灞傦紝涓旀瘡涓浘灞傜殑鏁伴噺澶т簬0锛岃繑鍥� true銆�
+     */
+    @ApiOperation(value = "闄嶆按鑼冨洿鏍￠獙")
+    @GetMapping("/rangeVerify")
+    public R<Object> rangeVerify(@RequestParam @ApiParam("鏈�灏廥") double minx,
+                                 @RequestParam @ApiParam("鏈�灏弝") double miny,
+                                 @RequestParam @ApiParam("鏈�澶") double maxx,
+                                 @RequestParam @ApiParam("鏈�澶") double maxy) {
+        try {
+            DataPo data = new DataPo();
+            data.setMinx(minx);
+            data.setMiny(miny);
+            data.setMaxx(maxx);
+            data.setMaxy(maxy);
+            data.setEpsg(4326);
+
+            String token = gedbService.getToken();
+            GeDb db = gedbService.connectGedb(token, data);
+            List<GeLayer> layers = gedbService.getLayers(token, db);
+
+            return success(gedbService.queryBboxCount(token, db, layers));
+        } catch (Exception ex) {
+            return fail(ex, false);
+        }
     }
 }

--
Gitblit v1.9.3