From 73ca802381bd76cc1a5bd608e4a1e5ef12de88a2 Mon Sep 17 00:00:00 2001
From: wuww <252740454@qq.com>
Date: 星期日, 04 五月 2025 20:46:46 +0800
Subject: [PATCH] 完成求解器对接~

---
 src/main/java/com/se/nsl/controller/SimuController.java |   59 +++++++++++++++++++++++++++++++++++++++++++++++++----------
 1 files changed, 49 insertions(+), 10 deletions(-)

diff --git a/src/main/java/com/se/nsl/controller/SimuController.java b/src/main/java/com/se/nsl/controller/SimuController.java
index f3cf371..3abe23e 100644
--- a/src/main/java/com/se/nsl/controller/SimuController.java
+++ b/src/main/java/com/se/nsl/controller/SimuController.java
@@ -1,18 +1,23 @@
 package com.se.nsl.controller;
 
+import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.se.nsl.domain.po.Simu;
+import com.se.nsl.domain.po.SimuData;
 import com.se.nsl.domain.vo.R;
+import com.se.nsl.domain.vo.SimuVo;
+import com.se.nsl.service.ResolveService;
 import com.se.nsl.service.SimuService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
+import java.util.List;
 
-@Api(tags = "2锛嶆帹婕旀ā鎷�")
+@Api(tags = "03锛嶆帹婕旀ā鎷�")
 @Slf4j
 @RestController
 @RequestMapping("/simu")
@@ -20,6 +25,9 @@
 public class SimuController extends BaseController {
     @Resource
     SimuService simuService;
+
+    @Resource
+    ResolveService resolveService;
 
     /**
      * 鍒嗛〉鏌ヨ鎺ㄦ紨妯℃嫙
@@ -30,13 +38,13 @@
      */
     @ApiOperation(value = "selectPage")
     @GetMapping("/selectPage")
-    public R<Object> selectPage(Simu simu, Integer pageNum, Integer pageSize) {
+    public R<Object> selectPage(SimuVo vo, Integer pageNum, Integer pageSize) {
         try {
             if (null == pageNum || pageNum < 1) pageNum = 1;
             if (null == pageSize || pageSize < 1) pageSize = 10;
             if (pageSize > 1000) pageSize = 1000;
 
-            IPage<Simu> paged = simuService.selectPage(simu, pageNum, pageSize);
+            IPage<Simu> paged = simuService.selectPage(vo, pageNum, pageSize);
             if (null == paged) {
                 return success(null, 0);
             }
@@ -55,7 +63,7 @@
      */
     @ApiOperation(value = "deleteByIds")
     @DeleteMapping("/deleteByIds")
-    public R<Object> deleteByIds(java.util.List<Integer> ids) {
+    public R<Object> deleteByIds(@RequestParam List<Integer> ids) {
         try {
             return success(simuService.deleteByIds(ids));
         } catch (Exception ex) {
@@ -70,10 +78,41 @@
      * @return 鏂板鎴愬姛鐨勮褰曟暟
      */
     @ApiOperation(value = "insert")
-    @PostMapping("/insert")
-    public R<Object> insert(Simu simu) {
+    @PostMapping(value = "/insert", produces = "application/json; charset=UTF-8")
+    public R<Object> insert(@RequestBody Simu simu) {
         try {
-            return success(simuService.insert(simu));
+            if (StringUtils.isEmpty(simu.getData())) return fail("data涓虹┖");
+
+            SimuData data = JSON.parseObject(simu.getData(), SimuData.class);
+            if (null == data) return fail("data鏁版嵁鏍煎紡(JSON)涓嶆纭�");
+
+            int rows = simuService.insert(simu);
+
+            return success(rows);
+        } catch (Exception ex) {
+            return fail(ex, null);
+        }
+    }
+
+    @ApiOperation(value = "start")
+    @GetMapping(value = "/start", produces = "application/json; charset=UTF-8")
+    public R<Object> start(Integer id) {
+        try {
+            if (null == id || id < 1) return fail("id涓虹┖");
+
+            Simu simu = simuService.selectById(id);
+            if (null == simu) return fail("鏂规鎵句笉鍒�");
+            if (StringUtils.isEmpty(simu.getData())) return fail("鏂规鏁版嵁(JSON)涓虹┖");
+
+            SimuData data = JSON.parseObject(simu.getData(), SimuData.class);
+            if (null == data) return fail("鏂规鏁版嵁鏍煎紡(JSON)涓嶆纭�");
+
+            //if (simu.getStatus() != 0) return fail("鏂规姝ｅ湪杩愯鎴栧凡瀹屾垚");
+            if (StringUtils.isEmpty(simu.getGeom())) return fail("鏂规鐨勫浘褰负绌�");
+
+            int rows = resolveService.start(simu);
+
+            return success("ok");
         } catch (Exception ex) {
             return fail(ex, null);
         }
@@ -86,8 +125,8 @@
      * @return 淇敼鎴愬姛鐨勮褰曟暟
      */
     @ApiOperation(value = "updateById")
-    @PutMapping("/updateById")
-    public R<Object> updateById(Simu simu) {
+    @PutMapping(value = "/updateById", produces = "application/json; charset=UTF-8")
+    public R<Object> updateById(@RequestBody Simu simu) {
         try {
             return success(simuService.updateById(simu));
         } catch (Exception ex) {

--
Gitblit v1.9.3