APP退出功能优化

fys-admin/src/main/java/com/fuyuanshen/app/controller/AppDeviceController.java

@@ -0,0 +1,49 @@
+package com.fuyuanshen.app.controller;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import com.fuyuanshen.app.domain.bo.AppUserBo;
+import com.fuyuanshen.app.domain.vo.AppUserVo;
+import com.fuyuanshen.app.domain.vo.DeviceVo;
+import com.fuyuanshen.app.service.DeviceService;
+import com.fuyuanshen.app.service.IAppUserService;
+import com.fuyuanshen.common.core.domain.R;
+import com.fuyuanshen.common.core.validate.AddGroup;
+import com.fuyuanshen.common.core.validate.EditGroup;
+import com.fuyuanshen.common.excel.utils.ExcelUtil;
+import com.fuyuanshen.common.idempotent.annotation.RepeatSubmit;
+import com.fuyuanshen.common.log.annotation.Log;
+import com.fuyuanshen.common.log.enums.BusinessType;
+import com.fuyuanshen.common.mybatis.core.page.PageQuery;
+import com.fuyuanshen.common.mybatis.core.page.TableDataInfo;
+import com.fuyuanshen.common.web.core.BaseController;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;
+import lombok.RequiredArgsConstructor;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * APP 设备信息管理
+ * @date 2025-06-27
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/app/device")
+public class AppDeviceController extends BaseController {
+
+    private final DeviceService deviceService;
+
+    /**
+     * 查询设备信息列表
+     */
+    @GetMapping("/list")
+    public TableDataInfo<DeviceVo> list(AppUserBo bo, PageQuery pageQuery) {
+        return deviceService.queryPageList(bo, pageQuery);
+    }
+
+
+}

fys-admin/src/main/java/com/fuyuanshen/app/domain/vo/DeviceVo.java

@@ -0,0 +1,14 @@
+package com.fuyuanshen.app.domain.vo;
+
+import lombok.Data;
+
+@Data
+public class DeviceVo {
+
+    private String deviceId;
+
+    private String deviceName;
+
+    private String deviceType;
+
+}

fys-admin/src/main/java/com/fuyuanshen/app/service/AppLoginService.java

@@ -11,7 +11,6 @@ import com.fuyuanshen.common.core.constant.SystemConstants;
 import com.fuyuanshen.common.core.constant.TenantConstants;
 import com.fuyuanshen.common.core.domain.dto.RoleDTO;
 import com.fuyuanshen.common.core.domain.model.AppLoginUser;
-import com.fuyuanshen.common.core.domain.model.LoginUser;
 import com.fuyuanshen.common.core.enums.LoginType;
 import com.fuyuanshen.common.core.exception.user.UserException;
 import com.fuyuanshen.common.core.utils.MessageUtils;
@@ -20,6 +19,7 @@ import com.fuyuanshen.common.core.utils.SpringUtils;
 import com.fuyuanshen.common.core.utils.StringUtils;
 import com.fuyuanshen.common.log.event.LogininforEvent;
 import com.fuyuanshen.common.redis.utils.RedisUtils;
+import com.fuyuanshen.common.satoken.utils.AppLoginHelper;
 import com.fuyuanshen.common.satoken.utils.LoginHelper;
 import com.fuyuanshen.common.tenant.exception.TenantException;
 import com.fuyuanshen.common.tenant.helper.TenantHelper;
@@ -54,7 +54,6 @@ public class AppLoginService {
     private Integer lockTime;
 
     private final ISysTenantService tenantService;
-    private final IAppPermissionService permissionService;
     private final IAppRoleService roleService;
 
 
@@ -69,7 +68,7 @@ public class AppLoginService {
      */
     public void logout() {
         try {
-            LoginUser loginUser = LoginHelper.getLoginUser();
+            AppLoginUser loginUser = AppLoginHelper.getLoginUser();
             if (ObjectUtil.isNull(loginUser)) {
                 return;
             }

fys-admin/src/main/java/com/fuyuanshen/app/service/DeviceService.java

@@ -0,0 +1,58 @@
+package com.fuyuanshen.app.service;
+
+import cn.dev33.satoken.exception.NotLoginException;
+import cn.dev33.satoken.stp.StpUtil;
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.ObjectUtil;
+import com.fuyuanshen.app.domain.bo.AppUserBo;
+import com.fuyuanshen.app.domain.vo.AppRoleVo;
+import com.fuyuanshen.app.domain.vo.AppUserVo;
+import com.fuyuanshen.app.domain.vo.DeviceVo;
+import com.fuyuanshen.common.core.constant.Constants;
+import com.fuyuanshen.common.core.constant.SystemConstants;
+import com.fuyuanshen.common.core.constant.TenantConstants;
+import com.fuyuanshen.common.core.domain.dto.RoleDTO;
+import com.fuyuanshen.common.core.domain.model.AppLoginUser;
+import com.fuyuanshen.common.core.domain.model.LoginUser;
+import com.fuyuanshen.common.core.enums.LoginType;
+import com.fuyuanshen.common.core.exception.user.UserException;
+import com.fuyuanshen.common.core.utils.MessageUtils;
+import com.fuyuanshen.common.core.utils.ServletUtils;
+import com.fuyuanshen.common.core.utils.SpringUtils;
+import com.fuyuanshen.common.core.utils.StringUtils;
+import com.fuyuanshen.common.log.event.LogininforEvent;
+import com.fuyuanshen.common.mybatis.core.page.PageQuery;
+import com.fuyuanshen.common.mybatis.core.page.TableDataInfo;
+import com.fuyuanshen.common.redis.utils.RedisUtils;
+import com.fuyuanshen.common.satoken.utils.LoginHelper;
+import com.fuyuanshen.common.tenant.exception.TenantException;
+import com.fuyuanshen.common.tenant.helper.TenantHelper;
+import com.fuyuanshen.system.domain.vo.SysTenantVo;
+import com.fuyuanshen.system.service.ISysTenantService;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Service;
+
+import java.time.Duration;
+import java.util.Date;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+import java.util.function.Supplier;
+
+/**
+ * 登录校验方法
+ *
+ * @author Lion Li
+ */
+@RequiredArgsConstructor
+@Slf4j
+@Service
+public class DeviceService {
+
+
+    public TableDataInfo<DeviceVo> queryPageList(AppUserBo bo, PageQuery pageQuery) {
+        return null;
+    }
+}