From 18f1c98549e29323ff1a89ef3ed670ffb9ed0764 Mon Sep 17 00:00:00 2001
From: dcb <dcb@163.com>
Date: 星期三, 14 五月 2025 09:28:33 +0800
Subject: [PATCH] 修复转png时rgb值溢出问题
---
src/main/java/com/se/nsl/controller/SimuController.java | 82 ++++++++++++++++++++++++++++++++++++-----
1 files changed, 72 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..0028a67 100644
--- a/src/main/java/com/se/nsl/controller/SimuController.java
+++ b/src/main/java/com/se/nsl/controller/SimuController.java
@@ -1,18 +1,25 @@
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.gdal.ogr.Geometry;
+import org.gdal.ogr.ogr;
+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 +27,9 @@
public class SimuController extends BaseController {
@Resource
SimuService simuService;
+
+ @Resource
+ ResolveService resolveService;
/**
* 鍒嗛〉鏌ヨ鎺ㄦ紨妯℃嫙
@@ -30,13 +40,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 +65,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 +80,50 @@
* @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)涓嶆纭�");
+ if (StringUtils.isEmpty(simu.getGeom())) return fail("geom瀛楃涓蹭笉鏄疻KT鏍煎紡");
+
+ Geometry geom = Geometry.CreateFromWkt(simu.getGeom());
+ if (!(geom.GetGeometryType() == ogr.wkbMultiPolygon || geom.GetGeometryType() == ogr.wkbPolygon))
+ return fail("geom瀵硅薄涓嶆槸澶氳竟褰�");
+
+ int rows = simuService.insert(simu);
+ if (rows > 0 && (null == data.getRainfalls() || data.getRainfalls().size() < 2)) {
+ resolveService.createRainfall(simu);
+ simuService.updateById(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,9 +136,21 @@
* @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 {
+ if (StringUtils.isEmpty(simu.getData())) return fail("data涓虹┖");
+
+ SimuData data = JSON.parseObject(simu.getData(), SimuData.class);
+ if (null == data) return fail("data鏁版嵁鏍煎紡(JSON)涓嶆纭�");
+ if (StringUtils.isEmpty(simu.getGeom())) return fail("geom瀛楃涓蹭笉鏄疻KT鏍煎紡");
+
+ Geometry geom = Geometry.CreateFromWkt(simu.getGeom());
+ if (!(geom.GetGeometryType() == ogr.wkbMultiPolygon || geom.GetGeometryType() == ogr.wkbPolygon))
+ return fail("geom瀵硅薄涓嶆槸澶氳竟褰�");
+
+ if (null == data.getRainfalls() || data.getRainfalls().size() < 2) resolveService.createRainfall(simu);
+
return success(simuService.updateById(simu));
} catch (Exception ex) {
return fail(ex, null);
--
Gitblit v1.9.3