From 32b0c2663c403998bee7a880f48dff6a6ce2bce4 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Tue, 10 May 2022 19:20:40 +0800
Subject: [PATCH] 农场接口修改，新增农场证书接口
---
src/main/java/org/springblade/modules/farm/controller/FarmController.java | 24 +++++++++++++++++++++++-
1 files changed, 23 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 09f2abb..a5d164a 100644
--- a/src/main/java/org/springblade/modules/farm/controller/FarmController.java
+++ b/src/main/java/org/springblade/modules/farm/controller/FarmController.java
@@ -31,6 +31,7 @@
import org.springblade.modules.farm.vo.FarmVO;
import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;
+import java.util.Date;
/**
* 农场控制器
@@ -52,6 +53,15 @@
@ApiOperation(value = "详情", notes = "传入farm")
public R<Farm> detail(Farm farm) {
Farm detail = farmService.getOne(Condition.getQueryWrapper(farm));
+ return R.data(detail);
+ }
+
+ /**
+ * 详情信息（自定义查询)
+ */
+ @GetMapping("/details")
+ public R<Farm> details(FarmVO farm) {
+ Farm detail = farmService.getFarmInfo(farm);
return R.data(detail);
}
@@ -84,6 +94,8 @@
@ApiOperationSupport(order = 4)
@ApiOperation(value = "新增", notes = "传入farm")
public R save(@Valid @RequestBody Farm farm) {
+ farm.setCreateTime(new Date());
+ farm.setUpdateTime(new Date());
return R.status(farmService.save(farm));
}
@@ -94,7 +106,17 @@
@ApiOperationSupport(order = 5)
@ApiOperation(value = "修改", notes = "传入farm")
public R update(@Valid @RequestBody Farm farm) {
- return R.status(farmService.updateById(farm));
+ farm.setUpdateTime(new Date());
+ //坐标转换
+ if (null!=farm.getPosition() && !farm.getPosition().equals("")) {
+ //替换逗号为空格
+ String sNull = farm.getPosition().replaceAll(",", " ");
+ //替换分号为逗号
+ String replaceAll = sNull.replaceAll(";", ",");
+ farm.setPosition("'POLYGON((" + replaceAll + "))'");
+ }
+ //更新并返回
+ return R.status(farmService.updateFarmById(farm));
}
/**
--
Gitblit v1.9.3