From f6d0e3738bba6c4651249c3a934893f2376e02cf Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Thu, 21 Jul 2022 17:06:42 +0800
Subject: [PATCH] 删除多余api，添加农场省市区
---
src/main/java/org/springblade/modules/farm/mapper/FarmMapper.xml | 6 ++++++
src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java | 10 ----------
src/main/java/org/springblade/modules/farm/entity/Farm.java | 19 +++++++++++++++++++
src/main/java/org/springblade/modules/system/controller/UserController.java | 11 -----------
src/main/java/org/springblade/modules/system/service/IUserService.java | 7 -------
5 files changed, 25 insertions(+), 28 deletions(-)
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 909e443..3ddde20 100644
--- a/src/main/java/org/springblade/modules/farm/entity/Farm.java
+++ b/src/main/java/org/springblade/modules/farm/entity/Farm.java
@@ -84,4 +84,23 @@
*/
private String deptId;
+ /**
+ * 省编号
+ */
+ private String province;
+
+ /**
+ * 市编号
+ */
+ private String city;
+
+ /**
+ * 区编号
+ */
+ private String district;
+
+ /**
+ * 360全景url
+ */
+ private String panoramic;
}
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 666711f..db59c34 100644
--- a/src/main/java/org/springblade/modules/farm/mapper/FarmMapper.xml
+++ b/src/main/java/org/springblade/modules/farm/mapper/FarmMapper.xml
@@ -52,6 +52,9 @@
slogan = #{farm.slogan},
introduce = #{farm.introduce},
picture = #{farm.picture},
+ province = #{farm.province},
+ city = #{farm.city},
+ district = #{farm.district},
<if test="farm.position!=null and farm.position!=''">
position = ST_GeomFromText(${farm.position}),
</if>
@@ -84,6 +87,9 @@
slogan,
introduce,
picture,
+ province,
+ city,
+ district,
ST_ASTEXT(position) as position,dept_id
from
sys_farm
diff --git a/src/main/java/org/springblade/modules/system/controller/UserController.java b/src/main/java/org/springblade/modules/system/controller/UserController.java
index 3af1273..88d8fd8 100644
--- a/src/main/java/org/springblade/modules/system/controller/UserController.java
+++ b/src/main/java/org/springblade/modules/system/controller/UserController.java
@@ -342,15 +342,4 @@
public R getUserList(UserVO user){
return R.data(userService.getUserList(user));
}
-
- /**
- * 根据用户id查询用户信息
- * @param user
- * @return
- */
- @PostMapping("/updateUserPersonal")
- @ApiOperation(value = "修改用户信息", notes = "传入user，id必须")
- public R updateUserPersonal( User user){
- return R.data(userService.updateUserPersonal(user));
- }
}
diff --git a/src/main/java/org/springblade/modules/system/service/IUserService.java b/src/main/java/org/springblade/modules/system/service/IUserService.java
index 9001162..9906a92 100644
--- a/src/main/java/org/springblade/modules/system/service/IUserService.java
+++ b/src/main/java/org/springblade/modules/system/service/IUserService.java
@@ -213,11 +213,4 @@
* @return
*/
List<User> getUserList(UserVO user);
-
- /**
- * 根据用户id查询用户信息
- * @param user
- * @return
- */
- int updateUserPersonal(User user);
}
diff --git a/src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java b/src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java
index c794acc..f19ac19 100644
--- a/src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java
+++ b/src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java
@@ -442,14 +442,4 @@
//查询用户信息并返回
return baseMapper.getUserList(user);
}
-
- /**
- * 根据用户id修改用户信息
- * @param user
- * @return
- */
- @Override
- public int updateUserPersonal(User user) {
- return baseMapper.updateById(user);
- }
}
--
Gitblit v1.9.3