From 373513b5e5c32f935320625e35d18abace6c0720 Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Thu, 30 Jun 2022 18:02:50 +0800
Subject: [PATCH] 地块管理
---
src/main/java/org/springblade/modules/farm/controller/FarmController.java | 23 +++++++++++++++++++++--
1 files changed, 21 insertions(+), 2 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 a5d164a..3cc4a78 100644
--- a/src/main/java/org/springblade/modules/farm/controller/FarmController.java
+++ b/src/main/java/org/springblade/modules/farm/controller/FarmController.java
@@ -30,13 +30,17 @@
import org.springblade.modules.farm.service.FarmService;
import org.springblade.modules.farm.vo.FarmVO;
import org.springframework.web.bind.annotation.*;
+
import javax.validation.Valid;
import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
/**
* 农场控制器
- * @since 2022-05-10
+ *
* @author zhongrj
+ * @since 2022-05-10
*/
@RestController
@AllArgsConstructor
@@ -108,7 +112,7 @@
public R update(@Valid @RequestBody Farm farm) {
farm.setUpdateTime(new Date());
//坐标转换
- if (null!=farm.getPosition() && !farm.getPosition().equals("")) {
+ if (null != farm.getPosition() && !farm.getPosition().equals("")) {
//替换逗号为空格
String sNull = farm.getPosition().replaceAll(",", " ");
//替换分号为逗号
@@ -140,4 +144,19 @@
return R.status(farmService.removeByIds(Func.toLongList(ids)));
}
+ /**
+ * 删除
+ */
+ @GetMapping("/SelectCount")
+ public R SelectCount() {
+ //农场数量
+ Integer integer = farmService.selectCountFarm();
+ //人员数量
+ Integer integer1 = farmService.selectCountUser();
+ Map map = new HashMap<>();
+ map.put("ncnum", integer);
+ map.put("rynum", integer1);
+ return R.data(map);
+ }
+
}
--
Gitblit v1.9.3