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/mapper/FarmMapper.xml | 24 ++++++++
src/main/java/org/springblade/modules/farm/service/FarmService.java | 9 +++
src/main/java/org/springblade/modules/farm/controller/FarmController.java | 12 ++++
src/main/java/org/springblade/modules/lang/mapper/LandMapper.java | 17 +++++
src/main/java/org/springblade/modules/lang/service/impl/LandServiceImpl.java | 9 +++
src/main/java/org/springblade/modules/farm/service/impl/FarmServiceImpl.java | 12 ++++
src/main/java/org/springblade/modules/farm/entity/Farm.java | 2
src/main/java/org/springblade/modules/lang/controller/LandController.java | 11 +++
src/main/java/org/springblade/modules/farm/mapper/FarmMapper.java | 7 ++
src/main/java/org/springblade/modules/lang/mapper/LandMapper.xml | 27 +++++++++
src/main/java/org/springblade/modules/lang/service/ILandService.java | 7 ++
11 files changed, 135 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 0fb2510..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")
diff --git a/src/main/java/org/springblade/modules/farm/entity/Farm.java b/src/main/java/org/springblade/modules/farm/entity/Farm.java
index 41582e1..909e443 100644
--- a/src/main/java/org/springblade/modules/farm/entity/Farm.java
+++ b/src/main/java/org/springblade/modules/farm/entity/Farm.java
@@ -80,7 +80,7 @@
private Date updateTime;
/**
- * 农场id
+ * 公司id
*/
private String deptId;
diff --git a/src/main/java/org/springblade/modules/farm/mapper/FarmMapper.java b/src/main/java/org/springblade/modules/farm/mapper/FarmMapper.java
index 381b0e9..17910a9 100644
--- a/src/main/java/org/springblade/modules/farm/mapper/FarmMapper.java
+++ b/src/main/java/org/springblade/modules/farm/mapper/FarmMapper.java
@@ -62,4 +62,11 @@
* @return
*/
int saveFarmInfo(@Param("farm") Farm farm);
+
+ /**
+ * 自定义查询所有农场信息（不分页）
+ * @param farm
+ * @return
+ */
+ List<FarmVO> getFarmList(@Param("farm") FarmVO farm);
}
diff --git a/src/main/java/org/springblade/modules/farm/mapper/FarmMapper.xml b/src/main/java/org/springblade/modules/farm/mapper/FarmMapper.xml
index 98d3028..666711f 100644
--- a/src/main/java/org/springblade/modules/farm/mapper/FarmMapper.xml
+++ b/src/main/java/org/springblade/modules/farm/mapper/FarmMapper.xml
@@ -18,6 +18,30 @@
<if test="farm.farmName!=null and farm.farmName!=''">
and farm_name like concat('%',#{farm.farmName},'%')
</if>
+ <if test="farm.deptId!=null and farm.deptId!=''">
+ and dept_id = #{farm.deptId}
+ </if>
+ </select>
+
+ <!--自定义查询农场列表数据（不分页）-->
+ <select id="getFarmList" resultType="org.springblade.modules.farm.vo.FarmVO">
+ select id,
+ farm_name,
+ farm_address,
+ farm_area,
+ slogan,
+ introduce,
+ picture,
+ ST_ASTEXT(position) as position
+ from
+ sys_farm
+ where 1=1
+ <if test="farm.farmName!=null and farm.farmName!=''">
+ and farm_name like concat('%',#{farm.farmName},'%')
+ </if>
+ <if test="farm.deptId!=null and farm.deptId!=''">
+ and dept_id = #{farm.deptId}
+ </if>
</select>
<!--自定义修改农场围栏数据-->
diff --git a/src/main/java/org/springblade/modules/farm/service/FarmService.java b/src/main/java/org/springblade/modules/farm/service/FarmService.java
index c5455df..3c0b656 100644
--- a/src/main/java/org/springblade/modules/farm/service/FarmService.java
+++ b/src/main/java/org/springblade/modules/farm/service/FarmService.java
@@ -6,6 +6,8 @@
import org.springblade.modules.farm.entity.Farm;
import org.springblade.modules.farm.vo.FarmVO;
+import java.util.List;
+
/**
* 农场服务类
* @since 2022-05-10
@@ -45,4 +47,11 @@
* @return
*/
boolean saveFarmInfo(Farm farm);
+
+ /**
+ * 自定义查询所有农场信息（不分页）
+ * @param farm
+ * @return
+ */
+ List<FarmVO> getFarmList(FarmVO farm);
}
diff --git a/src/main/java/org/springblade/modules/farm/service/impl/FarmServiceImpl.java b/src/main/java/org/springblade/modules/farm/service/impl/FarmServiceImpl.java
index 596c9b8..05371cf 100644
--- a/src/main/java/org/springblade/modules/farm/service/impl/FarmServiceImpl.java
+++ b/src/main/java/org/springblade/modules/farm/service/impl/FarmServiceImpl.java
@@ -7,6 +7,8 @@
import org.springblade.modules.farm.vo.FarmVO;
import org.springframework.stereotype.Service;
+import java.util.List;
+
/**
* 农场服务实现类
* @since 2022-05-10
@@ -75,4 +77,14 @@
}
return false;
}
+
+ /**
+ * 自定义查询所有农场信息（不分页）
+ * @param farm
+ * @return
+ */
+ @Override
+ public List<FarmVO> getFarmList(FarmVO farm) {
+ return baseMapper.getFarmList(farm);
+ }
}
diff --git a/src/main/java/org/springblade/modules/lang/controller/LandController.java b/src/main/java/org/springblade/modules/lang/controller/LandController.java
index a18f71f..88d098c 100644
--- a/src/main/java/org/springblade/modules/lang/controller/LandController.java
+++ b/src/main/java/org/springblade/modules/lang/controller/LandController.java
@@ -251,6 +251,17 @@
/**
+ * 地块列表(不分页)
+ * @param land
+ * @return
+ */
+ @GetMapping("/getLandList")
+ public R getLandList(LandVO land) {
+ return R.data(landService.getLandList(land));
+ }
+
+
+ /**
* 首页地块统计接口
*/
@GetMapping("/selectCount")
diff --git a/src/main/java/org/springblade/modules/lang/mapper/LandMapper.java b/src/main/java/org/springblade/modules/lang/mapper/LandMapper.java
index c16f311..2f3b988 100644
--- a/src/main/java/org/springblade/modules/lang/mapper/LandMapper.java
+++ b/src/main/java/org/springblade/modules/lang/mapper/LandMapper.java
@@ -49,20 +49,35 @@
* @return
*/
boolean saveLandInfo(@Param("land") Land land);
+
/**
* 详情信息（自定义查询)
+ * @param land
* @return
*/
Land getLandInfo(@Param("land") LandVO land);
+
/**
* 更新地块信息
- * @param farm
+ * @param land
* @return
*/
int updateLandById(@Param("land") Land land);
+
List selectLandList(String userid);
+
List selectNum(String deptId);
+
List<Map<String, Object>> selectZAre(String deptId);
+
List<Map<String, Object>> selectSAre(String deptId);
+
List<Map<String, Object>> selectWAre(String deptId);
+
+ /**
+ * 地块列表（不分页）
+ * @param land
+ * @return
+ */
+ List<LandVO> getLandList(LandVO land);
}
diff --git a/src/main/java/org/springblade/modules/lang/mapper/LandMapper.xml b/src/main/java/org/springblade/modules/lang/mapper/LandMapper.xml
index 85dee85..0ae8857 100644
--- a/src/main/java/org/springblade/modules/lang/mapper/LandMapper.xml
+++ b/src/main/java/org/springblade/modules/lang/mapper/LandMapper.xml
@@ -56,6 +56,33 @@
</if>
</select>
+ <!--查询地块列表（不分页）-->
+ <select id="getLandList" resultType="org.springblade.modules.lang.vo.LandVO">
+ SELECT
+ id,
+ land_name,
+ land_area,
+ ST_ASTEXT(land_range) as land_range,
+ url
+ FROM sys_land
+ where is_deleted = 0
+ <if test="land.landType!=null and land.landType != ''">
+ and land_type = #{land.landType}
+ </if>
+ <if test="land.landName!=null and land.landName != ''">
+ and land_name like concat('%', #{land.landName},'%')
+ </if>
+ <if test="land.deptId!=null and land.deptId != ''">
+ and dept_id=#{land.deptId}
+ </if>
+ <if test="land.type!=null and land.type != ''">
+ and type=#{land.type}
+ </if>
+ <if test="land.tenantId!=null and land.tenantId != ''">
+ and tenant_id =#{land.tenantId}
+ </if>
+ </select>
+
<insert id="saveLandInfo">
insert into sys_land
(user_id,land_name,land_type,land_area,land_range,type,land_unit,dept_id,url)
diff --git a/src/main/java/org/springblade/modules/lang/service/ILandService.java b/src/main/java/org/springblade/modules/lang/service/ILandService.java
index 5e2ab7e..f9295f6 100644
--- a/src/main/java/org/springblade/modules/lang/service/ILandService.java
+++ b/src/main/java/org/springblade/modules/lang/service/ILandService.java
@@ -77,4 +77,11 @@
List<Map<String, Object>> selectSAre(String deptId);
List<Map<String, Object>> selectWAre(String deptId);
List selectNum(String deptId);
+
+ /**
+ * 地块列表（不分页）
+ * @param land
+ * @return
+ */
+ List<LandVO> getLandList(LandVO land);
}
diff --git a/src/main/java/org/springblade/modules/lang/service/impl/LandServiceImpl.java b/src/main/java/org/springblade/modules/lang/service/impl/LandServiceImpl.java
index 569a74d..5685089 100644
--- a/src/main/java/org/springblade/modules/lang/service/impl/LandServiceImpl.java
+++ b/src/main/java/org/springblade/modules/lang/service/impl/LandServiceImpl.java
@@ -90,4 +90,13 @@
return baseMapper.selectNum(deptId);
}
+ /**
+ * 地块列表（不分页）
+ * @param land
+ * @return
+ */
+ @Override
+ public List<LandVO> getLandList(LandVO land) {
+ return baseMapper.getLandList(land);
+ }
}
--
Gitblit v1.9.3