From 7d81ce01560d384f15212edc40ebeaa9924913f9 Mon Sep 17 00:00:00 2001
From: wlzboy <66905212@qq.com>
Date: 星期日, 21 九月 2025 19:12:53 +0800
Subject: [PATCH] feat:新增评价功能

---
 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/GpsCollectServiceImpl.java |   19 ++++++-------------
 1 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/GpsCollectServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/GpsCollectServiceImpl.java
index 6385cea..42e8390 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/GpsCollectServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/GpsCollectServiceImpl.java
@@ -78,6 +78,7 @@
                     response.setSuccess(true);
                     response.setMessage("鐧诲綍鎴愬姛");
                     response.setToken(jsonResult.getString("token"));
+                    response.setServerid(jsonResult.getInteger("serverid"));
                     break;
                 case -1:
                     response.setSuccess(false);
@@ -166,9 +167,10 @@
                 if (loginResponse.isSuccess()) {
                     //灏唗oken鍐欏叆gspconfig
                     token = loginResponse.getToken();
+                    Integer serviceid = loginResponse.getServerid();
                     //getTokenExpireTime 杩欎釜鏄病鏈夌殑 闇�瑕佽嚜宸辫绠楋紝褰撳墠鏃堕棿+23灏忔椂
                     Date expireTime = DateUtils.addHours(new Date(), 23);
-                    gpsConfigService.updateToken("gps51", token, expireTime);
+                    gpsConfigService.updateToken("gps51", token,serviceid, expireTime);
                     System.out.println("GPS绯荤粺鐧诲綍鎴愬姛锛宼oken宸叉洿鏂�");
                     return token;
                 } else {
@@ -285,7 +287,7 @@
         
         String username = config.getUsername();
         // 鏋勫缓璇锋眰URL
-        String url = config.getDomain() + "/webapi?action=querymonitorlist&token=" + token;
+        String url = config.getDomain() + "/webapi?action=querymonitorlist&token=" + token+"&serverid="+config.getServerid();
         Map<String, String> params = new HashMap<>();
         params.put("username", username);
         
@@ -381,7 +383,7 @@
         System.out.println("token鑾峰彇鎴愬姛锛�"+token);
 
         // 鏋勫缓璇锋眰URL
-        String url = config.getDomain() + "/webapi?action=lastposition&token="+token;
+        String url = config.getDomain() + "/webapi?action=lastposition&token="+token+"&serverid="+config.getServerid();
         System.out.println("璇锋眰URL锛�"+url);
 
         // 鏋勫缓璇锋眰鍙傛暟
@@ -568,7 +570,7 @@
             System.out.println("Token鑾峰彇鎴愬姛: " + token);
 
             // 鏋勫缓璇锋眰URL
-            String url = config.getDomain() + "/webapi?action=querytracks&token=" + token;
+            String url = config.getDomain() + "/webapi?action=querytracks&token=" + token+"&serverid="+config.getServerid();
             System.out.println("璇锋眰URL: " + url);
             
             // 鏋勫缓璇锋眰鍙傛暟
@@ -603,15 +605,6 @@
             response.setDeviceid(jsonResult.getString("deviceid"));
 
             if (response.getStatus() == 0) {
-
-                if(jsonResult.getJSONObject("result")==null)
-                {
-                    System.err.println("鏌ヨ杞ㄨ抗澶辫触锛岃建杩硅褰曚负绌�");
-                    GpsTrackQueryResponse responseErr = new GpsTrackQueryResponse();
-                    responseErr.setStatus(-1);
-                    responseErr.setCause("杞ㄨ抗璁板綍涓虹┖");
-                    return responseErr;
-                }
 
                 // 瑙f瀽杞ㄨ抗璁板綍鍒楄〃
                 JSONArray recordsArray = jsonResult.getJSONArray("records");

--
Gitblit v1.9.1