From ffe705d1fe2c4fa60d457f94b3e2be0cfeaf24c0 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期日, 15 六月 2025 01:58:30 +0800
Subject: [PATCH] 修改功能

---
 ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TDriverController.java |   19 +++++++++++++++++--
 ManagementQYTTravel/guns-admin/pom.xml                                                                                   |   15 +++++++--------
 2 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/ManagementQYTTravel/guns-admin/pom.xml b/ManagementQYTTravel/guns-admin/pom.xml
index 7a3d6ae..4ec0f2f 100644
--- a/ManagementQYTTravel/guns-admin/pom.xml
+++ b/ManagementQYTTravel/guns-admin/pom.xml
@@ -25,12 +25,17 @@
             <groupId>com.stylefeng</groupId>
             <artifactId>guns-generator</artifactId>
         </dependency>
-        
+        <dependency>
+            <groupId>org.springframework.session</groupId>
+            <artifactId>spring-session-data-redis</artifactId>
+            <version>2.6.0</version>
+        </dependency>
+    
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-data-redis</artifactId>
         </dependency>
-        
+    
         <!--spring boot依赖-->
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -57,12 +62,6 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-devtools</artifactId>
             <optional>true</optional>
-        </dependency>
-        
-        <dependency>
-            <groupId>redis.clients</groupId>
-            <artifactId>jedis</artifactId>
-            <version>2.9.0</version>
         </dependency>
         
         <!-- 导入Excel数据依赖 start -->
diff --git a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TDriverController.java b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TDriverController.java
index f1d80eb..6945131 100644
--- a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TDriverController.java
+++ b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TDriverController.java
@@ -22,8 +22,7 @@
 import com.stylefeng.guns.modular.system.service.*;
 import com.stylefeng.guns.modular.system.util.*;
 import com.stylefeng.guns.modular.system.util.qianyuntong.EmployeeUtil;
-import com.stylefeng.guns.modular.system.util.qianyuntong.model.SaveStaffNode;
-import com.stylefeng.guns.modular.system.util.qianyuntong.model.SaveStaffNodeRequest;
+import com.stylefeng.guns.modular.system.util.qianyuntong.model.*;
 import org.apache.poi.ss.usermodel.Cell;
 import org.apache.poi.ss.usermodel.Row;
 import org.apache.poi.ss.usermodel.Sheet;
@@ -841,6 +840,22 @@
     public Object delete(@RequestParam Integer tDriverId) {
         TDriver driver = tDriverService.selectById(tDriverId);
         driver.setFlag("3");
+        ShiroUser user = ShiroKit.getUser();
+        User user1 = userService.selectById(user.getId());
+        TCompany tCompany = itCompanyService.selectById(user.getObjectId());
+        //中台先删除司机
+        GetStaffNodeRequest request = new GetStaffNodeRequest();
+        request.setEmpId(driver.getEmpId());
+        request.setMobile(user1.getPhone());
+        request.setEntercode(tCompany.getEnterCode());
+        StaffNodeInfo staffNode = EmployeeUtil.getStaffNode(request);
+        if ("1".equals(staffNode.getIsValid())) {
+            DeleteStafNodeRequest deleteStafNodeRequest = new DeleteStafNodeRequest();
+            deleteStafNodeRequest.setEmpId(driver.getEmpId());
+            deleteStafNodeRequest.setEntercode(tCompany.getEnterCode());
+            deleteStafNodeRequest.setMobile(user1.getPhone());
+            EmployeeUtil.ecrmDeleteStafNode(deleteStafNodeRequest);
+        }
         tDriverService.updateById(driver);
         String value = (String) redisTemplate.opsForValue().get("DRIVER_" + driver.getPhone());
         redisTemplate.delete(value);

--
Gitblit v1.7.1