From 996d167e7234e7e05b53f44292c701abcb52fbef Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Thu, 07 Jul 2022 19:06:14 +0800
Subject: [PATCH] 农场新增接口修改，农场证书新增字段
---
src/main/java/org/springblade/modules/farm/mapper/FarmMapper.xml | 25 +++++++++++-
src/main/java/org/springblade/modules/farm/service/FarmService.java | 7 +++
src/main/java/org/springblade/modules/farm/controller/FarmController.java | 10 ++++
src/main/java/org/springblade/modules/farm/service/impl/FarmServiceImpl.java | 15 +++++++
src/main/java/org/springblade/modules/farm/entity/FarmPaper.java | 6 ++
src/main/java/org/springblade/modules/farm/mapper/FarmMapper.java | 7 +++
6 files changed, 65 insertions(+), 5 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..0fb2510 100644
--- a/src/main/java/org/springblade/modules/farm/controller/FarmController.java
+++ b/src/main/java/org/springblade/modules/farm/controller/FarmController.java
@@ -100,7 +100,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));
}
/**
diff --git a/src/main/java/org/springblade/modules/farm/entity/FarmPaper.java b/src/main/java/org/springblade/modules/farm/entity/FarmPaper.java
index 4166f2e..a31897a 100644
--- a/src/main/java/org/springblade/modules/farm/entity/FarmPaper.java
+++ b/src/main/java/org/springblade/modules/farm/entity/FarmPaper.java
@@ -63,7 +63,7 @@
private String type;
/**
- * 农场id
+ * 公司id
*/
private String deptId;
@@ -74,5 +74,9 @@
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date createTime;
+ /**
+ * 农场id
+ */
+ private Integer farmId;
}
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 47cf91f..381b0e9 100644
--- a/src/main/java/org/springblade/modules/farm/mapper/FarmMapper.java
+++ b/src/main/java/org/springblade/modules/farm/mapper/FarmMapper.java
@@ -55,4 +55,11 @@
Farm getFarmInfo(@Param("farm") FarmVO farm);
Integer selectCountFarm();
Integer selectCountUser();
+
+ /**
+ * 自定义新增农场信息
+ * @param farm
+ * @return
+ */
+ int saveFarmInfo(@Param("farm") Farm 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 2ea4b48..7d178da 100644
--- a/src/main/java/org/springblade/modules/farm/mapper/FarmMapper.xml
+++ b/src/main/java/org/springblade/modules/farm/mapper/FarmMapper.xml
@@ -11,13 +11,16 @@
slogan,
introduce,
picture,
- ST_ASTEXT(position) as position,user_id
+ 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>
</select>
- <!--自定义修改电子围栏数据-->
+ <!--自定义修改农场围栏数据-->
<update id="updateFarmById">
update sys_farm set farm_name = #{farm.farmName},
farm_address = #{farm.farmAddress},
@@ -32,6 +35,22 @@
where id = #{farm.id}
</update>
+ <!--自定义新增农场围栏数据-->
+ <insert id="saveFarmInfo">
+ insert into sys_farm (farm_name,farm_address,farm_area,slogan,introduce,picture,position,create_time,update_time,dept_id)
+ values
+ (#{farm.farmName},#{farm.farmAddress},#{farm.farmArea},#{farm.slogan},#{farm.introduce},#{farm.picture},
+ <choose>
+ <when test="farm.position!=null and farm.position!=''">
+ ST_GeomFromText(${farm.position}),
+ </when>
+ <otherwise>
+ '',
+ </otherwise>
+ </choose>
+ #{farm.createTime},#{farm.updateTime},#{farm.deptId})
+ </insert>
+
<!--详情信息（自定义查询)-->
<select id="getFarmInfo" resultType="org.springblade.modules.farm.vo.FarmVO">
select id,
@@ -45,7 +64,7 @@
from
sys_farm
where 1=1
- and dept_id = #{farm.deptId}
+ and id = #{farm.id}
</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 00f0adb..c5455df 100644
--- a/src/main/java/org/springblade/modules/farm/service/FarmService.java
+++ b/src/main/java/org/springblade/modules/farm/service/FarmService.java
@@ -38,4 +38,11 @@
Farm getFarmInfo(FarmVO farm);
Integer selectCountFarm();
Integer selectCountUser();
+
+ /**
+ * 自定义新增农场信息
+ * @param farm
+ * @return
+ */
+ boolean saveFarmInfo(Farm 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 4fb3ecb..596c9b8 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
@@ -60,4 +60,19 @@
public Integer selectCountUser() {
return baseMapper.selectCountUser();
}
+
+ /**
+ * 自定义新增农场信息
+ * @param farm
+ * @return
+ */
+ @Override
+ public boolean saveFarmInfo(Farm farm) {
+ //新增
+ int i = baseMapper.saveFarmInfo(farm);
+ if (i>0){
+ return true;
+ }
+ return false;
+ }
}
--
Gitblit v1.9.3