From bd4f4d6186b905b3fcec9f8b4b25cb12dfdf7ae6 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Thu, 15 Sep 2022 17:31:40 +0800
Subject: [PATCH] 取消农场位置更新
---
src/main/java/org/springblade/modules/farm/mapper/FarmMapper.xml | 6 +++---
src/main/java/org/springblade/modules/soldr/controller/SoldrController.java | 3 ++-
src/main/java/org/springblade/modules/farm/controller/FarmController.java | 14 +++++++-------
3 files changed, 12 insertions(+), 11 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 6e3d3c0..d2fb1eb 100644
--- a/src/main/java/org/springblade/modules/farm/controller/FarmController.java
+++ b/src/main/java/org/springblade/modules/farm/controller/FarmController.java
@@ -134,13 +134,13 @@
public R update(@Valid @RequestBody Farm 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 + "))'");
- }
+// 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));
}
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 9fbb27b..617dba5 100644
--- a/src/main/java/org/springblade/modules/farm/mapper/FarmMapper.xml
+++ b/src/main/java/org/springblade/modules/farm/mapper/FarmMapper.xml
@@ -66,9 +66,9 @@
panoramic = #{farm.panoramic},
longitude = #{farm.longitude},
latitude = #{farm.latitude},
- <if test="farm.position!=null and farm.position!=''">
- position = ST_GeomFromText(${farm.position}),
- </if>
+<!-- <if test="farm.position!=null and farm.position!=''">-->
+<!-- position = ST_GeomFromText(${farm.position}),-->
+<!-- </if>-->
update_time = #{farm.updateTime}
where id = #{farm.id}
</update>
diff --git a/src/main/java/org/springblade/modules/soldr/controller/SoldrController.java b/src/main/java/org/springblade/modules/soldr/controller/SoldrController.java
index 6b09ddf..54c4124 100644
--- a/src/main/java/org/springblade/modules/soldr/controller/SoldrController.java
+++ b/src/main/java/org/springblade/modules/soldr/controller/SoldrController.java
@@ -302,7 +302,8 @@
stock.setState("0");
stockService.Updaet(stock);
//删除
- soldrService.del(soldrVOs.getId());
+// soldrService.del(soldrVOs.getId());
+ soldrService.delLogic(soldrVOs.getId());
}
//如果小于就修改
else {
--
Gitblit v1.9.3