From 75123b96a4f970390b4c9b8c44436ce0e81ee825 Mon Sep 17 00:00:00 2001
From: 18650502300 <18650502300@163.com>
Date: Tue, 17 Dec 2024 08:49:31 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BE=AE=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ruoyi/web/controller/system/SysLoginController.java  | 9 ++++-----
 .../ruoyi/system/service/impl/AsDeviceServiceImpl.java   | 5 +++--
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/electripper-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java b/electripper-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java
index 95879b1..db35d5e 100644
--- a/electripper-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java
+++ b/electripper-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java
@@ -2,7 +2,6 @@ package com.ruoyi.web.controller.system;
 
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
-import com.alibaba.fastjson2.JSON;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.constant.Constants;
 import com.ruoyi.common.constant.HttpStatus;
@@ -30,6 +29,8 @@ import javax.annotation.Resource;
 import java.util.List;
 import java.util.Set;
 
+import static com.ruoyi.common.utils.SecurityUtils.getUserId;
+
 /**
  * 登录验证
  *
@@ -129,9 +130,7 @@ public class SysLoginController
         if(ObjectUtil.isNotNull(userId)){
             user =  userService.selectUserById(userId);
         }else{
-            user = SecurityUtils.getLoginUser().getAsUser();
-            log.info("获取到当前登录用户:{}", JSON.toJSON(user));
-            user = asUserMapper.selectUserById(user.getUserId());
+            user = asUserMapper.selectUserById(getUserId());
         }
         // 根据用户角色查询所有菜单
         List<EtMenu> etMenus = appMenuService.selectEtMenuListByRole(user.getSysRole());
@@ -148,7 +147,7 @@ public class SysLoginController
     @GetMapping("getRouters")
     public AjaxResult getRouters()
     {
-        Long userId = SecurityUtils.getUserId();
+        Long userId = getUserId();
         List<SysMenu> menus = menuService.selectMenuTreeByUserId(userId);
         SysDept sysDept = deptService.selectDeptById(SecurityUtils.getDeptId());
 //        if(!sysDept.getIsProfitSharing().equals("true")){
diff --git a/electripper-system/src/main/java/com/ruoyi/system/service/impl/AsDeviceServiceImpl.java b/electripper-system/src/main/java/com/ruoyi/system/service/impl/AsDeviceServiceImpl.java
index 9f73ba2..1e05f8d 100644
--- a/electripper-system/src/main/java/com/ruoyi/system/service/impl/AsDeviceServiceImpl.java
+++ b/electripper-system/src/main/java/com/ruoyi/system/service/impl/AsDeviceServiceImpl.java
@@ -225,10 +225,11 @@ public class AsDeviceServiceImpl extends ServiceImpl<AsDeviceMapper, AsDevice> i
             LogEntry.LocationValue value = logEntry.getValue();
             // 坐标转换  WGS84 转 GCJ02
             double[] doubles = CommonUtil.coordinateConvert(value.getLon(),value.getLat());
-            BigDecimal lon = new BigDecimal(doubles[1]).setScale(8, RoundingMode.HALF_UP);
-            BigDecimal lat = new BigDecimal(doubles[0]).setScale(8, RoundingMode.HALF_UP);
+            BigDecimal lon = BigDecimal.valueOf(doubles[1]).setScale(8, RoundingMode.HALF_UP);
+            BigDecimal lat = BigDecimal.valueOf(doubles[0]).setScale(8, RoundingMode.HALF_UP);
             asDevice.setLongitude(lon.toString());
             asDevice.setLatitude(lat.toString());
+            asDevice.setLastLocationTime(new Date(logEntry.getAt()));
         }
         //正在进行中的订单
         EtOrder order = new EtOrder();