From 4d48da87faccd9c11fe644e92edd54ca0e167b69 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Sat, 09 Jul 2022 09:47:40 +0800
Subject: [PATCH] 农场，地块列表查询新增，不分页
---
src/main/java/org/springblade/modules/farm/controller/FarmController.java | 22 +++++++++++++++++++++-
1 files changed, 21 insertions(+), 1 deletions(-)
diff --git a/src/main/java/org/springblade/modules/farm/controller/FarmController.java b/src/main/java/org/springblade/modules/farm/controller/FarmController.java
index 3cc4a78..9538d35 100644
--- a/src/main/java/org/springblade/modules/farm/controller/FarmController.java
+++ b/src/main/java/org/springblade/modules/farm/controller/FarmController.java
@@ -34,6 +34,7 @@
import javax.validation.Valid;
import java.util.Date;
import java.util.HashMap;
+import java.util.List;
import java.util.Map;
/**
@@ -92,6 +93,17 @@
}
/**
+ * 自定义查询所有农场信息（不分页）
+ * @param farm
+ * @return
+ */
+ @GetMapping("/getFarmList")
+ public R<List<FarmVO>> getFarmList(FarmVO farm) {
+ List<FarmVO> farmList = farmService.getFarmList(farm);
+ return R.data(farmList);
+ }
+
+ /**
* 新增
*/
@PostMapping("/save")
@@ -100,7 +112,15 @@
public R save(@Valid @RequestBody Farm farm) {
farm.setCreateTime(new Date());
farm.setUpdateTime(new Date());
- return R.status(farmService.save(farm));
+ //坐标转换
+ if (null != farm.getPosition() && !farm.getPosition().equals("")) {
+ //替换逗号为空格
+ String sNull = farm.getPosition().replaceAll(",", " ");
+ //替换分号为逗号
+ String replaceAll = sNull.replaceAll(";", ",");
+ farm.setPosition("'POLYGON((" + replaceAll + "))'");
+ }
+ return R.status(farmService.saveFarmInfo(farm));
}
/**
--
Gitblit v1.9.3