From fdff4ca4813fc77a9006309ed4e5c232b4f3c85e Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Fri, 22 Jul 2022 14:26:51 +0800
Subject: [PATCH] 返回数据新增农场全景地址
---
src/main/java/org/springblade/modules/farm/controller/FarmController.java | 15 ++++++++++++++-
1 files changed, 14 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 0fb2510..a2c1b71 100644
--- a/src/main/java/org/springblade/modules/farm/controller/FarmController.java
+++ b/src/main/java/org/springblade/modules/farm/controller/FarmController.java
@@ -24,16 +24,19 @@
import org.springblade.core.boot.ctrl.BladeController;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
+import org.springblade.core.secure.BladeUser;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.Func;
import org.springblade.modules.farm.entity.Farm;
import org.springblade.modules.farm.service.FarmService;
import org.springblade.modules.farm.vo.FarmVO;
+import org.springblade.modules.system.vo.RoleVO;
import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;
import java.util.Date;
import java.util.HashMap;
+import java.util.List;
import java.util.Map;
/**
@@ -89,6 +92,17 @@
public R<IPage<FarmVO>> page(FarmVO farm, Query query) {
IPage<FarmVO> pages = farmService.selectFarmPage(Condition.getPage(query), farm);
return R.data(pages);
+ }
+
+ /**
+ * 自定义查询所有农场信息（不分页）
+ * @param farm
+ * @return
+ */
+ @GetMapping("/getFarmList")
+ public R<List<FarmVO>> getFarmList(FarmVO farm) {
+ List<FarmVO> farmList = farmService.getFarmList(farm);
+ return R.data(farmList);
}
/**
@@ -166,5 +180,4 @@
map.put("rynum", integer1);
return R.data(map);
}
-
}
--
Gitblit v1.9.3