From 49ae5bec0869ebe267e2e1a660ebbb01601f1548 Mon Sep 17 00:00:00 2001
From: litao <a15234804788@163.com>
Date: Mon, 25 Nov 2024 20:24:52 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=B4=E4=BF=AE=E4=BA=BA=E5=91=98=E5=9D=90?=
 =?UTF-8?q?=E6=A0=87=E6=9B=B4=E6=96=B0=EF=BC=88=E7=BC=93=E5=AD=98=E5=A4=84?=
 =?UTF-8?q?=E7=90=86=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/controller/UserController.java     | 19 +++++++++++++++++++
 .../modules/system/mapper/DeptMapper.xml      |  3 ++-
 .../system/service/impl/DeptServiceImpl.java  |  2 +-
 3 files changed, 22 insertions(+), 2 deletions(-)

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 42e34dd..31c53ab 100644
--- a/src/main/java/org/springblade/modules/system/controller/UserController.java
+++ b/src/main/java/org/springblade/modules/system/controller/UserController.java
@@ -69,6 +69,7 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
+import static org.springblade.core.cache.constant.CacheConstant.SYS_CACHE;
 import static org.springblade.core.cache.constant.CacheConstant.USER_CACHE;
 
 /**
@@ -360,4 +361,22 @@ public class UserController {
 		List<User> users = userService.list(Wrappers.lambdaQuery(User.class).eq(User::getRoleId, "1839552581620793346"));
 		return R.data(users);
 	}
+
+	/**
+	 * 维修人员坐标更新
+	 */
+	@PostMapping("/updateCoordinate")
+	public R updateCoordinate(@RequestBody User user) {
+		CacheUtil.put(SYS_CACHE, "coordinate:id:", user.getId(), user.getAddressLon() + "," + user.getAddressLon());
+		return R.status(true);
+	}
+
+	/**
+	 * 获取维修人员坐标
+	 */
+	@GetMapping("/getCoordinate")
+	public R getCoordinate(String userId) {
+		String coordinate = CacheUtil.get(SYS_CACHE, "coordinate:id:", userId, String.class);
+		return R.data(coordinate);
+	}
 }
diff --git a/src/main/java/org/springblade/modules/system/mapper/DeptMapper.xml b/src/main/java/org/springblade/modules/system/mapper/DeptMapper.xml
index 9d031da..5424206 100644
--- a/src/main/java/org/springblade/modules/system/mapper/DeptMapper.xml
+++ b/src/main/java/org/springblade/modules/system/mapper/DeptMapper.xml
@@ -75,7 +75,8 @@
     </select>
 
     <select id="limsTree" resultMap="treeNodeResultMap">
-        select id, parent_id, dept_name as title, id as "value", id as "key" from blade_dept where is_deleted = 0 and dept_category in (5,6,7)
+        select id, parent_id, dept_name as title, id as "value", id as "key" from blade_dept where is_deleted = 0 and dept_category in (5)
+        and id not in (SELECT dept_id FROM lab_maintenance_plan WHERE is_deleted = 0)
         <if test="_parameter!=null and _parameter!=''">
             and tenant_id = #{_parameter}
         </if>
diff --git a/src/main/java/org/springblade/modules/system/service/impl/DeptServiceImpl.java b/src/main/java/org/springblade/modules/system/service/impl/DeptServiceImpl.java
index 34207c9..357d59e 100644
--- a/src/main/java/org/springblade/modules/system/service/impl/DeptServiceImpl.java
+++ b/src/main/java/org/springblade/modules/system/service/impl/DeptServiceImpl.java
@@ -185,7 +185,7 @@ public class DeptServiceImpl extends ServiceImpl<DeptMapper, Dept> implements ID
 
 	@Override
 	public List<DeptVO> limsTree(String tenantId) {
-		return ForestNodeMerger.merge(baseMapper.limsTree(tenantId));
+		return baseMapper.limsTree(tenantId);
 	}
 
 }