openjdk没有Pair，使用Map

jjt-admin/src/main/java/com/jjt/web/controller/system/SysLoginController.java

@@ -46,7 +46,7 @@ public class SysLoginController {
         AjaxResult ajax = AjaxResult.success();
         // 生成令牌
         String token = loginService.login(loginBody.getUsername(), loginBody.getPassword(), loginBody.getCode(),
-                loginBody.getUuid()).getKey();
+                loginBody.getUuid());
         ajax.put(Constants.TOKEN, token);
         return ajax;
     }
@@ -64,7 +64,7 @@ public class SysLoginController {
         AjaxResult ajax = AjaxResult.success();
         // 生成令牌
         String token = loginService.login(loginBody.getUsername(), loginBody.getPassword(), loginBody.getCode(),
-                loginBody.getUuid()).getKey();
+                loginBody.getUuid());
         ajax.put(Constants.TOKEN, token);
         return ajax;
     }

jjt-biz/src/main/java/com/jjt/check/controller/CheckConfigController.java

@@ -20,7 +20,6 @@ import com.jjt.common.utils.IntervalUtil;
 import com.jjt.common.utils.bean.BeanUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import javafx.util.Pair;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
@@ -29,10 +28,7 @@ import java.io.*;
 import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.net.URLEncoder;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
+import java.util.*;
 
 /**
  * 自动巡检指标配置Controller
@@ -178,9 +174,9 @@ public class CheckConfigController extends BaseController {
                         }
                         BigDecimal avg = total.divide(BigDecimal.valueOf(oms.size()), 2, RoundingMode.HALF_UP);
                         boolean flag = IntervalUtil.inNumRange(avg.floatValue(), checkConfig.getCheckRule());
-                        Pair<String, String> pair = CheckExportVO.checkV(flag, avg.floatValue(), pos);
-                        crd.setResultL(pair.getKey());
-                        crd.setResultR(pair.getValue());
+                        Map<String, String> pair = CheckExportVO.checkV(flag, avg.floatValue(), pos);
+                        crd.setResultL(pair.get("left"));
+                        crd.setResultR(pair.get("right"));
                         if (flag) {
                             errors++;
                         }
@@ -188,9 +184,9 @@ public class CheckConfigController extends BaseController {
                         //发现一个就算异常
                         for (BizObjMetrics om : oms) {
                             boolean flag = IntervalUtil.inNumRange(om.getDValue().floatValue(), checkConfig.getCheckRule());
-                            Pair<String, String> pair = CheckExportVO.checkV(true, 0f, pos);
-                            crd.setResultL(pair.getKey());
-                            crd.setResultR(pair.getValue());
+                            Map<String, String> pair = CheckExportVO.checkV(true, 0f, pos);
+                            crd.setResultL(pair.get("left"));
+                            crd.setResultR(pair.get("right"));
                             if (flag) {
                                 errors++;
                                 break;
@@ -205,9 +201,9 @@ public class CheckConfigController extends BaseController {
                     flag = true;
                 }
 
-                Pair<String, String> pair = CheckExportVO.checkV(flag, v.floatValue(), pos);
-                crd.setResultL(pair.getKey());
-                crd.setResultR(pair.getValue());
+                Map<String, String> pair = CheckExportVO.checkV(flag, v.floatValue(), pos);
+                crd.setResultL(pair.get("left"));
+                crd.setResultR(pair.get("right"));
                 if (flag) {
                     errors++;
                 }

jjt-biz/src/main/java/com/jjt/check/vo/CheckExportVO.java

@@ -1,11 +1,12 @@
 package com.jjt.check.vo;
 
 import io.swagger.annotations.ApiModel;
-import javafx.util.Pair;
 import lombok.Data;
 
 import java.math.BigDecimal;
 import java.math.RoundingMode;
+import java.util.HashMap;
+import java.util.Map;
 import java.util.Random;
 
 /**
@@ -28,7 +29,8 @@ public class CheckExportVO {
     public static final Integer[] METHOD = new Integer[]{1, 1, 1, 1, 1, 2, 2, 2, 2, 1, 1, 1, 4, 2, 2, 2, 4, 2, 4, 2, 2, 2, 2, 3, 2, 2, 3, 2};
 
 
-    public static Pair<String, String> checkV(boolean flag, float v, int pos) {
+    public static Map<String, String> checkV(boolean flag, float v, int pos) {
+        Map<String, String> map = new HashMap<>();
         String resultR = "";
         String resultL = "";
         if (flag) {
@@ -72,7 +74,10 @@ public class CheckExportVO {
                 default:
             }
         }
-        return new Pair<>(resultL, resultR);
+        map.put("left", resultL);
+        map.put("right", resultR);
+
+        return map;
     }
 
     public void mock() {

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

@@ -17,7 +17,6 @@ import com.jjt.framework.manager.factory.AsyncFactory;
 import com.jjt.framework.security.context.AuthenticationContextHolder;
 import com.jjt.system.service.ISysConfigService;
 import com.jjt.system.service.ISysUserService;
-import javafx.util.Pair;
 import org.springframework.security.authentication.AuthenticationManager;
 import org.springframework.security.authentication.BadCredentialsException;
 import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
@@ -57,7 +56,7 @@ public class SysLoginService {
      * @param uuid     唯一标识
      * @return 结果
      */
-    public Pair<String, LoginUser> login(String username, String password, String code, String uuid) {
+    public String login(String username, String password, String code, String uuid) {
         // 验证码校验
         validateCaptcha(username, code, uuid);
         // 登录前置校验
@@ -84,7 +83,7 @@ public class SysLoginService {
         LoginUser loginUser = (LoginUser) authentication.getPrincipal();
 //        recordLoginInfo(loginUser.getUserId());
         // 生成token
-        return new Pair<>(tokenService.createToken(loginUser), loginUser);
+        return tokenService.createToken(loginUser);
     }
 
     /**