From 74be5321ec9b2a98d252d1f2e223f6bb866939d7 Mon Sep 17 00:00:00 2001
From: chenyouting <514333061@qq.com>
Date: Thu, 31 Jul 2025 19:03:04 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=962?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../app/controller/AppAuthController.java     |  9 ++++++++
 .../app/service/AppDeviceBizService.java      | 11 ++++++++++
 .../app/service/AppLoginService.java          | 22 ++++++++++++++++++-
 .../app/domain/vo/AppDeviceDetailVo.java      |  9 ++++++++
 4 files changed, 50 insertions(+), 1 deletion(-)

diff --git a/fys-admin/src/main/java/com/fuyuanshen/app/controller/AppAuthController.java b/fys-admin/src/main/java/com/fuyuanshen/app/controller/AppAuthController.java
index 9d32a5a2..d483e457 100644
--- a/fys-admin/src/main/java/com/fuyuanshen/app/controller/AppAuthController.java
+++ b/fys-admin/src/main/java/com/fuyuanshen/app/controller/AppAuthController.java
@@ -104,6 +104,15 @@ public class AppAuthController {
         return R.ok("退出成功");
     }
 
+    /**
+     * 用户注销
+     */
+    @PostMapping("/cancelAccount")
+    public R<Void> cancelAccount() {
+        loginService.cancelAccount();
+        return R.ok("用户注销成功");
+    }
+
     /**
      * 用户注册
      */
diff --git a/fys-admin/src/main/java/com/fuyuanshen/app/service/AppDeviceBizService.java b/fys-admin/src/main/java/com/fuyuanshen/app/service/AppDeviceBizService.java
index 4489ba0d..1a0cd9de 100644
--- a/fys-admin/src/main/java/com/fuyuanshen/app/service/AppDeviceBizService.java
+++ b/fys-admin/src/main/java/com/fuyuanshen/app/service/AppDeviceBizService.java
@@ -18,6 +18,7 @@ import com.fuyuanshen.app.domain.vo.AppPersonnelInfoVo;
 import com.fuyuanshen.app.mapper.AppDeviceBindRecordMapper;
 import com.fuyuanshen.app.mapper.AppPersonnelInfoMapper;
 import com.fuyuanshen.app.mapper.equipment.APPDeviceMapper;
+import com.fuyuanshen.common.core.constant.GlobalConstants;
 import com.fuyuanshen.common.core.exception.ServiceException;
 import com.fuyuanshen.common.core.utils.ImageToCArrayConverter;
 import com.fuyuanshen.common.core.utils.MapstructUtils;
@@ -320,6 +321,16 @@ public class AppDeviceBizService {
         }else{
             vo.setBatteryPercentage("0");
         }
+
+        // 获取经度纬度
+        String locationInfo = GlobalConstants.GLOBAL_REDIS_KEY+DeviceRedisKeyConstants.DEVICE_LOCATION_KEY_PREFIX + device.getDeviceImei();
+        if(StringUtils.isNotBlank(locationInfo)){
+            JSONObject jsonObject = JSONObject.parseObject(locationInfo);
+            vo.setLongitude((String)jsonObject.get("longitude"));
+            vo.setLatitude((String)jsonObject.get("latitude"));
+            vo.setAddress((String)jsonObject.get("address"));
+        }
+
         return vo;
     }
 
diff --git a/fys-admin/src/main/java/com/fuyuanshen/app/service/AppLoginService.java b/fys-admin/src/main/java/com/fuyuanshen/app/service/AppLoginService.java
index bd92c2bf..0c86da27 100644
--- a/fys-admin/src/main/java/com/fuyuanshen/app/service/AppLoginService.java
+++ b/fys-admin/src/main/java/com/fuyuanshen/app/service/AppLoginService.java
@@ -51,7 +51,7 @@ public class AppLoginService {
     private Integer lockTime;
 
     private final ISysTenantService tenantService;
-    private final IAppRoleService roleService;
+    private final IAppUserService appUserService;
 
 
     /**
@@ -185,4 +185,24 @@ public class AppLoginService {
         }
     }
 
+    public void cancelAccount() {
+        try {
+            AppLoginUser loginUser = AppLoginHelper.getLoginUser();
+            if (ObjectUtil.isNull(loginUser)) {
+                return;
+            }
+            appUserService.deleteWithValidByIds(Collections.singletonList(loginUser.getUserId()),true);
+            if (TenantHelper.isEnable() && LoginHelper.isSuperAdmin()) {
+                // 超级管理员 登出清除动态租户
+                TenantHelper.clearDynamic();
+            }
+            recordLogininfor(loginUser.getTenantId(), loginUser.getUsername(), Constants.LOGOUT, "用户注销成功");
+        } catch (NotLoginException ignored) {
+        } finally {
+            try {
+                StpUtil.logout();
+            } catch (NotLoginException ignored) {
+            }
+        }
+    }
 }
diff --git a/fys-modules/fys-app/src/main/java/com/fuyuanshen/app/domain/vo/AppDeviceDetailVo.java b/fys-modules/fys-app/src/main/java/com/fuyuanshen/app/domain/vo/AppDeviceDetailVo.java
index c2c3be8e..6478ea44 100644
--- a/fys-modules/fys-app/src/main/java/com/fuyuanshen/app/domain/vo/AppDeviceDetailVo.java
+++ b/fys-modules/fys-app/src/main/java/com/fuyuanshen/app/domain/vo/AppDeviceDetailVo.java
@@ -90,4 +90,13 @@ public class AppDeviceDetailVo {
      * 在线状态(0离线，1在线)
      */
     private Integer onlineStatus;
+
+    // 经度
+    private String longitude;
+
+    // 纬度
+    private String latitude;
+
+    // 逆解析地址
+    private String address;
 }