2026-03-09 优化标注功能 增加GeoCalculator计算工具类，算出面、圆的水平面积和水平周长，线的水平距离和直线距离。在调取按标注id...

zhaowenyu

2026-03-12 208731a6c41b644186bb68c93c19ef7026284e3b

 ard-framework/src/main/java/com/ard/framework/web/service/SysLoginService.java

@@ -1,11 +1,15 @@
package com.ard.framework.web.service;

import javax.annotation.Resource;

import com.ard.framework.security.handle.CustomAuthenticationSuccessHandler;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.security.authentication.AuthenticationManager;
import org.springframework.security.authentication.BadCredentialsException;
import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
import org.springframework.security.core.Authentication;
import org.springframework.security.core.userdetails.UserDetailsService;
import org.springframework.stereotype.Component;
import com.ard.common.constant.CacheConstants;
import com.ard.common.constant.Constants;
@@ -32,11 +36,15 @@
/**
 * 登录校验方法
 * 
 * @author ruoyi
 * @author ard
 */
@Component
public class SysLoginService
{
    // 是否允许账户多终端同时登录（true允许 false不允许）
    @Value("${token.soloLogin}")
    private boolean soloLogin;

    @Autowired
    private TokenService tokenService;

@@ -51,6 +59,12 @@

    @Autowired
    private ISysConfigService configService;

    @Resource
    private CustomAuthenticationSuccessHandler successHandler;

    @Autowired
    private UserDetailsService userDetailsService;

    /**
     * 登录验证
@@ -75,6 +89,11 @@
            AuthenticationContextHolder.setContext(authenticationToken);
            // 该方法会去调用UserDetailsServiceImpl.loadUserByUsername
            authentication = authenticationManager.authenticate(authenticationToken);
            // 登录成功逻辑
            if (authentication.isAuthenticated()) {
                // 检查是否已登录
                successHandler.onAuthenticationSuccess(authentication);
            }
        }
        catch (Exception e)
        {
@@ -96,6 +115,17 @@
        AsyncManager.me().execute(AsyncFactory.recordLogininfor(username, Constants.LOGIN_SUCCESS, MessageUtils.message("user.login.success")));
        LoginUser loginUser = (LoginUser) authentication.getPrincipal();
        recordLoginInfo(loginUser.getUserId());
        if (!soloLogin)
        {
            // 如果用户不允许多终端同时登录，清除缓存信息
            String userIdKey = CacheConstants.LOGIN_USERID_KEY + loginUser.getUser().getUserId();
            String userKey = redisCache.getCacheObject(userIdKey);
            if (StringUtils.isNotEmpty(userKey))
            {
                redisCache.deleteObject(userIdKey);
                redisCache.deleteObject(userKey);
            }
        }
        // 生成token
        return tokenService.createToken(loginUser);
    }
@@ -142,6 +172,7 @@
            AsyncManager.me().execute(AsyncFactory.recordLogininfor(username, Constants.LOGIN_FAIL, MessageUtils.message("not.null")));
            throw new UserNotExistsException();
        }

        // 密码如果不在指定范围内 错误
        if (password.length() < UserConstants.PASSWORD_MIN_LENGTH
                || password.length() > UserConstants.PASSWORD_MAX_LENGTH)